Index: /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk
===================================================================
--- /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 15891)
+++ /trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk	(revision 15892)
@@ -23,4 +23,27 @@
 include	$(KBUILD_PATH)/subheader.kmk
 
+ifeq ($(KBUILD_TARGET),win)
+# Windows installation/uninstallation tools.
+# Build these before the actual driver to clean up messed
+# up installation easier.
+
+#
+# NetFltInstall
+#
+PROGRAMS.win  += NetFltInstall
+NetFltInstall_TEMPLATE = VBOXR3STATIC
+NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
+NetFltInstall_SOURCES  = win/NetFltInstall.cpp
+NetFltInstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+
+#
+# NetFltUninstall
+#
+PROGRAMS.win  += NetFltUninstall
+NetFltUninstall_TEMPLATE = VBOXR3STATIC
+NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
+NetFltUninstall_SOURCES  = win/NetFltUninstall.cpp
+NetFltUninstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
+endif
 
 if1of ($(KBUILD_TARGET), darwin win)
@@ -150,24 +173,4 @@
 WinNetConfig_SOURCES  = \
 	win/WinNetConfig.cpp
-
-#
-# NetFltInstall
-#
-PROGRAMS.win  += NetFltInstall
-NetFltInstall_TEMPLATE = VBOXR3STATIC
-NetFltInstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
-NetFltInstall_SOURCES  = win/NetFltInstall.cpp
-NetFltInstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
-
-
-#
-# NetFltUninstall
-#
-PROGRAMS.win  += NetFltUninstall
-NetFltUninstall_TEMPLATE = VBOXR3STATIC
-NetFltUninstall_SDKS     = WINPSDK W2K3DDK VBOX_NTDLL
-NetFltUninstall_SOURCES  = win/NetFltUninstall.cpp
-NetFltUninstall_LIBS     = $(PATH_LIB)/WinNetConfig.lib
-
 
 #