From: Francesco Montorsi <f18m_cpp217828@yahoo.it>
Date: Wed, 4 Mar 2009 11:47:32 +0000 (+0000)
Subject: add headers to the samples' bakefiles so that they show up in MSVC project files
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/076218c2a96adf50b50dfc7fe0144490696dd12f

add headers to the samples' bakefiles so that they show up in MSVC project files

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/samples/animate/anitest.bkl b/samples/animate/anitest.bkl
index 27b4cc59c5..c001ba9d3d 100644
--- a/samples/animate/anitest.bkl
+++ b/samples/animate/anitest.bkl
@@ -4,9 +4,8 @@
     <include file="../../../build/bakefiles/common_samples.bkl"/>
 
     <exe id="anitest" template="wx_sample" template_append="wx_append">
-        <sources>
-            anitest.cpp
-        </sources>
+        <sources>anitest.cpp</sources>
+        <headers>anitest.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/animate/anitest.dsp b/samples/animate/anitest.dsp
index 6ae04fd5c0..5306e8852e 100644
--- a/samples/animate/anitest.dsp
+++ b/samples/animate/anitest.dsp
@@ -259,6 +259,14 @@ SOURCE=.\anitest.cpp
 SOURCE=.\..\sample.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\anitest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/animate/anitest_vc7.vcproj b/samples/animate/anitest_vc7.vcproj
index f31790f553..95a52e8db3 100644
--- a/samples/animate/anitest_vc7.vcproj
+++ b/samples/animate/anitest_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\anitest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\anitest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/animate/anitest_vc8.vcproj b/samples/animate/anitest_vc8.vcproj
index ddb7a1f5ac..bf7257117f 100644
--- a/samples/animate/anitest_vc8.vcproj
+++ b/samples/animate/anitest_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\anitest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/animate/anitest_vc9.vcproj b/samples/animate/anitest_vc9.vcproj
index 33c033bb63..c9002527f8 100644
--- a/samples/animate/anitest_vc9.vcproj
+++ b/samples/animate/anitest_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\anitest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/artprov/artprov.bkl b/samples/artprov/artprov.bkl
index 1913fe84c6..4930e8e634 100644
--- a/samples/artprov/artprov.bkl
+++ b/samples/artprov/artprov.bkl
@@ -5,6 +5,7 @@
 
     <exe id="arttest" template="wx_sample" template_append="wx_append">
         <sources>arttest.cpp artbrows.cpp</sources>
+        <headers>artbrows.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>arttest.rc</win32-res>
diff --git a/samples/artprov/artprov.dsp b/samples/artprov/artprov.dsp
index d8662256e9..b8dea12dd3 100644
--- a/samples/artprov/artprov.dsp
+++ b/samples/artprov/artprov.dsp
@@ -263,6 +263,14 @@ SOURCE=.\arttest.cpp
 SOURCE=.\arttest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\artbrows.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/artprov/artprov_vc7.vcproj b/samples/artprov/artprov_vc7.vcproj
index 0f92e98f81..02910f5238 100644
--- a/samples/artprov/artprov_vc7.vcproj
+++ b/samples/artprov/artprov_vc7.vcproj
@@ -532,6 +532,14 @@
 				RelativePath=".\arttest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\artbrows.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/artprov/artprov_vc8.vcproj b/samples/artprov/artprov_vc8.vcproj
index 9e6f5820f9..1a7e2fb1ed 100644
--- a/samples/artprov/artprov_vc8.vcproj
+++ b/samples/artprov/artprov_vc8.vcproj
@@ -796,6 +796,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\artbrows.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/artprov/artprov_vc9.vcproj b/samples/artprov/artprov_vc9.vcproj
index eb8023a74a..81cfb20d17 100644
--- a/samples/artprov/artprov_vc9.vcproj
+++ b/samples/artprov/artprov_vc9.vcproj
@@ -768,6 +768,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\artbrows.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dialogs/dialogs.bkl b/samples/dialogs/dialogs.bkl
index 1d02088ece..b04b88e4f0 100644
--- a/samples/dialogs/dialogs.bkl
+++ b/samples/dialogs/dialogs.bkl
@@ -32,6 +32,7 @@
             dialogs.cpp
             $(GENERIC_DIALOGS_IN_NATIVE_BUILDS)
         </sources>
+        <headers>dialogs.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/dialogs/dialogs.dsp b/samples/dialogs/dialogs.dsp
index 4cb3d5208a..4b56b70779 100644
--- a/samples/dialogs/dialogs.dsp
+++ b/samples/dialogs/dialogs.dsp
@@ -405,6 +405,14 @@ SOURCE=.\..\..\src\generic\fontdlgg.cpp
 
 !ENDIF
 
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\dialogs.h
 # End Source File
 # End Group
 # End Target
diff --git a/samples/dialogs/dialogs_vc7.vcproj b/samples/dialogs/dialogs_vc7.vcproj
index ffaa945da8..6d3b5072cb 100644
--- a/samples/dialogs/dialogs_vc7.vcproj
+++ b/samples/dialogs/dialogs_vc7.vcproj
@@ -613,6 +613,14 @@
 					ExcludedFromBuild="TRUE"/>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\dialogs.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dialogs/dialogs_vc8.vcproj b/samples/dialogs/dialogs_vc8.vcproj
index 717a9d61bc..e42835c69d 100644
--- a/samples/dialogs/dialogs_vc8.vcproj
+++ b/samples/dialogs/dialogs_vc8.vcproj
@@ -904,6 +904,16 @@
 				/>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\dialogs.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dialogs/dialogs_vc9.vcproj b/samples/dialogs/dialogs_vc9.vcproj
index 4961603b15..97494aac67 100644
--- a/samples/dialogs/dialogs_vc9.vcproj
+++ b/samples/dialogs/dialogs_vc9.vcproj
@@ -876,6 +876,16 @@
 				/>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\dialogs.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/docview/docview.bkl b/samples/docview/docview.bkl
index fc54024b4a..da903d0623 100644
--- a/samples/docview/docview.bkl
+++ b/samples/docview/docview.bkl
@@ -9,6 +9,7 @@
 
     <exe id="docview" template="wx_sample" template_append="wx_append">
         <sources>docview.cpp doc.cpp view.cpp</sources>
+        <headers>docview.h doc.h view.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>docview.rc</win32-res>
diff --git a/samples/docview/docview.dsp b/samples/docview/docview.dsp
index b6a8109a21..79ca9130c6 100644
--- a/samples/docview/docview.dsp
+++ b/samples/docview/docview.dsp
@@ -267,6 +267,22 @@ SOURCE=.\docview.rc
 SOURCE=.\view.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\doc.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\docview.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\view.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/docview/docview_vc7.vcproj b/samples/docview/docview_vc7.vcproj
index 86e43f3579..1fd74c89fb 100644
--- a/samples/docview/docview_vc7.vcproj
+++ b/samples/docview/docview_vc7.vcproj
@@ -535,6 +535,20 @@
 				RelativePath=".\view.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\doc.h">
