diff --git a/Makefile.in b/Makefile.in
index b83bd4d367..ff59e1665d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2706,6 +2706,7 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/bmpcbox.h \
 	wx/calctrl.h \
 	wx/dataview.h \
+	wx/datectrl.h \
 	wx/dateevt.h \
 	wx/dcbuffer.h \
 	wx/aboutdlg.h \
@@ -2737,8 +2738,6 @@ COND_WXUNIV_0_ADVANCED_HDR =  \
 	wx/tipdlg.h \
 	wx/wave.h \
 	wx/wizard.h \
-	wx/datectrl.h \
-	wx/dataview.h \
 	$(ADVANCED_PLATFORM_HDR) \
 	$(ADVANCED_PLATFORM_NATIVE_HDR)
 @COND_WXUNIV_0@ADVANCED_HDR = $(COND_WXUNIV_0_ADVANCED_HDR)
@@ -2748,6 +2747,7 @@ COND_WXUNIV_1_ADVANCED_HDR =  \
 	wx/bmpcbox.h \
 	wx/calctrl.h \
 	wx/dataview.h \
+	wx/datectrl.h \
 	wx/dateevt.h \
 	wx/dcbuffer.h \
 	wx/aboutdlg.h \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 69cb8bc5a6..cfef7d3bcb 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -2688,6 +2688,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/bmpcbox.h
     wx/calctrl.h
     wx/dataview.h
+    wx/datectrl.h
     wx/dateevt.h
     wx/dcbuffer.h
     wx/aboutdlg.h
@@ -2721,11 +2722,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/wizard.h
 </set>
 
-<set var="ADVANCED_CMN_NATIVE_HDR" hints="files">
-    wx/datectrl.h
-    wx/dataview.h
-</set>
-
 <set var="ADVANCED_MSW_SRC" hints="files">
     src/common/taskbarcmn.cpp
     src/msw/aboutdlg.cpp
@@ -3385,7 +3381,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_SRC) $(ADVANCED_PLATFORM_SRC)</if>
     </set>
     <set var="ADVANCED_HDR" hints="files">
-        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_CMN_NATIVE_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
+        <if cond="WXUNIV=='0'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR) $(ADVANCED_PLATFORM_NATIVE_HDR)</if>
         <if cond="WXUNIV=='1'">$(ADVANCED_CMN_HDR) $(ADVANCED_PLATFORM_HDR)</if>
     </set>