diff --git a/Expecta.xcodeproj/project.pbxproj b/Expecta.xcodeproj/project.pbxproj
index 2b4db0c..dbf9f0b 100644
--- a/Expecta.xcodeproj/project.pbxproj
+++ b/Expecta.xcodeproj/project.pbxproj
@@ -1216,7 +1216,7 @@
 			attributes = {
 				CLASSPREFIX = EXP;
 				LastTestingUpgradeCheck = 0630;
-				LastUpgradeCheck = 1010;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Peter Jihoon Kim";
 				TargetAttributes = {
 					908379101A8B9660009844DA = {
@@ -1232,6 +1232,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = E9ACDF0113B2DD520010F4D7;
@@ -1992,6 +1993,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2191,6 +2193,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
@@ -2238,6 +2241,7 @@
 				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
 				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
 				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
 				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
 				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
index 92f6b24..63a2f2a 100644
--- a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
+++ b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379101A8B9660009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta-iOS"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "908379101A8B9660009844DA"
-            BuildableName = "Expecta.framework"
-            BlueprintName = "Expecta-iOS"
-            ReferencedContainer = "container:Expecta.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Expecta.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
index f650b50..cd2cb8d 100644
--- a/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
+++ b/Expecta.xcodeproj/xcshareddata/xcschemes/Expecta.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "908379781A8B972C009844DA"
+            BuildableName = "Expecta.framework"
+            BlueprintName = "Expecta"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "908379781A8B972C009844DA"
-            BuildableName = "Expecta.framework"
-            BlueprintName = "Expecta"
-            ReferencedContainer = "container:Expecta.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -70,8 +68,6 @@
             ReferencedContainer = "container:Expecta.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme
index 957ec26..53a72e2 100644
--- a/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme
+++ b/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -39,8 +39,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:Expecta.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme b/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme
index 3475c95..94cc3a0 100644
--- a/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme
+++ b/Expecta.xcodeproj/xcshareddata/xcschemes/libExpecta.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1010"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -41,6 +41,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
+            BuildableName = "libExpecta.a"
+            BlueprintName = "libExpecta"
+            ReferencedContainer = "container:Expecta.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -53,17 +62,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E9ACDF0B13B2DD520010F4D7"
-            BuildableName = "libExpecta.a"
-            BlueprintName = "libExpecta"
-            ReferencedContainer = "container:Expecta.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -84,8 +82,6 @@
             ReferencedContainer = "container:Expecta.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/Expecta/EXPBlockDefinedMatcher.h b/Expecta/EXPBlockDefinedMatcher.h
index 58b1282..2042302 100644
--- a/Expecta/EXPBlockDefinedMatcher.h
+++ b/Expecta/EXPBlockDefinedMatcher.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "EXPMatcher.h"
-#import "EXPDefines.h"
+#import <Expecta/EXPMatcher.h>
+#import <Expecta/EXPDefines.h>
 
 @interface EXPBlockDefinedMatcher : NSObject <EXPMatcher> {
   EXPBoolBlock prerequisiteBlock;
diff --git a/Expecta/EXPExpect.h b/Expecta/EXPExpect.h
index 985c120..e449f3a 100644
--- a/Expecta/EXPExpect.h
+++ b/Expecta/EXPExpect.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
-#import "EXPMatcher.h"
-#import "EXPDefines.h"
+#import <Expecta/EXPMatcher.h>
+#import <Expecta/EXPDefines.h>
 
 @interface EXPExpect : NSObject {
   EXPIdBlock _actualBlock;
diff --git a/Expecta/ExpectaSupport.h b/Expecta/ExpectaSupport.h
index 28fc5e0..ea7f38a 100644
--- a/Expecta/ExpectaSupport.h
+++ b/Expecta/ExpectaSupport.h
@@ -1,5 +1,5 @@
-#import "EXPExpect.h"
-#import "EXPBlockDefinedMatcher.h"
+#import <Expecta/EXPExpect.h>
+#import <Expecta/EXPBlockDefinedMatcher.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/Expecta/Matchers/EXPMatchers+beCloseTo.h b/Expecta/Matchers/EXPMatchers+beCloseTo.h
index f683d6b..db5580f 100644
--- a/Expecta/Matchers/EXPMatchers+beCloseTo.h
+++ b/Expecta/Matchers/EXPMatchers+beCloseTo.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beCloseToWithin, (id expected, id within));
 EXPMatcherInterface(beCloseToWithin, (id expected, id within));
diff --git a/Expecta/Matchers/EXPMatchers+beFalsy.h b/Expecta/Matchers/EXPMatchers+beFalsy.h
index 89c8e00..dcc38d7 100644
--- a/Expecta/Matchers/EXPMatchers+beFalsy.h
+++ b/Expecta/Matchers/EXPMatchers+beFalsy.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beFalsy, (void));
diff --git a/Expecta/Matchers/EXPMatchers+beGreaterThan.h b/Expecta/Matchers/EXPMatchers+beGreaterThan.h
index a2f9fba..e6f5f6c 100644
--- a/Expecta/Matchers/EXPMatchers+beGreaterThan.h
+++ b/Expecta/Matchers/EXPMatchers+beGreaterThan.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beGreaterThan, (id expected));
 EXPMatcherInterface(beGreaterThan, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h b/Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h
index 3e91c64..cedfb89 100644
--- a/Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h
+++ b/Expecta/Matchers/EXPMatchers+beGreaterThanOrEqualTo.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beGreaterThanOrEqualTo, (id expected));
 EXPMatcherInterface(beGreaterThanOrEqualTo, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+beIdenticalTo.h b/Expecta/Matchers/EXPMatchers+beIdenticalTo.h
index d13619f..5a3c076 100644
--- a/Expecta/Matchers/EXPMatchers+beIdenticalTo.h
+++ b/Expecta/Matchers/EXPMatchers+beIdenticalTo.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beIdenticalTo, (void *expected));
 EXPMatcherInterface(beIdenticalTo, (void *expected)); // to aid code completion
diff --git a/Expecta/Matchers/EXPMatchers+beInTheRangeOf.h b/Expecta/Matchers/EXPMatchers+beInTheRangeOf.h
index 8ea990e..a08b381 100644
--- a/Expecta/Matchers/EXPMatchers+beInTheRangeOf.h
+++ b/Expecta/Matchers/EXPMatchers+beInTheRangeOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beInTheRangeOf, (id expectedLowerBound, id expectedUpperBound));
 EXPMatcherInterface(beInTheRangeOf, (id expectedLowerBound, id expectedUpperBound));
diff --git a/Expecta/Matchers/EXPMatchers+beInstanceOf.h b/Expecta/Matchers/EXPMatchers+beInstanceOf.h
index a8e8175..ce66451 100644
--- a/Expecta/Matchers/EXPMatchers+beInstanceOf.h
+++ b/Expecta/Matchers/EXPMatchers+beInstanceOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beInstanceOf,   (Class expected));
 EXPMatcherInterface(beAnInstanceOf, (Class expected));
