diff --git a/Headers/gnustep/base/o_list.h b/Headers/gnustep/base/o_list.h
index 43de621e5..4e346c7e9 100644
--- a/Headers/gnustep/base/o_list.h
+++ b/Headers/gnustep/base/o_list.h
@@ -82,8 +82,8 @@ struct _o_list_enumerator
 
 /** Basics **/
 
-#include <gnustep/base/o_list-bas.h>
-#include <gnustep/base/o_list-cbs.h>
+#include <gnustep/base/o_list_bas.h>
+#include <gnustep/base/o_list_cbs.h>
 
 /** Creating **/
 
diff --git a/Headers/gnustep/base/o_x_cbs.h.in b/Headers/gnustep/base/o_x_cbs.h.in
index 6d4101a61..668dfbfba 100644
--- a/Headers/gnustep/base/o_x_cbs.h.in
+++ b/Headers/gnustep/base/o_x_cbs.h.in
@@ -28,7 +28,7 @@
 /**** Included Headers *******************************************************/
 
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-@YY@.h>
+#include <gnustep/base/o_@YY@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Source/NSObject.m b/Source/NSObject.m
index e48c87d25..54a8889db 100644
--- a/Source/NSObject.m
+++ b/Source/NSObject.m
@@ -190,12 +190,12 @@ BOOL NSDecrementExtraRefCountWasZero (id anObject)
   struct objc_protocol_list* proto_list;
 
   for (proto_list = ((struct objc_class*)self)->class_pointer->protocols;
-       proto_list; proto_list = proto_list_>next)
+       proto_list; proto_list = proto_list->next)
     {
-      for (i=0; i < proto_list_>count; i++)
+      for (i=0; i < proto_list->count; i++)
       {
 	/* xxx We should add conformsToProtocol to Protocol class. */
-        if ([proto_list_>list[i] conformsTo: aProtocol])
+        if ([proto_list->list[i] conformsTo: aProtocol])
           return YES;
       }
     }
diff --git a/Source/NSString.m b/Source/NSString.m
index ee77cb549..c67de4639 100644
--- a/Source/NSString.m
+++ b/Source/NSString.m
@@ -301,7 +301,7 @@ handle_printf_atsign (FILE *stream,
 {
 #if HAVE_VSPRINTF
 #define BUFFER_EXTRA 1024
-  const char *format_cp = [format cStringNoCopy]);
+  const char *format_cp = [format cStringNoCopy];
   int format_len = strlen (format_cp);
   char buf[format_len + BUFFER_EXTRA]; /* xxx horrible disgusting, fix this! */
   int printed_len;
diff --git a/Source/o_x_bas.m.in b/Source/o_x_bas.m.in
index 7819cbc13..489126ee2 100644
--- a/Source/o_x_bas.m.in
+++ b/Source/o_x_bas.m.in
@@ -27,7 +27,7 @@
 #include <Foundation/NSZone.h>
 #include <Foundation/NSString.h>
 #include <gnustep/base/numbers.h>
-#include <gnustep/base/o-@XX@.h>
+#include <gnustep/base/o_@XX@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Source/o_x_cbs.m.in b/Source/o_x_cbs.m.in
index 43ac03a77..9d6306430 100644
--- a/Source/o_x_cbs.m.in
+++ b/Source/o_x_cbs.m.in
@@ -25,7 +25,7 @@
 /**** Included Headers *******************************************************/
 
 #include <gnustep/base/callbacks.h>
-#include <gnustep/base/o-@YY@.h>
+#include <gnustep/base/o_@YY@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/