diff --git a/configure b/configure
index 9e0094f6298..5e3ab39402d 100755
--- a/configure
+++ b/configure
@@ -3901,41 +3901,9 @@ if test "x$enable_win16" != "xyes"
 then
     WIN16_FILES=""
     WIN16_INSTALL=""
-    enable_comm_drv16=${enable_comm_drv16:-no}
-    enable_compobj_dll16=${enable_compobj_dll16:-no}
-    enable_dispdib_dll16=${enable_dispdib_dll16:-no}
-    enable_display_drv16=${enable_display_drv16:-no}
-    enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
-    enable_keyboard_drv16=${enable_keyboard_drv16:-no}
-    enable_lzexpand_dll16=${enable_lzexpand_dll16:-no}
-    enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
-    enable_monodebg_vxd=${enable_monodebg_vxd:-no}
-    enable_mouse_drv16=${enable_mouse_drv16:-no}
-    enable_msacm_dll16=${enable_msacm_dll16:-no}
-    enable_ole2_dll16=${enable_ole2_dll16:-no}
-    enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
-    enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
-    enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
-    enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
-    enable_ole2thk_dll16=${enable_ole2thk_dll16:-no}
-    enable_olecli_dll16=${enable_olecli_dll16:-no}
-    enable_olesvr_dll16=${enable_olesvr_dll16:-no}
-    enable_storage_dll16=${enable_storage_dll16:-no}
-    enable_stress_dll16=${enable_stress_dll16:-no}
-    enable_typelib_dll16=${enable_typelib_dll16:-no}
-    enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
-    enable_vmm_vxd=${enable_vmm_vxd:-no}
-    enable_vnbt_vxd=${enable_vnbt_vxd:-no}
-    enable_vnetbios_vxd=${enable_vnetbios_vxd:-no}
-    enable_vtdapi_vxd=${enable_vtdapi_vxd:-no}
-    enable_vwin32_vxd=${enable_vwin32_vxd:-no}
     enable_w32skrnl=${enable_w32skrnl:-no}
-    enable_win87em_dll16=${enable_win87em_dll16:-no}
-    enable_windebug_dll16=${enable_windebug_dll16:-no}
     enable_winedos=${enable_winedos:-no}
     enable_winevdm=${enable_winevdm:-no}