+			</File>
+			<File
+				RelativePath=".\docview.h">
+			</File>
+			<File
+				RelativePath=".\view.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/docview/docview_vc8.vcproj b/samples/docview/docview_vc8.vcproj
index 04eebd32eb..e806a32caf 100644
--- a/samples/docview/docview_vc8.vcproj
+++ b/samples/docview/docview_vc8.vcproj
@@ -800,6 +800,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\doc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\docview.h"
+				>
+			</File>
+			<File
+				RelativePath=".\view.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/docview/docview_vc9.vcproj b/samples/docview/docview_vc9.vcproj
index 251849a776..38acccf695 100644
--- a/samples/docview/docview_vc9.vcproj
+++ b/samples/docview/docview_vc9.vcproj
@@ -772,6 +772,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\doc.h"
+				>
+			</File>
+			<File
+				RelativePath=".\docview.h"
+				>
+			</File>
+			<File
+				RelativePath=".\view.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dragimag/dragimag.bkl b/samples/dragimag/dragimag.bkl
index e6ee22555a..831aad0dab 100644
--- a/samples/dragimag/dragimag.bkl
+++ b/samples/dragimag/dragimag.bkl
@@ -5,6 +5,7 @@
 
     <exe id="dragimag" template="wx_sample" template_append="wx_append">
         <sources>dragimag.cpp</sources>
+        <headers>dragimag.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>dragimag.rc</win32-res>
diff --git a/samples/dragimag/dragimag.dsp b/samples/dragimag/dragimag.dsp
index 230668487d..85e9e7cde6 100644
--- a/samples/dragimag/dragimag.dsp
+++ b/samples/dragimag/dragimag.dsp
@@ -259,6 +259,14 @@ SOURCE=.\dragimag.cpp
 SOURCE=.\dragimag.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\dragimag.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/dragimag/dragimag_vc7.vcproj b/samples/dragimag/dragimag_vc7.vcproj
index 5016ed2f84..d4717fc334 100644
--- a/samples/dragimag/dragimag_vc7.vcproj
+++ b/samples/dragimag/dragimag_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\dragimag.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\dragimag.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dragimag/dragimag_vc8.vcproj b/samples/dragimag/dragimag_vc8.vcproj
index 22f5bfcf59..e32807d8d9 100644
--- a/samples/dragimag/dragimag_vc8.vcproj
+++ b/samples/dragimag/dragimag_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\dragimag.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/dragimag/dragimag_vc9.vcproj b/samples/dragimag/dragimag_vc9.vcproj
index 5a776e1eec..1c54482c3b 100644
--- a/samples/dragimag/dragimag_vc9.vcproj
+++ b/samples/dragimag/dragimag_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\dragimag.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/grid/grid.bkl b/samples/grid/grid.bkl
index e69f297bff..a615fbbc77 100644
--- a/samples/grid/grid.bkl
+++ b/samples/grid/grid.bkl
@@ -5,6 +5,7 @@
 
     <exe id="grid" template="wx_sample" template_append="wx_append">
         <sources>griddemo.cpp</sources>
+        <headers>griddemo.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/grid/grid.dsp b/samples/grid/grid.dsp
index c0c5c8b05b..af1515ecf0 100644
--- a/samples/grid/grid.dsp
+++ b/samples/grid/grid.dsp
@@ -259,6 +259,14 @@ SOURCE=.\griddemo.cpp
 SOURCE=.\griddemo.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\griddemo.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/grid/grid_vc7.vcproj b/samples/grid/grid_vc7.vcproj
index 7d44d08616..a4f2bad00f 100644
--- a/samples/grid/grid_vc7.vcproj
+++ b/samples/grid/grid_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\griddemo.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\griddemo.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/grid/grid_vc8.vcproj b/samples/grid/grid_vc8.vcproj
index fc45044121..74f24c31e0 100644
--- a/samples/grid/grid_vc8.vcproj
+++ b/samples/grid/grid_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\griddemo.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/grid/grid_vc9.vcproj b/samples/grid/grid_vc9.vcproj
index aec57ced2b..43d436063f 100644
--- a/samples/grid/grid_vc9.vcproj
+++ b/samples/grid/grid_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\griddemo.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/help/help.bkl b/samples/help/help.bkl
index 373d3de412..5a50aad189 100644
--- a/samples/help/help.bkl
+++ b/samples/help/help.bkl
@@ -5,6 +5,7 @@
 
     <exe id="help" template="wx_sample" template_append="wx_append">
         <sources>demo.cpp</sources>
+        <headers>doc.h</headers>
         <wx-lib>html</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
diff --git a/samples/help/help.dsp b/samples/help/help.dsp
index 3049f5275f..9b9da386b6 100644
--- a/samples/help/help.dsp
+++ b/samples/help/help.dsp
@@ -259,6 +259,14 @@ SOURCE=.\demo.cpp
 SOURCE=.\demo.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\doc.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/help/help_vc7.vcproj b/samples/help/help_vc7.vcproj
index de0ead0b24..2526958bd4 100644
--- a/samples/help/help_vc7.vcproj
+++ b/samples/help/help_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\demo.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\doc.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/help/help_vc8.vcproj b/samples/help/help_vc8.vcproj
index 64079c95d3..7ea068fa84 100644
--- a/samples/help/help_vc8.vcproj
+++ b/samples/help/help_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\doc.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/help/help_vc9.vcproj b/samples/help/help_vc9.vcproj
index 1c493bca66..36d51aa55f 100644
--- a/samples/help/help_vc9.vcproj
+++ b/samples/help/help_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\doc.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/image/image.bkl b/samples/image/image.bkl
index f3f477abb5..b2218036e7 100644
--- a/samples/image/image.bkl
+++ b/samples/image/image.bkl
@@ -7,6 +7,7 @@
 
     <exe id="image" template="wx_sample" template_append="wx_append">
         <sources>image.cpp canvas.cpp</sources>
+        <headers>canvas.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>image.rc</win32-res>
diff --git a/samples/image/image.dsp b/samples/image/image.dsp
index f2bf96b09e..52b70cd504 100644
--- a/samples/image/image.dsp
+++ b/samples/image/image.dsp
@@ -263,6 +263,14 @@ SOURCE=.\image.cpp
 SOURCE=.\image.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\canvas.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/image/image_vc7.vcproj b/samples/image/image_vc7.vcproj
index 04dd6e25a1..18e351f23a 100644
--- a/samples/image/image_vc7.vcproj
+++ b/samples/image/image_vc7.vcproj
@@ -532,6 +532,14 @@
 				RelativePath=".\image.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\canvas.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/image/image_vc8.vcproj b/samples/image/image_vc8.vcproj
