diff --git a/ChangeLog b/ChangeLog
index 7bb22fb3e..96b8d812c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-12-04  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSFileManager.h: move includes around to fix bug #21718
+
 2007-12-03  David Ayers  <ayers@fsfe.org>
 
 	* Source/NSDecimalNumber.m: (isinf,isnan,isinff,isnanf):
diff --git a/Source/NSFileManager.m b/Source/NSFileManager.m
index 5a34b0aaa..deaf47918 100644
--- a/Source/NSFileManager.m
+++ b/Source/NSFileManager.m
@@ -41,15 +41,22 @@
 
 #include "config.h"
 #include "GNUstepBase/preface.h"
-#include "Foundation/NSFileManager.h"
-#include "Foundation/NSException.h"
+#include "Foundation/NSArray.h"
 #include "Foundation/NSAutoreleasePool.h"
-#include "Foundation/NSLock.h"
-#include "Foundation/NSDebug.h"
-#include "Foundation/NSProcessInfo.h"
-#include "Foundation/NSEnumerator.h"
-#include "Foundation/NSSet.h"
 #include "Foundation/NSBundle.h"
+#include "Foundation/NSData.h"
+#include "Foundation/NSDate.h"
+#include "Foundation/NSDebug.h"
+#include "Foundation/NSDictionary.h"
+#include "Foundation/NSEnumerator.h"
+#include "Foundation/NSException.h"
+#include "Foundation/NSFileManager.h"
+#include "Foundation/NSLock.h"
+#include "Foundation/NSPathUtilities.h"
+#include "Foundation/NSProcessInfo.h"
+#include "Foundation/NSSet.h"
+#include "Foundation/NSString.h"
+#include "Foundation/NSValue.h"
 #include "GSPrivate.h"
 
 #include <string.h>
@@ -158,17 +165,6 @@
 #define	GSBINIO	0
 #endif
 
-/* include usual headers */
-
-#include "Foundation/NSArray.h"
-#include "Foundation/NSDictionary.h"
-#include "Foundation/NSData.h"
-#include "Foundation/NSDate.h"
-#include "Foundation/NSString.h"
-#include "Foundation/NSValue.h"
-#include "Foundation/NSPathUtilities.h"
-#include "Foundation/NSFileManager.h"
-
 @interface NSDirectoryEnumerator (Local)
 - (id) initWithDirectoryPath: (NSString*)path 
    recurseIntoSubdirectories: (BOOL)recurse