diff --git a/MiscMerge/FoundationAdditions.m b/MiscMerge/FoundationAdditions.m
index 05a88cd9..77ba7269 100644
--- a/MiscMerge/FoundationAdditions.m
+++ b/MiscMerge/FoundationAdditions.m
@@ -30,7 +30,7 @@
  */
 
 #import "FoundationAdditions.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "NSString+MiscAdditions.h"
 
 
diff --git a/MiscMerge/MiscMergeExpression.h b/MiscMerge/MiscMergeExpression.h
index e354666d..b8658424 100755
--- a/MiscMerge/MiscMergeExpression.h
+++ b/MiscMerge/MiscMergeExpression.h
@@ -14,7 +14,7 @@
 //	for a list of all applicable permissions and restrictions.
 //
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 @class MiscMergeEngine;
 
diff --git a/MiscMerge/_MiscMergeDebugCommand.m b/MiscMerge/_MiscMergeDebugCommand.m
index f59af187..77be4bf9 100755
--- a/MiscMerge/_MiscMergeDebugCommand.m
+++ b/MiscMerge/_MiscMergeDebugCommand.m
@@ -15,7 +15,7 @@
 //
 
 #import "_MiscMergeDebugCommand.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "NSString+MiscAdditions.h"
 #import "NSScanner+MiscMerge.h"
 
diff --git a/MiscMerge/_MiscMergeProcedureCommand.m b/MiscMerge/_MiscMergeProcedureCommand.m
index 44f1bacd..c7f06fd6 100755
--- a/MiscMerge/_MiscMergeProcedureCommand.m
+++ b/MiscMerge/_MiscMergeProcedureCommand.m
@@ -15,7 +15,7 @@
 //	
 
 #import "_MiscMergeProcedureCommand.h"
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import "MiscMergeEngine.h"
 #import "MiscMergeTemplate.h"
 #import "MiscMergeCommandBlock.h"
diff --git a/ddcli/DDCliParseException.h b/ddcli/DDCliParseException.h
index 603cf728..3d118c52 100644
--- a/ddcli/DDCliParseException.h
+++ b/ddcli/DDCliParseException.h
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 
 /**
diff --git a/ddcli/DDCliUtil.h b/ddcli/DDCliUtil.h
index de513f98..d35a5c20 100644
--- a/ddcli/DDCliUtil.h
+++ b/ddcli/DDCliUtil.h
@@ -22,7 +22,7 @@
  * SOFTWARE.
  */
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 /**
  * @ingroup functions
diff --git a/ddcli/DDCommandLineInterface.h b/ddcli/DDCommandLineInterface.h
index 66e88277..a504d626 100644
--- a/ddcli/DDCommandLineInterface.h
+++ b/ddcli/DDCommandLineInterface.h
@@ -23,7 +23,7 @@
  */
 
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 #import <sysexits.h>
 
 #import "DDGetoptLongParser.h"
diff --git a/mogenerator.h b/mogenerator.h
index 1b9d4398..555b3009 100644
--- a/mogenerator.h
+++ b/mogenerator.h
@@ -3,8 +3,8 @@
 //   Some rights reserved: http://opensource.org/licenses/mit
 //   http://github.com/rentzsch/mogenerator
 
-#import <Foundation/Foundation.h>
-#import <CoreData/CoreData.h>
+@import Foundation;
+@import CoreData;
 
 #import "MiscMergeTemplate.h"
 #import "MiscMergeCommandBlock.h"
diff --git a/mogenerator.xcodeproj/project.pbxproj b/mogenerator.xcodeproj/project.pbxproj
index 61695a58..28a10cbd 100644
--- a/mogenerator.xcodeproj/project.pbxproj
+++ b/mogenerator.xcodeproj/project.pbxproj
@@ -518,6 +518,7 @@
 		1DEB927508733DD40010E9CD /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -541,6 +542,7 @@
 		1DEB927608733DD40010E9CD /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				CLANG_ENABLE_MODULES = YES;
 				DEPLOYMENT_POSTPROCESSING = NO;
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
diff --git a/mogenerator_Prefix.pch b/mogenerator_Prefix.pch
index f7088002..a9d1f0c3 100644
--- a/mogenerator_Prefix.pch
+++ b/mogenerator_Prefix.pch
@@ -1,7 +1,3 @@
-//
-// Prefix header for all source files of the 'mogenerator' target in the 'mogenerator' project.
-//
-
 #ifdef __OBJC__
