diff --git a/ChangeLog b/ChangeLog
index 1bbdf250ea..61ac4e5503 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-07  Hans Breuer  <hans@breuer.org>
+
+	* gimpdefs.msc : new file to keep common definitions for the msc build
+	* **/makefile.msc : use common defintions, e.g. GIMP_VER
+	* Makefile.am : add the former to EXTRA_DIST
+
 2004-02-07  Pedro Gimeno  <pggimeno@wanadoo.es>
 
 	* app/core/gimpimage-convert.c (median_cut_pass2_no_dither_rgb):
diff --git a/Makefile.am b/Makefile.am
index 01ea6bb539..d8a4d08411 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ EXTRA_DIST = \
 	gimp.spec.in		\
 	gimp.spec		\
 	gimp-zip.in		\
+	gimpdefs.msc	\
 	gimptool-win32.c.in	\
 	intltool-extract.in	\
 	intltool-merge.in	\
diff --git a/app/base/makefile.msc b/app/base/makefile.msc
index 988ddb9922..cec21b3cee 100644
--- a/app/base/makefile.msc
+++ b/app/base/makefile.msc
@@ -1,11 +1,13 @@
 # autogenerated from automake.am with automake.py
 # and slightly modified
 
+PACKAGE = appbase
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appbase
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 PKG_LINK = \
 	$(GLIB_LIBS) \
diff --git a/app/composite/makefile.msc b/app/composite/makefile.msc
index 71127eec4f..3bd265e826 100644
--- a/app/composite/makefile.msc
+++ b/app/composite/makefile.msc
@@ -1,9 +1,11 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appcomposite
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appcomposite
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
diff --git a/app/config/makefile.msc b/app/config/makefile.msc
index 35a3dd5d2a..58ccd76bde 100644
--- a/app/config/makefile.msc
+++ b/app/config/makefile.msc
@@ -1,11 +1,14 @@
 # autogenerated from automake.am with automake.py
 # and slightly modified
 
+PACKAGE = appconfig
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appconfig
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 PKG_LINK = \
 #	..\base\appbase-$(PKG_VER).lib \
diff --git a/app/core/makefile.msc b/app/core/makefile.msc
index cd8ed75cd1..900efcab34 100644
--- a/app/core/makefile.msc
+++ b/app/core/makefile.msc
@@ -1,9 +1,11 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appcore
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appcore
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 PKG_LINK = \
 	$(GLIB_LIBS) $(GTK_PIXBUF_LIBS) $(INTL_LIBS) $(LIBART_LIBS) \
diff --git a/app/display/makefile.msc b/app/display/makefile.msc
index af39d0c079..4cfdfefe5e 100644
--- a/app/display/makefile.msc
+++ b/app/display/makefile.msc
@@ -1,10 +1,13 @@
 # autogenerated from automake.am with automake.py
 # and slightly modified
+PACKAGE = appdisplay
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appdisplay
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
@@ -32,6 +35,7 @@ OBJECTS = \
 	gimpdisplayshell-callbacks.obj \
 	gimpdisplayshell-cursor.obj \
 	gimpdisplayshell-dnd.obj \
+	gimpdisplayshell-draw.obj \
 	gimpdisplayshell-filter.obj \
 	gimpdisplayshell-filter-dialog.obj \
 	gimpdisplayshell-handlers.obj \
diff --git a/app/file/makefile.msc b/app/file/makefile.msc
index e39c6465e4..33765c0a89 100644
--- a/app/file/makefile.msc
+++ b/app/file/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appfile
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appfile
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 OBJECTS = \
 	file-open.obj \
diff --git a/app/gui/makefile.msc b/app/gui/makefile.msc
index f1cf1da8c4..b133b41f81 100644
--- a/app/gui/makefile.msc
+++ b/app/gui/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appgui
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appgui
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
diff --git a/app/makefile.msc b/app/makefile.msc
index 9edaa1082f..7fdc3ad127 100644
--- a/app/makefile.msc
+++ b/app/makefile.msc
@@ -1,16 +1,19 @@
 # autogenerated from automake.am with automake.py
 # and slightly modified
 
+PACKAGE = gimp
 TOP = ..\..
 PRJ_TOP = ..
-PACKAGE = gimp
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
 includedir = $(PRJ_TOP)
 LT_RELEASE = $(PKG_VER)
+
 SUBDIRS = composite paint-funcs base config xcf core file text \
 	display paint vectors pdb plug-in tools widgets gui
 
