diff --git a/ChangeLog b/ChangeLog
index da457e6b9..057e806b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,38 @@ Tue Mar  4 18:05:24 1997  Ovidiu Predescu <ovidiu@bx.logicnet.ro>
 	* Source/NSTextFieldCell.m: -drawWithFrame:inView: : Call super's
 	implementation.
 
+Tue Mar  4 17:28:58 1997  GNUstep Development  <gnustep@net-community.com>
+
+	* Make sure gnustep-gui config.h file is included.
+	* Headers/gnustep/gui/AppKit.h: Likewise.
+	* Headers/gnustep/gui/NSCell.h: Likewise.
+	* Headers/gnustep/gui/NSColor.h: Likewise.
+	* Headers/gnustep/gui/NSColorList.h: Likewise.
+	* Headers/gnustep/gui/NSColorPicker.h: Likewise.
+	* Headers/gnustep/gui/NSCursor.h: Likewise.
+	* Headers/gnustep/gui/NSDataLink.h: Likewise.
+	* Headers/gnustep/gui/NSDataLinkManager.h: Likewise.
+	* Headers/gnustep/gui/NSEvent.h: Likewise.
+	* Headers/gnustep/gui/NSFont.h: Likewise.
+	* Headers/gnustep/gui/NSFontManager.h: Likewise.
+	* Headers/gnustep/gui/NSImage.h: Likewise.
+	* Headers/gnustep/gui/NSImageRep.h: Likewise.
+	* Headers/gnustep/gui/NSPasteboard.h: Likewise.
+	* Headers/gnustep/gui/NSPrintInfo.h: Likewise.
+	* Headers/gnustep/gui/NSPrintOperation.h: Likewise.
+	* Headers/gnustep/gui/NSPrinter.h: Likewise.
+	* Headers/gnustep/gui/NSResponder.h: Likewise.
+	* Headers/gnustep/gui/NSScreen.h: Likewise.
+	* Headers/gnustep/gui/NSSelection.h: Likewise.
+	* Headers/gnustep/gui/NSSpellChecker.h: Likewise.
+	* Headers/gnustep/gui/NSSpellServer.h: Likewise.
+	* Headers/gnustep/gui/NSWorkspace.h: Likewise.
+	* Source/Makefile.in: Remove non-existent header files.
+	* Source/tiff.m: Remove unneeded header file.
+	* Source/NSDPSContext.m: Remove unneeded header file.
+
+	* Headers/gnustep/gui/config.h.in: Define NSDebugLog if not defined.
+
 Tue Mar  4 17:04:16 1997  GNUstep Development  <gnustep@net-community.com>
 
 	* Reinstate NSCursor and NSColorWell changes that got lost.
diff --git a/Headers/gnustep/gui/AppKit.h b/Headers/gnustep/gui/AppKit.h
index fa9c2f648..496d2352b 100644
--- a/Headers/gnustep/gui/AppKit.h
+++ b/Headers/gnustep/gui/AppKit.h
@@ -29,12 +29,6 @@
 #ifndef _GNUstep_H_AppKit
 #define _GNUstep_H_AppKit
 
-//
-// System dependent information
-//
-float MB_SCREEN_MAXWIDTH();
-float MB_SCREEN_MAXHEIGHT();
-
 //
 // Display Postscript System
 //
diff --git a/Headers/gnustep/gui/NSCell.h b/Headers/gnustep/gui/NSCell.h
index bf769f201..3d53d1cc5 100644
--- a/Headers/gnustep/gui/NSCell.h
+++ b/Headers/gnustep/gui/NSCell.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSCell
 #define _GNUstep_H_NSCell
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/NSColor.h b/Headers/gnustep/gui/NSColor.h
index 7272ef6d6..1b9912846 100644
--- a/Headers/gnustep/gui/NSColor.h
+++ b/Headers/gnustep/gui/NSColor.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSColor
 #define _GNUstep_H_NSColor
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSColorList.h b/Headers/gnustep/gui/NSColorList.h
index 8f133229a..f1fff7e46 100644
--- a/Headers/gnustep/gui/NSColorList.h
+++ b/Headers/gnustep/gui/NSColorList.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSColorList
 #define _GNUstep_H_NSColorList
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSColorPicker.h b/Headers/gnustep/gui/NSColorPicker.h
index 8be30ddb5..16a0d5dc9 100644
--- a/Headers/gnustep/gui/NSColorPicker.h
+++ b/Headers/gnustep/gui/NSColorPicker.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSColorPicker
 #define _GNUstep_H_NSColorPicker
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <AppKit/NSColorPicking.h>
 
