diff --git a/ChangeLog b/ChangeLog
index 2423512..e62476d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-22  Peter Cooper  <comrade@obverse.com.au>
+
+	* Tools/NSArray+GSDoc.m: Include NSString.h ...
+	* EOControl/EOClassDescription.h: Include NSDictionary.h to compile
+	with new versions of -base/Foundation.
+	
 2007-11-27  David Ayers  <ayers@fsfe.org>
 
 	* EOControl/EOClassDescription.h/m
diff --git a/EOControl/EOClassDescription.h b/EOControl/EOClassDescription.h
index e3a9391..44d819a 100644
--- a/EOControl/EOClassDescription.h
+++ b/EOControl/EOClassDescription.h
@@ -31,6 +31,7 @@
 #include <Foundation/NSArray.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSZone.h>
+#include <Foundation/NSDictionary.h>
 #else
 #include <Foundation/Foundation.h>
 #endif
diff --git a/Tools/NSArray+GSDoc.m b/Tools/NSArray+GSDoc.m
index 4043fab..b8a571a 100644
--- a/Tools/NSArray+GSDoc.m
+++ b/Tools/NSArray+GSDoc.m
@@ -36,6 +36,7 @@ RCS_ID("$Id$")
 
 #ifdef GNUSTEP
 #include <Foundation/NSAutoreleasePool.h>
+#include <Foundation/NSString.h>
 #else
 #include <Foundation/Foundation.h>
 #endif