diff --git a/utils/Makefile.in b/utils/Makefile.in
index ee9bc5409b..cb6a9754e5 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -21,26 +21,30 @@ DESTDIR =
 
 ### Targets: ###
 
-all: emulator helpview ifacecheck
+all: emulator helpview hhp2cached ifacecheck screenshotgen
 
-install: all install_ifacecheck
+install: install_ifacecheck install_screenshotgen
 
-uninstall: uninstall_ifacecheck
+uninstall: uninstall_ifacecheck uninstall_screenshotgen
 
-install-strip: install install-strip_ifacecheck
+install-strip: install install-strip_ifacecheck install-strip_screenshotgen
 
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
 	-(cd emulator/src && $(MAKE) clean)
 	-(cd helpview/src && $(MAKE) clean)
+	-(cd hhp2cached && $(MAKE) clean)
 	-(cd ifacecheck/src && $(MAKE) clean)
+	-(cd screenshotgen/src && $(MAKE) clean)
 
 distclean: clean
 	rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 	-(cd emulator/src && $(MAKE) distclean)
 	-(cd helpview/src && $(MAKE) distclean)
+	-(cd hhp2cached && $(MAKE) distclean)
 	-(cd ifacecheck/src && $(MAKE) distclean)
+	-(cd screenshotgen/src && $(MAKE) distclean)
 
 emulator: 
 	(cd emulator/src && $(MAKE) all)
@@ -48,6 +52,9 @@ emulator:
 helpview: 
 	(cd helpview/src && $(MAKE) all)
 
+hhp2cached: 
+	(cd hhp2cached && $(MAKE) all)
+
 ifacecheck: 
 	(cd ifacecheck/src && $(MAKE) all)
 
@@ -60,9 +67,23 @@ uninstall_ifacecheck:
 install-strip_ifacecheck: 
 	(cd ifacecheck/src && $(MAKE) install-strip)
 
+screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) all)
+
+install_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) install)
+
+uninstall_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) uninstall)
+
+install-strip_screenshotgen: 
+	(cd screenshotgen/src && $(MAKE) install-strip)
+
 
 # Include dependency info, if present:
 @IF_GNU_MAKE@-include ./.deps/*.d
 
-.PHONY: all install uninstall clean distclean emulator helpview ifacecheck \
-	install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck
+.PHONY: all install uninstall clean distclean emulator helpview hhp2cached \
+	ifacecheck install_ifacecheck uninstall_ifacecheck install-strip_ifacecheck \
+	screenshotgen install_screenshotgen uninstall_screenshotgen \
+	install-strip_screenshotgen
diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 568d522722..4ee83f9874 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -28,8 +28,9 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 	-DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
 	-DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
-	-DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
-	-DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
+	-DUSE_AUI="$(USE_AUI)" -DUSE_PROPGRID="$(USE_PROPGRID)" \
+	-DUSE_RICHTEXT="$(USE_RICHTEXT)" -DUSE_STC="$(USE_STC)" \
+	-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_QA="$(USE_QA)" \
 	-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
 	-DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
 	-DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
@@ -43,7 +44,7 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: emulator helpview ifacecheck
+all: emulator helpview hhp2cached ifacecheck screenshotgen
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -57,10 +58,18 @@ clean:
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
 	call helpview.bat
 	@del helpview.bat
+	@echo cd hhp2cached >hhp2cached.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>hhp2cached.bat
+	call hhp2cached.bat
+	@del hhp2cached.bat
 	@echo cd ifacecheck\src >ifacecheck.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>ifacecheck.bat
 	call ifacecheck.bat
 	@del ifacecheck.bat
+	@echo cd screenshotgen\src >screenshotgen.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>screenshotgen.bat
+	call screenshotgen.bat
+	@del screenshotgen.bat
 
 emulator: 
 	@echo cd emulator\src >emulator.bat
@@ -74,9 +83,21 @@ helpview:
 	call helpview.bat
 	@del helpview.bat
 
+hhp2cached: 
+	@echo cd hhp2cached >hhp2cached.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>hhp2cached.bat
+	call hhp2cached.bat
+	@del hhp2cached.bat
+
 ifacecheck: 
 	@echo cd ifacecheck\src >ifacecheck.bat
 	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>ifacecheck.bat
 	call ifacecheck.bat
 	@del ifacecheck.bat
 
+screenshotgen: 
+	@echo cd screenshotgen\src >screenshotgen.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>screenshotgen.bat
+	call screenshotgen.bat
+	@del screenshotgen.bat
+
diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 0fed5d664c..2cd3af1f8e 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -20,8 +20,8 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
 	USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-	USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-	USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+	USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+	USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
 	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
 	USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -35,14 +35,16 @@ MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
 
 ### Targets: ###
 
-all: emulator helpview ifacecheck
+all: emulator helpview hhp2cached ifacecheck screenshotgen
 
 clean: 
 	-if exist .\*.o del .\*.o
 	-if exist .\*.d del .\*.d
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
+	$(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean
 
 emulator: 
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
@@ -50,10 +52,16 @@ emulator:
 helpview: 
 	$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
 
+hhp2cached: 
+	$(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all
+
 ifacecheck: 
 	$(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean emulator helpview ifacecheck
+screenshotgen: 
+	$(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean emulator helpview hhp2cached ifacecheck screenshotgen
 
 
 SHELL := $(COMSPEC)
diff --git a/utils/makefile.vc b/utils/makefile.vc
index 53489fb623..80f1f49775 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -19,8 +19,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 	DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
 	USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
-	USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" \
-	USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
+	USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \
+	USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \
 	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \
 	USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" \
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \
@@ -34,7 +34,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: sub_emulator sub_helpview sub_ifacecheck
+all: sub_emulator sub_helpview sub_hhp2cached sub_ifacecheck sub_screenshotgen
 
 clean: 
 	-if exist .\*.obj del .\*.obj
@@ -46,9 +46,15 @@ clean:
 	cd helpview\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
+	cd hhp2cached
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd "$(MAKEDIR)"
 	cd ifacecheck\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) clean
 	cd "$(MAKEDIR)"
+	cd screenshotgen\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd "$(MAKEDIR)"
 
 sub_emulator: 
 	cd emulator\src
@@ -60,8 +66,18 @@ sub_helpview:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+sub_hhp2cached: 
+	cd hhp2cached
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd "$(MAKEDIR)"
+
 sub_ifacecheck: 
 	cd ifacecheck\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd "$(MAKEDIR)"
 
+sub_screenshotgen: 
+	cd screenshotgen\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd "$(MAKEDIR)"
+
diff --git a/utils/makefile.wat b/utils/makefile.wat
index f1a3bd5091..90a9324b72 100644
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.3 (http://www.bakefile.org)
+#     Bakefile 0.2.4 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -36,8 +36,8 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
 	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
 	USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
-	USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
-	USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
+	USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" &
+	USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &
 	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
 	USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
 	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
@@ -48,7 +48,7 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
 
 ### Targets: ###
 
-all : .SYMBOLIC emulator helpview ifacecheck
+all : .SYMBOLIC emulator helpview hhp2cached ifacecheck screenshotgen
 
 clean : .SYMBOLIC 
 	-if exist .\*.obj del .\*.obj
@@ -62,9 +62,15 @@ clean : .SYMBOLIC
 	cd helpview\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
+	cd hhp2cached
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+	cd $(WATCOM_CWD)
 	cd ifacecheck\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
 	cd $(WATCOM_CWD)
+	cd screenshotgen\src
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
+	cd $(WATCOM_CWD)
 
 emulator : .SYMBOLIC 
 	cd emulator\src
@@ -76,8 +82,18 @@ helpview : .SYMBOLIC
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
+hhp2cached : .SYMBOLIC 
+	cd hhp2cached
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
 ifacecheck : .SYMBOLIC 
 	cd ifacecheck\src
 	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
 	cd $(WATCOM_CWD)
 
+screenshotgen : .SYMBOLIC 
+	cd screenshotgen\src
+	wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+	cd $(WATCOM_CWD)
+
diff --git a/utils/utils.bkl b/utils/utils.bkl
index 4d99e4bff2..ec11f79ac0 100644
--- a/utils/utils.bkl
+++ b/utils/utils.bkl
@@ -17,9 +17,19 @@
         <installable>no</installable>
     </subproject>
 
+    <subproject id="hhp2cached" template="sub">
+        <dir>hhp2cached</dir>
+        <installable>no</installable>
+    </subproject>
+
     <subproject id="ifacecheck" template="sub">
         <dir>ifacecheck/src</dir>
         <installable>yes</installable>
     </subproject>
 
+    <subproject id="screenshotgen" template="sub">
+        <dir>screenshotgen/src</dir>
+        <installable>yes</installable>
+    </subproject>
+
 </makefile>