diff --git a/ChangeLog b/ChangeLog
index ef26d4efb..cd40e2f60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2007-11-29 Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSWindowController.m:
+	* Source/GSDisplayServer.m:
+	* Source/NSBox.m:
+	* Source/NSFontManager.m:
+	* Source/GSLayoutManager.m:
+	* Source/NSWindow.m:
+	* Source/NSLayoutManager.m:
+	* Source/NSPrinter.m:
+	* Source/NSPasteboard.m:
+	* Source/NSToolbar.m:
+	* Source/NSFont.m:
+	* Source/NSOutlineView.m:
+	* Source/NSTextView.m:
+	* Source/GSToolbar.m:
+	* Source/tiff.m:
+	* Source/NSDataLinkPanel.m:
+	* Source/NSTableView.m:
+	* Source/NSSpellChecker.m:
+	* Printing/GSLPR/GSLPRPrinter.m:
+	* Tools/gcloseall.m:
+	* Tools/gclose.m:
+	Update includes to add NSEnumerator where needed and remove use of
+	the deprecated Foundation/NSUtilities.h header.
+
 2007-11-29 Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/GSToolTips.m: Fix for #20861
diff --git a/Printing/GSLPR/GSLPRPrinter.m b/Printing/GSLPR/GSLPRPrinter.m
index 570ddffe6..c6eb5eb5e 100644
--- a/Printing/GSLPR/GSLPRPrinter.m
+++ b/Printing/GSLPR/GSLPRPrinter.m
@@ -42,17 +42,16 @@
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSCharacterSet.h>
-#include <Foundation/NSDictionary.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSScanner.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
-#include <Foundation/NSUtilities.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSMapTable.h>
 #include "AppKit/AppKitExceptions.h"
diff --git a/Source/GSDisplayServer.m b/Source/GSDisplayServer.m
index 2d5c84e0c..4dd770f50 100644
--- a/Source/GSDisplayServer.m
+++ b/Source/GSDisplayServer.m
@@ -28,6 +28,7 @@
 
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSLock.h>
 #include <Foundation/NSRunLoop.h>
diff --git a/Source/GSLayoutManager.m b/Source/GSLayoutManager.m
index ecf70bdda..a2f3ec63c 100644
--- a/Source/GSLayoutManager.m
+++ b/Source/GSLayoutManager.m
@@ -27,6 +27,7 @@
 
 #include <Foundation/NSCharacterSet.h>
 #include <Foundation/NSDebug.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSValue.h>
 
diff --git a/Source/GSToolbar.m b/Source/GSToolbar.m
index 100a138d6..22ecd7f2d 100644
--- a/Source/GSToolbar.m
+++ b/Source/GSToolbar.m
@@ -32,6 +32,7 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSKeyValueCoding.h>
 #include <Foundation/NSNotification.h>
diff --git a/Source/NSBox.m b/Source/NSBox.m
index e4d8c1e35..a5de90088 100644
--- a/Source/NSBox.m
+++ b/Source/NSBox.m
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSKeyedArchiver.h>
 #include <Foundation/NSString.h>
diff --git a/Source/NSDataLinkPanel.m b/Source/NSDataLinkPanel.m
index 5cc7e2374..6fcca9d56 100644
--- a/Source/NSDataLinkPanel.m
+++ b/Source/NSDataLinkPanel.m
@@ -26,6 +26,7 @@
 */ 
 
 #include "config.h"
+#include "Foundation/NSDictionary.h"
 #include "AppKit/NSDataLinkPanel.h"
 #include "AppKit/NSDataLinkManager.h"
 #include "AppKit/NSDataLink.h"
diff --git a/Source/NSFont.m b/Source/NSFont.m
index 2d75fd449..da644913f 100644
--- a/Source/NSFont.m
+++ b/Source/NSFont.m
@@ -30,6 +30,7 @@
 #include "config.h"
 #include <Foundation/NSAffineTransform.h>
 #include <Foundation/NSCoder.h>
+#include <Foundation/NSDictionary.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSSet.h>
diff --git a/Source/NSFontManager.m b/Source/NSFontManager.m
index 8618d5514..443f3f58c 100644
--- a/Source/NSFontManager.m
+++ b/Source/NSFontManager.m
@@ -29,6 +29,7 @@
 
 #include "config.h"
 #include <Foundation/NSArray.h>
+#include <Foundation/NSDictionary.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSValue.h>
diff --git a/Source/NSLayoutManager.m b/Source/NSLayoutManager.m
index 157c46706..3a20f4f0a 100644
--- a/Source/NSLayoutManager.m
+++ b/Source/NSLayoutManager.m
@@ -108,6 +108,7 @@ first. Remaining cases, highest priority first:
 #include "AppKit/NSLayoutManager.h"
 #include "GNUstepGUI/GSLayoutManager_internal.h"
 
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include "AppKit/NSAttributedString.h"
 #include "AppKit/NSColor.h"
