diff --git a/Classes-MacOSX/UI/GHTestOutlineViewModel.h b/Classes-MacOSX/UI/GHTestOutlineViewModel.h
index 4f29e285..807ab556 100644
--- a/Classes-MacOSX/UI/GHTestOutlineViewModel.h
+++ b/Classes-MacOSX/UI/GHTestOutlineViewModel.h
@@ -6,6 +6,7 @@
 //  Copyright 2009. All rights reserved.
 //
 
+#import <Cocoa/Cocoa.h>
 #import "GHTestViewModel.h"
 @class GHTestOutlineViewModel;
 
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/GHUnit b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/GHUnit
index 48a67875..72aa1f4a 100755
Binary files a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/GHUnit and b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/GHUnit differ
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHNSLocale+Mock.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHNSLocale+Mock.h
index 5d58be94..9bf495e0 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHNSLocale+Mock.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHNSLocale+Mock.h
@@ -29,6 +29,8 @@
 
 //! @cond DEV
 
+#import <Foundation/Foundation.h>
+
 /*!
  Category for overriding the current locale at runtime.
 
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTest.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTest.h
index 657de0bb..fd95ca20 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTest.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTest.h
@@ -29,6 +29,9 @@
 
 //! @cond DEV
 
+#import <Foundation/Foundation.h>
+
+
 /*!
  Test status.
  */
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestMacros.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestMacros.h
index 2d5d313f..ec0daeae 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestMacros.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestMacros.h
@@ -82,6 +82,8 @@
  @brief Assert macros for testing.
  */
 
+#import <Foundation/Foundation.h>
+
 #import "NSException+GHTestFailureExceptions.h"
 #import "NSValue+GHValueFormatter.h"
 
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestOutlineViewModel.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestOutlineViewModel.h
index 4f29e285..807ab556 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestOutlineViewModel.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestOutlineViewModel.h
@@ -6,6 +6,7 @@
 //  Copyright 2009. All rights reserved.
 //
 
+#import <Cocoa/Cocoa.h>
 #import "GHTestViewModel.h"
 @class GHTestOutlineViewModel;
 
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestViewModel.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestViewModel.h
index d39c27b2..4abf05e7 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestViewModel.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTestViewModel.h
@@ -30,6 +30,8 @@
 //! @cond DEV
 
 #import "GHTestGroup.h"
+#import "GHTestSuite.h"
+#import "GHTestRunner.h"
 
 @class GHTestNode;
 
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTesting.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTesting.h
index 85449757..947dae46 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTesting.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHTesting.h
@@ -48,6 +48,9 @@
 //  the License.
 //
 
+#import <Foundation/Foundation.h>
+#import "GHUnit.h"
+
 #ifdef __cplusplus
 extern "C" NSString *GHUStackTraceFromException(NSException *e);
 #else
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHUnit.h b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHUnit.h
index c0254e7c..afcb2da2 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHUnit.h
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Headers/GHUnit.h
@@ -114,7 +114,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
  - In the "Tests" target, Build Settings, under 'Framework Search Paths' make sure the (parent) directory to GHUnitIOS.framework is listed.
  - In the "Tests" target, Build Settigns, under 'Other Linker Flags' in the "Tests" target, add <tt>-ObjC</tt> and <tt>-all_load</tt>
  - By default, the Tests-Info.plist file includes <tt>MainWindow_iPhone</tt> and <tt>MainWindow_iPad</tt> for <tt>Main nib file base name</tt>. You should remove both these fields.
- - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-IPhone/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target. You should delete the existing main.m file (or replace the contents of the existing main.m with GHUnitIOSTestMain.m).
+ - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-iOS/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target. You should delete the existing main.m file (or replace the contents of the existing main.m with GHUnitIOSTestMain.m).
  - @ref Examples "Create a test"
  - Build and run the "Tests" target.
  - You can remove the files: TestsAppDelete* and MainWindow* that were generated with the Tests target.
@@ -132,7 +132,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
  - In Build Settings, under 'Framework Search Paths' make sure the (parent) directory to GHUnitIOS.framework is listed.
  - In Build Settings, under 'Other Linker Flags' in the <tt>Tests</tt> target, add <tt>-ObjC</tt> and <tt>-all_load</tt>
  - By default, the Tests-Info.plist file includes <tt>MainWindow</tt> for <tt>Main nib file base name</tt>. You should clear this field.
- - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-IPhone/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target.
+ - Add the GHUnitIOSTestMain.m (http://github.com/gabriel/gh-unit/blob/master/Project-iOS/GHUnitIOSTestMain.m) file into your project and make sure its enabled for the "Tests" target.
  - (Optional) Create and and set a prefix header (<tt>Tests_Prefix.pch</tt>) and add <tt>#import <GHUnitIOS/GHUnit.h></tt> to it, and then you won't have to include that import for every test.
  - @ref Examples "Create a test"
  - Build and run the "Tests" target.
@@ -199,7 +199,7 @@ fputs([[[NSString stringWithFormat:fmt, ##__VA_ARGS__] stringByAppendingString:@
 /*!
  @page Building Building
  
- For iOS, run <tt>make</tt> from within the <tt>Project-IPhone</tt> directory. The framework is in <tt>Project-IPhone/build/Framework/</tt>.
+ For iOS, run <tt>make</tt> from within the <tt>Project-iOS</tt> directory. The framework is in <tt>Project-iOS/build/Framework/</tt>.
  
  For Mac OS X, the framework build is stored in <tt>Project/build/Release/</tt>.
  */
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestApp.nib b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestApp.nib
index 89c4c1ec..e64efc88 100644
Binary files a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestApp.nib and b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestApp.nib differ
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestView.nib b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestView.nib
index ec4b376d..3c724ba2 100644
Binary files a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestView.nib and b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestView.nib differ
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestWindow.nib b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestWindow.nib
index 7c747d44..4a3a5ba1 100644
Binary files a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestWindow.nib and b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/GHTestWindow.nib differ
diff --git a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/Info.plist b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/Info.plist
index 421824e9..8d8dc98e 100644
--- a/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/Info.plist
+++ b/Examples/MyTestable-MacOSX/Frameworks/GHUnit.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>10J4138</string>
+	<string>10K540</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleExecutable</key>
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.4.29</string>
+	<string>0.4.30</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
diff --git a/Project-MacOSX/GHUnitMacOSX.xcodeproj/project.pbxproj b/Project-MacOSX/GHUnitMacOSX.xcodeproj/project.pbxproj
index 843df193..7d4184b1 100644
--- a/Project-MacOSX/GHUnitMacOSX.xcodeproj/project.pbxproj
+++ b/Project-MacOSX/GHUnitMacOSX.xcodeproj/project.pbxproj
@@ -9,6 +9,9 @@
 /* Begin PBXBuildFile section */
 		00271A3813C28D1F00B06B98 /* GHUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0083D08613BCFDDB00F71F21 /* GHUnit.framework */; };
 		00271A3913C294F800B06B98 /* GHUnitTestMain.m in Sources */ = {isa = PBXBuildFile; fileRef = 0083D0DC13BCFE1700F71F21 /* GHUnitTestMain.m */; };
+		004E186E13C518C1007D842B /* GTMGarbageCollection.h in Headers */ = {isa = PBXBuildFile; fileRef = 004E186B13C518C1007D842B /* GTMGarbageCollection.h */; };
+		004E186F13C518C1007D842B /* GTMNSString+XML.h in Headers */ = {isa = PBXBuildFile; fileRef = 004E186C13C518C1007D842B /* GTMNSString+XML.h */; };
+		004E187013C518C1007D842B /* GTMNSString+XML.m in Sources */ = {isa = PBXBuildFile; fileRef = 004E186D13C518C1007D842B /* GTMNSString+XML.m */; };
 		0083D08A13BCFDDB00F71F21 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0083D08913BCFDDB00F71F21 /* Cocoa.framework */; };
 		0083D09413BCFDDB00F71F21 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0083D09213BCFDDB00F71F21 /* InfoPlist.strings */; };
 		0083D0EA13BCFE1700F71F21 /* GHAsyncTestCase.h in Headers */ = {isa = PBXBuildFile; fileRef = 0083D0B413BCFE1700F71F21 /* GHAsyncTestCase.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -120,6 +123,9 @@
 
 /* Begin PBXFileReference section */
 		00271A3A13C2965200B06B98 /* RunTests.sh */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = RunTests.sh; path = ../../Scripts/RunTests.sh; sourceTree = "<group>"; };
+		004E186B13C518C1007D842B /* GTMGarbageCollection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTMGarbageCollection.h; sourceTree = "<group>"; };
+		004E186C13C518C1007D842B /* GTMNSString+XML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GTMNSString+XML.h"; sourceTree = "<group>"; };
+		004E186D13C518C1007D842B /* GTMNSString+XML.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "GTMNSString+XML.m"; sourceTree = "<group>"; };
 		0083D08613BCFDDB00F71F21 /* GHUnit.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = GHUnit.framework; sourceTree = BUILT_PRODUCTS_DIR; };
 		0083D08913BCFDDB00F71F21 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		0083D08C13BCFDDB00F71F21 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -127,7 +133,6 @@
 		0083D08E13BCFDDB00F71F21 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		0083D09113BCFDDB00F71F21 /* GHUnitMacOSX-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "GHUnitMacOSX-Info.plist"; sourceTree = "<group>"; };
 		0083D09313BCFDDB00F71F21 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		0083D09513BCFDDB00F71F21 /* GHUnitMacOSX-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "GHUnitMacOSX-Prefix.pch"; sourceTree = "<group>"; };
 		0083D0B413BCFE1700F71F21 /* GHAsyncTestCase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GHAsyncTestCase.h; sourceTree = "<group>"; };
 		0083D0B513BCFE1700F71F21 /* GHAsyncTestCase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GHAsyncTestCase.m; sourceTree = "<group>"; };
 		0083D0B713BCFE1700F71F21 /* GHTest+JUnitXML.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "GHTest+JUnitXML.h"; sourceTree = "<group>"; };
@@ -299,7 +304,6 @@
 				0083D19513C28B8700F71F21 /* GTM */,
 				0083D09113BCFDDB00F71F21 /* GHUnitMacOSX-Info.plist */,
 				0083D09213BCFDDB00F71F21 /* InfoPlist.strings */,
-				0083D09513BCFDDB00F71F21 /* GHUnitMacOSX-Prefix.pch */,
 			);
 			name = "Supporting Files";
 			sourceTree = "<group>";
@@ -503,6 +507,9 @@
 		0083D19613C28B8700F71F21 /* Foundation */ = {
 			isa = PBXGroup;
 			children = (
+				004E186B13C518C1007D842B /* GTMGarbageCollection.h */,
+				004E186C13C518C1007D842B /* GTMNSString+XML.h */,
+				004E186D13C518C1007D842B /* GTMNSString+XML.m */,
 				0083D19713C28B8700F71F21 /* GTMObjC2Runtime.h */,
 				0083D19813C28B8700F71F21 /* GTMObjC2Runtime.m */,
 				0083D19913C28B8700F71F21 /* GTMStackTrace.h */,
@@ -547,6 +554,8 @@
 				0083D1A213C28B8700F71F21 /* GTMObjC2Runtime.h in Headers */,
 				0083D1A413C28B8700F71F21 /* GTMStackTrace.h in Headers */,
 				0083D1A613C28B8700F71F21 /* GTMDefines.h in Headers */,
+				004E186E13C518C1007D842B /* GTMGarbageCollection.h in Headers */,
+				004E186F13C518C1007D842B /* GTMNSString+XML.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -685,6 +694,7 @@
 				0083D1A113C28B8700F71F21 /* GHNSObject+Invocation.m in Sources */,
 				0083D1A313C28B8700F71F21 /* GTMObjC2Runtime.m in Sources */,
 				0083D1A513C28B8700F71F21 /* GTMStackTrace.m in Sources */,
+				004E187013C518C1007D842B /* GTMNSString+XML.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -782,8 +792,6 @@
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "GHUnitMacOSX/GHUnitMacOSX-Prefix.pch";
 				INFOPLIST_FILE = "GHUnitMacOSX/GHUnitMacOSX-Info.plist";
 				PRODUCT_NAME = GHUnit;
 				WRAPPER_EXTENSION = framework;
@@ -797,8 +805,6 @@
 				COPY_PHASE_STRIP = YES;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "GHUnitMacOSX/GHUnitMacOSX-Prefix.pch";
 				INFOPLIST_FILE = "GHUnitMacOSX/GHUnitMacOSX-Info.plist";
 				PRODUCT_NAME = GHUnit;
 				WRAPPER_EXTENSION = framework;
diff --git a/Project-MacOSX/GHUnitMacOSX/GHUnitMacOSX-Prefix.pch b/Project-MacOSX/GHUnitMacOSX/GHUnitMacOSX-Prefix.pch
deleted file mode 100644
index e9a3f235..00000000
--- a/Project-MacOSX/GHUnitMacOSX/GHUnitMacOSX-Prefix.pch
+++ /dev/null
@@ -1,14 +0,0 @@
-//
-// Prefix header for all source files of the 'GHUnitMacOSX' target in the 'GHUnitMacOSX' project
-//
-
-#ifdef __OBJC__
-  #import <Cocoa/Cocoa.h>
-  
-  // GHKit Dependencies
-  #import "GHNSInvocation+Utils.h"
-  #import "GHNSObject+Invocation.h"
-
-  #import "GHUnit.h"
-
-#endif
diff --git a/XcodeConfig/GHUnit.xcconfig b/XcodeConfig/GHUnit.xcconfig
index a3a370cc..04f5adcc 100644
--- a/XcodeConfig/GHUnit.xcconfig
+++ b/XcodeConfig/GHUnit.xcconfig
@@ -11,5 +11,3 @@ INFOPLIST_FILE = Info.plist
 PRODUCT_NAME = GHUnit
 WRAPPER_EXTENSION = framework
 GCC_ENABLE_OBJC_GC = supported
-GCC_PRECOMPILE_PREFIX_HEADER = YES
-GCC_PREFIX_HEADER = GHUnit_Prefix.pch