diff --git a/Headers/Additions/GNUstepBase/GSObjCRuntime.h b/Headers/Additions/GNUstepBase/GSObjCRuntime.h
index 1a249e080..cbf6c2734 100644
--- a/Headers/Additions/GNUstepBase/GSObjCRuntime.h
+++ b/Headers/Additions/GNUstepBase/GSObjCRuntime.h
@@ -39,6 +39,8 @@ extern "C" {
 
 #include <stdarg.h>
 
+#include <GNUstepBase/GSVersionMacros.h>
+
 #ifdef GNUSTEP_WITH_DLL
  
 #if BUILD_libgnustep_base_DLL
diff --git a/Headers/Additions/GNUstepBase/GSVersionMacros.h b/Headers/Additions/GNUstepBase/GSVersionMacros.h
index dc010da2b..b47d13fa2 100644
--- a/Headers/Additions/GNUstepBase/GSVersionMacros.h
+++ b/Headers/Additions/GNUstepBase/GSVersionMacros.h
@@ -1,4 +1,4 @@
-/* GNUstep.h - macros for managing API versioning
+/* GSVersionMacros.h - macros for managing API versioning
    Copyright (C) 2006 Free Software Foundation, Inc.
 
    Written by: Richard Frith-Macdonald <rfm@gnu.org>
diff --git a/Headers/Foundation/NSObject.h b/Headers/Foundation/NSObject.h
index 1c5b84cb9..b683965a6 100644
--- a/Headers/Foundation/NSObject.h
+++ b/Headers/Foundation/NSObject.h
@@ -32,8 +32,6 @@
 extern "C" {
 #endif
 
-#include <GNUstepBase/GSVersionMacros.h>
-
 #include <Foundation/NSObjCRuntime.h>
 #include <GNUstepBase/preface.h>
 #include <GSConfig.h>