-    enable_winhelp_exe16=${enable_winhelp_exe16:-no}
-    enable_winoldap_mod16=${enable_winoldap_mod16:-no}
 fi
 
 { $as_echo "$as_me:$LINENO: checking for the directory containing the Wine tools" >&5
@@ -24769,7 +24737,7 @@ ac_config_files="$ac_config_files dlls/comdlg32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/comm.drv16/Makefile"
-test "x$enable_comm_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	comm.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/comm.drv16/Makefile: dlls/comm.drv16/Makefile.in dlls/Makedll.rules"
@@ -24777,7 +24745,7 @@ ac_config_files="$ac_config_files dlls/comm.drv16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/compobj.dll16/Makefile"
-test "x$enable_compobj_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	compobj.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/compobj.dll16/Makefile: dlls/compobj.dll16/Makefile.in dlls/Makedll.rules"
@@ -25241,7 +25209,7 @@ ac_config_files="$ac_config_files dlls/dinput8/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/dispdib.dll16/Makefile"
-test "x$enable_dispdib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	dispdib.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/dispdib.dll16/Makefile: dlls/dispdib.dll16/Makefile.in dlls/Makedll.rules"
@@ -25249,7 +25217,7 @@ ac_config_files="$ac_config_files dlls/dispdib.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/display.drv16/Makefile"
-test "x$enable_display_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	display.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/display.drv16/Makefile: dlls/display.drv16/Makefile.in dlls/Makedll.rules"
@@ -25649,7 +25617,7 @@ ac_config_files="$ac_config_files dlls/icmp/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ifsmgr.vxd/Makefile"
-test "x$enable_ifsmgr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ifsmgr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ifsmgr.vxd/Makefile: dlls/ifsmgr.vxd/Makefile.in dlls/Makedll.rules"
@@ -25833,7 +25801,7 @@ ac_config_files="$ac_config_files dlls/kernel32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/keyboard.drv16/Makefile"
-test "x$enable_keyboard_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	keyboard.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/keyboard.drv16/Makefile: dlls/keyboard.drv16/Makefile.in dlls/Makedll.rules"
@@ -25897,7 +25865,7 @@ ac_config_files="$ac_config_files dlls/lz32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/lzexpand.dll16/Makefile"
-test "x$enable_lzexpand_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	lzexpand.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/lzexpand.dll16/Makefile: dlls/lzexpand.dll16/Makefile.in dlls/Makedll.rules"
@@ -25985,7 +25953,7 @@ ac_config_files="$ac_config_files dlls/mlang/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mmdevldr.vxd/Makefile"
-test "x$enable_mmdevldr_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mmdevldr.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mmdevldr.vxd/Makefile: dlls/mmdevldr.vxd/Makefile.in dlls/Makedll.rules"
@@ -25993,7 +25961,7 @@ ac_config_files="$ac_config_files dlls/mmdevldr.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/monodebg.vxd/Makefile"
-test "x$enable_monodebg_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	monodebg.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/monodebg.vxd/Makefile: dlls/monodebg.vxd/Makefile.in dlls/Makedll.rules"
@@ -26009,7 +25977,7 @@ ac_config_files="$ac_config_files dlls/mountmgr.sys/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/mouse.drv16/Makefile"
-test "x$enable_mouse_drv16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	mouse.drv16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/mouse.drv16/Makefile: dlls/mouse.drv16/Makefile.in dlls/Makedll.rules"
@@ -26033,7 +26001,7 @@ ac_config_files="$ac_config_files dlls/mprapi/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/msacm.dll16/Makefile"
-test "x$enable_msacm_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	msacm.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/msacm.dll16/Makefile: dlls/msacm.dll16/Makefile.in dlls/Makedll.rules"
@@ -26497,7 +26465,7 @@ ac_config_files="$ac_config_files dlls/odbccp32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2.dll16/Makefile"
-test "x$enable_ole2_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2.dll16/Makefile: dlls/ole2.dll16/Makefile.in dlls/Makedll.rules"
@@ -26505,7 +26473,7 @@ ac_config_files="$ac_config_files dlls/ole2.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2conv.dll16/Makefile"
-test "x$enable_ole2conv_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2conv.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2conv.dll16/Makefile: dlls/ole2conv.dll16/Makefile.in dlls/Makedll.rules"
@@ -26513,7 +26481,7 @@ ac_config_files="$ac_config_files dlls/ole2conv.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2disp.dll16/Makefile"
-test "x$enable_ole2disp_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2disp.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2disp.dll16/Makefile: dlls/ole2disp.dll16/Makefile.in dlls/Makedll.rules"
@@ -26521,7 +26489,7 @@ ac_config_files="$ac_config_files dlls/ole2disp.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2nls.dll16/Makefile"
-test "x$enable_ole2nls_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2nls.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2nls.dll16/Makefile: dlls/ole2nls.dll16/Makefile.in dlls/Makedll.rules"
@@ -26529,7 +26497,7 @@ ac_config_files="$ac_config_files dlls/ole2nls.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2prox.dll16/Makefile"
-test "x$enable_ole2prox_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2prox.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2prox.dll16/Makefile: dlls/ole2prox.dll16/Makefile.in dlls/Makedll.rules"
@@ -26537,7 +26505,7 @@ ac_config_files="$ac_config_files dlls/ole2prox.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/ole2thk.dll16/Makefile"
-test "x$enable_ole2thk_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	ole2thk.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/ole2thk.dll16/Makefile: dlls/ole2thk.dll16/Makefile.in dlls/Makedll.rules"
@@ -26593,7 +26561,7 @@ ac_config_files="$ac_config_files dlls/oleaut32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olecli.dll16/Makefile"
-test "x$enable_olecli_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olecli.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olecli.dll16/Makefile: dlls/olecli.dll16/Makefile.in dlls/Makedll.rules"
@@ -26625,7 +26593,7 @@ ac_config_files="$ac_config_files dlls/olepro32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/olesvr.dll16/Makefile"
-test "x$enable_olesvr_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	olesvr.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/olesvr.dll16/Makefile: dlls/olesvr.dll16/Makefile.in dlls/Makedll.rules"
@@ -27169,7 +27137,7 @@ ac_config_files="$ac_config_files dlls/sti/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/storage.dll16/Makefile"
-test "x$enable_storage_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	storage.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/storage.dll16/Makefile: dlls/storage.dll16/Makefile.in dlls/Makedll.rules"
@@ -27177,7 +27145,7 @@ ac_config_files="$ac_config_files dlls/storage.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/stress.dll16/Makefile"
-test "x$enable_stress_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	stress.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/stress.dll16/Makefile: dlls/stress.dll16/Makefile.in dlls/Makedll.rules"
@@ -27241,7 +27209,7 @@ ac_config_files="$ac_config_files dlls/twain_32/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/typelib.dll16/Makefile"
-test "x$enable_typelib_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	typelib.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/typelib.dll16/Makefile: dlls/typelib.dll16/Makefile.in dlls/Makedll.rules"
@@ -27361,7 +27329,7 @@ ac_config_files="$ac_config_files dlls/uxtheme/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vdhcp.vxd/Makefile"
-test "x$enable_vdhcp_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vdhcp.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vdhcp.vxd/Makefile: dlls/vdhcp.vxd/Makefile.in dlls/Makedll.rules"
@@ -27393,7 +27361,7 @@ ac_config_files="$ac_config_files dlls/version/tests/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vmm.vxd/Makefile"
-test "x$enable_vmm_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vmm.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vmm.vxd/Makefile: dlls/vmm.vxd/Makefile.in dlls/Makedll.rules"
@@ -27401,7 +27369,7 @@ ac_config_files="$ac_config_files dlls/vmm.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnbt.vxd/Makefile"
-test "x$enable_vnbt_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vnbt.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnbt.vxd/Makefile: dlls/vnbt.vxd/Makefile.in dlls/Makedll.rules"
@@ -27409,7 +27377,7 @@ ac_config_files="$ac_config_files dlls/vnbt.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vnetbios.vxd/Makefile"
-test "x$enable_vnetbios_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vnetbios.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vnetbios.vxd/Makefile: dlls/vnetbios.vxd/Makefile.in dlls/Makedll.rules"
@@ -27417,7 +27385,7 @@ ac_config_files="$ac_config_files dlls/vnetbios.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vtdapi.vxd/Makefile"
-test "x$enable_vtdapi_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vtdapi.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vtdapi.vxd/Makefile: dlls/vtdapi.vxd/Makefile.in dlls/Makedll.rules"
@@ -27425,7 +27393,7 @@ ac_config_files="$ac_config_files dlls/vtdapi.vxd/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/vwin32.vxd/Makefile"
-test "x$enable_vwin32_vxd" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	vwin32.vxd"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/vwin32.vxd/Makefile: dlls/vwin32.vxd/Makefile.in dlls/Makedll.rules"
@@ -27441,7 +27409,7 @@ ac_config_files="$ac_config_files dlls/w32skrnl/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/win87em.dll16/Makefile"
-test "x$enable_win87em_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	win87em.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/win87em.dll16/Makefile: dlls/win87em.dll16/Makefile.in dlls/Makedll.rules"
@@ -27449,7 +27417,7 @@ ac_config_files="$ac_config_files dlls/win87em.dll16/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	dlls/windebug.dll16/Makefile"
-test "x$enable_windebug_dll16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
+test "x$enable_win16" != xno && ALL_DLL_DIRS="$ALL_DLL_DIRS \\
 	windebug.dll16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
 dlls/windebug.dll16/Makefile: dlls/windebug.dll16/Makefile.in dlls/Makedll.rules"
@@ -28273,7 +28241,7 @@ ac_config_files="$ac_config_files programs/winevdm/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winhelp.exe16/Makefile"
-test "x$enable_winhelp_exe16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
+test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	winhelp.exe16" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\
 	winhelp.exe16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
@@ -28291,7 +28259,7 @@ ac_config_files="$ac_config_files programs/winhlp32/Makefile"
 
 ALL_MAKEFILES="$ALL_MAKEFILES \\
 	programs/winoldap.mod16/Makefile"
-test "x$enable_winoldap_mod16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
+test "x$enable_win16" != xno && ALL_PROGRAM_DIRS="$ALL_PROGRAM_DIRS \\
 	winoldap.mod16" && ALL_PROGRAM_INSTALL_DIRS="$ALL_PROGRAM_INSTALL_DIRS \\
 	winoldap.mod16"
 ALL_MAKEFILE_DEPENDS="$ALL_MAKEFILE_DEPENDS
diff --git a/configure.ac b/configure.ac
index e11433103d4..3c2463c140e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,41 +138,9 @@ if test "x$enable_win16" != "xyes"
 then
     WIN16_FILES=""
     WIN16_INSTALL=""
-    enable_comm_drv16=${enable_comm_drv16:-no}
-    enable_compobj_dll16=${enable_compobj_dll16:-no}
-    enable_dispdib_dll16=${enable_dispdib_dll16:-no}
-    enable_display_drv16=${enable_display_drv16:-no}
-    enable_ifsmgr_vxd=${enable_ifsmgr_vxd:-no}
-    enable_keyboard_drv16=${enable_keyboard_drv16:-no}
-    enable_lzexpand_dll16=${enable_lzexpand_dll16:-no}
-    enable_mmdevldr_vxd=${enable_mmdevldr_vxd:-no}
-    enable_monodebg_vxd=${enable_monodebg_vxd:-no}
-    enable_mouse_drv16=${enable_mouse_drv16:-no}
-    enable_msacm_dll16=${enable_msacm_dll16:-no}
-    enable_ole2_dll16=${enable_ole2_dll16:-no}
-    enable_ole2conv_dll16=${enable_ole2conv_dll16:-no}
-    enable_ole2disp_dll16=${enable_ole2disp_dll16:-no}
-    enable_ole2nls_dll16=${enable_ole2nls_dll16:-no}
-    enable_ole2prox_dll16=${enable_ole2prox_dll16:-no}
-    enable_ole2thk_dll16=${enable_ole2thk_dll16:-no}
-    enable_olecli_dll16=${enable_olecli_dll16:-no}
-    enable_olesvr_dll16=${enable_olesvr_dll16:-no}
-    enable_storage_dll16=${enable_storage_dll16:-no}
-    enable_stress_dll16=${enable_stress_dll16:-no}
-    enable_typelib_dll16=${enable_typelib_dll16:-no}
-    enable_vdhcp_vxd=${enable_vdhcp_vxd:-no}
-    enable_vmm_vxd=${enable_vmm_vxd:-no}
-    enable_vnbt_vxd=${enable_vnbt_vxd:-no}
-    enable_vnetbios_vxd=${enable_vnetbios_vxd:-no}
-    enable_vtdapi_vxd=${enable_vtdapi_vxd:-no}
-    enable_vwin32_vxd=${enable_vwin32_vxd:-no}
     enable_w32skrnl=${enable_w32skrnl:-no}
-    enable_win87em_dll16=${enable_win87em_dll16:-no}
-    enable_windebug_dll16=${enable_windebug_dll16:-no}
     enable_winedos=${enable_winedos:-no}
     enable_winevdm=${enable_winevdm:-no}
-    enable_winhelp_exe16=${enable_winhelp_exe16:-no}
-    enable_winoldap_mod16=${enable_winoldap_mod16:-no}
 fi
 
 AC_CACHE_CHECK([for the directory containing the Wine tools], wine_cv_toolsdir,
@@ -1938,8 +1906,8 @@ WINE_CONFIG_MAKEFILE([dlls/comctl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_D
 WINE_CONFIG_MAKEFILE([dlls/comctl32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/comdlg32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/comdlg32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/comm.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/compobj.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/comm.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/compobj.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/compstui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/credui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/credui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
@@ -1997,8 +1965,8 @@ WINE_CONFIG_MAKEFILE([dlls/devenum/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/dinput/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dinput/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/dinput8/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/dispdib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/display.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/dispdib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/display.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/dmband/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dmcompos/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/dmime/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2048,7 +2016,7 @@ WINE_CONFIG_MAKEFILE([dlls/hnetcfg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/httpapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/iccvid/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/icmp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ifsmgr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/imaadp32.acm/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/imagehlp/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/imm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2071,7 +2039,7 @@ WINE_CONFIG_MAKEFILE([dlls/jscript/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/jscript/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/kernel32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/kernel32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/keyboard.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/keyboard.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/loadperf/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/localspl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/localspl/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
@@ -2079,7 +2047,7 @@ WINE_CONFIG_MAKEFILE([dlls/localui/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/localui/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/lz32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/lz32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/lzexpand.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/lzexpand.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/mapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mapi32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/mciavi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2090,13 +2058,13 @@ WINE_CONFIG_MAKEFILE([dlls/mciwave/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DL
 WINE_CONFIG_MAKEFILE([dlls/midimap/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mlang/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mlang/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mmdevldr.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/monodebg.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/mountmgr.sys/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/mouse.drv16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/mpr/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/mprapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/msacm.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/msacm.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/msacm32.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/msacm32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/msacm32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
@@ -2154,23 +2122,23 @@ WINE_CONFIG_MAKEFILE([dlls/objsel/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
 WINE_CONFIG_MAKEFILE([dlls/odbc32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/odbccp32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/odbccp32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/ole2.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ole2disp.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ole2nls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/ole2.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/ole2conv.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/ole2disp.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/ole2nls.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/ole2prox.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/ole2thk.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/ole32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/ole32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/oleacc/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/oleacc/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
 WINE_CONFIG_MAKEFILE([dlls/oleaut32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/oleaut32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/olecli.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olecli.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/olecli32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/oledlg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/olepro32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/olesvr.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/olesvr.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/olesvr32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/olethk32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/opengl32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2238,8 +2206,8 @@ WINE_CONFIG_MAKEFILE([dlls/spoolss/tests/Makefile],[dlls/Maketest.rules],[dlls],
 WINE_CONFIG_MAKEFILE([dlls/stdole2.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/stdole32.tlb/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/sti/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/storage.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/storage.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/stress.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/strmiids/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/svrapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/sxs/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2247,7 +2215,7 @@ WINE_CONFIG_MAKEFILE([dlls/tapi32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL
 WINE_CONFIG_MAKEFILE([dlls/traffic/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/twain_32/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/twain_32/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/typelib.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/unicows/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/updspapi/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/url/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2262,18 +2230,18 @@ WINE_CONFIG_MAKEFILE([dlls/usp10/tests/Makefile],[dlls/Maketest.rules],[dlls],[A
 WINE_CONFIG_MAKEFILE([dlls/uuid/Makefile],[dlls/Makeimplib.rules],[dlls],[ALL_IMPLIB_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/uxtheme/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/uxtheme/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vdhcp.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/vdmdbg/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/version/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/version/tests/Makefile],[dlls/Maketest.rules],[dlls],[ALL_TEST_DIRS],[enable_tests])
-WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/vmm.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/vnbt.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/vnetbios.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/vtdapi.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/vwin32.vxd/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/w32skrnl/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
-WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
+WINE_CONFIG_MAKEFILE([dlls/win87em.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
+WINE_CONFIG_MAKEFILE([dlls/windebug.dll16/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([dlls/winealsa.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/wineaudioio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
 WINE_CONFIG_MAKEFILE([dlls/winecoreaudio.drv/Makefile],[dlls/Makedll.rules],[dlls],[ALL_DLL_DIRS])
@@ -2370,9 +2338,9 @@ WINE_CONFIG_MAKEFILE([programs/winemine/Makefile],[programs/Makeprog.rules],[pro
 WINE_CONFIG_MAKEFILE([programs/winepath/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS,ALL_PROGRAM_BIN_INSTALL_DIRS])
 WINE_CONFIG_MAKEFILE([programs/winetest/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS])
 WINE_CONFIG_MAKEFILE([programs/winevdm/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
-WINE_CONFIG_MAKEFILE([programs/winhelp.exe16/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
+WINE_CONFIG_MAKEFILE([programs/winhelp.exe16/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([programs/winhlp32/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
-WINE_CONFIG_MAKEFILE([programs/winoldap.mod16/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
+WINE_CONFIG_MAKEFILE([programs/winoldap.mod16/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS],[enable_win16])
 WINE_CONFIG_MAKEFILE([programs/winver/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
 WINE_CONFIG_MAKEFILE([programs/wordpad/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
 WINE_CONFIG_MAKEFILE([programs/write/Makefile],[programs/Makeprog.rules],[programs],[ALL_PROGRAM_DIRS,ALL_PROGRAM_INSTALL_DIRS])
diff --git a/tools/make_makefiles b/tools/make_makefiles
index ff6e85a5ad9..91f7d39335e 100755
--- a/tools/make_makefiles
+++ b/tools/make_makefiles
@@ -236,7 +236,11 @@ sub update_makefiles(@)
         my %make = %{$makefiles{$file}};
         my $rules = $make{"=rules"};
         my $args = "";
-        if ($rules eq $makerules{"MAKE_DLL_RULES"}) { $args = ",[dlls],[ALL_DLL_DIRS]"; }
+        if ($rules eq $makerules{"MAKE_DLL_RULES"})
+        {
+            $args = ",[dlls],[ALL_DLL_DIRS]";
+            $args .= ",[enable_win16]" if $make{"MODULE"} =~ /(16|\.vxd)$/;
+        }
         elsif ($rules eq $makerules{"MAKE_IMPLIB_RULES"}) { $args = ",[dlls],[ALL_IMPLIB_DIRS]"; }
         elsif ($rules eq $makerules{"MAKE_TEST_RULES"}) { $args = ",[dlls],[ALL_TEST_DIRS],[enable_tests]"; }
         elsif ($rules eq $makerules{"MAKE_PROG_RULES"})
@@ -246,6 +250,7 @@ sub update_makefiles(@)
             $args .= ",ALL_PROGRAM_INSTALL_DIRS" unless $dont_install{$name};
             $args .= ",ALL_PROGRAM_BIN_INSTALL_DIRS" if $bin_install{$name};
             $args .= "]";
+            $args .= ",[enable_win16]" if $make{"MODULE"} =~ /16$/;
         }
         elsif ($file =~ /^[^\/]*\/Makefile$/) { $args = ",[],[ALL_TOP_DIRS]"; }
         push @lines, "WINE_CONFIG_MAKEFILE([$file],[$rules]$args)\n";