index 29d28ca05e..e1e074b726 100644
--- a/samples/image/image_vc8.vcproj
+++ b/samples/image/image_vc8.vcproj
@@ -796,6 +796,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\canvas.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/image/image_vc9.vcproj b/samples/image/image_vc9.vcproj
index dc1847b454..c101238677 100644
--- a/samples/image/image_vc9.vcproj
+++ b/samples/image/image_vc9.vcproj
@@ -768,6 +768,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\canvas.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc.bkl b/samples/ipc/ipc.bkl
index ee919ecde5..5f6802540e 100644
--- a/samples/ipc/ipc.bkl
+++ b/samples/ipc/ipc.bkl
@@ -13,6 +13,7 @@
 
     <exe id="ipcclient" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">
         <sources>client.cpp</sources>
+        <headers>client.h connection.h ipcsetup.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>
@@ -20,6 +21,7 @@
 
     <exe id="ipcserver" template="wx_sample" template_append="wx_append" cond="$(cond_build_gui)">
         <sources>server.cpp</sources>
+        <headers>server.h connection.h ipcsetup.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>net</wx-lib>
         <wx-lib>base</wx-lib>
@@ -29,12 +31,14 @@
     <if cond="FORMAT!='msevc4prj'">
         <exe id="baseipcclient" template="wx_sample_console" template_append="wx_append_base">
             <sources>baseclient.cpp</sources>
+            <headers>connection.h ipcsetup.h</headers>
             <wx-lib>net</wx-lib>
             <wx-lib>base</wx-lib>
         </exe>
 
         <exe id="baseipcserver" template="wx_sample_console" template_append="wx_append_base">
             <sources>baseserver.cpp</sources>
+            <headers>connection.h ipcsetup.h</headers>
             <wx-lib>net</wx-lib>
             <wx-lib>base</wx-lib>
         </exe>
diff --git a/samples/ipc/ipc_baseipcclient.dsp b/samples/ipc/ipc_baseipcclient.dsp
index a0607b6005..480428df52 100644
--- a/samples/ipc/ipc_baseipcclient.dsp
+++ b/samples/ipc/ipc_baseipcclient.dsp
@@ -238,6 +238,18 @@ LINK32=link.exe
 SOURCE=.\baseclient.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\connection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipcsetup.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/ipc/ipc_baseipcserver.dsp b/samples/ipc/ipc_baseipcserver.dsp
index 8c71f1b04d..d51cc6ddf2 100644
--- a/samples/ipc/ipc_baseipcserver.dsp
+++ b/samples/ipc/ipc_baseipcserver.dsp
@@ -238,6 +238,18 @@ LINK32=link.exe
 SOURCE=.\baseserver.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\connection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipcsetup.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/ipc/ipc_ipcclient.dsp b/samples/ipc/ipc_ipcclient.dsp
index 1efc1c54f1..95ab828455 100644
--- a/samples/ipc/ipc_ipcclient.dsp
+++ b/samples/ipc/ipc_ipcclient.dsp
@@ -259,6 +259,22 @@ SOURCE=.\client.cpp
 SOURCE=.\..\..\samples\sample.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\client.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\connection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipcsetup.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/ipc/ipc_ipcserver.dsp b/samples/ipc/ipc_ipcserver.dsp
index d59b2fa7c0..7f46e8394e 100644
--- a/samples/ipc/ipc_ipcserver.dsp
+++ b/samples/ipc/ipc_ipcserver.dsp
@@ -259,6 +259,22 @@ SOURCE=.\..\..\samples\sample.rc
 SOURCE=.\server.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\connection.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\ipcsetup.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\server.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/ipc/ipc_vc7_baseipcclient.vcproj b/samples/ipc/ipc_vc7_baseipcclient.vcproj
index 7632116922..b42717d5ec 100644
--- a/samples/ipc/ipc_vc7_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcclient.vcproj
@@ -529,6 +529,17 @@
 				RelativePath=".\baseclient.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\connection.h">
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc7_baseipcserver.vcproj b/samples/ipc/ipc_vc7_baseipcserver.vcproj
index f7a043c31d..c062d3a9e2 100644
--- a/samples/ipc/ipc_vc7_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_baseipcserver.vcproj
@@ -529,6 +529,17 @@
 				RelativePath=".\baseserver.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\connection.h">
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h">
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc7_ipcclient.vcproj b/samples/ipc/ipc_vc7_ipcclient.vcproj
index fcd74ed9b0..9618df2b59 100644
--- a/samples/ipc/ipc_vc7_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc7_ipcclient.vcproj
@@ -529,6 +529,20 @@
 				RelativePath=".\client.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\client.h">
+			</File>
+			<File
+				RelativePath=".\connection.h">
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc_vc7_ipcserver.vcproj b/samples/ipc/ipc_vc7_ipcserver.vcproj
index ff281d1059..12ca976911 100644
--- a/samples/ipc/ipc_vc7_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc7_ipcserver.vcproj
@@ -529,6 +529,20 @@
 				RelativePath=".\server.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\connection.h">
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h">
+			</File>
+			<File
+				RelativePath=".\server.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc_vc8_baseipcclient.vcproj b/samples/ipc/ipc_vc8_baseipcclient.vcproj
index ea0919c049..ec9ecb1e3a 100644
--- a/samples/ipc/ipc_vc8_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcclient.vcproj
@@ -792,6 +792,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc8_baseipcserver.vcproj b/samples/ipc/ipc_vc8_baseipcserver.vcproj
index f244048ff2..b5764b51e9 100644
--- a/samples/ipc/ipc_vc8_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_baseipcserver.vcproj
@@ -792,6 +792,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc8_ipcclient.vcproj b/samples/ipc/ipc_vc8_ipcclient.vcproj
index 59353e92f5..f253692d5a 100644
--- a/samples/ipc/ipc_vc8_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc8_ipcclient.vcproj
@@ -792,6 +792,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\client.h"
+				>
+			</File>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc_vc8_ipcserver.vcproj b/samples/ipc/ipc_vc8_ipcserver.vcproj
index 36f1398325..8a03d56ea2 100644
--- a/samples/ipc/ipc_vc8_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc8_ipcserver.vcproj
@@ -792,6 +792,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+			<File
+				RelativePath=".\server.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc_vc9_baseipcclient.vcproj b/samples/ipc/ipc_vc9_baseipcclient.vcproj
index ad999e593c..89642df724 100644
--- a/samples/ipc/ipc_vc9_baseipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcclient.vcproj
@@ -764,6 +764,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc9_baseipcserver.vcproj b/samples/ipc/ipc_vc9_baseipcserver.vcproj
index 07c8604f13..9b2c5921a1 100644
--- a/samples/ipc/ipc_vc9_baseipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_baseipcserver.vcproj
@@ -764,6 +764,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 		
diff --git a/samples/ipc/ipc_vc9_ipcclient.vcproj b/samples/ipc/ipc_vc9_ipcclient.vcproj
index 8bed2dfceb..e01e3c6f29 100644
--- a/samples/ipc/ipc_vc9_ipcclient.vcproj
+++ b/samples/ipc/ipc_vc9_ipcclient.vcproj
@@ -764,6 +764,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\client.h"
+				>
+			</File>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/ipc/ipc_vc9_ipcserver.vcproj b/samples/ipc/ipc_vc9_ipcserver.vcproj
index fd726219e9..861ea6e8bd 100644
--- a/samples/ipc/ipc_vc9_ipcserver.vcproj
+++ b/samples/ipc/ipc_vc9_ipcserver.vcproj
@@ -764,6 +764,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\connection.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ipcsetup.h"
+				>
+			</File>
+			<File
+				RelativePath=".\server.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/joytest/joytest.bkl b/samples/joytest/joytest.bkl
index 4a9ada2f85..90d3181995 100644
--- a/samples/joytest/joytest.bkl
+++ b/samples/joytest/joytest.bkl
@@ -5,6 +5,7 @@
 
     <exe id="joytest" template="wx_sample" template_append="wx_append">
         <sources>joytest.cpp</sources>