diff --git a/Expecta/Matchers/EXPMatchers+beKindOf.h b/Expecta/Matchers/EXPMatchers+beKindOf.h
index b8623e0..277f971 100644
--- a/Expecta/Matchers/EXPMatchers+beKindOf.h
+++ b/Expecta/Matchers/EXPMatchers+beKindOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beKindOf,  (Class expected));
 EXPMatcherInterface(beAKindOf, (Class expected));
diff --git a/Expecta/Matchers/EXPMatchers+beLessThan.h b/Expecta/Matchers/EXPMatchers+beLessThan.h
index 5ed0a24..5544b91 100644
--- a/Expecta/Matchers/EXPMatchers+beLessThan.h
+++ b/Expecta/Matchers/EXPMatchers+beLessThan.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beLessThan, (id expected));
 EXPMatcherInterface(beLessThan, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h b/Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h
index 2c31341..6356a24 100644
--- a/Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h
+++ b/Expecta/Matchers/EXPMatchers+beLessThanOrEqualTo.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_beLessThanOrEqualTo, (id expected));
 EXPMatcherInterface(beLessThanOrEqualTo, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+beNil.h b/Expecta/Matchers/EXPMatchers+beNil.h
index 6d78162..4e668ca 100644
--- a/Expecta/Matchers/EXPMatchers+beNil.h
+++ b/Expecta/Matchers/EXPMatchers+beNil.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beNil, (void));
 EXPMatcherInterface(beNull, (void));
diff --git a/Expecta/Matchers/EXPMatchers+beSubclassOf.h b/Expecta/Matchers/EXPMatchers+beSubclassOf.h
index 65401c5..72187db 100644
--- a/Expecta/Matchers/EXPMatchers+beSubclassOf.h
+++ b/Expecta/Matchers/EXPMatchers+beSubclassOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beSubclassOf,  (Class expected));
 EXPMatcherInterface(beASubclassOf, (Class expected));
