--- src/idl-compiler/orbit-idl-c-headers.c.dist	2009-03-24 10:29:32.600794600 +0000
+++ src/idl-compiler/orbit-idl-c-headers.c	2009-03-24 10:31:27.797177160 +0000
@@ -351,14 +351,20 @@ ch_output_interface(IDL_tree tree, OIDL_
 {
     char *fullname;
     fullname = orbit_cbe_get_typespec_str(tree);
-    fprintf(ci->fh, "#if !defined(ORBIT_DECL_%s) && !defined(_%s_defined)\n#define ORBIT_DECL_%s 1\n#define _%s_defined 1\n", fullname, fullname, fullname, fullname);
+    //fprintf(ci->fh, "#if !defined(ORBIT_DECL_%s) && !defined(_%s_defined)\n#define ORBIT_DECL_%s 1\n#define _%s_defined 1\n", fullname, fullname, fullname, fullname);
+    fprintf(ci->fh, "#if !defined(ORBIT_DECL_%s)", fullname);
+    fprintf(ci->fh, " && !defined(_%s_defined)\n", fullname);
+    fprintf(ci->fh, "#define ORBIT_DECL_%s 1\n", fullname);
+    fprintf(ci->fh, "#define _%s_defined 1\n", fullname);
 
     if ( tree->declspec & IDLF_DECLSPEC_PIDL ) {
         /* PIDL interfaces are not normal CORBA Objects */
-    	fprintf(ci->fh, "typedef struct %s_type *%s;\n", fullname, fullname);
-	fprintf(ci->fh, "#ifndef TC_%s\n", fullname);
-	fprintf(ci->fh, "#  define TC_%s TC_CORBA_Object\n", fullname);
-	fprintf(ci->fh, "#endif\n");
+    	//fprintf(ci->fh, "typedef struct %s_type *%s;\n", fullname, fullname);
+    	fprintf(ci->fh, "typedef struct %s_type", fullname);
+      fprintf(ci->fh, " *%s;\n", fullname);
+    	fprintf(ci->fh, "#ifndef TC_%s\n", fullname);
+    	fprintf(ci->fh, "#  define TC_%s TC_CORBA_Object\n", fullname);
+    	fprintf(ci->fh, "#endif\n");
     } else {
     	fprintf(ci->fh, "#define %s__freekids CORBA_Object__freekids\n", fullname);
     	fprintf(ci->fh, "typedef CORBA_Object %s;\n", fullname);