diff --git a/Headers/Foundation/NSLock.h b/Headers/Foundation/NSLock.h
index a2eeef4e7..3e5e6a912 100644
--- a/Headers/Foundation/NSLock.h
+++ b/Headers/Foundation/NSLock.h
@@ -362,9 +362,5 @@ GS_EXPORT NSLock_error_handler  *_NSLock_error_handler;
 }
 #endif
 
-#if     !NO_GNUSTEP && !defined(GNUSTEP_BASE_INTERNAL)
-#import <GNUstepBase/NSLock+GNUstepBase.h>
-#endif
-
 #endif /* __NSLock_h_GNUSTEP_BASE_INCLUDE */
 
diff --git a/Headers/GNUstepBase/Additions.h b/Headers/GNUstepBase/Additions.h
index c22bd42fb..bbbc1fd7a 100644
--- a/Headers/GNUstepBase/Additions.h
+++ b/Headers/GNUstepBase/Additions.h
@@ -36,7 +36,6 @@
 #endif
 #import	<GNUstepBase/GSFunctions.h>
 #import	<GNUstepBase/GSLocale.h>
-#import	<GNUstepBase/GSLock.h>
 #import	<GNUstepBase/GSMime.h>
 #import	<GNUstepBase/GSXML.h>
 #import	<GNUstepBase/Unicode.h>
@@ -48,7 +47,6 @@
 #import	<GNUstepBase/NSData+GNUstepBase.h>
 #import	<GNUstepBase/NSDebug+GNUstepBase.h>
 #import	<GNUstepBase/NSFileHandle+GNUstepBase.h>
-#import	<GNUstepBase/NSLock+GNUstepBase.h>
 #import	<GNUstepBase/NSMutableString+GNUstepBase.h>
 #import	<GNUstepBase/NSNetServices+GNUstepBase.h>
 #import	<GNUstepBase/NSNumber+GNUstepBase.h>
diff --git a/Source/Additions/Unicode.m b/Source/Additions/Unicode.m
index 86530a023..14232ae7f 100644
--- a/Source/Additions/Unicode.m
+++ b/Source/Additions/Unicode.m
@@ -39,7 +39,6 @@
 #import "Foundation/NSPathUtilities.h"
 #endif
 
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/GSMime.h"
 #import "GNUstepBase/Unicode.h"
 
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index dffae230d..1ee4b1f0f 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -130,7 +130,6 @@ GSIArray.h \
 GSIMap.h \
 GSFunctions.h \
 GSLocale.h \
-GSLock.h \
 GSMime.h \
 GSTLS.h \
 GSXML.h \
@@ -142,7 +141,6 @@ NSData+GNUstepBase.h \
 NSDebug+GNUstepBase.h \
 NSFileHandle+GNUstepBase.h \
 NSHashTable+GNUstepBase.h \
-NSLock+GNUstepBase.h \
 NSMutableString+GNUstepBase.h \
 NSNetServices+GNUstepBase.h \
 NSNumber+GNUstepBase.h \
diff --git a/Source/GSAttributedString.m b/Source/GSAttributedString.m
index 4bb1603d4..e26008284 100644
--- a/Source/GSAttributedString.m
+++ b/Source/GSAttributedString.m
@@ -45,7 +45,6 @@
  */
 
 #import "common.h"
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
 #import "Foundation/NSAttributedString.h"
 #import "Foundation/NSException.h"
diff --git a/Source/GSHTTPAuthentication.m b/Source/GSHTTPAuthentication.m
index 3be2bd43d..db2ef64bd 100644
--- a/Source/GSHTTPAuthentication.m
+++ b/Source/GSHTTPAuthentication.m
@@ -29,7 +29,6 @@
 #import "Foundation/NSScanner.h"
 #import "Foundation/NSSet.h"
 #import "Foundation/NSValue.h"
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/GSMime.h"
 #import "GNUstepBase/NSData+GNUstepBase.h"
 
