diff --git a/ChangeLog b/ChangeLog
index aa5b289..347a76c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2003-07-30  David Ayers  <d.ayers@inode.at>
+
+	* Created tag 'pre-header-reorg-20030731'.
+
+	* Source/art/GNUmakefile: Do not make headers publilc.
+	* Source/gsc/GNUmakefile: Ditto.
+	* Source/x11/GNUmakefile: Ditto.
+	* Source/xdps/GNUmakefile: Ditto.
+	* Source/xlib/GNUmakefile: Ditto.
+
+	* Headers/win32/*.h: Update includes for new header structure.
+	* Headers/winlib/*.h: Ditto.
+	* Headers/x11/XGServer.h: Ditto.
+	* Headers/xlib/*.h: Ditto.
+	
+	* Source/art/ftfont.m: Ditto.
+	* Source/gsc/*.m: Ditto.
+	* Source/x11/*.m: Ditto.
+	* Source/xdps/*.m: Ditto.
+	* Source/xlib/*.m: Ditto.
+
+	* Tools/gpbs.m: Ditto.
+
 2003-07-26  Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/x11/XGServer.m
diff --git a/Headers/win32/WIN32Server.h b/Headers/win32/WIN32Server.h
index f77347e..784faf3 100644
--- a/Headers/win32/WIN32Server.h
+++ b/Headers/win32/WIN32Server.h
@@ -25,7 +25,7 @@
 #ifndef _WIN32Server_h_INCLUDE
 #define _WIN32Server_h_INCLUDE
 
-#include <AppKit/GSDisplayServer.h>
+#include <GNUstepGUI/GSDisplayServer.h>
 
 #include <windows.h>
 
diff --git a/Headers/winlib/WIN32FontEnumerator.h b/Headers/winlib/WIN32FontEnumerator.h
index dbb41b5..15ebff2 100644
--- a/Headers/winlib/WIN32FontEnumerator.h
+++ b/Headers/winlib/WIN32FontEnumerator.h
@@ -25,7 +25,7 @@
 #ifndef _WIN32FontEnumerator_h_INCLUDE
 #define _WIN32FontEnumerator_h_INCLUDE
 
-#include "AppKit/GSFontInfo.h"
+#include "GNUstepGUI/GSFontInfo.h"
 
 @interface WIN32FontEnumerator : GSFontEnumerator
 {
diff --git a/Headers/winlib/WIN32FontInfo.h b/Headers/winlib/WIN32FontInfo.h
index db2de7e..1551c32 100644
--- a/Headers/winlib/WIN32FontInfo.h
+++ b/Headers/winlib/WIN32FontInfo.h
@@ -26,7 +26,7 @@
 #define _WIN32FontInfo_h_INCLUDE
 
 #include "windows.h"
-#include "AppKit/GSFontInfo.h"
+#include "GNUstepGUI/GSFontInfo.h"
 
 @interface WIN32FontInfo : GSFontInfo
 {
diff --git a/Headers/x11/XGServer.h b/Headers/x11/XGServer.h
index b04c6ca..0e6470e 100644
--- a/Headers/x11/XGServer.h
+++ b/Headers/x11/XGServer.h
@@ -27,7 +27,7 @@
 #ifndef _XGServer_h_INCLUDE
 #define _XGServer_h_INCLUDE
 
-#include <AppKit/GSDisplayServer.h>
+#include <GNUstepGUI/GSDisplayServer.h>
 #include <X11/Xatom.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/Headers/xlib/GSXftFontInfo.h b/Headers/xlib/GSXftFontInfo.h
index 91efb29..1e28bee 100644
--- a/Headers/xlib/GSXftFontInfo.h
+++ b/Headers/xlib/GSXftFontInfo.h
@@ -32,7 +32,7 @@
 #include <X11/Xft/Xft.h>
 #undef id
 
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 
 @interface FcFontEnumerator : GSFontEnumerator
 {
diff --git a/Headers/xlib/XGFontSetFontInfo.h b/Headers/xlib/XGFontSetFontInfo.h
index 9e5a69e..8530aed 100644
--- a/Headers/xlib/XGFontSetFontInfo.h
+++ b/Headers/xlib/XGFontSetFontInfo.h
@@ -12,7 +12,7 @@
 #define __XGFontSetFontInfo_h
 
 #include <X11/Xlib.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 
 #ifdef X_HAVE_UTF8_STRING
 
diff --git a/Headers/xlib/XGPrivate.h b/Headers/xlib/XGPrivate.h
index 8a220bc..35cfd9e 100644
--- a/Headers/xlib/XGPrivate.h
+++ b/Headers/xlib/XGPrivate.h
@@ -35,7 +35,7 @@
 
 #include "x11/XGServer.h"
 #include "xlib/XGContext.h"
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 
 /* Font function (defined in XGFontManager) */
 extern NSString	*XGXFontName(NSString *fontName, float size);