diff --git a/Headers/gnustep/gui/NSCursor.h b/Headers/gnustep/gui/NSCursor.h
index ae12d5d1f..e152beadb 100644
--- a/Headers/gnustep/gui/NSCursor.h
+++ b/Headers/gnustep/gui/NSCursor.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSCursor
 #define _GNUstep_H_NSCursor
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSImage;
diff --git a/Headers/gnustep/gui/NSDataLink.h b/Headers/gnustep/gui/NSDataLink.h
index 5063de37f..adb2985f7 100644
--- a/Headers/gnustep/gui/NSDataLink.h
+++ b/Headers/gnustep/gui/NSDataLink.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSDataLink
 #define _GNUstep_H_NSDataLink
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSDataLinkManager.h b/Headers/gnustep/gui/NSDataLinkManager.h
index 93ad0f7e5..10c0d59a5 100644
--- a/Headers/gnustep/gui/NSDataLinkManager.h
+++ b/Headers/gnustep/gui/NSDataLinkManager.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSDataLinkManager
 #define _GNUstep_H_NSDataLinkManager
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSEvent.h b/Headers/gnustep/gui/NSEvent.h
index cf0675bc5..3b2d52eb4 100644
--- a/Headers/gnustep/gui/NSEvent.h
+++ b/Headers/gnustep/gui/NSEvent.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSEvent
 #define _GNUstep_H_NSEvent
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
 #include <Foundation/NSDate.h>
diff --git a/Headers/gnustep/gui/NSFont.h b/Headers/gnustep/gui/NSFont.h
index be0f323e9..dadfc007d 100644
--- a/Headers/gnustep/gui/NSFont.h
+++ b/Headers/gnustep/gui/NSFont.h
@@ -30,6 +30,7 @@
 #ifndef _GNUstep_H_NSFont
 #define _GNUstep_H_NSFont
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/NSFontManager.h b/Headers/gnustep/gui/NSFontManager.h
index 9b2c443f2..f03dd96f2 100644
--- a/Headers/gnustep/gui/NSFontManager.h
+++ b/Headers/gnustep/gui/NSFontManager.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSFontManager
 #define _GNUstep_H_NSFontManager
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSImage.h b/Headers/gnustep/gui/NSImage.h
index 20a9570a4..675253551 100644
--- a/Headers/gnustep/gui/NSImage.h
+++ b/Headers/gnustep/gui/NSImage.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSImage
 #define _GNUstep_H_NSImage
 
+#include <gnustep/gui/config.h>
 #include <DPSClient/TypesandConstants.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSCoder.h>
diff --git a/Headers/gnustep/gui/NSImageRep.h b/Headers/gnustep/gui/NSImageRep.h
index 952ac3baf..3ae84eeff 100644
--- a/Headers/gnustep/gui/NSImageRep.h
+++ b/Headers/gnustep/gui/NSImageRep.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSImageRep
 #define _GNUstep_H_NSImageRep
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/NSPasteboard.h b/Headers/gnustep/gui/NSPasteboard.h
index a031ff105..1d0ac1242 100644
--- a/Headers/gnustep/gui/NSPasteboard.h
+++ b/Headers/gnustep/gui/NSPasteboard.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSPasteboard
 #define _GNUstep_H_NSPasteboard
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSString.h>
 
diff --git a/Headers/gnustep/gui/NSPrintInfo.h b/Headers/gnustep/gui/NSPrintInfo.h
index 3e968e9b0..01985af7e 100644
--- a/Headers/gnustep/gui/NSPrintInfo.h
+++ b/Headers/gnustep/gui/NSPrintInfo.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSPrintInfo
 #define _GNUstep_H_NSPrintInfo
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/NSPrintOperation.h b/Headers/gnustep/gui/NSPrintOperation.h
index abd581fe5..a20de366e 100644
--- a/Headers/gnustep/gui/NSPrintOperation.h
+++ b/Headers/gnustep/gui/NSPrintOperation.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSPrintOperation
 #define _GNUstep_H_NSPrintOperation
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/NSPrinter.h b/Headers/gnustep/gui/NSPrinter.h
index e1d4a8852..3bb28408b 100644
--- a/Headers/gnustep/gui/NSPrinter.h
+++ b/Headers/gnustep/gui/NSPrinter.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSPrinter
 #define _GNUstep_H_NSPrinter
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSResponder.h b/Headers/gnustep/gui/NSResponder.h
index 1ef8e5a11..9f8fa7e82 100644
--- a/Headers/gnustep/gui/NSResponder.h
+++ b/Headers/gnustep/gui/NSResponder.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSResponder
 #define _GNUstep_H_NSResponder
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSString;
diff --git a/Headers/gnustep/gui/NSScreen.h b/Headers/gnustep/gui/NSScreen.h
index 5a15b28ac..24589babf 100644
--- a/Headers/gnustep/gui/NSScreen.h
+++ b/Headers/gnustep/gui/NSScreen.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSScreen
 #define _GNUstep_H_NSScreen
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <AppKit/NSGraphics.h>
 
