diff --git a/ChangeLog b/ChangeLog
index e6a8172d..bc170bda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-23 08:16 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormLib/GNUmakefile.postamble: Changed the build process a little
+	to be more compatible with mingw on win32.
+	
 2004-10-17 12:51 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormControlEditor.m: Added necessary methods for dragging
diff --git a/GormLib/GNUmakefile.postamble b/GormLib/GNUmakefile.postamble
index 780ec8a0..ee82725b 100644
--- a/GormLib/GNUmakefile.postamble
+++ b/GormLib/GNUmakefile.postamble
@@ -23,8 +23,9 @@
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 before-all::
-	rm -f InterfaceBuilder
-	$(LN_S) . InterfaceBuilder
+	rm -rf ./InterfaceBuilder
+	rm -rf ../InterfaceBuilder
+	$(LN_S) GormLib ../InterfaceBuilder
 
 after-clean::
-	rm -f InterfaceBuilder
+	rm -rf ../InterfaceBuilder
diff --git a/GormLib/GNUmakefile.preamble b/GormLib/GNUmakefile.preamble
index 022b9cd0..8b08cf29 100644
--- a/GormLib/GNUmakefile.preamble
+++ b/GormLib/GNUmakefile.preamble
@@ -47,7 +47,7 @@
 # ADDITIONAL_CFLAGS += -Wall -Werror
 
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += 
+ADDITIONAL_INCLUDE_DIRS += -I../InterfaceBuilder
 
 # Additional LDFLAGS to pass to the linker
 #ADDITIONAL_LDFLAGS += 
diff --git a/GormPalettesPref.m b/GormPalettesPref.m
index d8c5e0b4..a42ad5dd 100644
--- a/GormPalettesPref.m
+++ b/GormPalettesPref.m
@@ -2,12 +2,10 @@
 #include "GormPrivate.h"
 
 #include <Foundation/NSUserDefaults.h>
-#include <AppKit/NSButton.h>
-#include <AppKit/NSTableView.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSNibLoading.h>
-#include <AppKit/NSOpenPanel.h>
-#include <AppKit/NSStringDrawing.h>
+
+@class NSTableView;
 
 // data source...
 @interface PaletteDataSource : NSObject