diff --git a/common.gypi b/common.gypi
index c6517c644..68d89be03 100644
--- a/common.gypi
+++ b/common.gypi
@@ -81,9 +81,12 @@
     },
     'xcode_settings': {
       'SYMROOT': '<(DEPTH)/build/xenia/',
-      'ARCHS': [ 'x86_64' ],
+      'ALWAYS_SEARCH_USER_PATHS': 'NO',
+      'ARCHS': ['x86_64'],
+      'GCC_C_LANGUAGE_STANDARD': 'c99',
       'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES',
       'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES',
+      'WARNING_CFLAGS': ['-Wall', '-Wendif-labels'],
     },
   },
 }
diff --git a/xenia.gyp b/xenia.gyp
index 309e683a7..653c54929 100644
--- a/xenia.gyp
+++ b/xenia.gyp
@@ -31,6 +31,13 @@
         'libraries': [
           #'!@(pkg-config --libs-only-l apr-1)',
         ],
+
+        'xcode_settings': {
+          'OTHER_LDFLAGS': [
+            '<!@(<(llvm_config) --ldflags)',
+            '<!@(<(llvm_config) --libs core)',
+          ],
+        }
       },
 
       'cflags': [