diff --git a/Source/collhash.c b/Source/collhash.c
index 853c516c3..40e0bf93d 100644
--- a/Source/collhash.c
+++ b/Source/collhash.c
@@ -26,8 +26,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #include <stdio.h>
 #include <assert.h>
 
-#include <objects/collhash.h>
-#include <objects/objc-malloc.h>
+#include <gnustep/base/collhash.h>
+#include <gnustep/base/objc-malloc.h>
 #include <objc/objc.h>
 
 /* These two macros determine when a hash table is full and
diff --git a/Source/numbers.c b/Source/numbers.c
index b5a073052..82c61881f 100644
--- a/Source/numbers.c
+++ b/Source/numbers.c
@@ -24,7 +24,7 @@
 
 /**** Included Headers *******************************************************/
 
-#include <objects/numbers.h>
+#include <gnustep/base/numbers.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
diff --git a/Source/o_x_bas.m.in b/Source/o_x_bas.m.in
index c33eee591..4ab26f50a 100644
--- a/Source/o_x_bas.m.in
+++ b/Source/o_x_bas.m.in
@@ -26,8 +26,8 @@
 
 #include <Foundation/NSZone.h>
 #include <Foundation/NSString.h>
-#include <objects/numbers.h>
-#include <objects/@XX@.h>
+#include <gnustep/base/numbers.h>
+#include <gnustep/base/@XX@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/
 
@@ -84,7 +84,7 @@ objects_@XX@_unset_name(objects_@XX@_t *xx)
 /** Number **/
 
 /* Returns the (process-wide) unique serial number given to the
- * structure XX.  See <objects/numbers.h> for more info. */
+ * structure XX.  See <gnustep/base/numbers.h> for more info. */
 inline size_t
 objects_@XX@_serial_number(objects_@XX@_t *xx)
 {
@@ -92,7 +92,7 @@ objects_@XX@_serial_number(objects_@XX@_t *xx)
 }
 
 /* Gives XX a new (process-wide) unique number.  Numbers are not
- * reused.  See <objects/numbers.h> for more info. */
+ * reused.  See <gnustep/base/numbers.h> for more info. */
 inline size_t
 _objects_@XX@_set_serial_number(objects_@XX@_t *xx)
 {
diff --git a/Source/o_x_cbs.m.in b/Source/o_x_cbs.m.in
index b90876841..13501a3b8 100644
--- a/Source/o_x_cbs.m.in
+++ b/Source/o_x_cbs.m.in
@@ -24,8 +24,8 @@
 
 /**** Included Headers *******************************************************/
 
-#include <objects/callbacks.h>
-#include <objects/@YY@.h>
+#include <gnustep/base/callbacks.h>
+#include <gnustep/base/@YY@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/