diff --git a/Source/Additions/GSCategories.m b/Source/Additions/GSCategories.m
index 0582cec45..dec50952c 100644
--- a/Source/Additions/GSCategories.m
+++ b/Source/Additions/GSCategories.m
@@ -23,6 +23,7 @@
 */
 #include "config.h"
 #include	<Foundation/Foundation.h>
+#include "GSCompatibility.h"
 
 /**
  * Extension methods for the NSCalendarDate class
diff --git a/Source/Additions/GSCompatibility.h b/Source/Additions/GSCompatibility.h
index 3c191718e..4bd3ed34e 100644
--- a/Source/Additions/GSCompatibility.h
+++ b/Source/Additions/GSCompatibility.h
@@ -27,8 +27,7 @@
 
 #ifdef NeXT_Foundation_LIBRARY
 #include <string.h>
-#include <Foundation/NSArray.h>
-#include <Foundation/NSLock.h>
+#include <Foundation/Foundation.h>
 #include "gnustep/base/preface.h"
 #include "gnustep/base/GSObjCRuntime.h"
 #include "gnustep/base/GNUstep.h"