diff --git a/build/cmake/lib/base/CMakeLists.txt b/build/cmake/lib/base/CMakeLists.txt
index d8c587994b..7f60e93f52 100644
--- a/build/cmake/lib/base/CMakeLists.txt
+++ b/build/cmake/lib/base/CMakeLists.txt
@@ -14,9 +14,13 @@ if(WIN32)
     wx_append_sources(BASE_FILES BASE_WIN32)
     wx_append_sources(BASE_FILES BASE_AND_GUI_WIN32)
 elseif(APPLE)
-    wx_append_sources(BASE_FILES BASE_OSX_SHARED)
-    if(WXOSX_COCOA)
-        wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA)
+    if(WXOSX_COCOA OR WXOSX_IPHONE)
+        wx_append_sources(BASE_FILES BASE_OSX_SHARED)
+        if(WXOSX_COCOA)
+            wx_append_sources(BASE_FILES BASE_AND_GUI_OSX_COCOA)
+        endif()
+    else()
+        wx_append_sources(BASE_FILES BASE_OSX_NOTWXMAC)
     endif()
 elseif(UNIX)
     wx_append_sources(BASE_FILES BASE_UNIX)
diff --git a/build/cmake/lib/core/CMakeLists.txt b/build/cmake/lib/core/CMakeLists.txt
index 22f523a65e..a2d47b9867 100644
--- a/build/cmake/lib/core/CMakeLists.txt
+++ b/build/cmake/lib/core/CMakeLists.txt
@@ -28,6 +28,7 @@ if(WXMSW)
     endif()
 elseif(WXGTK)
     if(WXGTK2)
+        set(GTK2_LOWLEVEL_HDR ${GTK_LOWLEVEL_HDR})
         wx_append_sources(CORE_SRC GTK2_LOWLEVEL)
         wx_append_sources(CORE_SRC GTK2)
     else()
@@ -47,6 +48,7 @@ elseif(WXOSX_COCOA)
     wx_append_sources(CORE_SRC OSX_COCOA)
 elseif(WXOSX_IPHONE)
     wx_append_sources(CORE_SRC OSX_LOWLEVEL)
+    wx_append_sources(CORE_SRC OSX_SHARED)
     wx_append_sources(CORE_SRC OSX_IPHONE)
 elseif(WXQT)
     wx_append_sources(CORE_SRC QT)