diff --git a/Expecta/Matchers/EXPMatchers+beSupersetOf.h b/Expecta/Matchers/EXPMatchers+beSupersetOf.h
index f9a47ba..bc0e6df 100644
--- a/Expecta/Matchers/EXPMatchers+beSupersetOf.h
+++ b/Expecta/Matchers/EXPMatchers+beSupersetOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beSupersetOf, (id subset));
 
diff --git a/Expecta/Matchers/EXPMatchers+beTruthy.h b/Expecta/Matchers/EXPMatchers+beTruthy.h
index 1e4e78f..6658f03 100644
--- a/Expecta/Matchers/EXPMatchers+beTruthy.h
+++ b/Expecta/Matchers/EXPMatchers+beTruthy.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beTruthy, (void));
diff --git a/Expecta/Matchers/EXPMatchers+beginWith.h b/Expecta/Matchers/EXPMatchers+beginWith.h
index 07ddd6c..8baa537 100644
--- a/Expecta/Matchers/EXPMatchers+beginWith.h
+++ b/Expecta/Matchers/EXPMatchers+beginWith.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(beginWith, (id expected));
 EXPMatcherInterface(startWith, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+conformTo.h b/Expecta/Matchers/EXPMatchers+conformTo.h
index efc7b98..3bb8c81 100644
--- a/Expecta/Matchers/EXPMatchers+conformTo.h
+++ b/Expecta/Matchers/EXPMatchers+conformTo.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(conformTo, (Protocol *expected));
diff --git a/Expecta/Matchers/EXPMatchers+contain.h b/Expecta/Matchers/EXPMatchers+contain.h
index 5803146..9bbe8cd 100644
--- a/Expecta/Matchers/EXPMatchers+contain.h
+++ b/Expecta/Matchers/EXPMatchers+contain.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_contain, (id expected));
 EXPMatcherInterface(contain, (id expected)); // to aid code completion
diff --git a/Expecta/Matchers/EXPMatchers+endWith.h b/Expecta/Matchers/EXPMatchers+endWith.h
index 228cea9..ba7b330 100644
--- a/Expecta/Matchers/EXPMatchers+endWith.h
+++ b/Expecta/Matchers/EXPMatchers+endWith.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(endWith, (id expected));
diff --git a/Expecta/Matchers/EXPMatchers+equal.h b/Expecta/Matchers/EXPMatchers+equal.h
index b4047c0..137731d 100644
--- a/Expecta/Matchers/EXPMatchers+equal.h
+++ b/Expecta/Matchers/EXPMatchers+equal.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(_equal, (id expected));
 EXPMatcherInterface(equal, (id expected)); // to aid code completion
diff --git a/Expecta/Matchers/EXPMatchers+haveCountOf.h b/Expecta/Matchers/EXPMatchers+haveCountOf.h
index 2e9aef5..c5f2e8b 100644
--- a/Expecta/Matchers/EXPMatchers+haveCountOf.h
+++ b/Expecta/Matchers/EXPMatchers+haveCountOf.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(haveCountOf,   (NSUInteger expected));
 EXPMatcherInterface(haveCount,     (NSUInteger expected));
diff --git a/Expecta/Matchers/EXPMatchers+match.h b/Expecta/Matchers/EXPMatchers+match.h
index 4f0e8e4..e6b43c1 100644
--- a/Expecta/Matchers/EXPMatchers+match.h
+++ b/Expecta/Matchers/EXPMatchers+match.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(match, (NSString *expected));
diff --git a/Expecta/Matchers/EXPMatchers+postNotification.h b/Expecta/Matchers/EXPMatchers+postNotification.h
index cdba4a3..04a0ef3 100644
--- a/Expecta/Matchers/EXPMatchers+postNotification.h
+++ b/Expecta/Matchers/EXPMatchers+postNotification.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(postNotification, (id expectedNotification));
 EXPMatcherInterface(notify, (id expectedNotification));
diff --git a/Expecta/Matchers/EXPMatchers+raise.h b/Expecta/Matchers/EXPMatchers+raise.h
index 1f7fae0..dfaee88 100644
--- a/Expecta/Matchers/EXPMatchers+raise.h
+++ b/Expecta/Matchers/EXPMatchers+raise.h
@@ -1,4 +1,4 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(raise, (NSString *expectedExceptionName));
 #define raiseAny() raise(nil)