diff --git a/Headers/gnustep/gui/NSSelection.h b/Headers/gnustep/gui/NSSelection.h
index e839b7e36..cb89bc992 100644
--- a/Headers/gnustep/gui/NSSelection.h
+++ b/Headers/gnustep/gui/NSSelection.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSSelection
 #define _GNUstep_H_NSSelection
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSCoder.h>
 
 @class NSData;
diff --git a/Headers/gnustep/gui/NSSpellChecker.h b/Headers/gnustep/gui/NSSpellChecker.h
index e339400a3..6ade7b545 100644
--- a/Headers/gnustep/gui/NSSpellChecker.h
+++ b/Headers/gnustep/gui/NSSpellChecker.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSSpellChecker
 #define _GNUstep_H_NSSpellChecker
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSRange.h>
 
diff --git a/Headers/gnustep/gui/NSSpellServer.h b/Headers/gnustep/gui/NSSpellServer.h
index e98fed5e7..9d18d655c 100644
--- a/Headers/gnustep/gui/NSSpellServer.h
+++ b/Headers/gnustep/gui/NSSpellServer.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSSpellServer
 #define _GNUstep_H_NSSpellServer
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSArray.h>
 
diff --git a/Headers/gnustep/gui/NSWorkspace.h b/Headers/gnustep/gui/NSWorkspace.h
index 0daa4e5e3..a2dbfbcbe 100644
--- a/Headers/gnustep/gui/NSWorkspace.h
+++ b/Headers/gnustep/gui/NSWorkspace.h
@@ -29,6 +29,7 @@
 #ifndef _GNUstep_H_NSWorkspace
 #define _GNUstep_H_NSWorkspace
 
+#include <gnustep/gui/config.h>
 #include <Foundation/NSObject.h>
 #include <Foundation/NSGeometry.h>
 
diff --git a/Headers/gnustep/gui/config.h.in b/Headers/gnustep/gui/config.h.in
index 31fd6149c..1b33117cf 100644
--- a/Headers/gnustep/gui/config.h.in
+++ b/Headers/gnustep/gui/config.h.in
@@ -39,5 +39,14 @@
 /* Do we have the DPS Client library? */
 #undef HAVE_DPS_DPSCLIENT_H
 
+/* Define NSDebugLog if not defined */
+#ifndef NSDebugLog
+# ifdef DEBUGLOG
+#  define NSDebugLog(format, args...) NSLog(format, ## args)
+# else
+#  define NSDebugLog(format, args...)
+# endif
+#endif /* !NSDebugLog */
+
 #endif /* _GNUstep_H_AppKitConfig */
 
diff --git a/Source/Makefile.in b/Source/Makefile.in
index de2c5d98b..16184f07b 100644
--- a/Source/Makefile.in
+++ b/Source/Makefile.in
@@ -157,9 +157,7 @@ gui/NSView.h \
 gui/NSWindow.h \
 gui/NSWorkspace.h \
 gui/TrackingRectangle.h \
-gui/TypesandConstants.h \
 gui/config.h \
-gui/stdappkit.h \
 gui/nsimage-tiff.h
 
 GNUSTEP_DPS_HEADERS = dps/NSDPSContext.h \
diff --git a/Source/NSDPSContext.m b/Source/NSDPSContext.m
index 4b006fb37..50068cbc3 100644
--- a/Source/NSDPSContext.m
+++ b/Source/NSDPSContext.m
@@ -30,7 +30,6 @@
 #include <Foundation/NSLock.h>
 #include <Foundation/NSData.h>
 #include <Foundation/NSDictionary.h>
-#include <gnustep/gui/config.h>
 #include <gnustep/dps/NSDPSContext.h>
 
 //
diff --git a/Source/tiff.m b/Source/tiff.m
index c091124a1..3b8000514 100644
--- a/Source/tiff.m
+++ b/Source/tiff.m
@@ -54,10 +54,8 @@
  * OF THIS SOFTWARE.
  */
 
-//#include <gnustep/base/preface.h>
 #include <Foundation/NSString.h>
 #include <Foundation/NSUtilities.h>
-#include <gnustep/gui/config.h>
 
 #include <math.h>
 #include <stdlib.h>