diff --git a/Source/GSHTTPURLHandle.m b/Source/GSHTTPURLHandle.m
index 561cb2f3e..e767b99ab 100644
--- a/Source/GSHTTPURLHandle.m
+++ b/Source/GSHTTPURLHandle.m
@@ -42,7 +42,6 @@
 #import "Foundation/NSURLHandle.h"
 #import "Foundation/NSValue.h"
 #import "GNUstepBase/GSMime.h"
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/GSTLS.h"
 #import "GNUstepBase/NSData+GNUstepBase.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
diff --git a/Source/GSMDNSNetServices.m b/Source/GSMDNSNetServices.m
index e14c3e224..d818bd7ad 100644
--- a/Source/GSMDNSNetServices.m
+++ b/Source/GSMDNSNetServices.m
@@ -32,9 +32,6 @@
 #import "Foundation/NSRunLoop.h"
 #import "Foundation/NSTimer.h"
 #import "Foundation/NSValue.h"
-#if defined(_REENTRANT)
-#import "GNUstepBase/GSLock.h"
-#endif
 
 #import <dns_sd.h>		// Apple's DNS Service Discovery
 
diff --git a/Source/NSCalendar.m b/Source/NSCalendar.m
index f2044e1f4..949eda54d 100644
--- a/Source/NSCalendar.m
+++ b/Source/NSCalendar.m
@@ -29,11 +29,11 @@
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSLocale.h"
+#import "Foundation/NSLock.h"
 #import "Foundation/NSNotification.h"
 #import "Foundation/NSString.h"
 #import "Foundation/NSTimeZone.h"
 #import "Foundation/NSUserDefaults.h"
-#import "GNUstepBase/GSLock.h"
 
 #if defined(HAVE_UNICODE_UCAL_H)
 #define id ucal_id
diff --git a/Source/NSConnection.m b/Source/NSConnection.m
index a08c41c9d..24ff4c76c 100644
--- a/Source/NSConnection.m
+++ b/Source/NSConnection.m
@@ -82,7 +82,6 @@
 #endif
 
 #import "Foundation/NSEnumerator.h"
-#import "GNUstepBase/GSLock.h"
 
 /* Skip past an argument and also any offset information before the next.
  */
diff --git a/Source/NSCountedSet.m b/Source/NSCountedSet.m
index 231cc21ba..896994f78 100644
--- a/Source/NSCountedSet.m
+++ b/Source/NSCountedSet.m
@@ -26,7 +26,6 @@
    */
 
 #import "common.h"
-#import "GNUstepBase/GSLock.h"
 #import "Foundation/NSEnumerator.h"
 #import "Foundation/NSSet.h"
 #import "Foundation/NSCoder.h"
diff --git a/Source/NSDebug.m b/Source/NSDebug.m
index a581afc3d..fa14829f8 100644
--- a/Source/NSDebug.m
+++ b/Source/NSDebug.m
@@ -31,7 +31,6 @@
 #include <stdio.h>
 #import "GSPrivate.h"
 #import "GSPThread.h"
-#import "GNUstepBase/GSLock.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSData.h"
 #import "Foundation/NSDictionary.h"
diff --git a/Source/NSIndexPath.m b/Source/NSIndexPath.m
index 7fa91dc50..2bdda18ba 100644
--- a/Source/NSIndexPath.m
+++ b/Source/NSIndexPath.m
@@ -32,7 +32,6 @@
 #import	"Foundation/NSIndexPath.h"
 #import	"Foundation/NSKeyedArchiver.h"
 #import	"Foundation/NSLock.h"
-#import	"GNUstepBase/GSLock.h"
 
 static	NSRecursiveLock	*lock = nil;
 static	NSHashTable	*shared = 0;
