diff --git a/Makefile.in b/Makefile.in
index 336279d83c..916a187ef6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2399,8 +2399,8 @@ COND_TOOLKIT_OSX_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
 	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h \
 	wx/unix/app.h \
 	wx/unix/apptbase.h \
 	wx/unix/apptrait.h \
@@ -2432,8 +2432,8 @@ COND_TOOLKIT_COCOA_BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
-	wx/osx/core/colour.h
+	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h
 @COND_TOOLKIT_COCOA@BASE_OSX_HDR = $(COND_TOOLKIT_COCOA_BASE_OSX_HDR)
 COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2454,8 +2454,8 @@ COND_TOOLKIT_GTK_BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
-	wx/osx/core/colour.h
+	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h
 @COND_TOOLKIT_GTK@BASE_OSX_HDR = $(COND_TOOLKIT_GTK_BASE_OSX_HDR)
 COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2476,8 +2476,8 @@ COND_TOOLKIT_X11_BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
-	wx/osx/core/colour.h
+	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h
 @COND_TOOLKIT_X11@BASE_OSX_HDR = $(COND_TOOLKIT_X11_BASE_OSX_HDR)
 COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2498,8 +2498,8 @@ COND_TOOLKIT_MOTIF_BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
-	wx/osx/core/colour.h
+	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h
 @COND_TOOLKIT_MOTIF@BASE_OSX_HDR = $(COND_TOOLKIT_MOTIF_BASE_OSX_HDR)
 COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/unix/app.h \
@@ -2520,8 +2520,8 @@ COND_TOOLKIT__BASE_OSX_HDR =  \
 	wx/osx/core/evtloop.h \
 	wx/osx/core/objcid.h \
 	wx/osx/core/private.h \
-	wx/osx/core/stdpaths.h \
-	wx/osx/core/colour.h
+	wx/osx/core/colour.h \
+	wx/osx/carbon/region.h
 @COND_TOOLKIT_@BASE_OSX_HDR = $(COND_TOOLKIT__BASE_OSX_HDR)
 @COND_PLATFORM_MACOSX_1@BASE_PLATFORM_HDR = $(BASE_OSX_HDR)
 COND_PLATFORM_UNIX_1_BASE_PLATFORM_HDR =  \
diff --git a/build/bakefiles/files.bkl b/build/bakefiles/files.bkl
index 6d7516b21c..653391dadb 100644
--- a/build/bakefiles/files.bkl
+++ b/build/bakefiles/files.bkl
@@ -193,8 +193,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
     wx/osx/core/evtloop.h
     wx/osx/core/objcid.h
     wx/osx/core/private.h
-    wx/osx/core/stdpaths.h
     wx/osx/core/colour.h
+    wx/osx/carbon/region.h
 </set>
 
 <!-- Base files used by OS X ports (not Carbon) -->
diff --git a/build/files b/build/files
index 800fae5604..3e2a653124 100644
--- a/build/files
+++ b/build/files
@@ -139,6 +139,7 @@ BASE_COREFOUNDATION_SRC =
     src/osx/cocoa/utils_base.mm
 
 BASE_COREFOUNDATION_HDR =
+    wx/osx/carbon/region.h
     wx/osx/core/cfdataref.h
     wx/osx/core/cfref.h
     wx/osx/core/cfstring.h
@@ -147,7 +148,6 @@ BASE_COREFOUNDATION_HDR =
     wx/osx/core/evtloop.h
     wx/osx/core/objcid.h
     wx/osx/core/private.h
-    wx/osx/core/stdpaths.h
 
 # Base files used by OS X ports (not Carbon)
 BASE_OSX_SHARED_SRC =