diff --git a/Makefile.in b/Makefile.in
index 4d610cabb5..d167f2c1c0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1229,10 +1229,9 @@ COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR = \
wx/unix/pipe.h \
wx/unix/stdpaths.h
@COND_TOOLKIT_COCOA@BASE_PLATFORM_HDR = $(COND_TOOLKIT_COCOA_BASE_PLATFORM_HDR)
-COND_TOOLKIT_MAC_BASE_PLATFORM_HDR = \
- include/wx/mac/corefoundation/cfstring.h \
- include/wx/mac/corefoundation/stdpaths.h
-@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = $(COND_TOOLKIT_MAC_BASE_PLATFORM_HDR)
+@COND_TOOLKIT_MAC@BASE_PLATFORM_HDR = \
+@COND_TOOLKIT_MAC@ wx/mac/corefoundation/cfstring.h \
+@COND_TOOLKIT_MAC@ wx/mac/corefoundation/stdpaths.h
@COND_PLATFORM_MACOSX_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
@COND_PLATFORM_MACOS_1@NET_PLATFORM_HDR = include/wx/mac/carbon/gsockmac.h
@COND_PLATFORM_OS2_1@NET_PLATFORM_HDR = wx/unix/gsockunx.h
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index d1581683f9..2619358894 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -146,8 +146,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
- include/wx/mac/corefoundation/cfstring.h
- include/wx/mac/corefoundation/stdpaths.h
+ wx/mac/corefoundation/cfstring.h
+ wx/mac/corefoundation/stdpaths.h