diff --git a/Source/NSOutlineView.m b/Source/NSOutlineView.m
index 0ac93d478..2851bbd54 100644
--- a/Source/NSOutlineView.m
+++ b/Source/NSOutlineView.m
@@ -32,6 +32,7 @@
 */ 
 
 #include <Foundation/NSArray.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSIndexSet.h>
 #include <Foundation/NSMapTable.h>
diff --git a/Source/NSPasteboard.m b/Source/NSPasteboard.m
index b70f7a62e..62ab1cd84 100644
--- a/Source/NSPasteboard.m
+++ b/Source/NSPasteboard.m
@@ -528,6 +528,7 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSHost.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSConnection.h>
 #include <Foundation/NSDistantObject.h>
 #include <Foundation/NSDistributedNotificationCenter.h>
diff --git a/Source/NSPrinter.m b/Source/NSPrinter.m
index 387f93f39..193dd4ead 100644
--- a/Source/NSPrinter.m
+++ b/Source/NSPrinter.m
@@ -38,13 +38,13 @@
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSCharacterSet.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSFileManager.h>
 #include <Foundation/NSPathUtilities.h>
 #include <Foundation/NSScanner.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSString.h>
-#include <Foundation/NSUtilities.h>
 #include <Foundation/NSValue.h>
 #include <Foundation/NSMapTable.h>
 #include <Foundation/NSSet.h>
diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m
index 10bbe77f5..eb4693c07 100644
--- a/Source/NSSpellChecker.m
+++ b/Source/NSSpellChecker.m
@@ -34,10 +34,10 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSSet.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSProxy.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSSpellServer.h>
-#include <Foundation/NSUtilities.h>
 #include <Foundation/NSValue.h>
 #include "AppKit/NSNibLoading.h"
 #include "AppKit/NSImage.h"
diff --git a/Source/NSTableView.m b/Source/NSTableView.m
index 5d2e22c49..ad876bd11 100644
--- a/Source/NSTableView.m
+++ b/Source/NSTableView.m
@@ -31,6 +31,7 @@
 */ 
 
 #include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSFormatter.h>
 #include <Foundation/NSIndexSet.h>
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 8db186fd6..809932709 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -52,6 +52,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSDebug.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSKeyedArchiver.h>
 #include <Foundation/NSNotification.h>
diff --git a/Source/NSToolbar.m b/Source/NSToolbar.m
index c20245170..9ca5f49b6 100644
--- a/Source/NSToolbar.m
+++ b/Source/NSToolbar.m
@@ -33,6 +33,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSNotification.h>
 #include "AppKit/NSToolbarItem.h"
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 5e32cac15..e512ca443 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -42,6 +42,7 @@
 #include <Foundation/NSString.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSArray.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSGeometry.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSValue.h>
diff --git a/Source/NSWindowController.m b/Source/NSWindowController.m
index 131d8fce9..9d68de7b7 100644
--- a/Source/NSWindowController.m
+++ b/Source/NSWindowController.m
@@ -27,6 +27,8 @@
 */
 
 #include <Foundation/NSBundle.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSNotification.h>
 #include <Foundation/NSString.h>
diff --git a/Source/tiff.m b/Source/tiff.m
index 7cedd5a00..757dbbcee 100644
--- a/Source/tiff.m
+++ b/Source/tiff.m
@@ -62,7 +62,8 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSString.h>
-#include <Foundation/NSUtilities.h>
+#include <Foundation/NSDictionary.h>
+#include <Foundation/NSEnumerator.h>
 
 #include <math.h>
 #include <stdlib.h>
diff --git a/Tools/gclose.m b/Tools/gclose.m
index d3c1b8d7d..c08af91da 100644
--- a/Tools/gclose.m
+++ b/Tools/gclose.m
@@ -26,6 +26,7 @@
 
 #include <Foundation/NSArray.h>
 #include <Foundation/NSConnection.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSHost.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSProcessInfo.h>
diff --git a/Tools/gcloseall.m b/Tools/gcloseall.m
index 4e5538804..eb17b7828 100644
--- a/Tools/gcloseall.m
+++ b/Tools/gcloseall.m
@@ -26,6 +26,7 @@
 
 #include <Foundation/NSArray.h>
 #include <Foundation/NSConnection.h>
+#include <Foundation/NSEnumerator.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSAutoreleasePool.h>
 #include <Foundation/NSException.h>