diff --git a/ChangeLog b/ChangeLog
index 0888fd244..417e096e5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-12-02 02:31-EST Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* Source/GSNibLoading.m
+	* Source/NSButtonCell.m
+	* Source/NSNibAXAttributeConnector.m
+	* Source/NSNibAXRelationshipConnector.m
+	* Source/NSNibBindingConnector.m
+	* Source/NSNib.m
+	* Source/NSProgressIndicator.m: Change to use new headers.
+
 2008-12-02 02:07-EST Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Headers/Additions/GNUstepGUI/GSNibCompatibility.h: Remove
diff --git a/Source/GSNibLoading.m b/Source/GSNibLoading.m
index 77719b285..f16b4ce88 100644
--- a/Source/GSNibLoading.m
+++ b/Source/GSNibLoading.m
@@ -60,7 +60,7 @@
 #define GSI_ARRAY_TYPES GSUNION_OBJ
 #include <GNUstepBase/GSIArray.h>
 
-#include <GNUstepGUI/GSNibCompatibility.h>
+#include <GNUstepGUI/GSNibLoading.h>
 #include <GNUstepGUI/GSInstantiator.h>
 
 static BOOL _isInInterfaceBuilder = NO;
diff --git a/Source/NSButtonCell.m b/Source/NSButtonCell.m
index d88f5e180..37b4b59a5 100644
--- a/Source/NSButtonCell.m
+++ b/Source/NSButtonCell.m
@@ -53,7 +53,7 @@
 #include "AppKit/NSSound.h"
 #include "AppKit/NSWindow.h"
 #include "GNUstepGUI/GSTheme.h"
-#include "GNUstepGUI/GSNibCompatibility.h"
+#include "GNUstepGUI/GSNibLoading.h"
 
 #include <math.h>
 
diff --git a/Source/NSNib.m b/Source/NSNib.m
index 4827eea51..d0f414a39 100644
--- a/Source/NSNib.m
+++ b/Source/NSNib.m
@@ -53,7 +53,7 @@
 #include <Foundation/NSException.h>
 
 #include "GNUstepGUI/GSModelLoaderFactory.h"
-#include "GNUstepGUI/GSNibTemplates.h"
+#include "GNUstepGUI/GSGormLoading.h"
 #include "GNUstepGUI/IMLoading.h"
 
 @implementation NSNib
diff --git a/Source/NSNibAXAttributeConnector.m b/Source/NSNibAXAttributeConnector.m
index 3e7aea40a..7f7cd5d06 100644
--- a/Source/NSNibAXAttributeConnector.m
+++ b/Source/NSNibAXAttributeConnector.m
@@ -27,7 +27,7 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#import <GNUstepGUI/GSNibCompatibility.h>
+#import <GNUstepGUI/GSNibLoading.h>
 #import <Foundation/NSString.h>
 
 @implementation NSNibAXAttributeConnector
diff --git a/Source/NSNibAXRelationshipConnector.m b/Source/NSNibAXRelationshipConnector.m
index f89ecec3c..63e5ffaea 100644
--- a/Source/NSNibAXRelationshipConnector.m
+++ b/Source/NSNibAXRelationshipConnector.m
@@ -27,7 +27,7 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#import <GNUstepGUI/GSNibCompatibility.h>
+#import <GNUstepGUI/GSNibLoading.h>
 #import <Foundation/NSString.h>
 
 @implementation NSNibAXRelationshipConnector
diff --git a/Source/NSNibBindingConnector.m b/Source/NSNibBindingConnector.m
index 0fb30c7a2..8f2127277 100644
--- a/Source/NSNibBindingConnector.m
+++ b/Source/NSNibBindingConnector.m
@@ -29,7 +29,7 @@
    Boston, MA 02110-1301, USA.
 */ 
 
-#import <GNUstepGUI/GSNibCompatibility.h>
+#import <GNUstepGUI/GSNibLoading.h>
 #import <Foundation/NSString.h>
 #import <Foundation/NSDictionary.h>
 #import <AppKit/NSKeyValueBinding.h>
diff --git a/Source/NSProgressIndicator.m b/Source/NSProgressIndicator.m
index 65b174a55..764804a79 100644
--- a/Source/NSProgressIndicator.m
+++ b/Source/NSProgressIndicator.m
@@ -29,7 +29,7 @@
 #include "AppKit/NSGraphics.h"
 #include "AppKit/NSWindow.h"
 #include "GNUstepGUI/GSTheme.h"
-#include "GNUstepGUI/GSNibCompatibility.h"
+#include "GNUstepGUI/GSNibLoading.h"
 
 @implementation NSProgressIndicator