diff --git a/Source/NSKeyValueObserving.m b/Source/NSKeyValueObserving.m
index 3bc8666c1..3b6339a48 100644
--- a/Source/NSKeyValueObserving.m
+++ b/Source/NSKeyValueObserving.m
@@ -41,7 +41,6 @@
 #import "Foundation/NSValue.h"
 #import "GNUstepBase/GSObjCRuntime.h"
 #import "GNUstepBase/Unicode.h"
-#import "GNUstepBase/GSLock.h"
 #import "GSInvocation.h"
 #import "GSPThread.h"
 
diff --git a/Source/NSLocale.m b/Source/NSLocale.m
index 07eab81ec..8c78407ba 100644
--- a/Source/NSLocale.m
+++ b/Source/NSLocale.m
@@ -37,7 +37,6 @@
 #import "Foundation/NSUserDefaults.h"
 #import "Foundation/NSString.h"
 #import "GNUstepBase/NSMutableString+GNUstepBase.h"
-#import "GNUstepBase/GSLock.h"
 
 #if	defined(HAVE_UNICODE_ULOC_H)
 # include <unicode/uloc.h>
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index 57b32bf96..5b37c1e26 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -25,7 +25,6 @@
 #import "common.h"
 #define	EXPOSE_NSPort_IVARS	1
 #define	EXPOSE_NSMessagePort_IVARS	1
-#import "GNUstepBase/GSLock.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSAutoreleasePool.h"
 #import "Foundation/NSNotification.h"
diff --git a/Source/NSNotificationCenter.m b/Source/NSNotificationCenter.m
index 3d308be42..d33ceed09 100644
--- a/Source/NSNotificationCenter.m
+++ b/Source/NSNotificationCenter.m
@@ -37,7 +37,6 @@
 #import "Foundation/NSOperation.h"
 #import "Foundation/NSThread.h"
 #import "Foundation/NSHashTable.h"
-#import "GNUstepBase/GSLock.h"
 
 static NSZone	*_zone = 0;
 
diff --git a/Source/NSSocketPort.m b/Source/NSSocketPort.m
index e1f41e640..c6eeba7bb 100644
--- a/Source/NSSocketPort.m
+++ b/Source/NSSocketPort.m
@@ -25,7 +25,6 @@
 #import "common.h"
 #define	EXPOSE_NSPort_IVARS	1
 #define	EXPOSE_NSSocketPort_IVARS	1
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/GSTLS.h"
 #import "Foundation/NSArray.h"
 #import "Foundation/NSNotification.h"
diff --git a/Source/NSTimeZone.m b/Source/NSTimeZone.m
index 410c32de3..ee78a4c0d 100644
--- a/Source/NSTimeZone.m
+++ b/Source/NSTimeZone.m
@@ -86,7 +86,6 @@
 
 #import "common.h"
 #define	EXPOSE_NSTimeZone_IVARS	1
-#import "GNUstepBase/GSLock.h"
 #include <stdio.h>
 #include <time.h>
 #import "Foundation/NSArray.h"
diff --git a/Source/NSUserDefaults.m b/Source/NSUserDefaults.m
index 32afef442..ebbb6087e 100644
--- a/Source/NSUserDefaults.m
+++ b/Source/NSUserDefaults.m
@@ -52,7 +52,6 @@
 #import "Foundation/NSTimer.h"
 #import "Foundation/NSValue.h"
 #import "GNUstepBase/GSLocale.h"
-#import "GNUstepBase/GSLock.h"
 #import "GNUstepBase/NSProcessInfo+GNUstepBase.h"
 #import "GNUstepBase/NSString+GNUstepBase.h"
 
diff --git a/Source/NSValueTransformer.m b/Source/NSValueTransformer.m
index f851175e8..9ed8e4135 100644
--- a/Source/NSValueTransformer.m
+++ b/Source/NSValueTransformer.m
@@ -30,9 +30,9 @@
 #import "Foundation/NSDictionary.h"
 #import "Foundation/NSException.h"
 #import "Foundation/NSArchiver.h"