diff --git a/app/paint-funcs/makefile.msc b/app/paint-funcs/makefile.msc
index 2c5ee8674a..bbd835459e 100644
--- a/app/paint-funcs/makefile.msc
+++ b/app/paint-funcs/makefile.msc
@@ -1,9 +1,11 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = apppaint-funcs
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = apppaint-funcs
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
@@ -32,8 +34,9 @@ INCLUDES = \
 all : \
 	$(PRJ_TOP)\config.h \
 	$(PACKAGE).lib \
+!IFDEF DLLGIMP
 	$(PACKAGE)-$(PKG_VER).dll
-
+!ENDIF
 
 $(PRJ_TOP)\config.h: $(PRJ_TOP)\config.h.win32
 	copy $(PRJ_TOP)\config.h.win32 $(PRJ_TOP)\config.h
diff --git a/app/paint/makefile.msc b/app/paint/makefile.msc
index b7e9001d0b..ee77e37c24 100644
--- a/app/paint/makefile.msc
+++ b/app/paint/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = apppaint
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = apppaint
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
diff --git a/app/pdb/makefile.msc b/app/pdb/makefile.msc
index 43625ae62d..e81fa39bdb 100644
--- a/app/pdb/makefile.msc
+++ b/app/pdb/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = apppdb
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = apppdb
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
@@ -53,7 +56,6 @@ OBJECTS = \
 	layer_cmds.obj \
 	message_cmds.obj \
 	misc_cmds.obj \
-	misc_tools_cmds.obj \
 	paint_tools_cmds.obj \
 	palette_cmds.obj \
 	palettes_cmds.obj \
diff --git a/app/plug-in/makefile.msc b/app/plug-in/makefile.msc
index 924da54c1a..5c761ccf68 100644
--- a/app/plug-in/makefile.msc
+++ b/app/plug-in/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appplug-in
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appplug-in
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 PKG_LINK = \
 	$(GLIB_LIBS) \
diff --git a/app/text/makefile.msc b/app/text/makefile.msc
index b5822b765b..73c1c72664 100644
--- a/app/text/makefile.msc
+++ b/app/text/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = apptext
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = apptext
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 PKG_LINK = \
 	$(GLIB_LIBS) $(PANGOFT2_LIBS) \
diff --git a/app/tools/makefile.msc b/app/tools/makefile.msc
index 3dc8005c0c..f42321ee5a 100644
--- a/app/tools/makefile.msc
+++ b/app/tools/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = apptools
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = apptools
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
diff --git a/app/vectors/makefile.msc b/app/vectors/makefile.msc
index bb121c22c5..fafcebbe13 100644
--- a/app/vectors/makefile.msc
+++ b/app/vectors/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appvectors
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appvectors
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 PKG_LINK = \
 	$(GLIB_LIBS) \
diff --git a/app/widgets/makefile.msc b/app/widgets/makefile.msc
index e7e7e79910..b35a3481b9 100644
--- a/app/widgets/makefile.msc
+++ b/app/widgets/makefile.msc
@@ -1,9 +1,12 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = appwidgets
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = appwidgets
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
@@ -45,6 +48,7 @@ OBJECTS = \
 	gimpcontainerview.obj \
 	gimpcontainerview-utils.obj \
 	gimpcursor.obj \
+	gimpdasheditor.obj \
 	gimpdataeditor.obj \
 	gimpdatafactoryview.obj \
 	gimpdeviceinfo.obj \
diff --git a/app/xcf/makefile.msc b/app/xcf/makefile.msc
index f677a46ae9..bbf9d38db2 100644
--- a/app/xcf/makefile.msc
+++ b/app/xcf/makefile.msc
@@ -1,9 +1,11 @@
 # autogenerated from automake.am with automake.py
+PACKAGE = xcf
 TOP = ..\..\..
 PRJ_TOP = ..\..
-PACKAGE = xcf
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 top_srcdir = $(PRJ_TOP)
 top_builddir = $(PRJ_TOP)