+        <headers>joytest.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/joytest/joytest.dsp b/samples/joytest/joytest.dsp
index 88a0969dae..618bd09b55 100644
--- a/samples/joytest/joytest.dsp
+++ b/samples/joytest/joytest.dsp
@@ -259,6 +259,14 @@ SOURCE=.\joytest.cpp
 SOURCE=.\joytest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\joytest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/joytest/joytest_vc7.vcproj b/samples/joytest/joytest_vc7.vcproj
index 8e3eb9b9f2..4255d36114 100644
--- a/samples/joytest/joytest_vc7.vcproj
+++ b/samples/joytest/joytest_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\joytest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\joytest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/joytest/joytest_vc8.vcproj b/samples/joytest/joytest_vc8.vcproj
index 629d30fd97..9ae2797ea2 100644
--- a/samples/joytest/joytest_vc8.vcproj
+++ b/samples/joytest/joytest_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\joytest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/joytest/joytest_vc9.vcproj b/samples/joytest/joytest_vc9.vcproj
index c218c33c68..96578aa091 100644
--- a/samples/joytest/joytest_vc9.vcproj
+++ b/samples/joytest/joytest_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\joytest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/layout/layout.bkl b/samples/layout/layout.bkl
index 5d6f4b732a..349f58c4c1 100644
--- a/samples/layout/layout.bkl
+++ b/samples/layout/layout.bkl
@@ -5,6 +5,7 @@
 
     <exe id="layout" template="wx_sample" template_append="wx_append">
         <sources>layout.cpp</sources>
+        <headers>layout.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>layout.rc</win32-res>
diff --git a/samples/layout/layout.dsp b/samples/layout/layout.dsp
index b304aa709c..a95fa06f93 100644
--- a/samples/layout/layout.dsp
+++ b/samples/layout/layout.dsp
@@ -259,6 +259,14 @@ SOURCE=.\layout.cpp
 SOURCE=.\layout.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\layout.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/layout/layout_vc7.vcproj b/samples/layout/layout_vc7.vcproj
index d885b4c74f..ca4fd914b3 100644
--- a/samples/layout/layout_vc7.vcproj
+++ b/samples/layout/layout_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\layout.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\layout.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/layout/layout_vc8.vcproj b/samples/layout/layout_vc8.vcproj
index e5b9b3352b..228b844f1e 100644
--- a/samples/layout/layout_vc8.vcproj
+++ b/samples/layout/layout_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\layout.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/layout/layout_vc9.vcproj b/samples/layout/layout_vc9.vcproj
index 96eb79e0c5..11f88296b7 100644
--- a/samples/layout/layout_vc9.vcproj
+++ b/samples/layout/layout_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\layout.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/listctrl/listctrl.bkl b/samples/listctrl/listctrl.bkl
index d49ddc5d69..9e9cf319d0 100644
--- a/samples/listctrl/listctrl.bkl
+++ b/samples/listctrl/listctrl.bkl
@@ -5,6 +5,7 @@
 
     <exe id="listctrl" template="wx_sample" template_append="wx_append">
         <sources>listtest.cpp</sources>
+        <headers>listtest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>listtest.rc</win32-res>
diff --git a/samples/listctrl/listctrl.dsp b/samples/listctrl/listctrl.dsp
index ef89eee480..333ca73179 100644
--- a/samples/listctrl/listctrl.dsp
+++ b/samples/listctrl/listctrl.dsp
@@ -259,6 +259,14 @@ SOURCE=.\listtest.cpp
 SOURCE=.\listtest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\listtest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/listctrl/listctrl_vc7.vcproj b/samples/listctrl/listctrl_vc7.vcproj
index 9a19992cc8..f18cdbe8c6 100644
--- a/samples/listctrl/listctrl_vc7.vcproj
+++ b/samples/listctrl/listctrl_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\listtest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\listtest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/listctrl/listctrl_vc8.vcproj b/samples/listctrl/listctrl_vc8.vcproj
index 909e0597b0..1d02f10cc3 100644
--- a/samples/listctrl/listctrl_vc8.vcproj
+++ b/samples/listctrl/listctrl_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\listtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/listctrl/listctrl_vc9.vcproj b/samples/listctrl/listctrl_vc9.vcproj
index 1b8822d204..659b53c69b 100644
--- a/samples/listctrl/listctrl_vc9.vcproj
+++ b/samples/listctrl/listctrl_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\listtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mdi/mdi.bkl b/samples/mdi/mdi.bkl
index 01e2f566b1..7e253cd9f2 100644
--- a/samples/mdi/mdi.bkl
+++ b/samples/mdi/mdi.bkl
@@ -5,6 +5,7 @@
 
     <exe id="mdi" template="wx_sample" template_append="wx_append">
         <sources>mdi.cpp</sources>
+        <headers>mdi.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>mdi.rc</win32-res>
diff --git a/samples/mdi/mdi.dsp b/samples/mdi/mdi.dsp
index 55975d0ddb..7083a1bc59 100644
--- a/samples/mdi/mdi.dsp
+++ b/samples/mdi/mdi.dsp
@@ -259,6 +259,14 @@ SOURCE=.\mdi.cpp
 SOURCE=.\mdi.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\mdi.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/mdi/mdi_vc7.vcproj b/samples/mdi/mdi_vc7.vcproj
index e176c1c553..a8e8fb8825 100644
--- a/samples/mdi/mdi_vc7.vcproj
+++ b/samples/mdi/mdi_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\mdi.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\mdi.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mdi/mdi_vc8.vcproj b/samples/mdi/mdi_vc8.vcproj
index bd2d51928a..8fcd28cb71 100644
--- a/samples/mdi/mdi_vc8.vcproj
+++ b/samples/mdi/mdi_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\mdi.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mdi/mdi_vc9.vcproj b/samples/mdi/mdi_vc9.vcproj
index 01412779db..d0be22c353 100644
--- a/samples/mdi/mdi_vc9.vcproj
+++ b/samples/mdi/mdi_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\mdi.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mfc/mfc.bkl b/samples/mfc/mfc.bkl
index 222cf076b8..46f9c8df05 100644
--- a/samples/mfc/mfc.bkl
+++ b/samples/mfc/mfc.bkl
@@ -5,6 +5,7 @@
 
     <exe id="mfctest" template="wx_sample" template_append="wx_append">
         <sources>mfctest.cpp</sources>
