diff --git a/samples/help/Makefile.in b/samples/help/Makefile.in
index baca165290..d43b20b770 100644
--- a/samples/help/Makefile.in
+++ b/samples/help/Makefile.in
@@ -194,7 +194,7 @@ data:
 
 data_doc: 
 	@mkdir -p ./doc
-	@for f in aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
+	@for f in aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm; do \
 	if test ! -f ./doc/$$f -a ! -d ./doc/$$f ; \
 	then x=yep ; \
 	else x=`find $(srcdir)/doc/$$f -newer ./doc/$$f -print` ; \
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 50af7881c2..14a7a735c3 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -36,18 +36,13 @@
         <srcdir>$(SRCDIR)/doc</srcdir>
         <files>
             aindex.html
-            ClassGraph.class
-            ClassGraphPanel.class
-            ClassLayout.class
             down.gif
             dxxgifs.tex
             HIER.html
-            HIERjava.html
             icon1.gif
             icon2.gif
             index.html
             logo.gif
-            NavigatorButton.class
             USE_HELP.html
             wx204.htm
             wx34.htm
diff --git a/samples/help/makefile.bcc b/samples/help/makefile.bcc
index e482238ff4..390126e43c 100644
--- a/samples/help/makefile.bcc
+++ b/samples/help/makefile.bcc
@@ -245,7 +245,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+	for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
 
 $(OBJS)\help_sample.res: .\..\..\samples\sample.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -i$(BCCDIR)\include\windows\sdk -dNOPCH .\..\..\samples\sample.rc
diff --git a/samples/help/makefile.gcc b/samples/help/makefile.gcc
index 20ab94973a..e318d753ac 100644
--- a/samples/help/makefile.gcc
+++ b/samples/help/makefile.gcc
@@ -234,7 +234,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %%f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
+	for %%f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%%f copy .\doc\%%f $(OBJS)\doc
 
 $(OBJS)\help_sample_rc.o: ./../../samples/sample.rc
 	$(WINDRES) -i$< -o$@    --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
diff --git a/samples/help/makefile.vc b/samples/help/makefile.vc
index debbb3c689..c38f41b88a 100644
--- a/samples/help/makefile.vc
+++ b/samples/help/makefile.vc
@@ -368,7 +368,7 @@ data:
 
 data_doc: 
 	if not exist $(OBJS)\doc mkdir $(OBJS)\doc
-	for %f in (aindex.html ClassGraph.class ClassGraphPanel.class ClassLayout.class down.gif dxxgifs.tex HIER.html HIERjava.html icon1.gif icon2.gif index.html logo.gif NavigatorButton.class USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
+	for %f in (aindex.html down.gif dxxgifs.tex HIER.html icon1.gif icon2.gif index.html logo.gif USE_HELP.html wx204.htm wx34.htm wxExtHelpController.html wxhelp.map wx.htm) do if not exist $(OBJS)\doc\%f copy .\doc\%f $(OBJS)\doc
 
 $(OBJS)\help_sample.res: .\..\..\samples\sample.rc
 	rc /fo$@  /d WIN32 $(____DEBUGRUNTIME_3_p_1) /d _CRT_SECURE_NO_DEPRECATE=1 /d _CRT_NON_CONFORMING_SWPRINTFS=1 /d _SCL_SECURE_NO_WARNINGS=1 $(__NO_VC_CRTDBG_p_1)  /d __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i $(SETUPHDIR) /i .\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) /i . $(__DLLFLAG_p_1) /d _WINDOWS /i .\..\..\samples /d NOPCH .\..\..\samples\sample.rc