diff --git a/Source/art/GNUmakefile b/Source/art/GNUmakefile
index 360cd03..c49a2d8 100644
--- a/Source/art/GNUmakefile
+++ b/Source/art/GNUmakefile
@@ -42,12 +42,6 @@ art_OBJC_FILES = \
   path.m \
   shfill.m
 
-art_HEADER_FILES_DIR = ../../Headers/art
-art_HEADER_FILES_INSTALL_DIR = gnustep/art
-
-art_HEADER_FILES = \
-ARTContext.h
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/Source/art/ftfont.m b/Source/art/ftfont.m
index 9600559..76509f1 100644
--- a/Source/art/ftfont.m
+++ b/Source/art/ftfont.m
@@ -32,7 +32,7 @@
 #include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSDebug.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 #include <AppKit/NSAffineTransform.h>
 #include <AppKit/NSBezierPath.h>
 
@@ -754,7 +754,7 @@ static FT_Error ft_get_face(FTC_FaceID fid, FT_Library lib, FT_Pointer data, FT_
 }
 
 
-#include <gnustep/base/Unicode.h>
+#include <GNUstepBase/Unicode.h>
 
 /* TODO: the current point probably needs updating after drawing is done */
 
@@ -2766,7 +2766,7 @@ GSLayoutManager glyph generation code.
 TODO: clean this up
 */
 #include <Foundation/NSCharacterSet.h>
-#include <AppKit/GSLayoutManager_internal.h>
+#include <GNUstepGUI/GSLayoutManager_internal.h>
 #include <AppKit/NSTextStorage.h>
 #include <AppKit/NSTextAttachment.h>
 
diff --git a/Source/gsc/GNUmakefile b/Source/gsc/GNUmakefile
index 2b1de6a..bdf3585 100644
--- a/Source/gsc/GNUmakefile
+++ b/Source/gsc/GNUmakefile
@@ -44,15 +44,6 @@ externs.m
 
 gsc_C_FILES = gscolors.c
 
-gsc_HEADER_FILES_DIR = ../../Headers/gsc
-gsc_HEADER_FILES_INSTALL_DIR = gnustep/gsc
-
-gsc_HEADER_FILES = \
-gscolors.h \
-GSContext.h \
-GSGState.h \
-GSGStateOps.h
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/Source/gsc/GSContext.m b/Source/gsc/GSContext.m
index 7c7018f..7711da7 100644
--- a/Source/gsc/GSContext.m
+++ b/Source/gsc/GSContext.m
@@ -28,7 +28,7 @@
 #include <AppKit/NSColor.h>
 #include <AppKit/NSView.h>
 #include <AppKit/NSWindow.h>
-#include <AppKit/GSDisplayServer.h>
+#include <GNUstepGUI/GSDisplayServer.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSArray.h>
 #include <Foundation/NSDictionary.h>
@@ -57,7 +57,7 @@
 #ifdef GSIArray
 #undef GSIArray
 #endif
-#include <base/GSIArray.h>
+#include <GNUstepBase/GSIArray.h>
 
 /* Error macros */
 #define CHECK_NULL_OUTPUT(outvar) \