+#import "Foundation/NSLock.h"
 #import "Foundation/NSValue.h"
 #import "Foundation/NSValueTransformer.h"
-#import "GNUstepBase/GSLock.h"
 
 @interface NSNegateBooleanTransformer : NSValueTransformer
 @end
diff --git a/Source/win32/NSMessagePort.m b/Source/win32/NSMessagePort.m
index e020f4b86..ff87f7292 100644
--- a/Source/win32/NSMessagePort.m
+++ b/Source/win32/NSMessagePort.m
@@ -24,7 +24,6 @@
 #include "common.h"
 #define	EXPOSE_NSPort_IVARS	1
 #define	EXPOSE_NSMessagePort_IVARS	1
-#include "GNUstepBase/GSLock.h"
 #include "Foundation/NSArray.h"
 #include "Foundation/NSNotification.h"
 #include "Foundation/NSError.h"
diff --git a/base.xcodeproj/project.pbxproj b/base.xcodeproj/project.pbxproj
index a2b66c364..9eb519970 100644
--- a/base.xcodeproj/project.pbxproj
+++ b/base.xcodeproj/project.pbxproj
@@ -132,7 +132,6 @@
 		18394BAC1610D9ED00335E85 /* NSData+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF21610BF3C0003C892 /* NSData+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		18394BAD1610D9ED00335E85 /* NSDebug+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF31610BF3C0003C892 /* NSDebug+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		18394BAE1610D9ED00335E85 /* NSFileHandle+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF41610BF3C0003C892 /* NSFileHandle+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		18394BAF1610D9ED00335E85 /* NSLock+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF51610BF3C0003C892 /* NSLock+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		18394BB01610D9ED00335E85 /* NSMutableString+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF61610BF3C0003C892 /* NSMutableString+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		18394BB11610D9ED00335E85 /* NSNetServices+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF71610BF3C0003C892 /* NSNetServices+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		18394BB21610D9ED00335E85 /* NSNumber+GNUstepBase.h in Headers */ = {isa = PBXBuildFile; fileRef = 18906EF81610BF3C0003C892 /* NSNumber+GNUstepBase.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -273,7 +272,6 @@
 		185289591613961A0016729B /* GCObject.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F0D1610BF3C0003C892 /* GCObject.m */; };
 		1852895A161396200016729B /* GSFunctions.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F0F1610BF3C0003C892 /* GSFunctions.m */; };
 		1852895B161396240016729B /* GSInsensitiveDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F101610BF3C0003C892 /* GSInsensitiveDictionary.m */; };
-		1852895C161396280016729B /* GSLock.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F111610BF3C0003C892 /* GSLock.m */; };
 		1852895D1613962B0016729B /* GSMime.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F121610BF3C0003C892 /* GSMime.m */; };
 		1852895E161396310016729B /* GSXML.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F141610BF3C0003C892 /* GSXML.m */; };
 		1852895F161396450016729B /* GSArray.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F391610BF3C0003C892 /* GSArray.m */; };
@@ -309,7 +307,6 @@
 		18528989161398FF0016729B /* NSDebug+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F1C1610BF3C0003C892 /* NSDebug+GNUstepBase.m */; };
 		1852898A161398FF0016729B /* NSError+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F1D1610BF3C0003C892 /* NSError+GNUstepBase.m */; };
 		1852898B161398FF0016729B /* NSFileHandle+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F1E1610BF3C0003C892 /* NSFileHandle+GNUstepBase.m */; };
-		1852898C161399000016729B /* NSLock+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F1F1610BF3C0003C892 /* NSLock+GNUstepBase.m */; };
 		1852898D161399000016729B /* NSMutableString+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F201610BF3C0003C892 /* NSMutableString+GNUstepBase.m */; };
 		1852898E161399000016729B /* NSNumber+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F211610BF3C0003C892 /* NSNumber+GNUstepBase.m */; };
 		1852898F161399000016729B /* NSObject+GNUstepBase.m in Sources */ = {isa = PBXBuildFile; fileRef = 18906F221610BF3C0003C892 /* NSObject+GNUstepBase.m */; };