diff --git a/gimpdefs.msc b/gimpdefs.msc
new file mode 100644
index 0000000000..5df5f9d631
--- /dev/null
+++ b/gimpdefs.msc
@@ -0,0 +1,15 @@
+# common GIMP definitions for msvc/win32 build
+# to keep them in one place
+
+GIMP_VER = 2.0
+
+# The name of the directory in your %HOME% where the GIMP's personal settings
+# and stuff is saved.
+GIMPDIR = _gimp$(GIMP_VER)
+
+# Build app/* as DLLs; don't define this, it doesn't work yet.
+#DLLGIMP = 1 
+
+# This one doesn't work either withot patching Pango and The Gimp
+# Tries to not depend on ft2
+#PANGO_WIN32_EXTENDED = 1
diff --git a/libgimp/makefile.msc b/libgimp/makefile.msc
index 5c68804157..9c95ba6f1f 100644
--- a/libgimp/makefile.msc
+++ b/libgimp/makefile.msc
@@ -1,19 +1,9 @@
 ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
-# only, it probably is best to keep them in the GIMP's bin directory.
-BIN = C:\install\gimp\bin
-
 TOP = ..\..
 !INCLUDE $(TOP)\glib\build\win32\make.msc 
-
-GIMP_VER = 1.3
-
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(GIMP_VER)
+!INCLUDE ..\gimpdefs.msc
 
 ################################################################
 
@@ -66,7 +56,6 @@ PDB_WRAPPERS_O = \
 	gimplayer_pdb.obj \
 	gimpmessage_pdb.obj \
 	gimpmisc_pdb.obj \
-	gimpmisctools_pdb.obj \
 	gimppainttools_pdb.obj \
 	gimppalette_pdb.obj \
 	gimppalettes_pdb.obj \
@@ -110,10 +99,11 @@ gimp_OBJECTS = \
 #	gimphelp.obj \
 	gimpimage.obj \
 	gimplayer.obj \
-	gimpmisc.obj \
 	gimppatternselect.obj \
+	gimppixelfetcher.obj \
 	gimppixelrgn.obj \
 	gimpproceduraldb.obj \
+	gimpregioniterator.obj \
 	gimpselection.obj \
 	gimptile.obj \
 	gimpunitcache.obj \
@@ -140,7 +130,6 @@ gimpui_OBJECTS = \
 	gimpmenu.obj \
 	gimppatternmenu.obj \
 	gimpexport.obj \
-	gimpmiscui.obj \
 #	gimppatheditor.obj \
 
 gimpui-$(GIMP_VER).dll : $(gimpui_OBJECTS) gimpui.def
diff --git a/libgimpbase/makefile.msc b/libgimpbase/makefile.msc
index 39ca71e899..f900e0f80e 100644
--- a/libgimpbase/makefile.msc
+++ b/libgimpbase/makefile.msc
@@ -3,12 +3,11 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = gimpbase
-PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(PKG_VER)
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
 	-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"
 
diff --git a/libgimpcolor/makefile.msc b/libgimpcolor/makefile.msc
index 710d97d567..5dc06fcb4f 100644
--- a/libgimpcolor/makefile.msc
+++ b/libgimpcolor/makefile.msc
@@ -1,18 +1,12 @@
 ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
-# only, it probably is best to keep them in the GIMP's bin directory.
-BIN = C:\install\gimp\bin
 TOP = ..\..
+PRJ_TOP = ..
 !include $(TOP)\glib\build\win32\make.msc
 
-GIMP_VER = 1.3
-
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(GIMP_VER)
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 ################################################################
 
diff --git a/libgimpmath/makefile.msc b/libgimpmath/makefile.msc
index b9b4e6b950..96f599580e 100644
--- a/libgimpmath/makefile.msc
+++ b/libgimpmath/makefile.msc
@@ -1,18 +1,12 @@
 ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
-# only, it probably is best to keep them in the GIMP's bin directory.
-BIN = C:\install\gimp\bin
 TOP = ..\..
+PRJ_TOP = ..
 !include $(TOP)\glib\build\win32\make.msc
 
-GIMP_VER = 1.3
-
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(GIMP_VER)
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 ################################################################
 
diff --git a/libgimpmodule/makefile.msc b/libgimpmodule/makefile.msc
index 0ce3c33300..044e64301e 100644
--- a/libgimpmodule/makefile.msc
+++ b/libgimpmodule/makefile.msc
@@ -3,12 +3,11 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = gimpmodule
-PKG_VER = 1.3
-!INCLUDE $(TOP)\glib\build\win32\make.msc
+!include $(TOP)\glib\build\win32\make.msc
+
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(PKG_VER)
 DEFINES = -DGIMPDIR=\"$(GIMPDIR)\" -DDATADIR=\"\" -DSYSCONFDIR=\"\" \
 	-DPLUGINDIR=\"plug-ins\" -DLOCALEDIR=\"locale\"
 
