diff --git a/apple/OSX/platform.m b/apple/OSX/platform.m
index 31eb2000d1..412f71ea03 100644
--- a/apple/OSX/platform.m
+++ b/apple/OSX/platform.m
@@ -133,13 +133,6 @@ static char** waiting_argv;
 {
    apple_platform = self;
 
-   char support_path_buf[PATH_MAX + 1];
-   CFSearchPathForDirectoriesInDomains(CFApplicationSupportDirectory, CFUserDomainMask, YES, support_path_buf, sizeof(support_path_buf));
-   
-   fill_pathname_join(g_defaults.core_dir, NSBundle.mainBundle.bundlePath.UTF8String, "Contents/Resources/modules", sizeof(g_defaults.core_dir));
-   fill_pathname_join(g_defaults.menu_config_dir, support_path_buf, "RetroArch", sizeof(g_defaults.menu_config_dir));
-   fill_pathname_join(g_defaults.config_path, g_defaults.menu_config_dir, "retroarch.cfg", sizeof(g_defaults.config_path));
-
    
 #if __MAC_OS_X_VERSION_MAX_ALLOWED >= 1070
    [self.window setCollectionBehavior:[self.window collectionBehavior] | NSWindowCollectionBehaviorFullScreenPrimary];
diff --git a/apple/common/CFExtensions.h b/apple/common/CFExtensions.h
index 0de98777ef..08c2f0fb01 100644
--- a/apple/common/CFExtensions.h
+++ b/apple/common/CFExtensions.h
@@ -60,6 +60,6 @@ typedef enum
 } CFDomainMask;
 
 void CFSearchPathForDirectoriesInDomains(unsigned flags,
-      unsigned domain_mask, BOOL expand_tilde, char *buf, size_t sizeof_buf);
+      unsigned domain_mask, unsigned expand_tilde, char *buf, size_t sizeof_buf);
 
 #endif
diff --git a/apple/common/CFExtensions.m b/apple/common/CFExtensions.m
index 2862465551..d96284e847 100644
--- a/apple/common/CFExtensions.m
+++ b/apple/common/CFExtensions.m
@@ -19,11 +19,11 @@
 #include "CFExtensions.h"
 
 void CFSearchPathForDirectoriesInDomains(unsigned flags,
-                                               unsigned domain_mask, BOOL expand_tilde,
+                                               unsigned domain_mask, unsigned expand_tilde,
                                                char *buf, size_t sizeof_buf)
 {
    CFArrayRef array = CFBridgingRetain(NSSearchPathForDirectoriesInDomains(
-      flags, domain_mask, expand_tilde));
+      flags, domain_mask, (BOOL)expand_tilde));
    CFStringRef path = CFBridgingRetain(CFArrayGetValueAtIndex(array, 0));
    CFStringGetCString(path, buf, sizeof_buf, kCFStringEncodingUTF8);
    CFRelease(path);
diff --git a/frontend/platform/platform_apple.c b/frontend/platform/platform_apple.c
index 5c834f32e7..7c6f4511fa 100644
--- a/frontend/platform/platform_apple.c
+++ b/frontend/platform/platform_apple.c
@@ -14,6 +14,7 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include "../../apple/common/CFExtensions.h"
 #include "../menu/menu_common.h"
 #include "../../settings_data.h"
 
@@ -169,6 +170,13 @@ static void frontend_apple_get_environment_settings(int *argc, char *argv[],
    }
 
    CFRelease(home_dir);
+#elif defined(OSX)
+    char support_path_buf[PATH_MAX + 1];
+    CFSearchPathForDirectoriesInDomains(CFApplicationSupportDirectory, CFUserDomainMask, 1, support_path_buf, sizeof(support_path_buf));
+    
+    fill_pathname_join(g_defaults.core_dir, bundle_path_buf, "Contents/Resources/modules", sizeof(g_defaults.core_dir));
+    fill_pathname_join(g_defaults.menu_config_dir, support_path_buf, "RetroArch", sizeof(g_defaults.menu_config_dir));
+    fill_pathname_join(g_defaults.config_path, g_defaults.menu_config_dir, "retroarch.cfg", sizeof(g_defaults.config_path));
 #endif
 
    CFRelease(bundle_path);