diff --git a/Headers/gnustep/base/NSString.h b/Headers/gnustep/base/NSString.h
index efbc4fe53..189f0049d 100644
--- a/Headers/gnustep/base/NSString.h
+++ b/Headers/gnustep/base/NSString.h
@@ -272,8 +272,8 @@ compiler warning.
 @end
 
 /* Because the compiler thinks that @".." strings are NXConstantString's. */
-#include <Foundation/NSCString.h>
-@interface NXConstantString : NSCString
+#include <Foundation/NSGCString.h>
+@interface NXConstantString : NSGCString
 @end
 
 #endif /* __NSString_h_OBJECTS_INCLUDE */
diff --git a/Source/Makefile.in b/Source/Makefile.in
index 13ce45184..5cdf495a0 100644
--- a/Source/Makefile.in
+++ b/Source/Makefile.in
@@ -280,7 +280,6 @@ NSCharacterSet.m \
 NSCoder.m \
 NSCopyObject.m \
 NSConcreteValue.m \
-NSCString.m \
 NSData.m \
 NSDate.m \
 NSDeallocateObject.m \
@@ -291,6 +290,7 @@ NSGeometry.m \
 NSGArchiver.m \
 NSGArray.m \
 NSGCoder.m \
+NSGCString.m \
 NSGData.m \
 NSGDictionary.m \
 NSGUnarchiver.m \
@@ -337,7 +337,6 @@ Foundation/NSAutoreleasePool.h \
 Foundation/NSBitmapCharSet.h \
 Foundation/NSBundle.h \
 Foundation/NSCharacterSet.h \
-Foundation/NSCString.h \
 Foundation/NSCoder.h \
 Foundation/NSConcreteNumber.h \
 Foundation/NSConcreteValue.h \
@@ -349,6 +348,7 @@ Foundation/NSGeometry.h \
 Foundation/NSGArchiver.h \
 Foundation/NSGArray.h \
 Foundation/NSGCoder.h \
+Foundation/NSGCString.h \
 Foundation/NSGData.h \
 Foundation/NSGDictionary.h \
 Foundation/NSGUnarchiver.h \