@@ -693,7 +690,6 @@
 		18906EE51610BF3C0003C892 /* GSIArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSIArray.h; sourceTree = "<group>"; };
 		18906EE61610BF3C0003C892 /* GSIMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSIMap.h; sourceTree = "<group>"; };
 		18906EE71610BF3C0003C892 /* GSLocale.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSLocale.h; sourceTree = "<group>"; };
-		18906EE81610BF3C0003C892 /* GSLock.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSLock.h; sourceTree = "<group>"; };
 		18906EE91610BF3C0003C892 /* GSMime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSMime.h; sourceTree = "<group>"; };
 		18906EEA1610BF3C0003C892 /* GSObjCRuntime.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSObjCRuntime.h; sourceTree = "<group>"; };
 		18906EEB1610BF3C0003C892 /* GSUnion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GSUnion.h; sourceTree = "<group>"; };
@@ -706,7 +702,6 @@
 		18906EF21610BF3C0003C892 /* NSData+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSData+GNUstepBase.h"; path = "../GNUstepBase/NSData+GNUstepBase.h"; sourceTree = "<group>"; };
 		18906EF31610BF3C0003C892 /* NSDebug+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSDebug+GNUstepBase.h"; path = "../GNUstepBase/NSDebug+GNUstepBase.h"; sourceTree = "<group>"; };
 		18906EF41610BF3C0003C892 /* NSFileHandle+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSFileHandle+GNUstepBase.h"; path = "../GNUstepBase/NSFileHandle+GNUstepBase.h"; sourceTree = "<group>"; };
-		18906EF51610BF3C0003C892 /* NSLock+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSLock+GNUstepBase.h"; path = "../GNUstepBase/NSLock+GNUstepBase.h"; sourceTree = "<group>"; };
 		18906EF61610BF3C0003C892 /* NSMutableString+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSMutableString+GNUstepBase.h"; path = "../GNUstepBase/NSMutableString+GNUstepBase.h"; sourceTree = "<group>"; };
 		18906EF71610BF3C0003C892 /* NSNetServices+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSNetServices+GNUstepBase.h"; path = "../GNUstepBase/NSNetServices+GNUstepBase.h"; sourceTree = "<group>"; };
 		18906EF81610BF3C0003C892 /* NSNumber+GNUstepBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSNumber+GNUstepBase.h"; path = "../GNUstepBase/NSNumber+GNUstepBase.h"; sourceTree = "<group>"; };
@@ -726,7 +721,6 @@
 		18906F0E1610BF3C0003C892 /* GNUmakefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = GNUmakefile; sourceTree = "<group>"; };
 		18906F0F1610BF3C0003C892 /* GSFunctions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSFunctions.m; sourceTree = "<group>"; };
 		18906F101610BF3C0003C892 /* GSInsensitiveDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSInsensitiveDictionary.m; sourceTree = "<group>"; };
-		18906F111610BF3C0003C892 /* GSLock.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSLock.m; sourceTree = "<group>"; };
 		18906F121610BF3C0003C892 /* GSMime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSMime.m; sourceTree = "<group>"; };
 		18906F131610BF3C0003C892 /* GSObjCRuntime.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSObjCRuntime.m; sourceTree = "<group>"; };
 		18906F141610BF3C0003C892 /* GSXML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GSXML.m; sourceTree = "<group>"; };
@@ -740,7 +734,6 @@
 		18906F1C1610BF3C0003C892 /* NSDebug+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDebug+GNUstepBase.m"; sourceTree = "<group>"; };
 		18906F1D1610BF3C0003C892 /* NSError+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSError+GNUstepBase.m"; sourceTree = "<group>"; };
 		18906F1E1610BF3C0003C892 /* NSFileHandle+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFileHandle+GNUstepBase.m"; sourceTree = "<group>"; };
-		18906F1F1610BF3C0003C892 /* NSLock+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSLock+GNUstepBase.m"; sourceTree = "<group>"; };
 		18906F201610BF3C0003C892 /* NSMutableString+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableString+GNUstepBase.m"; sourceTree = "<group>"; };
 		18906F211610BF3C0003C892 /* NSNumber+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSNumber+GNUstepBase.m"; sourceTree = "<group>"; };
 		18906F221610BF3C0003C892 /* NSObject+GNUstepBase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSObject+GNUstepBase.m"; sourceTree = "<group>"; };
@@ -1376,7 +1369,6 @@
 		18FE1FFE1628550100389A13 /* ullong-8.type */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ullong-8.type"; sourceTree = "<group>"; };
 		18FE1FFF1628550100389A13 /* ulong-4.type */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ulong-4.type"; sourceTree = "<group>"; };
 		18FE20001628550100389A13 /* ushort-2.type */ = {isa = PBXFileReference; lastKnownFileType = file; path = "ushort-2.type"; sourceTree = "<group>"; };
