diff --git a/framework/BridgeSupport.xcodeproj/project.pbxproj b/framework/BridgeSupport.xcodeproj/project.pbxproj
index 54377e45..24dbadf2 100644
--- a/framework/BridgeSupport.xcodeproj/project.pbxproj
+++ b/framework/BridgeSupport.xcodeproj/project.pbxproj
@@ -169,7 +169,11 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB91B108733DA50010E9CD /* Build configuration list for PBXProject "BridgeSupport" */;
 			compatibilityVersion = "Xcode 3.0";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				en,
+			);
 			mainGroup = 0867D691FE84028FC02AAC07 /* BridgeSupport */;
 			productRefGroup = 034768DFFF38A50411DB9C8B /* Products */;
 			projectDirPath = "";
@@ -262,26 +266,26 @@
 		1DEB91B208733DA50010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				SDKROOT = macosx;
 			};
 			name = Debug;
 		};
 		1DEB91B308733DA50010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				ARCHS = (
-					ppc,
-					i386,
-				);
+				ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+				ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = /usr/include/libxml2;
 				PREBINDING = NO;
-				SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk";
+				SDKROOT = macosx;
 			};
 			name = Release;
 		};
diff --git a/framework/bs_lex.h b/framework/bs_lex.h
index d40663d7..b029379d 100644
--- a/framework/bs_lex.h
+++ b/framework/bs_lex.h
@@ -2,6 +2,11 @@
 /* Command-line: gperf --switch=1 --language=ANSI-C --struct-type -N bs_xml_element bs.gperf  */
 /* Computed positions: -k'1' */
 
+#ifndef __BS_LEX_H_
+#define __BS_LEX_H_
+
+#import <string.h>
+
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
       && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
       && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
@@ -81,7 +86,7 @@ hash (register const char *str, register unsigned int len)
   return len + asso_values[(unsigned char)str[0]];
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__clang__)
 __inline
 #endif
 struct bs_xml_atom *
@@ -200,3 +205,5 @@ bs_xml_element (register const char *str, register unsigned int len)
 #define BS_XML_FUNCTION_ALIAS     12
 #define BS_XML_STRING_CONSTANT    13
 #define BS_XML_DEPENDS_ON         14
+
+#endif /* __BS_LEX_H_ */