diff --git a/Expecta/Matchers/EXPMatchers+raiseWithReason.h b/Expecta/Matchers/EXPMatchers+raiseWithReason.h
index 2cf5a5d..b35be47 100644
--- a/Expecta/Matchers/EXPMatchers+raiseWithReason.h
+++ b/Expecta/Matchers/EXPMatchers+raiseWithReason.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(raiseWithReason, (NSString *expectedExceptionName, NSString *expectedReason));
diff --git a/Expecta/Matchers/EXPMatchers+respondTo.h b/Expecta/Matchers/EXPMatchers+respondTo.h
index 279131d..b420593 100644
--- a/Expecta/Matchers/EXPMatchers+respondTo.h
+++ b/Expecta/Matchers/EXPMatchers+respondTo.h
@@ -1,3 +1,3 @@
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 
 EXPMatcherInterface(respondTo, (SEL expected));
diff --git a/Expecta/Matchers/EXPMatchers.h b/Expecta/Matchers/EXPMatchers.h
index ed6ef85..79c7e8f 100644
--- a/Expecta/Matchers/EXPMatchers.h
+++ b/Expecta/Matchers/EXPMatchers.h
@@ -1,25 +1,25 @@
-#import "EXPMatchers+beNil.h"
-#import "EXPMatchers+equal.h"
-#import "EXPMatchers+beInstanceOf.h"
-#import "EXPMatchers+beKindOf.h"
-#import "EXPMatchers+beSubclassOf.h"
-#import "EXPMatchers+conformTo.h"
-#import "EXPMatchers+beTruthy.h"
-#import "EXPMatchers+beFalsy.h"
-#import "EXPMatchers+contain.h"
-#import "EXPMatchers+beSupersetOf.h"
-#import "EXPMatchers+haveCountOf.h"
-#import "EXPMatchers+beIdenticalTo.h"
-#import "EXPMatchers+beGreaterThan.h"
-#import "EXPMatchers+beGreaterThanOrEqualTo.h"
-#import "EXPMatchers+beLessThan.h"
-#import "EXPMatchers+beLessThanOrEqualTo.h"
-#import "EXPMatchers+beInTheRangeOf.h"
-#import "EXPMatchers+beCloseTo.h"
-#import "EXPMatchers+raise.h"
-#import "EXPMatchers+raiseWithReason.h"
-#import "EXPMatchers+respondTo.h"
-#import "EXPMatchers+postNotification.h"
-#import "EXPMatchers+beginWith.h"
-#import "EXPMatchers+endWith.h"
-#import "EXPMatchers+match.h"
+#import <Expecta/EXPMatchers+beNil.h>
+#import <Expecta/EXPMatchers+equal.h>
+#import <Expecta/EXPMatchers+beInstanceOf.h>
+#import <Expecta/EXPMatchers+beKindOf.h>
+#import <Expecta/EXPMatchers+beSubclassOf.h>
+#import <Expecta/EXPMatchers+conformTo.h>
+#import <Expecta/EXPMatchers+beTruthy.h>
+#import <Expecta/EXPMatchers+beFalsy.h>
+#import <Expecta/EXPMatchers+contain.h>
+#import <Expecta/EXPMatchers+beSupersetOf.h>
+#import <Expecta/EXPMatchers+haveCountOf.h>
+#import <Expecta/EXPMatchers+beIdenticalTo.h>
+#import <Expecta/EXPMatchers+beGreaterThan.h>
+#import <Expecta/EXPMatchers+beGreaterThanOrEqualTo.h>
+#import <Expecta/EXPMatchers+beLessThan.h>
+#import <Expecta/EXPMatchers+beLessThanOrEqualTo.h>
+#import <Expecta/EXPMatchers+beInTheRangeOf.h>
+#import <Expecta/EXPMatchers+beCloseTo.h>
+#import <Expecta/EXPMatchers+raise.h>
+#import <Expecta/EXPMatchers+raiseWithReason.h>
+#import <Expecta/EXPMatchers+respondTo.h>
+#import <Expecta/EXPMatchers+postNotification.h>
+#import <Expecta/EXPMatchers+beginWith.h>
+#import <Expecta/EXPMatchers+endWith.h>
+#import <Expecta/EXPMatchers+match.h>
diff --git a/Tests/Helpers/TestHelper.h b/Tests/Helpers/TestHelper.h
index 5ef3e23..06484a9 100644
--- a/Tests/Helpers/TestHelper.h
+++ b/Tests/Helpers/TestHelper.h
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <XCTest/XCTest.h>
 #define EXP_SHORTHAND
-#import "Expecta.h"
+#import <Expecta/Expecta.h>
 #import "FakeTestCase.h"
 #import "EXPExpect+Test.h"
 #import "Fixtures.h"