diff --git a/Source/o_x_bas.m.in b/Source/o_x_bas.m.in
index 93b17e523..acd07cb63 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/@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 68cf462c5..43ac03a77 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/@YY@.h>
+#include <gnustep/base/o-@YY@.h>
 
 /**** Type, Constant, and Macro Definitions **********************************/