diff --git a/Externals/CLRun/include/OpenCL/cl.h b/Externals/CLRun/include/OpenCL/cl.h
deleted file mode 100644
index 9e3d489a1d..0000000000
--- a/Externals/CLRun/include/OpenCL/cl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <CL/cl.h>
diff --git a/Externals/CLRun/include/OpenCL/cl_platform.h b/Externals/CLRun/include/OpenCL/cl_platform.h
deleted file mode 100644
index 00046849b2..0000000000
--- a/Externals/CLRun/include/OpenCL/cl_platform.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <CL/cl_platform.h>
diff --git a/SConstruct b/SConstruct
index a0bd096a5f..18ac2cd420 100644
--- a/SConstruct
+++ b/SConstruct
@@ -121,17 +121,18 @@ if sys.platform == 'darwin':
     ccld += ['--sysroot=/Developer/SDKs/MacOSX10.5.sdk']
     system = '/System/Library/Frameworks'
     env['CCFLAGS'] += ccld
+    env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
     env['CCFLAGS'] += ['-Xarch_i386', '-msse3', '-Xarch_x86_64', '-mssse3']
-    env['CCFLAGS'] += ['-mtune=core2', '-Xarch_x86_64', '-march=core2']
-    env['CCFLAGS'] += ['-mdynamic-no-pic']
+    env['CCFLAGS'] += ['-march=core2', '-mdynamic-no-pic']
     env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.5.sdk' + system]
     env['CCFLAGS'] += ['-iframework/Developer/SDKs/MacOSX10.6.sdk' + system]
-    env['CC'] = "gcc-4.2 -ObjC"
-    env['CXX'] = "g++-4.2 -ObjC++"
+    env['CC'] = '/Developer/usr/bin/llvm-gcc -ObjC'
+    env['CXX'] = '/Developer/usr/bin/llvm-g++ -ObjC++'
     env['FRAMEWORKS'] += ['AppKit', 'Carbon', 'CoreFoundation', 'CoreServices']
     env['FRAMEWORKS'] += ['AudioUnit', 'CoreAudio', 'WebKit']
     env['FRAMEWORKS'] += ['IOBluetooth', 'IOKit', 'OpenGL']
-    env['FRAMEWORKSFLAGS'] = ['-Xarch_i386', '-Wl,-framework,QuickTime']
+    env['FRAMEWORKSFLAGS'] = ['-weak_framework', 'OpenCL']
+    env['FRAMEWORKSFLAGS'] += ['-Xarch_i386', '-Wl,-framework,QuickTime']
     env['LIBPATH'] += ['/usr/lib']
     env['LINKFLAGS'] += ccld
     env['LINKFLAGS'] += ['-Wl,-search_paths_first', '-Wl,-Z', '-F' + system]
@@ -139,12 +140,6 @@ if sys.platform == 'darwin':
     env['SHLINKFLAGS'] += ['-Wl,-undefined,dynamic_lookup']
     env['SHLINKFLAGS'] += ['-Xarch_i386', '-Wl,-read_only_relocs,suppress']
 
-    if platform.mac_ver()[0] >= '10.6.0':
-        env['CC'] = "llvm-gcc-4.2 -ObjC"
-        env['CXX'] = "llvm-g++-4.2 -ObjC++"
-        env['CCFLAGS'] += ['-Wextra-tokens', '-Wnewline-eof']
-        env['FRAMEWORKSFLAGS'] += ['-weak_framework', 'OpenCL']
-
     if env['nowx']:
         env['HAVE_WX'] = 0
     else:
diff --git a/Source/Core/Common/Src/StringUtil.h b/Source/Core/Common/Src/StringUtil.h
index 913a06030e..a48d462b1d 100644
--- a/Source/Core/Common/Src/StringUtil.h
+++ b/Source/Core/Common/Src/StringUtil.h
@@ -52,9 +52,7 @@ template <typename I>
 std::string ThousandSeparate(I value, int spaces = 0)
 {
 	std::ostringstream oss;
-#ifndef __APPLE__	// XXX
-	oss.imbue(std::locale(""));
-#endif
+	oss.imbue(std::locale());
 	oss << std::setw(spaces) << value;
 
 	return oss.str();