diff --git a/Xcode/stepmania.xcodeproj/project.pbxproj b/Xcode/stepmania.xcodeproj/project.pbxproj
index 86e6cf4579..3b393aab10 100644
--- a/Xcode/stepmania.xcodeproj/project.pbxproj
+++ b/Xcode/stepmania.xcodeproj/project.pbxproj
@@ -7434,8 +7434,8 @@
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				SDKROOT_i386 = "";
+				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = NO;
 				STRIP_STYLE = "non-global";
@@ -8011,8 +8011,8 @@
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				SDKROOT_i386 = "";
+				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
@@ -8357,8 +8357,8 @@
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.3.9.sdk;
+				SDKROOT_i386 = "";
+				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
@@ -8487,8 +8487,8 @@
 				PREBINDING = NO;
 				PRESERVE_DEAD_CODE_INITS_AND_TERMS = YES;
 				SDKROOT = macosx10.5;
-				SDKROOT_i386 = /Developer/SDKs/MacOSX10.5.sdk;
-				SDKROOT_ppc = /Developer/SDKs/MacOSX10.4u.sdk;
+				SDKROOT_i386 = "";
+				SDKROOT_ppc = "";
 				SHARED_PRECOMPS_DIR = "/Library/Caches/com.apple.Xcode.$(UID)/SharedPrecompiledHeaders/$(PRODUCT_NAME)/$(CONFIGURATION)";
 				STRIP_INSTALLED_PRODUCT = YES;
 				STRIP_STYLE = "non-global";
diff --git a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h
index d291a49ced..9dd1644616 100644
--- a/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h
+++ b/src/arch/LowLevelWindow/LowLevelWindow_MacOSX.h
@@ -6,8 +6,6 @@
 #include <objc/objc.h>
 
 typedef const struct __CFDictionary *CFDictionaryRef;
-/* XXX: This was changed to a uint32_t later and its header file cannot be included
- * since Style conflicts. Ugh. */
 typedef uint32_t CGDirectDisplayID;
 
 class LowLevelWindow_MacOSX : public LowLevelWindow
diff --git a/src/archutils/Darwin/DarwinThreadHelpers.cpp b/src/archutils/Darwin/DarwinThreadHelpers.cpp
index bd88592a3a..b71a8f8c67 100644
--- a/src/archutils/Darwin/DarwinThreadHelpers.cpp
+++ b/src/archutils/Darwin/DarwinThreadHelpers.cpp
@@ -33,8 +33,8 @@ bool GetThreadBacktraceContext( uint64_t iID, BacktraceContext *ctx )
 	
 	if( thread_get_state(thread, PPC_THREAD_STATE, thread_state_t(&state), &count) )
 		return false;
-	ctx->FramePtr = (const Frame *)state.r1;
-	ctx->PC = (void *)state.srr0;
+	ctx->FramePtr = (const Frame *)state.__r1;
+	ctx->PC = (void *)state.__srr0;
 	return true;
 #elif defined(__i386__)
 	i386_thread_state_t state;
diff --git a/src/archutils/Unix/Backtrace.cpp b/src/archutils/Unix/Backtrace.cpp
index 00c8fa64dd..60c7bc9dfc 100644
--- a/src/archutils/Unix/Backtrace.cpp
+++ b/src/archutils/Unix/Backtrace.cpp
@@ -635,8 +635,13 @@ struct Frame
 
 void GetSignalBacktraceContext( BacktraceContext *ctx, const ucontext_t *uc )
 {
+#if defined(__ppc__)
+	ctx->PC = (const void *) uc->uc_mcontext->__ss.__srr0;
+	ctx->FramePtr = (const Frame *) uc->uc_mcontext->__ss.__r1;
+#else
 	ctx->PC = (const void *) uc->uc_mcontext->ss.srr0;
 	ctx->FramePtr = (const Frame *) uc->uc_mcontext->ss.r1;
+#endif
 }
 
 void InitializeBacktrace() { }