diff --git a/Makefile.nmake b/Makefile.nmake
index ef2012f720..8df985a09e 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.308 2003/06/13 22:31:11 guy Exp $
+# $Id: Makefile.nmake,v 1.309 2003/06/14 20:35:55 guy Exp $
 
 include config.nmake
 include <win32.mak>
@@ -13,8 +13,7 @@ LINK= link
 
 LDFLAGS = /NOLOGO /INCREMENTAL:no /MACHINE:I386 $(LOCAL_LDFLAGS)
 
-CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) /I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule \
-	/I$(GTK_DIR) /I. /Iwiretap /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=-DHAVE_CONFIG_H $(LOCAL_CFLAGS) $(GTK_CFLAGS) /I. /Iwiretap \
 	/I$(ZLIB_DIR) /I$(PCAP_DIR)\include \
 	/I$(NET_SNMP_DIR)\include /I$(NET_SNMP_DIR)\win32 \
 	/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \
diff --git a/config.nmake b/config.nmake
index 724342f7cd..d60abb3507 100644
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.43 2003/06/14 03:23:21 guy Exp $
+# $Id: config.nmake,v 1.44 2003/06/14 20:35:55 guy Exp $
 
 VERSION=0.9.13
 #
@@ -57,3 +57,15 @@ YACC=bison
 
 # To build the installer
 MAKENSIS="C:/program files/nsis/makensis.exe"
+
+#
+# You should not have to change anything below this comment.
+# If you do, it's a deficiency in the Makefile.nmake files;
+# either tell ethereal-dev@ethereal.com about it, including
+# details of why you had to change it, or fix config.nmake
+# and any Makefile.nmake files that need to be changed, and
+# send us the patches, along with details of why the change
+# was necessary.
+#
+GLIB_CFLAGS=/I$(GLIB_DIR) /I$(GLIB_DIR)\gmodule
+GTK_CFLAGS=/I$(GTK_DIR) /I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 $(GLIB_CFLAGS)
diff --git a/epan/Makefile.nmake b/epan/Makefile.nmake
index 2c22635ba3..0a42f95cbd 100644
--- a/epan/Makefile.nmake
+++ b/epan/Makefile.nmake
@@ -1,15 +1,13 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.26 2003/06/13 22:45:15 guy Exp $
+# $Id: Makefile.nmake,v 1.27 2003/06/14 20:35:56 guy Exp $
 
 include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../wiretap $(GTK_CFLAGS) \
 !IFDEF ADNS_DIR
 	/I$(ADNS_DIR)\src /I$(ADNS_DIR)\adns_win32 \
 !ENDIF
diff --git a/epan/dfilter/Makefile.nmake b/epan/dfilter/Makefile.nmake
index e8105fbf11..a0e927b4bb 100644
--- a/epan/dfilter/Makefile.nmake
+++ b/epan/dfilter/Makefile.nmake
@@ -1,7 +1,7 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.8 2002/02/27 09:42:41 guy Exp $
+# $Id: Makefile.nmake,v 1.9 2003/06/14 20:35:56 guy Exp $
 
 include ..\..\config.nmake
 
@@ -10,9 +10,7 @@ include ..\..\config.nmake
 LEMON=..\..\tools\lemon
 
 CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I..\.. /I$(LEMON) \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)\gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
-	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
+	$(GTK_CFLAGS) /I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL
 
