diff --git a/iOS/AboutController.h b/iOS/AboutController.h
index 4b82cd8..4c91705 100644
--- a/iOS/AboutController.h
+++ b/iOS/AboutController.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface AboutController: UIViewController <UIWebViewDelegate>
 @property (nonatomic, retain) IBOutlet UIWebView *webView;
diff --git a/iOS/AddSiteController.h b/iOS/AddSiteController.h
index a404a7b..9d72076 100644
--- a/iOS/AddSiteController.h
+++ b/iOS/AddSiteController.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "MainViewController.h"
 
diff --git a/iOS/AddSiteController.m b/iOS/AddSiteController.m
index 4b6f1ff..8a47992 100644
--- a/iOS/AddSiteController.m
+++ b/iOS/AddSiteController.m
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "AddSiteController.h"
 #import "SelectKeyFileController.h"
diff --git a/iOS/AppDelegate.h b/iOS/AppDelegate.h
index 51b55f2..1956098 100644
--- a/iOS/AppDelegate.h
+++ b/iOS/AppDelegate.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface AppDelegate: UIResponder <UIApplicationDelegate>
 @property (nonatomic, strong) UIWindow *window;
diff --git a/iOS/HTTPServerDelegate.h b/iOS/HTTPServerDelegate.h
index 4330a90..72a6a74 100644
--- a/iOS/HTTPServerDelegate.h
+++ b/iOS/HTTPServerDelegate.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 @interface HTTPServerDelegate: OFObject <OFHTTPServerDelegate>
 @end
diff --git a/iOS/MainViewController.h b/iOS/MainViewController.h
index 7f86ec9..47c2153 100644
--- a/iOS/MainViewController.h
+++ b/iOS/MainViewController.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "SiteStorage.h"
 
diff --git a/iOS/MainViewController.m b/iOS/MainViewController.m
index 04f2f26..085804f 100644
--- a/iOS/MainViewController.m
+++ b/iOS/MainViewController.m
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "MainViewController.h"
 
diff --git a/iOS/SelectKeyFileController.h b/iOS/SelectKeyFileController.h
index 7bb16d5..7ac07b6 100644
--- a/iOS/SelectKeyFileController.h
+++ b/iOS/SelectKeyFileController.h
@@ -20,8 +20,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
+@import UIKit;
 
 #import "AddSiteController.h"
 #import "HTTPServerDelegate.h"
diff --git a/iOS/SelectKeyFileController.m b/iOS/SelectKeyFileController.m
index dc28f28..d906a8c 100644
--- a/iOS/SelectKeyFileController.m
+++ b/iOS/SelectKeyFileController.m
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "HTTPServerDelegate.h"
 #import "SelectKeyFileController.h"
diff --git a/iOS/ShowDetailsController.h b/iOS/ShowDetailsController.h
index a86d3f0..be28a6d 100644
--- a/iOS/ShowDetailsController.h
+++ b/iOS/ShowDetailsController.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "MainViewController.h"
 
diff --git a/iOS/ShowDetailsController.m b/iOS/ShowDetailsController.m
index 836a1a7..986cc8c 100644
--- a/iOS/ShowDetailsController.m
+++ b/iOS/ShowDetailsController.m
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "ShowDetailsController.h"
 
diff --git a/iOS/SiteStorage.h b/iOS/SiteStorage.h
index 962f7ce..02da0bf 100644
--- a/iOS/SiteStorage.h
+++ b/iOS/SiteStorage.h
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 @interface SiteStorage: OFObject
 {
diff --git a/iOS/SiteStorage.m b/iOS/SiteStorage.m
index 82887ca..ebcebd0 100644
--- a/iOS/SiteStorage.m
+++ b/iOS/SiteStorage.m
@@ -20,7 +20,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 #import "SiteStorage.h"
 
@@ -33,9 +33,9 @@ static OFNumber *lengthField, *legacyField, *keyFileField;
 @implementation SiteStorage
 + (void)initialize
 {
-	lengthField = [@(UINT8_C(0)) retain];
-	legacyField = [@(UINT8_C(1)) retain];
-	keyFileField = [@(UINT8_C(2)) retain];
+	lengthField = [[OFNumber alloc] initWithUInt8: 0];
+	legacyField = [[OFNumber alloc] initWithUInt8: 1];
+	keyFileField = [[OFNumber alloc] initWithUInt8: 2];
 }
 
 - (instancetype)init
@@ -155,8 +155,8 @@ static OFNumber *lengthField, *legacyField, *keyFileField;
 		OFMutableDictionary *siteDictionary =
 		    [OFMutableDictionary dictionary];
 
-		siteDictionary[lengthField] = @(length);
-		siteDictionary[legacyField] = @(legacy);
+		siteDictionary[lengthField] = [OFNumber numberWithSize: length];
+		siteDictionary[legacyField] = [OFNumber numberWithBool: legacy];
 		siteDictionary[keyFileField] = keyFile;
 
 		[siteDictionary makeImmutable];
diff --git a/iOS/scrypt-pwgen.xcodeproj/project.pbxproj b/iOS/scrypt-pwgen.xcodeproj/project.pbxproj
index b09cfb7..e2eac92 100644
--- a/iOS/scrypt-pwgen.xcodeproj/project.pbxproj
+++ b/iOS/scrypt-pwgen.xcodeproj/project.pbxproj
@@ -379,6 +379,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				DEVELOPMENT_TEAM = MXKNFCKFL6;
@@ -399,6 +400,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = NO;
 				CLANG_ENABLE_OBJC_WEAK = YES;
 				DEVELOPMENT_TEAM = MXKNFCKFL6;