diff --git a/libgimpthumb/makefile.msc b/libgimpthumb/makefile.msc
index 3aa1672106..3d1f4ffa2a 100644
--- a/libgimpthumb/makefile.msc
+++ b/libgimpthumb/makefile.msc
@@ -1,18 +1,12 @@
 ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
-# only, it probably is best to keep them in the GIMP's bin directory.
-BIN = C:\install\gimp\bin
 TOP = ..\..
+PRJ_TOP = ..
 !include $(TOP)\glib\build\win32\make.msc
 
-GIMP_VER = 1.3
-
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(GIMP_VER)
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 ################################################################
 
diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc
index b26b6deef4..37e8433f54 100644
--- a/libgimpwidgets/makefile.msc
+++ b/libgimpwidgets/makefile.msc
@@ -1,18 +1,12 @@
 ## Makefile for building the GIMP DLLs and LIBs with Microsoft C.
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you want to install the DLLs. This directory
-# should be in your PATH. As these DLLs are for the GIMP and its plug-ins
-# only, it probably is best to keep them in the GIMP's bin directory.
-BIN = C:\install\gimp\bin
 TOP = ..\..
+PRJ_TOP = ..
 !include $(TOP)\glib\build\win32\make.msc
 
-GIMP_VER = 1.3
-
-# The name of the directory in your %HOME% where the GIMP's personal settings
-# and stuff is saved.
-GIMPDIR = _gimp$(GIMP_VER)
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
 
 ################################################################
 
diff --git a/makefile.msc b/makefile.msc
index 2de71e9d1b..f42ba3b932 100644
--- a/makefile.msc
+++ b/makefile.msc
@@ -1,9 +1,11 @@
 TOP = ..
 PRJ_TOP = .
 PACKAGE = gimp
-PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
+!INCLUDE $(PRJ_TOP)\gimpdefs.msc
+PKG_VER = $(GIMP_VER)
+
 # in required build order
 # ./themes gets extra handling below
 SUBDIRS = \
diff --git a/modules/makefile.msc b/modules/makefile.msc
index a32fdedc42..e0e526d2b1 100644
--- a/modules/makefile.msc
+++ b/modules/makefile.msc
@@ -1,11 +1,6 @@
 ## Makefile for building gimp modules with Microsoft C
 ## Use: nmake -f makefile.msc
 
-# Change this to wherever you install gimp.
-# This is what I use as installation target, from where the installer-builder
-# will pick it up.
-GIMP = \install\gimp
-
 TOP = ..\..
 
 ################################################################
@@ -13,8 +8,7 @@ TOP = ..\..
 # Nothing much configurable below
 
 !INCLUDE $(TOP)\glib\build\win32\make.msc
-
-GIMP_VER = 1.3
+!INCLUDE ..\gimpdefs.msc
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
@@ -30,6 +24,7 @@ MODULES = \
 #	colorsel_gtk-$(GIMP_VER).dll \
 	colorsel_triangle-$(GIMP_VER).dll \
 	colorsel_water-$(GIMP_VER).dll \
+	colorsel_cmyk-$(GIMP_VER).dll \
 	cdisplay_colorblind-$(GIMP_VER).dll \
 	cdisplay_gamma-$(GIMP_VER).dll \
 	cdisplay_highcontrast-$(GIMP_VER).dll
@@ -65,6 +60,13 @@ colorsel_water-$(GIMP_VER).dll : colorsel_water.obj
 	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
 	$(DEPLIBS)
 
+colorsel_cmyk-$(GIMP_VER).dll : colorsel_cmyk.obj
+	$(CC) $(CFLAGS) -LD -Fe$@ colorsel_cmyk.obj $(LDFLAGS) \
+	..\app\gimp.lib \
+	..\libgimpcolor\gimpcolor-$(GIMP_VER).lib \
+	..\libgimpwidgets\gimpwidgets-$(GIMP_VER).lib \
+	$(DEPLIBS)
+
 cdisplay_colorblind-$(GIMP_VER).dll : cdisplay_colorblind.obj
 	$(CC) $(CFLAGS) -LD -Fe$@ cdisplay_colorblind.obj $(LDFLAGS) ..\app\gimp.lib \
 	..\libgimpbase\gimpbase-$(GIMP_VER).lib \
diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc
index 793bbf6328..98e8091d65 100644
--- a/plug-ins/makefile.msc
+++ b/plug-ins/makefile.msc
@@ -19,6 +19,7 @@ GIMPTOP = ..
 
 TOP = ..\$(GIMPTOP)
 !INCLUDE $(TOP)\glib\build\win32\make.msc
