Index: iOS/AboutController.h
==================================================================
--- iOS/AboutController.h
+++ iOS/AboutController.h
@@ -18,10 +18,10 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface AboutController: UIViewController <UIWebViewDelegate>
 @property (nonatomic, retain) IBOutlet UIWebView *webView;
 @end

Index: iOS/AddSiteController.h
==================================================================
--- iOS/AddSiteController.h
+++ iOS/AddSiteController.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "MainViewController.h"
 
 @interface AddSiteController: UITableViewController <UITableViewDelegate>
 @property (nonatomic, retain) IBOutlet UITextField *nameField;

Index: iOS/AddSiteController.m
==================================================================
--- iOS/AddSiteController.m
+++ iOS/AddSiteController.m
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "AddSiteController.h"
 #import "SelectKeyFileController.h"
 
 static void

Index: iOS/AppDelegate.h
==================================================================
--- iOS/AppDelegate.h
+++ iOS/AppDelegate.h
@@ -18,10 +18,10 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 @interface AppDelegate: UIResponder <UIApplicationDelegate>
 @property (nonatomic, strong) UIWindow *window;
 @end

Index: iOS/HTTPServerDelegate.h
==================================================================
--- iOS/HTTPServerDelegate.h
+++ iOS/HTTPServerDelegate.h
@@ -18,9 +18,9 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 @interface HTTPServerDelegate: OFObject <OFHTTPServerDelegate>
 @end

Index: iOS/MainViewController.h
==================================================================
--- iOS/MainViewController.h
+++ iOS/MainViewController.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "SiteStorage.h"
 
 @interface MainViewController: UIViewController <UISearchBarDelegate,
     UITableViewDelegate, UITableViewDataSource>

Index: iOS/MainViewController.m
==================================================================
--- iOS/MainViewController.m
+++ iOS/MainViewController.m
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "MainViewController.h"
 
 #import "AddSiteController.h"
 #import "ShowDetailsController.h"

Index: iOS/SelectKeyFileController.h
==================================================================
--- iOS/SelectKeyFileController.h
+++ iOS/SelectKeyFileController.h
@@ -18,12 +18,12 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
+@import UIKit;
 
 #import "AddSiteController.h"
 #import "HTTPServerDelegate.h"
 
 @interface SelectKeyFileController: UITableViewController <UITableViewDelegate,

Index: iOS/SelectKeyFileController.m
==================================================================
--- iOS/SelectKeyFileController.m
+++ iOS/SelectKeyFileController.m
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "HTTPServerDelegate.h"
 #import "SelectKeyFileController.h"
 
 @implementation SelectKeyFileController

Index: iOS/ShowDetailsController.h
==================================================================
--- iOS/ShowDetailsController.h
+++ iOS/ShowDetailsController.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <UIKit/UIKit.h>
+@import UIKit;
 
 #import "MainViewController.h"
 
 @interface ShowDetailsController: UITableViewController <UITableViewDelegate,
     UITextFieldDelegate>

Index: iOS/ShowDetailsController.m
==================================================================
--- iOS/ShowDetailsController.m
+++ iOS/ShowDetailsController.m
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW_Bridge/ObjFW_Bridge.h>
+@import ObjFW_Bridge;
 
 #import "ShowDetailsController.h"
 
 #import "SiteStorage.h"
 #import "PasswordGenerator.h"

Index: iOS/SiteStorage.h
==================================================================
--- iOS/SiteStorage.h
+++ iOS/SiteStorage.h
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 @interface SiteStorage: OFObject
 {
 	OFString *_path;
 	OFMutableDictionary<OFString *, OFDictionary<OFNumber *, id> *>

Index: iOS/SiteStorage.m
==================================================================
--- iOS/SiteStorage.m
+++ iOS/SiteStorage.m
@@ -18,11 +18,11 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#import <ObjFW/ObjFW.h>
+@import ObjFW;
 
 #import "SiteStorage.h"
 
 @interface SiteStorage ()
 - (void)_update;
@@ -31,13 +31,13 @@
 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
 {
 	self = [super init];
@@ -153,12 +153,12 @@
 {
 	@autoreleasepool {
 		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];
 
 		_storage[site] = siteDictionary;

Index: iOS/scrypt-pwgen.xcodeproj/project.pbxproj
==================================================================
--- iOS/scrypt-pwgen.xcodeproj/project.pbxproj
+++ iOS/scrypt-pwgen.xcodeproj/project.pbxproj
@@ -377,10 +377,11 @@
 		};
 		4B2E52F41DA942840040D091 /* Debug */ = {
 			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;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -397,10 +398,11 @@
 		};
 		4B2E52F51DA942840040D091 /* Release */ = {
 			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;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (