diff --git a/ChangeLog b/ChangeLog
index 1c5d068be..bd6f40294 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-14  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source\NSGarbageCollector.m: Avoid compiler warning
+	* Source\pathconfig/pathconfig.mak.in: Fix syntax error in warning
+	* Headers\Additions\GNUstepBase\GSCategories.h: remove obsolete methods
+	* GNUmakefile: Fix order of includes
+	* Source/GSArray.m: Remove unused line from last change
+	* Source/NSNotificationCenter.m: Remove unused line
+
 2009-01-13 18:35-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/GSArray.m
diff --git a/Headers/Additions/GNUstepBase/GSCategories.h b/Headers/Additions/GNUstepBase/GSCategories.h
index 465645d23..1e1d73948 100644
--- a/Headers/Additions/GNUstepBase/GSCategories.h
+++ b/Headers/Additions/GNUstepBase/GSCategories.h
@@ -321,18 +321,10 @@ typedef enum _NSGNUstepStringEncoding
 + (id) newLockAt: (id *)location;
 @end
 
-@interface NSLock (GSCompatibility)
-- (void) gcFinalize;
-@end
-
 @interface NSRecursiveLock (GSCategories)
 + (id)newLockAt:(id *)location;
 @end
 
-@interface NSRecursiveLock (GSCompatibility)
-- (void) gcFinalize;
-@end
-
 /* ------------------------------------------------------------------------
  * Functions
  */
diff --git a/Source/NSGarbageCollector.m b/Source/NSGarbageCollector.m
index bffc15438..bc52d243b 100644
--- a/Source/NSGarbageCollector.m
+++ b/Source/NSGarbageCollector.m
@@ -24,21 +24,22 @@
    */
 
 #import	"Foundation/NSGarbageCollector.h"
-#import	"Foundation/NSLock.h"
 #import	"Foundation/NSZone.h"
 
+static NSGarbageCollector	*collector = nil;
+static unsigned			disabled = 0;
+
 #if	GS_WITH_GC
 
 #include <gc.h>
 
+#import	"Foundation/NSLock.h"
+static NSLock			*lock = nil;
+
 #endif
 
 @implementation	NSGarbageCollector
 
-static NSGarbageCollector	*collector = nil;
-static NSLock			*lock = nil;
-static unsigned			disabled = 0;
-
 + (id) defaultCollector
 {
   return collector;