diff --git a/epan/ftypes/Makefile.nmake b/epan/ftypes/Makefile.nmake
index 0fe6ba167e..8099cd7ec4 100644
--- a/epan/ftypes/Makefile.nmake
+++ b/epan/ftypes/Makefile.nmake
@@ -1,15 +1,13 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.4 2002/02/27 09:42:42 guy Exp $
+# $Id: Makefile.nmake,v 1.5 2003/06/14 20:35:57 guy Exp $
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=-DHAVE_CONFIG_H /I. /I.. /I../.. $(GTK_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 CVARSDLL=-DWIN32 -DNULL=0 -D_MT -D_DLL 
diff --git a/gtk/Makefile.nmake b/gtk/Makefile.nmake
index 4f2862a963..73b6e42b5c 100644
--- a/gtk/Makefile.nmake
+++ b/gtk/Makefile.nmake
@@ -1,15 +1,13 @@
 ## Makefile for building ethereal.exe with Microsoft C and nmake
 ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
 #
-# $Id: Makefile.nmake,v 1.43 2003/04/25 20:54:18 guy Exp $
+# $Id: Makefile.nmake,v 1.44 2003/06/14 20:35:57 guy Exp $
 
 include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=-DHAVE_CONFIG_H /I.. /I../wiretap $(GTK_CFLAGS) \
 	/I$(ZLIB_DIR) \
 	/I$(PCAP_DIR)\WPCAP\LIBPCAP /I$(PCAP_DIR)\WPCAP\LIBPCAP\bpf \
 	/I$(PCAP_DIR)\WPCAP\LIBPCAP\lbl \
diff --git a/plugins/Makefile.nmake b/plugins/Makefile.nmake
index 3a14c83a9a..257920c327 100644
--- a/plugins/Makefile.nmake
+++ b/plugins/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.18 2003/06/11 09:17:02 guy Exp $
+# $Id: Makefile.nmake,v 1.19 2003/06/14 20:35:58 guy Exp $
 #
 
 include ..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I.. /I../wiretap /I. $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=plugin_api.obj 
diff --git a/plugins/artnet/Makefile.nmake b/plugins/artnet/Makefile.nmake
index 7400cbafea..ffa1ff5ac5 100644
--- a/plugins/artnet/Makefile.nmake
+++ b/plugins/artnet/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.1 2003/04/21 21:28:39 guy Exp $
+# $Id: Makefile.nmake,v 1.2 2003/06/14 20:35:59 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-artnet.obj 
diff --git a/plugins/docsis/Makefile.nmake b/plugins/docsis/Makefile.nmake
index 40d04ba61a..f95b0c4fca 100644
--- a/plugins/docsis/Makefile.nmake
+++ b/plugins/docsis/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.3 2002/09/10 19:07:37 guy Exp $
+# $Id: Makefile.nmake,v 1.4 2003/06/14 20:35:59 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-docsis.obj packet-bpkmattr.obj \
diff --git a/plugins/giop/Makefile.nmake b/plugins/giop/Makefile.nmake
index 73e838168b..f2fb16b6cf 100644
--- a/plugins/giop/Makefile.nmake
+++ b/plugins/giop/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.6 2002/02/27 09:42:46 guy Exp $
+# $Id: Makefile.nmake,v 1.7 2003/06/14 20:36:01 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-cosnaming.obj  packet-coseventcomm.obj
diff --git a/plugins/gryphon/Makefile.nmake b/plugins/gryphon/Makefile.nmake
index e8a91d679b..328650bd5d 100644
--- a/plugins/gryphon/Makefile.nmake
+++ b/plugins/gryphon/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.9 2003/06/12 10:12:21 guy Exp $
+# $Id: Makefile.nmake,v 1.10 2003/06/14 20:36:01 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-gryphon.obj 
diff --git a/plugins/megaco/Makefile.nmake b/plugins/megaco/Makefile.nmake
index 068a880e0f..b84be0cee1 100644
--- a/plugins/megaco/Makefile.nmake
+++ b/plugins/megaco/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.1 2003/01/14 23:53:40 guy Exp $
+# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:02 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-megaco.obj 
diff --git a/plugins/mgcp/Makefile.nmake b/plugins/mgcp/Makefile.nmake
index 5092aca329..2c6e9d20bb 100644
--- a/plugins/mgcp/Makefile.nmake
+++ b/plugins/mgcp/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.5 2002/02/27 09:42:48 guy Exp $
+# $Id: Makefile.nmake,v 1.6 2003/06/14 20:36:03 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-mgcp.obj 
diff --git a/plugins/pcli/Makefile.nmake b/plugins/pcli/Makefile.nmake
index c73cbb93da..39e21fe00c 100644
--- a/plugins/pcli/Makefile.nmake
+++ b/plugins/pcli/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.1 2002/10/03 02:56:59 hagbard Exp $
+# $Id: Makefile.nmake,v 1.2 2003/06/14 20:36:03 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-pcli.obj 
diff --git a/plugins/rtnet/Makefile.nmake b/plugins/rtnet/Makefile.nmake
index d1390681d9..345aa0ac36 100644
--- a/plugins/rtnet/Makefile.nmake
+++ b/plugins/rtnet/Makefile.nmake
@@ -1,14 +1,12 @@
 #
-# $Id: Makefile.nmake,v 1.2 2003/06/11 14:40:17 gerald Exp $
+# $Id: Makefile.nmake,v 1.3 2003/06/14 20:36:04 guy Exp $
 #
 
 include ..\..\config.nmake
 
 ############### no need to modify below this line #########
 
-CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap \
-	/I$(GLIB_DIR) /I$(GTK_DIR) /I$(GLIB_DIR)/gmodule \
-	/I$(GTK_DIR)\gdk /I$(GTK_DIR)\gdk\win32 \
+CFLAGS=/DHAVE_CONFIG_H /I../.. /I../../wiretap $(GLIB_CFLAGS) \
 	/I$(PCAP_DIR)\include -D_U_="" $(LOCAL_CFLAGS)
 
 OBJECTS=packet-rtnet.obj 
diff --git a/wiretap/Makefile.nmake b/wiretap/Makefile.nmake
index 55c80d635d..babe8a58c7 100644
--- a/wiretap/Makefile.nmake
+++ b/wiretap/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.28 2002/07/31 19:27:56 guy Exp $
+# $Id: Makefile.nmake,v 1.29 2003/06/14 20:36:04 guy Exp $
 #
 
 include ..\config.nmake
@@ -7,7 +7,7 @@ include <win32.mak>
 
 ############### no need to modify below this line #########
 
-CFLAGS=-DHAVE_CONFIG_H /I$(GLIB_DIR) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
+CFLAGS=-DHAVE_CONFIG_H $(GLIB_CFLAGS) /I$(ZLIB_DIR) /I$(PCAP_DIR)/include \
 	-D_U_="" $(LOCAL_CFLAGS)
 
 .c.obj::