-    #import <Foundation/Foundation.h>
+@import Foundation;
 #endif
diff --git a/momcom/NSAttributeDescription+momcom.h b/momcom/NSAttributeDescription+momcom.h
index f9f8adea..76ebe39d 100644
--- a/momcom/NSAttributeDescription+momcom.h
+++ b/momcom/NSAttributeDescription+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSAttributeDescription (momcom)
 
diff --git a/momcom/NSEntityDescription+momcom.h b/momcom/NSEntityDescription+momcom.h
index bf8e8603..e0ecac1b 100644
--- a/momcom/NSEntityDescription+momcom.h
+++ b/momcom/NSEntityDescription+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSEntityDescription (momcom)
 
diff --git a/momcom/NSFetchRequest+momcom.h b/momcom/NSFetchRequest+momcom.h
index bf2a967c..50b938d3 100644
--- a/momcom/NSFetchRequest+momcom.h
+++ b/momcom/NSFetchRequest+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSFetchRequest (momcom)
 
diff --git a/momcom/NSFetchedPropertyDescription+momcom.h b/momcom/NSFetchedPropertyDescription+momcom.h
index 0fb7ad44..2e751f6f 100644
--- a/momcom/NSFetchedPropertyDescription+momcom.h
+++ b/momcom/NSFetchedPropertyDescription+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSFetchedPropertyDescription (momcom)
 
diff --git a/momcom/NSManagedObjectModel+momcom.h b/momcom/NSManagedObjectModel+momcom.h
index 272b1f6b..be2716e8 100644
--- a/momcom/NSManagedObjectModel+momcom.h
+++ b/momcom/NSManagedObjectModel+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSManagedObjectModel (momcom)
 
diff --git a/momcom/NSPropertyDescription+momcom.h b/momcom/NSPropertyDescription+momcom.h
index 038e3a70..e9971f94 100644
--- a/momcom/NSPropertyDescription+momcom.h
+++ b/momcom/NSPropertyDescription+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSPropertyDescription (momcom)
 
diff --git a/momcom/NSRelationshipDescription+momcom.h b/momcom/NSRelationshipDescription+momcom.h
index dc87226b..17f6a6bc 100644
--- a/momcom/NSRelationshipDescription+momcom.h
+++ b/momcom/NSRelationshipDescription+momcom.h
@@ -6,7 +6,7 @@
 //  Copyright (c) 2013 Tom Harrington. All rights reserved.
 //
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 @interface NSRelationshipDescription (momcom)
 
diff --git a/nsenumerate.h b/nsenumerate.h
index e43904dd..411e42e0 100644
--- a/nsenumerate.h
+++ b/nsenumerate.h
@@ -8,7 +8,7 @@
 	
 	************************************************************************************/
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 #define nsenumerate_getEnumerator( TYPE, OBJ )				\
 	(TYPE)([OBJ isKindOfClass:[NSEnumerator class]]			\
diff --git a/ponso/MKCDAGNode.h b/ponso/MKCDAGNode.h
index bb16510e..e02bf062 100644
--- a/ponso/MKCDAGNode.h
+++ b/ponso/MKCDAGNode.h
@@ -17,7 +17,7 @@
  Created by Nikita Zhuk on 22.1.2011.
  */
 
-#import <Foundation/Foundation.h>
+@import Foundation;
 
 /**
  Generic DAG (Directed Acyclic Graph) implementation
diff --git a/ponso/MKCNSEntityDescriptionAdditions.h b/ponso/MKCNSEntityDescriptionAdditions.h
index e4007744..e0681aa4 100644
--- a/ponso/MKCNSEntityDescriptionAdditions.h
+++ b/ponso/MKCNSEntityDescriptionAdditions.h
@@ -17,7 +17,7 @@
  Created by Nikita Zhuk on 22.1.2011.
  */
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 
 @interface NSEntityDescription(MKCNSEntityDescriptionAdditions)
diff --git a/ponso/MKCNSManagedObjectModelAdditions.h b/ponso/MKCNSManagedObjectModelAdditions.h
index 94db08e0..15187130 100644
--- a/ponso/MKCNSManagedObjectModelAdditions.h
+++ b/ponso/MKCNSManagedObjectModelAdditions.h
@@ -17,7 +17,7 @@
  Created by Nikita Zhuk on 22.1.2011.
  */
 
-#import <CoreData/CoreData.h>
+@import CoreData;
 
 
 @protocol MKCNSRelationshipDescriptionDependencyFilter<NSObject>