diff --git a/Source/gsc/GSGState.m b/Source/gsc/GSGState.m
index 15edd69..c73edd0 100644
--- a/Source/gsc/GSGState.m
+++ b/Source/gsc/GSGState.m
@@ -27,7 +27,7 @@
 #include <AppKit/NSAffineTransform.h>
 #include <AppKit/NSBezierPath.h>
 #include <AppKit/NSColor.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 #include <AppKit/NSGraphics.h>
 #include "gsc/GSContext.h"
 #include "gsc/GSGState.h"
diff --git a/Source/gsc/GSStreamContext.m b/Source/gsc/GSStreamContext.m
index 71211d0..e0b00ff 100644
--- a/Source/gsc/GSStreamContext.m
+++ b/Source/gsc/GSStreamContext.m
@@ -27,7 +27,7 @@
 #include "gsc/GSContext.h"
 #include "gsc/GSStreamContext.h"
 #include "gsc/GSStreamGState.h"
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 #include <AppKit/NSAffineTransform.h>
 #include <AppKit/NSBezierPath.h>
 #include <AppKit/NSView.h>
diff --git a/Source/x11/GNUmakefile b/Source/x11/GNUmakefile
index 51edf93..a9e928b 100644
--- a/Source/x11/GNUmakefile
+++ b/Source/x11/GNUmakefile
@@ -63,13 +63,6 @@ XWindowBuffer.m\
 XGGLFormat.m\
 XGGLContext.m
 
-x11_HEADER_FILES_DIR = ../../Headers/x11
-x11_HEADER_FILES_INSTALL_DIR = gnustep/x11
-
-x11_HEADER_FILES = \
-XGServer.h \
-XGServerWindow.h
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/Source/x11/XGGLContext.m b/Source/x11/XGGLContext.m
index a2dbd0f..1393598 100644
--- a/Source/x11/XGGLContext.m
+++ b/Source/x11/XGGLContext.m
@@ -28,7 +28,7 @@
 #ifdef HAVE_GLX
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
-#include <AppKit/GSDisplayServer.h>
+#include <GNUstepGUI/GSDisplayServer.h>
 #include <AppKit/NSView.h>
 #include <AppKit/NSWindow.h>
 #include "x11/XGServerWindow.h"
diff --git a/Source/x11/XGGLFormat.m b/Source/x11/XGGLFormat.m
index 5e4cd9c..25a3245 100644
--- a/Source/x11/XGGLFormat.m
+++ b/Source/x11/XGGLFormat.m
@@ -28,7 +28,7 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSData.h>
-#include <AppKit/GSDisplayServer.h>
+#include <GNUstepGUI/GSDisplayServer.h>
 #include "x11/XGServer.h"
 #include "x11/XGOpenGL.h"
 
diff --git a/Source/x11/XIMInputServer.m b/Source/x11/XIMInputServer.m
index d245104..46f68d0 100644
--- a/Source/x11/XIMInputServer.m
+++ b/Source/x11/XIMInputServer.m
@@ -31,9 +31,9 @@
 #include <Foundation/NSData.h>
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSException.h>
-#include <base/Unicode.h>
+#include <GNUstepBase/Unicode.h>
 #include <AppKit/NSWindow.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 
 #include "x11/XGInputServer.h"
 #include <X11/Xlocale.h>