+        <headers>mfctest.h resource.h stdafx.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>mfctest.rc</win32-res>
diff --git a/samples/mfc/mfc.dsp b/samples/mfc/mfc.dsp
index ec291eba3c..f261892637 100644
--- a/samples/mfc/mfc.dsp
+++ b/samples/mfc/mfc.dsp
@@ -259,6 +259,22 @@ SOURCE=.\mfctest.cpp
 SOURCE=.\mfctest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\mfctest.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\stdafx.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/mfc/mfc_vc7.vcproj b/samples/mfc/mfc_vc7.vcproj
index 2457dbbdef..e8f313290d 100644
--- a/samples/mfc/mfc_vc7.vcproj
+++ b/samples/mfc/mfc_vc7.vcproj
@@ -529,6 +529,20 @@
 				RelativePath=".\mfctest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\mfctest.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+			<File
+				RelativePath=".\stdafx.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mfc/mfc_vc8.vcproj b/samples/mfc/mfc_vc8.vcproj
index 72b847bd02..b8e000c2a6 100644
--- a/samples/mfc/mfc_vc8.vcproj
+++ b/samples/mfc/mfc_vc8.vcproj
@@ -792,6 +792,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\mfctest.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/mfc/mfc_vc9.vcproj b/samples/mfc/mfc_vc9.vcproj
index 855ccde54d..36c71f3c2f 100644
--- a/samples/mfc/mfc_vc9.vcproj
+++ b/samples/mfc/mfc_vc9.vcproj
@@ -764,6 +764,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\mfctest.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+			<File
+				RelativePath=".\stdafx.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/nativdlg/nativdlg.bkl b/samples/nativdlg/nativdlg.bkl
index 3337a8240f..ae96c4d8d2 100644
--- a/samples/nativdlg/nativdlg.bkl
+++ b/samples/nativdlg/nativdlg.bkl
@@ -5,6 +5,7 @@
 
     <exe id="nativdlg" template="wx_sample" template_append="wx_append">
         <sources>nativdlg.cpp</sources>
+        <headers>nativdg.h resource.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>nativdlg.rc</win32-res>
diff --git a/samples/nativdlg/nativdlg.dsp b/samples/nativdlg/nativdlg.dsp
index 82aa94910b..f9bcf907e5 100644
--- a/samples/nativdlg/nativdlg.dsp
+++ b/samples/nativdlg/nativdlg.dsp
@@ -259,6 +259,18 @@ SOURCE=.\nativdlg.cpp
 SOURCE=.\nativdlg.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\nativdg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\resource.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/nativdlg/nativdlg_vc7.vcproj b/samples/nativdlg/nativdlg_vc7.vcproj
index b1fe4e593c..5176923d67 100644
--- a/samples/nativdlg/nativdlg_vc7.vcproj
+++ b/samples/nativdlg/nativdlg_vc7.vcproj
@@ -529,6 +529,17 @@
 				RelativePath=".\nativdlg.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\nativdg.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/nativdlg/nativdlg_vc8.vcproj b/samples/nativdlg/nativdlg_vc8.vcproj
index 66952a704b..4fd07344ba 100644
--- a/samples/nativdlg/nativdlg_vc8.vcproj
+++ b/samples/nativdlg/nativdlg_vc8.vcproj
@@ -792,6 +792,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\nativdg.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/nativdlg/nativdlg_vc9.vcproj b/samples/nativdlg/nativdlg_vc9.vcproj
index 92ef98c705..888255b531 100644
--- a/samples/nativdlg/nativdlg_vc9.vcproj
+++ b/samples/nativdlg/nativdlg_vc9.vcproj
@@ -764,6 +764,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\nativdg.h"
+				>
+			</File>
+			<File
+				RelativePath=".\resource.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/notebook/notebook.bkl b/samples/notebook/notebook.bkl
index d777cc2715..0ff96c0d9f 100644
--- a/samples/notebook/notebook.bkl
+++ b/samples/notebook/notebook.bkl
@@ -5,6 +5,7 @@
 
     <exe id="notebook" template="wx_sample" template_append="wx_append">
         <sources>notebook.cpp</sources>
+        <headers>notebook.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </exe>
diff --git a/samples/notebook/notebook.dsp b/samples/notebook/notebook.dsp
index 891951c085..bbf90b7abb 100644
--- a/samples/notebook/notebook.dsp
+++ b/samples/notebook/notebook.dsp
@@ -259,6 +259,14 @@ SOURCE=.\notebook.cpp
 SOURCE=.\..\..\samples\sample.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\notebook.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/notebook/notebook_vc7.vcproj b/samples/notebook/notebook_vc7.vcproj
index 7822812ac0..85c921ade4 100644
--- a/samples/notebook/notebook_vc7.vcproj
+++ b/samples/notebook/notebook_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\notebook.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\notebook.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/notebook/notebook_vc8.vcproj b/samples/notebook/notebook_vc8.vcproj
index 317384e731..676b15ade2 100644
--- a/samples/notebook/notebook_vc8.vcproj
+++ b/samples/notebook/notebook_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\notebook.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/notebook/notebook_vc9.vcproj b/samples/notebook/notebook_vc9.vcproj
index cb4d7d2d13..5e1c82b597 100644
--- a/samples/notebook/notebook_vc9.vcproj
+++ b/samples/notebook/notebook_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\notebook.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/opengl/cube/cube.bkl b/samples/opengl/cube/cube.bkl
index a391390a71..50b4b5c5c4 100644
--- a/samples/opengl/cube/cube.bkl
+++ b/samples/opengl/cube/cube.bkl
@@ -11,6 +11,7 @@
 
     <exe id="cube" template="wx_sample" template_append="wx_append" cond="USE_OPENGL=='1'">
         <sources>cube.cpp</sources>
+        <headers>cube.h</headers>
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/opengl/isosurf/isosurf.bkl b/samples/opengl/isosurf/isosurf.bkl
index 3d922da778..8b538e1c9e 100644
--- a/samples/opengl/isosurf/isosurf.bkl
+++ b/samples/opengl/isosurf/isosurf.bkl
@@ -11,6 +11,7 @@
 
     <exe id="isosurf" template="wx_sample" template_append="wx_append" cond="USE_OPENGL=='1'">
         <sources>isosurf.cpp</sources>
+        <headers>isosurf.h</headers>
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/opengl/penguin/penguin.bkl b/samples/opengl/penguin/penguin.bkl
index c53872944f..53a93afe21 100644
--- a/samples/opengl/penguin/penguin.bkl
+++ b/samples/opengl/penguin/penguin.bkl
@@ -4,7 +4,7 @@
 <makefile>
 
     <include file="../../../build/bakefiles/common_samples.bkl"/>