-		18FE20021628550100389A13 /* GSLock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GSLock.m; sourceTree = "<group>"; };
 		18FE20031628550100389A13 /* GSMime.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GSMime.m; sourceTree = "<group>"; };
 		18FE20041628550100389A13 /* GSObjCRuntime.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GSObjCRuntime.m; sourceTree = "<group>"; };
 		18FE20051628550100389A13 /* GSXML.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GSXML.m; sourceTree = "<group>"; };
@@ -1606,7 +1598,6 @@
 				18906EF21610BF3C0003C892 /* NSData+GNUstepBase.h */,
 				18906EF31610BF3C0003C892 /* NSDebug+GNUstepBase.h */,
 				18906EF41610BF3C0003C892 /* NSFileHandle+GNUstepBase.h */,
-				18906EF51610BF3C0003C892 /* NSLock+GNUstepBase.h */,
 				18906EF61610BF3C0003C892 /* NSMutableString+GNUstepBase.h */,
 				18906EF71610BF3C0003C892 /* NSNetServices+GNUstepBase.h */,
 				18906EF81610BF3C0003C892 /* NSNumber+GNUstepBase.h */,
@@ -2141,7 +2132,6 @@
 				18906EE51610BF3C0003C892 /* GSIArray.h */,
 				18906EE61610BF3C0003C892 /* GSIMap.h */,
 				18906EE71610BF3C0003C892 /* GSLocale.h */,
-				18906EE81610BF3C0003C892 /* GSLock.h */,
 				18906EE91610BF3C0003C892 /* GSMime.h */,
 				18906EEA1610BF3C0003C892 /* GSObjCRuntime.h */,
 				18EA6763172EC7F70026AC34 /* GSTypeEncoding.h */,
@@ -2201,7 +2191,6 @@
 				18906F0E1610BF3C0003C892 /* GNUmakefile */,
 				18906F0F1610BF3C0003C892 /* GSFunctions.m */,
 				18906F101610BF3C0003C892 /* GSInsensitiveDictionary.m */,
-				18906F111610BF3C0003C892 /* GSLock.m */,
 				18906F121610BF3C0003C892 /* GSMime.m */,
 				18906F131610BF3C0003C892 /* GSObjCRuntime.m */,
 				18EA675F172EC6170026AC34 /* GSTypeEncoding.c */,
@@ -2216,7 +2205,6 @@
 				18906F1C1610BF3C0003C892 /* NSDebug+GNUstepBase.m */,
 				18906F1D1610BF3C0003C892 /* NSError+GNUstepBase.m */,
 				18906F1E1610BF3C0003C892 /* NSFileHandle+GNUstepBase.m */,
