diff --git a/ChangeLog b/ChangeLog
index 82f13d1e76..caa76b0a8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-10-27  Hans Breuer  <hans@breuer.org>
+
+	* app/base/makefile.msc app/file/makefile.msc app/gimpcore.def
+	  app/gui/makefile.msc app/plug-in/makefile.msc
+	  libgimpwidgets/makefile.msc : updated msvc build
+	* config.h.win32 : add ENABLE_TOOLBOX_MENU, it should only
+	vanish on Mac OSX (Quartz build)
+
 2007-10-27  Tor Lillqvist  <tml@novell.com>
 
 	* libgimpbase/gimpenv.c (gimp_toplevel_directory): Drop the Win9x
diff --git a/app/base/makefile.msc b/app/base/makefile.msc
index 582d7e0fb6..246afc7d4e 100644
--- a/app/base/makefile.msc
+++ b/app/base/makefile.msc
@@ -41,6 +41,7 @@ OBJECTS = \
 	tile-manager-crop.obj \
 	tile-manager-preview.obj \
 	tile-pyramid.obj \
+	tile-rowhints.obj \
 	tile-swap.obj \
 
 INCLUDES = \
diff --git a/app/file/makefile.msc b/app/file/makefile.msc
index cdb32f53fa..c9ce1d3250 100644
--- a/app/file/makefile.msc
+++ b/app/file/makefile.msc
@@ -13,8 +13,6 @@ OBJECTS = \
 	file-procedure.obj \
 	file-save.obj \
 	file-utils.obj \
-	gimprecentitem.obj \
-	gimprecentlist.obj \
 
 INCLUDES = \
 	-FImsvc_recommended_pragmas.h \
diff --git a/app/gimpcore.def b/app/gimpcore.def
index 0f3564990a..ce5b68cd60 100644
--- a/app/gimpcore.def
+++ b/app/gimpcore.def
@@ -912,3 +912,5 @@ gimp_image_parasite_attach
 gimp_image_parasite_detach
 
 gimp_image_get_active_drawable
+
+gimp_image_get_load_proc
diff --git a/app/gui/makefile.msc b/app/gui/makefile.msc
index 6a9edf6384..167469f13b 100644
--- a/app/gui/makefile.msc
+++ b/app/gui/makefile.msc
@@ -45,7 +45,8 @@ INCLUDES = \
 	-I$(includedir)
 
 DEFINES = \
-	-DG_LOG_DOMAIN=\"Gimp-GUI\"
+	-DG_LOG_DOMAIN=\"Gimp-GUI\" \
+	-DGIMP_COMMAND=\"gimp.exe\"
 
 all : \
 	$(PRJ_TOP)\config.h \
diff --git a/app/plug-in/makefile.msc b/app/plug-in/makefile.msc
index 17cc482c61..a8d3cfa6ba 100644
--- a/app/plug-in/makefile.msc
+++ b/app/plug-in/makefile.msc
@@ -44,6 +44,7 @@ OBJECTS = \
 	\
 	plug-in-enums.obj \
 	plug-in-icc-profile.obj \
+	plug-in-menu-path.obj \
 	plug-in-params.obj \
 	plug-in-rc.obj
 
diff --git a/config.h.win32 b/config.h.win32
index 0083a170c7..212a13000b 100644
--- a/config.h.win32
+++ b/config.h.win32
@@ -186,3 +186,6 @@
 
 /* Define if you have the i library (-li).  */
 /* #undef HAVE_LIBI */
+
+/* File + Xtns at the toolbox, only *not* on OSX */
+#define ENABLE_TOOLBOX_MENU 1
diff --git a/libgimpwidgets/makefile.msc b/libgimpwidgets/makefile.msc
index d0d93831a2..56767d0ae6 100644
--- a/libgimpwidgets/makefile.msc
+++ b/libgimpwidgets/makefile.msc
@@ -49,7 +49,6 @@ OBJECTS = \
 	gimpcolorscales.obj \
 	gimpcolorselect.obj \
 	gimpcolorselection.obj \
-	gimpcolordisplaystack.obj \
 	gimpcolorselector.obj \
 	gimpcontroller.obj \
 	gimpdialog.obj \