diff --git a/Source/xdps/AFMFileFontInfo.h b/Source/xdps/AFMFileFontInfo.h
index a1e908e..69725bb 100644
--- a/Source/xdps/AFMFileFontInfo.h
+++ b/Source/xdps/AFMFileFontInfo.h
@@ -29,7 +29,7 @@
 #define __AFMFileFontInfo_h__
 
 #include <Foundation/NSMapTable.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 #include "parseAFM.h"
 
 typedef struct {
diff --git a/Source/xdps/GNUmakefile b/Source/xdps/GNUmakefile
index 27bb7b3..208ad87 100644
--- a/Source/xdps/GNUmakefile
+++ b/Source/xdps/GNUmakefile
@@ -50,12 +50,6 @@ NSDPSContext.m \
 NSDPSContextOps.m \
 PXKFontManager.m
 
-xdps_HEADER_FILES_DIR = ../../Headers/xdps
-xdps_HEADER_FILES_INSTALL_DIR = gnustep/xdps
-
-xdps_HEADER_FILES = \
-NSDPSContext.h
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/Source/xdps/NSDPSContext.m b/Source/xdps/NSDPSContext.m
index 560fae9..e19b54c 100644
--- a/Source/xdps/NSDPSContext.m
+++ b/Source/xdps/NSDPSContext.m
@@ -38,7 +38,7 @@
 #include <AppKit/NSView.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSWindow.h>
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 
 #include "x11/XGServer.h"
 #include "xdps/NSDPSContext.h"
diff --git a/Source/xlib/GNUmakefile b/Source/xlib/GNUmakefile
index 3042c74..c6b29f4 100644
--- a/Source/xlib/GNUmakefile
+++ b/Source/xlib/GNUmakefile
@@ -50,15 +50,6 @@ ifeq ($(WITH_XFT),yes)
 xlib_OBJC_FILES += GSXftFontInfo.m
 endif
 
-xlib_HEADER_FILES_DIR = ../../Headers/xlib
-xlib_HEADER_FILES_INSTALL_DIR = gnustep/xlib
-
-xlib_HEADER_FILES = \
-XGContext.h \
-XGPrivate.h \
-XGGeometry.h \
-XGGState.h 
-
 -include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/subproject.make
diff --git a/Source/xlib/GSXftFontInfo.m b/Source/xlib/GSXftFontInfo.m
index be364ec..15660c2 100644
--- a/Source/xlib/GSXftFontInfo.m
+++ b/Source/xlib/GSXftFontInfo.m
@@ -35,7 +35,7 @@
 #include <Foundation/NSDebug.h>
 #include <Foundation/NSValue.h>
 // For the encoding functions
-#include <base/Unicode.h>
+#include <GNUstepBase/Unicode.h>
 
 #include "xlib/GSXftFontInfo.h"
 
diff --git a/Source/xlib/XGCommonFont.m b/Source/xlib/XGCommonFont.m
index bcf2314..623f22a 100644
--- a/Source/xlib/XGCommonFont.m
+++ b/Source/xlib/XGCommonFont.m
@@ -42,7 +42,7 @@
 #include "xlib/XGPrivate.h"
 #include <Foundation/NSDebug.h>
 // For the encoding functions
-#include <base/Unicode.h>
+#include <GNUstepBase/Unicode.h>
 
 static Atom XA_SLANT = (Atom)0;
 static Atom XA_SETWIDTH_NAME = (Atom)0;
diff --git a/Source/xlib/XGFont.m b/Source/xlib/XGFont.m
index 87591a5..4ca609c 100644
--- a/Source/xlib/XGFont.m
+++ b/Source/xlib/XGFont.m
@@ -43,7 +43,7 @@
 #include <Foundation/NSData.h>
 #include <Foundation/NSValue.h>
 // For the encoding functions
-#include <base/Unicode.h>
+#include <GNUstepBase/Unicode.h>
 
 static Atom XA_SLANT = (Atom)0;
 static Atom XA_SETWIDTH_NAME = (Atom)0;
diff --git a/Source/xlib/XGFontManager.m b/Source/xlib/XGFontManager.m
index 30d133e..ffaef88 100644
--- a/Source/xlib/XGFontManager.m
+++ b/Source/xlib/XGFontManager.m
@@ -32,7 +32,7 @@
 #include <config.h>
 #include <stdio.h>
 
-#include <AppKit/GSFontInfo.h>
+#include <GNUstepGUI/GSFontInfo.h>
 #include <Foundation/NSArchiver.h>
 #include <Foundation/NSBundle.h>
 #include <Foundation/NSFileManager.h>
diff --git a/Tools/gpbs.m b/Tools/gpbs.m
index 9c5bb53..2a82c5a 100644
--- a/Tools/gpbs.m
+++ b/Tools/gpbs.m
@@ -24,7 +24,7 @@
 
 #include <Foundation/Foundation.h>
 #include <AppKit/NSPasteboard.h>
-#include <AppKit/GSPasteboardServer.h>
+#include <GNUstepGUI/GSPasteboardServer.h>
 
 #include <signal.h>
 #include <unistd.h>