-				18906F1F1610BF3C0003C892 /* NSLock+GNUstepBase.m */,
 				18906F201610BF3C0003C892 /* NSMutableString+GNUstepBase.m */,
 				18906F211610BF3C0003C892 /* NSNumber+GNUstepBase.m */,
 				18906F221610BF3C0003C892 /* NSObject+GNUstepBase.m */,
@@ -3439,7 +3427,6 @@
 		18FE20011628550100389A13 /* headers */ = {
 			isa = PBXGroup;
 			children = (
-				18FE20021628550100389A13 /* GSLock.m */,
 				18FE20031628550100389A13 /* GSMime.m */,
 				18FE20041628550100389A13 /* GSObjCRuntime.m */,
 				18FE20051628550100389A13 /* GSXML.m */,
@@ -3673,7 +3660,6 @@
 				18394BAC1610D9ED00335E85 /* NSData+GNUstepBase.h in Headers */,
 				18394BAD1610D9ED00335E85 /* NSDebug+GNUstepBase.h in Headers */,
 				18394BAE1610D9ED00335E85 /* NSFileHandle+GNUstepBase.h in Headers */,
-				18394BAF1610D9ED00335E85 /* NSLock+GNUstepBase.h in Headers */,
 				18394BB01610D9ED00335E85 /* NSMutableString+GNUstepBase.h in Headers */,
 				18394BB11610D9ED00335E85 /* NSNetServices+GNUstepBase.h in Headers */,
 				18394BB21610D9ED00335E85 /* NSNumber+GNUstepBase.h in Headers */,
@@ -3825,7 +3811,6 @@
 				185289591613961A0016729B /* GCObject.m in Sources */,
 				1852895A161396200016729B /* GSFunctions.m in Sources */,
 				1852895B161396240016729B /* GSInsensitiveDictionary.m in Sources */,
-				1852895C161396280016729B /* GSLock.m in Sources */,
 				1852895D1613962B0016729B /* GSMime.m in Sources */,
 				185289511613861E0016729B /* GSObjCRuntime.m in Sources */,
 				1852895E161396310016729B /* GSXML.m in Sources */,
@@ -3837,7 +3822,6 @@
 				18528989161398FF0016729B /* NSDebug+GNUstepBase.m in Sources */,
 				1852898A161398FF0016729B /* NSError+GNUstepBase.m in Sources */,
 				1852898B161398FF0016729B /* NSFileHandle+GNUstepBase.m in Sources */,
-				1852898C161399000016729B /* NSLock+GNUstepBase.m in Sources */,
 				1852898D161399000016729B /* NSMutableString+GNUstepBase.m in Sources */,
 				1852898E161399000016729B /* NSNumber+GNUstepBase.m in Sources */,
 				1852898F161399000016729B /* NSObject+GNUstepBase.m in Sources */,
diff --git a/macosx/gnustep.pbproj/project.pbxproj b/macosx/gnustep.pbproj/project.pbxproj
index 3b8f51674..026fc489a 100644
--- a/macosx/gnustep.pbproj/project.pbxproj
+++ b/macosx/gnustep.pbproj/project.pbxproj
@@ -1745,29 +1745,12 @@
 //EF2
 //EF3
 //EF4
-		EFEFAC3C055D9BC400B39730 = {
-			expectedFileType = sourcecode.c.h;
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			path = GSLock.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		EFEFAC3D055D9BC400B39730 = {
 			fileRef = EFEFAC3C055D9BC400B39730;
 			isa = PBXBuildFile;
 			settings = {
 			};
 		};
-		EFEFAC3E055D9BF400B39730 = {
-			expectedFileType = sourcecode.c.objc;
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			name = GSLock.m;
-			path = Additions/GSLock.m;
-			refType = 4;
-			sourceTree = "<group>";
-		};
 		EFEFAC3F055D9BF400B39730 = {
 			fileRef = EFEFAC3E055D9BF400B39730;
 			isa = PBXBuildFile;