restored changes accidentally reverted by previous commit

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

build/bakefiles/files.bkl

@@ -187,6 +187,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/common/utilscmn.cpp
 </set>
 <set var="BASE_CMN_HDR" hints="files">
+    wx/afterstd.h
     wx/app.h
     wx/apptrait.h
     wx/arrimpl.cpp
@@ -524,7 +525,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
 
     wx/accel.h
     wx/access.h
-    wx/afterstd.h
     wx/artprov.h
     wx/bitmap.h
     wx/busyinfo.h
@@ -1557,6 +1557,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     src/generic/fontdlgg.cpp
     src/generic/imaglist.cpp
     src/generic/listctrl.cpp
+    src/generic/prntdlgg.cpp
     src/generic/statusbr.cpp
     src/generic/tabg.cpp
     <!-- Unix files used by wxMac: -->
@@ -2253,7 +2254,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
             $(LOWLEVEL_HDR)
             $(GUI_CORE_HEADERS)
             $(ADVANCED_HDR) $(HTML_HDR)
-            $(OPENGL_HDR) $(ODBC_HDR) $(DBGRID_HDR)
+            $(OPENGL_HDR) $(DBGRID_HDR)
         </if>
     </set>
 
@@ -2261,7 +2262,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     <set var="ALL_BASE_HEADERS" make_var="1" hints="files">
         $(BASE_CMN_HDR) $(BASE_PLATFORM_HDR)
         $(NET_CMN_HDR) $(NET_PLATFORM_HDR)
-        $(XML_HDR)
+        $(XML_HDR) $(ODBC_HDR)
     </set>
 
     <set var="ALL_HEADERS" make_var="1" hints="files">
@@ -2278,7 +2279,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         $(BASE_AND_GUI_DARWIN_SRC)
         $(BASE_AND_GUI_WIN32_SRC)
         $(NET_CMN_SRC) $(NET_UNIX_SRC) $(NET_WIN32_SRC) $(NET_MAC_SRC)
-        $(XML_SRC)
+        $(XML_SRC) $(ODBC_SRC)
     </set>
 
 </makefile>

contrib/build/deprecated/deprecated.bkl

@@ -38,12 +38,14 @@
     <dll id="deprecateddll" template="wx_contrib_dll" cond="SHARED=='1'">
         <define>WXUSINGDLL</define>
         <define>WXMAKINGDLL_DEPRECATED</define>
+        <include>$(SRCDIR)</include>
         <sources>$(DEPRECATED_SRC)</sources>
         <wx-lib>core</wx-lib>
         <wx-lib>base</wx-lib>
     </dll>
     
     <lib id="deprecatedlib" template="wx_contrib_lib" cond="SHARED=='0'">
+        <include>$(SRCDIR)</include>
         <sources>$(DEPRECATED_SRC)</sources>
     </lib>