diff --git a/EasyMapping/EKManagedObjectMapper.h b/EasyMapping/EKManagedObjectMapper.h
index 8642290..5bbda62 100644
--- a/EasyMapping/EKManagedObjectMapper.h
+++ b/EasyMapping/EKManagedObjectMapper.h
@@ -21,7 +21,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-@import CoreData;
+#import <CoreData/CoreData.h>
 #import "EKManagedObjectMapping.h"
 
 /**
diff --git a/EasyMapping/EKManagedObjectModel.h b/EasyMapping/EKManagedObjectModel.h
index 24a39d1..e929d6e 100644
--- a/EasyMapping/EKManagedObjectModel.h
+++ b/EasyMapping/EKManagedObjectModel.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 EasyKit. All rights reserved.
 //
 
-@import CoreData;
+#import <CoreData/CoreData.h>
 #import "EKMappingProtocol.h"
 
 /**
diff --git a/EasyMapping/EKMappingBlocks.h b/EasyMapping/EKMappingBlocks.h
index be036f1..30c002d 100644
--- a/EasyMapping/EKMappingBlocks.h
+++ b/EasyMapping/EKMappingBlocks.h
@@ -21,8 +21,8 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-@import Foundation;
-@import CoreData;
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
 
 typedef id(^EKMappingValueBlock)(NSString *key, id value);
 typedef id(^EKMappingReverseBlock)( id value);
diff --git a/EasyMapping/EKMappingProtocol.h b/EasyMapping/EKMappingProtocol.h
index 5aa0c32..97423d0 100644
--- a/EasyMapping/EKMappingProtocol.h
+++ b/EasyMapping/EKMappingProtocol.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 EasyKit. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "EKObjectMapping.h"
 #import "EKManagedObjectMapping.h"
 
diff --git a/EasyMapping/EKObjectModel.h b/EasyMapping/EKObjectModel.h
index 7144e30..bb1e042 100644
--- a/EasyMapping/EKObjectModel.h
+++ b/EasyMapping/EKObjectModel.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 EasyKit. All rights reserved.
 //
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 #import "EKMappingProtocol.h"
 
 /**
diff --git a/EasyMapping/EKSerializer.h b/EasyMapping/EKSerializer.h
index 3be6147..e2b4b4a 100644
--- a/EasyMapping/EKSerializer.h
+++ b/EasyMapping/EKSerializer.h
@@ -22,7 +22,6 @@
 // THE SOFTWARE.
 
 #import "EKObjectMapping.h"
-#import "EKSerializer.h"
 #import "EKManagedObjectMapping.h"
 
 /**
diff --git a/EasyMapping/EasyMapping.h b/EasyMapping/EasyMapping.h
index 00f8551..af0655b 100644
--- a/EasyMapping/EasyMapping.h
+++ b/EasyMapping/EasyMapping.h
@@ -21,12 +21,14 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-#import "EKMapper.h"
-#import "EKSerializer.h"
-#import "EKObjectMapping.h"
-#import "EKManagedObjectMapper.h"
-#import "EKManagedObjectMapping.h"
-#import "EKMappingBlocks.h"
-#import "EKObjectModel.h"
-#import "EKManagedObjectModel.h"
-#import "NSDateFormatter+EasyMappingAdditions.h"
+#import <EasyMapping/EKMapper.h>
+#import <EasyMapping/EKSerializer.h>
+#import <EasyMapping/EKObjectMapping.h>
+#import <EasyMapping/EKManagedObjectMapper.h>
+#import <EasyMapping/EKManagedObjectMapping.h>
+#import <EasyMapping/EKMappingBlocks.h>
+#import <EasyMapping/EKObjectModel.h>
+#import <EasyMapping/EKManagedObjectModel.h>
+#import <EasyMapping/EKMappingProtocol.h>
+#import <EasyMapping/EKPropertyMapping.h>
+#import <EasyMapping/NSDateFormatter+EasyMappingAdditions.h>
diff --git a/EasyMapping/NSDateFormatter+EasyMappingAdditions.h b/EasyMapping/NSDateFormatter+EasyMappingAdditions.h
index ef3fe9b..a87085e 100644
--- a/EasyMapping/NSDateFormatter+EasyMappingAdditions.h
+++ b/EasyMapping/NSDateFormatter+EasyMappingAdditions.h
@@ -23,7 +23,7 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-@import Foundation;
+#import <Foundation/Foundation.h>
 
 static NSString * const EKRFC_3339DatetimeFormat = @"yyyy-MM-dd'T'HH:mm:ss'Z'";
 static NSString * const EKRFC_822DatetimeFormat = @"EEE, dd MMM yyyy HH:mm:ss z";
diff --git a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj
index d27e669..118568f 100644
--- a/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj
+++ b/EasyMappingExample/EasyMappingExample.xcodeproj/project.pbxproj
@@ -84,14 +84,14 @@
 		9A2A382D1AEA5AB50021E97D /* EasyMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CF616F2B2770003759B /* EasyMapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A38341AEA607E0021E97D /* EKSerializer.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16D0016F2B2770003759B /* EKSerializer.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A38351AEA607E0021E97D /* EKManagedObjectMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA7CEBD191E555300608262 /* EKManagedObjectMapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9A2A38361AEA607E0021E97D /* EKCoreDataImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA7CEC9191E62A100608262 /* EKCoreDataImporter.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9A2A38361AEA607E0021E97D /* EKCoreDataImporter.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA7CEC9191E62A100608262 /* EKCoreDataImporter.h */; };
 		9A2A38371AEA607E0021E97D /* EKManagedObjectMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AE54FE2190BD91A003A3B56 /* EKManagedObjectMapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A38381AEA607E0021E97D /* EKMapper.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CF916F2B2770003759B /* EKMapper.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A38391AEA607E0021E97D /* EKObjectMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CFC16F2B2770003759B /* EKObjectMapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A383A1AEA607E0021E97D /* EKPropertyMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CF716F2B2770003759B /* EKPropertyMapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9A2A383B1AEA607E0021E97D /* EKRelationshipMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A170330194C820200682F00 /* EKRelationshipMapping.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9A2A383C1AEA607E0021E97D /* EKPropertyHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CFE16F2B2770003759B /* EKPropertyHelper.h */; settings = {ATTRIBUTES = (Public, ); }; };
