diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 0a935ca153..facd539cf4 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -403,7 +403,6 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/mimetype.h
     wx/module.h
     wx/msgout.h
-    wx/msgout.h
     wx/mstream.h
     wx/object.h
     wx/platform.h
@@ -2789,8 +2788,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
         <if cond="TOOLKIT==''">$(BASE_MACOSX_NOTWXMAC_HDR)</if>
     </set>
     <set var="BASE_PLATFORM_HDR" hints="files">
-        <if cond="PLATFORM_UNIX=='1'">$(BASE_UNIX_HDR)</if>
-        <if cond="PLATFORM_WIN32=='1'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
+        <if cond="PLATFORM_UNIX=='1' or FORMAT=='rpmspec'">$(BASE_UNIX_HDR)</if>
+        <if cond="PLATFORM_WIN32=='1' and FORMAT!='rpmspec'">$(BASE_WIN32_HDR) $(BASE_WINCE_HDR)</if>
         <if cond="PLATFORM_MACOSX=='1'">$(BASE_MACOSX_HDR)</if>
         <if cond="PLATFORM_PALMOS=='1'">$(BASE_PALMOS_HDR)</if>
         <if cond="PLATFORM_MSDOS=='1'">$(BASE_MSDOS_HDR)</if>
diff --git a/build/bakefiles/formats/rpmspec.empy b/build/bakefiles/formats/rpmspec.empy
index a4cce6a766..5447f44226 100644
--- a/build/bakefiles/formats/rpmspec.empy
+++ b/build/bakefiles/formats/rpmspec.empy
@@ -1,5 +1,5 @@
 # --- wxBase headers list begins here ---
-cat <<EOF >wxbase-headers-list
+cat <<EOF >wxbase-headers.files
 @('\n'.join(ALL_BASE_HEADERS.split()))
 EOF
 # --- wxBase headers list ends here ---