-    
+
     <if cond="OUT_OF_TREE_MAKEFILES=='1'">
         <set var="USE_OPENGL">1</set>
     </if>
@@ -15,6 +15,11 @@
             dxfrenderer.cpp
             trackball.c
         </sources>
+        <headers>
+            dxfrenderer.h
+            penguin.h
+            trackball.h
+        </headers>
         <wx-lib>gl</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/printing/printing.bkl b/samples/printing/printing.bkl
index 2d31ff3ead..0829d7b60d 100644
--- a/samples/printing/printing.bkl
+++ b/samples/printing/printing.bkl
@@ -5,6 +5,7 @@
 
     <exe id="printing" template="wx_sample" template_append="wx_append">
         <sources>printing.cpp</sources>
+        <headers>printing.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>printing.rc</win32-res>
diff --git a/samples/printing/printing.dsp b/samples/printing/printing.dsp
index f138398616..60b1a22030 100644
--- a/samples/printing/printing.dsp
+++ b/samples/printing/printing.dsp
@@ -259,6 +259,14 @@ SOURCE=.\printing.cpp
 SOURCE=.\printing.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\printing.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/printing/printing_vc7.vcproj b/samples/printing/printing_vc7.vcproj
index e831dee15f..020b66c65b 100644
--- a/samples/printing/printing_vc7.vcproj
+++ b/samples/printing/printing_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\printing.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\printing.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/printing/printing_vc8.vcproj b/samples/printing/printing_vc8.vcproj
index 6f486ed736..73a56be998 100644
--- a/samples/printing/printing_vc8.vcproj
+++ b/samples/printing/printing_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\printing.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/printing/printing_vc9.vcproj b/samples/printing/printing_vc9.vcproj
index 7b0ddf95e2..00dac4d832 100644
--- a/samples/printing/printing_vc9.vcproj
+++ b/samples/printing/printing_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\printing.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/propgrid/propgrid.bkl b/samples/propgrid/propgrid.bkl
index a12075b786..ccfaa87c12 100644
--- a/samples/propgrid/propgrid.bkl
+++ b/samples/propgrid/propgrid.bkl
@@ -11,6 +11,10 @@
             sampleprops.cpp
             tests.cpp
         </sources>
+        <headers>
+            sampleprops.h
+            propgrid.h
+        </headers>
         <wx-lib>propgrid</wx-lib>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
diff --git a/samples/propgrid/propgrid.dsp b/samples/propgrid/propgrid.dsp
index cc3c0bd7aa..d19285b931 100644
--- a/samples/propgrid/propgrid.dsp
+++ b/samples/propgrid/propgrid.dsp
@@ -271,6 +271,18 @@ SOURCE=.\sampleprops.cpp
 SOURCE=.\tests.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\propgrid.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\sampleprops.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/propgrid/propgrid_vc7.vcproj b/samples/propgrid/propgrid_vc7.vcproj
index 241668999d..df75ccd4cb 100644
--- a/samples/propgrid/propgrid_vc7.vcproj
+++ b/samples/propgrid/propgrid_vc7.vcproj
@@ -538,6 +538,17 @@
 				RelativePath=".\tests.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\propgrid.h">
+			</File>
+			<File
+				RelativePath=".\sampleprops.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/propgrid/propgrid_vc8.vcproj b/samples/propgrid/propgrid_vc8.vcproj
index 0af460e6df..ecccd480b9 100644
--- a/samples/propgrid/propgrid_vc8.vcproj
+++ b/samples/propgrid/propgrid_vc8.vcproj
@@ -804,6 +804,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\propgrid.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sampleprops.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/propgrid/propgrid_vc9.vcproj b/samples/propgrid/propgrid_vc9.vcproj
index cfc9e93ea7..054c996e2d 100644
--- a/samples/propgrid/propgrid_vc9.vcproj
+++ b/samples/propgrid/propgrid_vc9.vcproj
@@ -776,6 +776,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\propgrid.h"
+				>
+			</File>
+			<File
+				RelativePath=".\sampleprops.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/sashtest/sashtest.bkl b/samples/sashtest/sashtest.bkl
index 518d2ec97c..9be3136677 100644
--- a/samples/sashtest/sashtest.bkl
+++ b/samples/sashtest/sashtest.bkl
@@ -5,6 +5,7 @@
 
     <exe id="sashtest" template="wx_sample" template_append="wx_append">
         <sources>sashtest.cpp</sources>
+        <headers>sashtest.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/sashtest/sashtest.dsp b/samples/sashtest/sashtest.dsp
index c0d9f5e6c6..1d96185eb8 100644
--- a/samples/sashtest/sashtest.dsp
+++ b/samples/sashtest/sashtest.dsp
@@ -259,6 +259,14 @@ SOURCE=.\sashtest.cpp
 SOURCE=.\sashtest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\sashtest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/sashtest/sashtest_vc7.vcproj b/samples/sashtest/sashtest_vc7.vcproj
index 4c2dac25e0..d4390be186 100644
--- a/samples/sashtest/sashtest_vc7.vcproj
+++ b/samples/sashtest/sashtest_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\sashtest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\sashtest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/sashtest/sashtest_vc8.vcproj b/samples/sashtest/sashtest_vc8.vcproj
index eebfb97aac..f4d653ebb9 100644
--- a/samples/sashtest/sashtest_vc8.vcproj
+++ b/samples/sashtest/sashtest_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\sashtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/sashtest/sashtest_vc9.vcproj b/samples/sashtest/sashtest_vc9.vcproj
index de1add6ac9..3a001dc005 100644
--- a/samples/sashtest/sashtest_vc9.vcproj
+++ b/samples/sashtest/sashtest_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\sashtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/stc/stctest.bkl b/samples/stc/stctest.bkl
index d800c447ea..03cdd5498b 100644
--- a/samples/stc/stctest.bkl
+++ b/samples/stc/stctest.bkl
@@ -6,24 +6,29 @@
     <exe id="stctest" template="wx_sample" template_append="wx_append">
         <sources>
             stctest.cpp
-	    edit.cpp
-	    prefs.cpp
+            edit.cpp
+            prefs.cpp
         </sources>
+        <headers>
+            edit.h
+            defsext.h
+            prefs.h
+        </headers>
         <wx-lib>stc</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
-        
+
         <if cond="OUT_OF_TREE_MAKEFILES=='0'">
             <sys-lib>$(LIB_SCINTILLA)</sys-lib>
         </if>
-        
+
         <win32-res>../sample.rc</win32-res>
     </exe>
 
-    <wx-data id="data">   
-        <files>   
-             stctest.cpp   
-        </files>   
-    </wx-data>   
-  
+    <wx-data id="data">
+        <files>
+             stctest.cpp
+        </files>
+    </wx-data>
+
 </makefile>
