diff --git a/Headers/gnustep/base/NSString.h b/Headers/gnustep/base/NSString.h
index ea17385af..cd2722a28 100644
--- a/Headers/gnustep/base/NSString.h
+++ b/Headers/gnustep/base/NSString.h
@@ -309,8 +309,8 @@ compiler warning.
 @end
 
 /* Because the compiler thinks that @".." strings are NXConstantString's. */
-#include <gnustep/base/NSGString.h>
-#include <gnustep/base/NSGCString.h>
+#include <Foundation/NSGString.h>
+#include <Foundation/NSGCString.h>
 @interface NXConstantString : NSGCString
 @end
 
diff --git a/Source/NSGString.m b/Source/NSGString.m
index 827443b09..8bd61bcef 100644
--- a/Source/NSGString.m
+++ b/Source/NSGString.m
@@ -75,7 +75,7 @@
       if (_hash == 0)
         _fastImp._NSGString_hash(self, @selector(hash));
       if (other->_hash == 0)
-        _fastImp._NSGString_hash(self, @selector(hash));
+        _fastImp._NSGString_hash(other, @selector(hash));
       if (_hash != other->_hash)
 	return NO;
       return [self isEqualToString: other];