+!INCLUDE $(GIMPTOP)\gimpdefs.msc
 
 !IFNDEF LIBRARY
 !IFNDEF PLUGIN
@@ -472,8 +473,12 @@ OBJECTS = \
 
 !IFDEF EXTRA_gimpressionist
 
+gimpressionist.c: logo-pixbuf.h
+
+logo-pixbuf.h: logo.png
+	gdk-pixbuf-csource --raw --name=logo_data logo.png > $(@F)
+
 OBJECTS = \
-	about.obj \
 	brush.obj \
 	color.obj \
 	general.obj \
@@ -573,8 +578,6 @@ EXTRACFLAGS = $(JPEG_CFLAGS)
 EXTRALIBS = $(JPEG_LIBS)
 !ENDIF
 
-GIMP_VER = 1.3
-
 PLUGINDIR = $(GIMPTOP)\plug-ins
 
 !IFNDEF OPTIMIZE
@@ -593,7 +596,7 @@ LINKDEBUG = /debug
 RTL = -MDd
 !ENDIF
 
-CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm200
+CC = cl -nologo -G5 -GF $(OPTIMIZE) $(RTL) -W2 -Zm400
 
 CFLAGS = -FImsvc_recommended_pragmas.h \
 	-DHAVE_CONFIG_H $(EXTRACFLAGS) \
diff --git a/regexrepl/makefile.msc b/regexrepl/makefile.msc
index 4a7e33aafb..9cc2e8b23a 100644
--- a/regexrepl/makefile.msc
+++ b/regexrepl/makefile.msc
@@ -4,14 +4,8 @@
 TOP = ..\..
 PRJ_TOP = ..
 PACKAGE = regexrepl
-PKG_VER = 1.3
 !INCLUDE $(TOP)\glib\build\win32\make.msc
 
-top_srcdir = $(PRJ_TOP)
-top_builddir = $(PRJ_TOP)
-includedir = $(PRJ_TOP)
-LT_RELEASE = $(PKG_VER)
-
 PKG_CFLAGS = -I ..
 
 OBJECTS = \
diff --git a/themes/Default/images/makefile.msc b/themes/Default/images/makefile.msc
index 720080366d..a0c8f6ed9e 100644
--- a/themes/Default/images/makefile.msc
+++ b/themes/Default/images/makefile.msc
@@ -59,6 +59,10 @@ STOCK_VARIABLES = \
 	stock_channel_green_24		stock-channel-green-24.png	\
 	stock_channel_green_32		stock-channel-green-32.png	\
 	stock_channel_green_48		stock-channel-green-48.png	\
+	stock_channel_indexed_16		stock-channel-indexed-16.png \
+	stock_channel_indexed_24		stock-channel-indexed-24.png \
+	stock_channel_indexed_32		stock-channel-indexed-32.png \
+	stock_channel_indexed_48		stock-channel-indexed-48.png \
 	stock_channel_red_16		stock-channel-red-16.png	\
 	stock_channel_red_24		stock-channel-red-24.png	\
 	stock_channel_red_32		stock-channel-red-32.png	\
@@ -138,6 +142,10 @@ STOCK_VARIABLES = \
 	stock_layer_24		stock-layer-24.png	\
 	stock_layer_32		stock-layer-32.png	\
 	stock_layer_48		stock-layer-48.png	\
+	stock_layer_mask_16		stock-layer-mask-16.png \
+	stock_layer_mask_24		stock-layer-mask-24.png \
+	stock_layer_mask_32		stock-layer-mask-32.png \
+	stock_layer_mask_48		stock-layer-mask-48.png \
 	stock_layer_to_imagesize_16		stock-layer-to-imagesize-16.png	\
 	stock_layers_16		stock-layers-16.png	\
 	stock_layers_24		stock-layers-24.png	\
@@ -194,6 +202,7 @@ STOCK_VARIABLES = \
 	stock_selection_16		stock-selection-16.png \
 	stock_selection_add_16		stock-selection-add-16.png	\
 	stock_selection_all_16		stock-selection-all-16.png	\
+	stock_selection_border_16		stock-selection-border-16.png	\
 	stock_selection_grow_16		stock-selection-grow-16.png	\
 	stock_selection_intersect_16		stock-selection-intersect-16.png	\
 	stock_selection_none_16		stock-selection-none-16.png	\