diff --git a/samples/stc/stctest.dsp b/samples/stc/stctest.dsp
index 9c4b2e158e..f8339c5adf 100644
--- a/samples/stc/stctest.dsp
+++ b/samples/stc/stctest.dsp
@@ -267,6 +267,22 @@ SOURCE=.\..\sample.rc
 SOURCE=.\stctest.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\defsext.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\edit.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\prefs.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/stc/stctest_vc7.vcproj b/samples/stc/stctest_vc7.vcproj
index f4cb823866..fbb44e99fb 100644
--- a/samples/stc/stctest_vc7.vcproj
+++ b/samples/stc/stctest_vc7.vcproj
@@ -535,6 +535,20 @@
 				RelativePath=".\stctest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\defsext.h">
+			</File>
+			<File
+				RelativePath=".\edit.h">
+			</File>
+			<File
+				RelativePath=".\prefs.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/stc/stctest_vc8.vcproj b/samples/stc/stctest_vc8.vcproj
index 50a0160e8d..2e5c3f66e8 100644
--- a/samples/stc/stctest_vc8.vcproj
+++ b/samples/stc/stctest_vc8.vcproj
@@ -800,6 +800,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\defsext.h"
+				>
+			</File>
+			<File
+				RelativePath=".\edit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\prefs.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/stc/stctest_vc9.vcproj b/samples/stc/stctest_vc9.vcproj
index c3852eafd7..87d2b07f14 100644
--- a/samples/stc/stctest_vc9.vcproj
+++ b/samples/stc/stctest_vc9.vcproj
@@ -772,6 +772,24 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\defsext.h"
+				>
+			</File>
+			<File
+				RelativePath=".\edit.h"
+				>
+			</File>
+			<File
+				RelativePath=".\prefs.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/taskbar/taskbar.bkl b/samples/taskbar/taskbar.bkl
index 4cdc7a14e2..f075718b28 100644
--- a/samples/taskbar/taskbar.bkl
+++ b/samples/taskbar/taskbar.bkl
@@ -5,6 +5,7 @@
 
     <exe id="taskbar" template="wx_sample" template_append="wx_append">
         <sources>tbtest.cpp</sources>
+        <headers>tbtest.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/taskbar/taskbar.dsp b/samples/taskbar/taskbar.dsp
index 4419d9a277..a61eb6a52a 100644
--- a/samples/taskbar/taskbar.dsp
+++ b/samples/taskbar/taskbar.dsp
@@ -259,6 +259,14 @@ SOURCE=.\..\..\samples\sample.rc
 SOURCE=.\tbtest.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\tbtest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/taskbar/taskbar_vc7.vcproj b/samples/taskbar/taskbar_vc7.vcproj
index 339515eadd..2f41d56997 100644
--- a/samples/taskbar/taskbar_vc7.vcproj
+++ b/samples/taskbar/taskbar_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\tbtest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\tbtest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/taskbar/taskbar_vc8.vcproj b/samples/taskbar/taskbar_vc8.vcproj
index 9fcc4355ae..882ebc1f59 100644
--- a/samples/taskbar/taskbar_vc8.vcproj
+++ b/samples/taskbar/taskbar_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\tbtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/taskbar/taskbar_vc9.vcproj b/samples/taskbar/taskbar_vc9.vcproj
index 4f2ad44adc..0baa4e8324 100644
--- a/samples/taskbar/taskbar_vc9.vcproj
+++ b/samples/taskbar/taskbar_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\tbtest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/treectrl/treectrl.bkl b/samples/treectrl/treectrl.bkl
index a52e2e111d..3caf1ea120 100644
--- a/samples/treectrl/treectrl.bkl
+++ b/samples/treectrl/treectrl.bkl
@@ -5,6 +5,7 @@
 
     <exe id="treectrl" template="wx_sample" template_append="wx_append">
         <sources>treetest.cpp</sources>
+        <headers>treetest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>../sample.rc</win32-res>
diff --git a/samples/treectrl/treectrl.dsp b/samples/treectrl/treectrl.dsp
index a931e07604..eb35a7b422 100644
--- a/samples/treectrl/treectrl.dsp
+++ b/samples/treectrl/treectrl.dsp
@@ -259,6 +259,14 @@ SOURCE=.\..\sample.rc
 SOURCE=.\treetest.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\treetest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/treectrl/treectrl_vc7.vcproj b/samples/treectrl/treectrl_vc7.vcproj
index 2344b2a934..82f81d7bee 100644
--- a/samples/treectrl/treectrl_vc7.vcproj
+++ b/samples/treectrl/treectrl_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\treetest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\treetest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/treectrl/treectrl_vc8.vcproj b/samples/treectrl/treectrl_vc8.vcproj
index 695b7ed4a2..74b175dc3b 100644
--- a/samples/treectrl/treectrl_vc8.vcproj
+++ b/samples/treectrl/treectrl_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\treetest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/treectrl/treectrl_vc9.vcproj b/samples/treectrl/treectrl_vc9.vcproj
index 88105de868..486ece4785 100644
--- a/samples/treectrl/treectrl_vc9.vcproj
+++ b/samples/treectrl/treectrl_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\treetest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/typetest/typetest.bkl b/samples/typetest/typetest.bkl
index 03ce78737a..ae9e27cba6 100644
--- a/samples/typetest/typetest.bkl
+++ b/samples/typetest/typetest.bkl
@@ -5,6 +5,7 @@
 
     <exe id="typetest" template="wx_sample" template_append="wx_append">
         <sources>typetest.cpp</sources>
+        <headers>typetest.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>typetest.rc</win32-res>
diff --git a/samples/typetest/typetest.cpp b/samples/typetest/typetest.cpp
index cbd16a5c03..617c6d74ca 100644
--- a/samples/typetest/typetest.cpp
+++ b/samples/typetest/typetest.cpp
@@ -6,7 +6,7 @@
 // Created:     04/01/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:       wxWindows license
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // For compilers that support precompilation, includes "wx/wx.h".
diff --git a/samples/typetest/typetest.dsp b/samples/typetest/typetest.dsp
index 988fb06361..7adaef9b67 100644
--- a/samples/typetest/typetest.dsp
+++ b/samples/typetest/typetest.dsp
@@ -259,6 +259,14 @@ SOURCE=.\typetest.cpp
 SOURCE=.\typetest.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\typetest.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/typetest/typetest_vc7.vcproj b/samples/typetest/typetest_vc7.vcproj
index 4a71b1490f..4e2a31cf07 100644
--- a/samples/typetest/typetest_vc7.vcproj
+++ b/samples/typetest/typetest_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\typetest.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\typetest.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/typetest/typetest_vc8.vcproj b/samples/typetest/typetest_vc8.vcproj
index 7f5122aa6e..8a672e7369 100644
--- a/samples/typetest/typetest_vc8.vcproj
+++ b/samples/typetest/typetest_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\typetest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/typetest/typetest_vc9.vcproj b/samples/typetest/typetest_vc9.vcproj
index 95891ee56d..770d9b899e 100644
--- a/samples/typetest/typetest_vc9.vcproj
+++ b/samples/typetest/typetest_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\typetest.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/validate/validate.bkl b/samples/validate/validate.bkl
index bbf1ea0721..bc72569d92 100644
--- a/samples/validate/validate.bkl
+++ b/samples/validate/validate.bkl
@@ -5,6 +5,7 @@
 
     <exe id="validate" template="wx_sample" template_append="wx_append">
         <sources>validate.cpp</sources>
