diff --git a/Headers/gnustep/base/Coder.h b/Headers/gnustep/base/Coder.h
index 9d752c566..ae6204f4e 100644
--- a/Headers/gnustep/base/Coder.h
+++ b/Headers/gnustep/base/Coder.h
@@ -27,7 +27,6 @@
 #include <gnustep/base/preface.h>
 #include <gnustep/base/Coding.h>
 #include <gnustep/base/Streaming.h>
-#include <gnustep/base/String.h>
 #include <Foundation/NSHashTable.h>
 #include <Foundation/NSMapTable.h>
 
diff --git a/Headers/gnustep/base/NSArray.h b/Headers/gnustep/base/NSArray.h
index d8127fc4c..d0389d3c2 100644
--- a/Headers/gnustep/base/NSArray.h
+++ b/Headers/gnustep/base/NSArray.h
@@ -101,7 +101,6 @@
 #ifndef NO_GNUSTEP
 
 #include <gnustep/base/IndexedCollecting.h>
-#include <gnustep/base/String.h>
 
 /* Eventually we'll make a Constant version of this protocol. */
 @interface NSArray (GNU) <IndexedCollecting>
diff --git a/Headers/gnustep/base/Port.h b/Headers/gnustep/base/Port.h
index f9b662a9e..03e449a90 100644
--- a/Headers/gnustep/base/Port.h
+++ b/Headers/gnustep/base/Port.h
@@ -27,7 +27,8 @@
 #include <gnustep/base/preface.h>
 #include <gnustep/base/Coding.h>
 #include <gnustep/base/MemoryStream.h>
-#include <gnustep/base/NSString.h>
+#include <Foundation/NSString.h>
+#include <gnustep/base/Invocation.h>
 
 /* xxx Use something like this? */
 @protocol PacketSending
diff --git a/Headers/gnustep/base/Streaming.h b/Headers/gnustep/base/Streaming.h
index 8313bf3e7..b5a361d04 100644
--- a/Headers/gnustep/base/Streaming.h
+++ b/Headers/gnustep/base/Streaming.h
@@ -25,7 +25,6 @@
 #define __Streaming_h__GNUSTEP_BASE_INCLUDE
 
 #include <gnustep/base/preface.h>
-#include <gnustep/base/String.h>
 
 @protocol Streaming <NSObject>