-		9A2A383D1AEA607E0021E97D /* NSArray+FlattenArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA7CED5191FCFFE00608262 /* NSArray+FlattenArray.h */; settings = {ATTRIBUTES = (Public, ); }; };
+		9A2A383B1AEA607E0021E97D /* EKRelationshipMapping.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A170330194C820200682F00 /* EKRelationshipMapping.h */; };
+		9A2A383C1AEA607E0021E97D /* EKPropertyHelper.h in Headers */ = {isa = PBXBuildFile; fileRef = A9D16CFE16F2B2770003759B /* EKPropertyHelper.h */; };
+		9A2A383D1AEA607E0021E97D /* NSArray+FlattenArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AA7CED5191FCFFE00608262 /* NSArray+FlattenArray.h */; };
 		9A2A383E1AEA607E0021E97D /* EKObjectModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A8420E01957164E006DDDE3 /* EKObjectModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A383F1AEA607E0021E97D /* EKManagedObjectModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A8420E6195718A2006DDDE3 /* EKManagedObjectModel.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		9A2A38401AEA607E0021E97D /* NSDateFormatter+EasyMappingAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A53E2D81A7E536600C4D169 /* NSDateFormatter+EasyMappingAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -1040,19 +1040,19 @@
 				9A2A382C1AEA5AA10021E97D /* EasyMapping.h in Headers */,
 				9A2A38341AEA607E0021E97D /* EKSerializer.h in Headers */,
 				9A2A38351AEA607E0021E97D /* EKManagedObjectMapper.h in Headers */,
-				9A2A38361AEA607E0021E97D /* EKCoreDataImporter.h in Headers */,
 				9A2A38371AEA607E0021E97D /* EKManagedObjectMapping.h in Headers */,
 				9A2A38381AEA607E0021E97D /* EKMapper.h in Headers */,
 				9A2A38391AEA607E0021E97D /* EKObjectMapping.h in Headers */,
-				9A2A383A1AEA607E0021E97D /* EKPropertyMapping.h in Headers */,
-				9A2A383B1AEA607E0021E97D /* EKRelationshipMapping.h in Headers */,
-				9A2A383C1AEA607E0021E97D /* EKPropertyHelper.h in Headers */,
-				9A2A383D1AEA607E0021E97D /* NSArray+FlattenArray.h in Headers */,
 				9A2A383E1AEA607E0021E97D /* EKObjectModel.h in Headers */,
 				9A2A383F1AEA607E0021E97D /* EKManagedObjectModel.h in Headers */,
 				9A2A38401AEA607E0021E97D /* NSDateFormatter+EasyMappingAdditions.h in Headers */,
+				9A2A383A1AEA607E0021E97D /* EKPropertyMapping.h in Headers */,
 				9A2A38411AEA607E0021E97D /* EKMappingBlocks.h in Headers */,
 				9A2A38421AEA607F0021E97D /* EKMappingProtocol.h in Headers */,
+				9A2A383D1AEA607E0021E97D /* NSArray+FlattenArray.h in Headers */,
+				9A2A38361AEA607E0021E97D /* EKCoreDataImporter.h in Headers */,
+				9A2A383C1AEA607E0021E97D /* EKPropertyHelper.h in Headers */,
+				9A2A383B1AEA607E0021E97D /* EKRelationshipMapping.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};