+        <headers>validate.h</headers>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
         <win32-res>../sample.rc</win32-res>
diff --git a/samples/validate/validate.dsp b/samples/validate/validate.dsp
index 14c18e1368..b3a4c54f59 100644
--- a/samples/validate/validate.dsp
+++ b/samples/validate/validate.dsp
@@ -259,6 +259,14 @@ SOURCE=.\..\sample.rc
 SOURCE=.\validate.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\validate.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/validate/validate_vc7.vcproj b/samples/validate/validate_vc7.vcproj
index 7331f099ac..54aad14a87 100644
--- a/samples/validate/validate_vc7.vcproj
+++ b/samples/validate/validate_vc7.vcproj
@@ -529,6 +529,14 @@
 				RelativePath=".\validate.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\validate.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/validate/validate_vc8.vcproj b/samples/validate/validate_vc8.vcproj
index 7020ca207b..b964cfb2d4 100644
--- a/samples/validate/validate_vc8.vcproj
+++ b/samples/validate/validate_vc8.vcproj
@@ -792,6 +792,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\validate.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/validate/validate_vc9.vcproj b/samples/validate/validate_vc9.vcproj
index eab1ad4ae4..2628a6b87f 100644
--- a/samples/validate/validate_vc9.vcproj
+++ b/samples/validate/validate_vc9.vcproj
@@ -764,6 +764,16 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\validate.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/widgets/widgets.bkl b/samples/widgets/widgets.bkl
index cfba0672ce..9227075d1a 100644
--- a/samples/widgets/widgets.bkl
+++ b/samples/widgets/widgets.bkl
@@ -35,6 +35,7 @@
             toggle.cpp
             widgets.cpp
         </sources>
+        <headers>widgets.h itemcontainer.h</headers>
         <wx-lib>adv</wx-lib>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
diff --git a/samples/widgets/widgets.dsp b/samples/widgets/widgets.dsp
index e5316848e5..c667af23c1 100644
--- a/samples/widgets/widgets.dsp
+++ b/samples/widgets/widgets.dsp
@@ -367,6 +367,18 @@ SOURCE=.\toggle.cpp
 SOURCE=.\widgets.cpp
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\itemcontainer.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\widgets.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/widgets/widgets_vc7.vcproj b/samples/widgets/widgets_vc7.vcproj
index 52936ac09f..5ba82429c1 100644
--- a/samples/widgets/widgets_vc7.vcproj
+++ b/samples/widgets/widgets_vc7.vcproj
@@ -610,6 +610,17 @@
 				RelativePath=".\widgets.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\itemcontainer.h">
+			</File>
+			<File
+				RelativePath=".\widgets.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/widgets/widgets_vc8.vcproj b/samples/widgets/widgets_vc8.vcproj
index df380ef133..71814fa1ff 100644
--- a/samples/widgets/widgets_vc8.vcproj
+++ b/samples/widgets/widgets_vc8.vcproj
@@ -900,6 +900,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\itemcontainer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\widgets.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/widgets/widgets_vc9.vcproj b/samples/widgets/widgets_vc9.vcproj
index 0fcbe881ff..a08d98151a 100644
--- a/samples/widgets/widgets_vc9.vcproj
+++ b/samples/widgets/widgets_vc9.vcproj
@@ -872,6 +872,20 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\itemcontainer.h"
+				>
+			</File>
+			<File
+				RelativePath=".\widgets.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/xrc/xrcdemo.bkl b/samples/xrc/xrcdemo.bkl
index f4ed1e1568..9c646c5718 100644
--- a/samples/xrc/xrcdemo.bkl
+++ b/samples/xrc/xrcdemo.bkl
@@ -10,6 +10,12 @@
             derivdlg.cpp
             custclas.cpp
         </sources>
+        <headers>
+            derivdlg.h
+            xrcdemo.h
+            myframe.h
+            custclas.h
+        </headers>
         <wx-lib>xrc</wx-lib>
         <wx-lib>html</wx-lib>
         <wx-lib>adv</wx-lib>
diff --git a/samples/xrc/xrcdemo.dsp b/samples/xrc/xrcdemo.dsp
index 41e2992dc3..d23355d02a 100644
--- a/samples/xrc/xrcdemo.dsp
+++ b/samples/xrc/xrcdemo.dsp
@@ -271,6 +271,26 @@ SOURCE=.\xrcdemo.cpp
 SOURCE=.\xrcdemo.rc
 # End Source File
 # End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter ""
+# Begin Source File
+
+SOURCE=.\custclas.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\derivdlg.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\myframe.h
+# End Source File
+# Begin Source File
+
+SOURCE=.\xrcdemo.h
+# End Source File
+# End Group
 # End Target
 # End Project
 
diff --git a/samples/xrc/xrcdemo_vc7.vcproj b/samples/xrc/xrcdemo_vc7.vcproj
index 390a37a51c..eb58085f8f 100644
--- a/samples/xrc/xrcdemo_vc7.vcproj
+++ b/samples/xrc/xrcdemo_vc7.vcproj
@@ -538,6 +538,23 @@
 				RelativePath=".\xrcdemo.cpp">
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}">
+			<File
+				RelativePath=".\custclas.h">
+			</File>
+			<File
+				RelativePath=".\derivdlg.h">
+			</File>
+			<File
+				RelativePath=".\myframe.h">
+			</File>
+			<File
+				RelativePath=".\xrcdemo.h">
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/xrc/xrcdemo_vc8.vcproj b/samples/xrc/xrcdemo_vc8.vcproj
index e75b26701b..6ca3ef6fca 100644
--- a/samples/xrc/xrcdemo_vc8.vcproj
+++ b/samples/xrc/xrcdemo_vc8.vcproj
@@ -804,6 +804,28 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\custclas.h"
+				>
+			</File>
+			<File
+				RelativePath=".\derivdlg.h"
+				>
+			</File>
+			<File
+				RelativePath=".\myframe.h"
+				>
+			</File>
+			<File
+				RelativePath=".\xrcdemo.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
diff --git a/samples/xrc/xrcdemo_vc9.vcproj b/samples/xrc/xrcdemo_vc9.vcproj
index 85689f6915..53b2e8ab64 100644
--- a/samples/xrc/xrcdemo_vc9.vcproj
+++ b/samples/xrc/xrcdemo_vc9.vcproj
@@ -776,6 +776,28 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\custclas.h"
+				>
+			</File>
+			<File
+				RelativePath=".\derivdlg.h"
+				>
+			</File>
+			<File
+				RelativePath=".\myframe.h"
+				>
+			</File>
+			<File
+				RelativePath=".\xrcdemo.h"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="Resource Files"
 			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"