Index: src/ObjFW.h
==================================================================
--- src/ObjFW.h
+++ src/ObjFW.h
@@ -214,5 +214,6 @@
 #ifdef OF_HAVE_SOCKETS
 # import "resolver.h"
 #endif
 #import "pbkdf2.h"
 #import "scrypt.h"
+#import "unicode.h"

Index: src/bridge/Makefile
==================================================================
--- src/bridge/Makefile
+++ src/bridge/Makefile
@@ -13,14 +13,14 @@
        OFString+NSObject.m		\
        NSArray+OFObject.m		\
        NSDictionary+OFObject.m		\
        NSString+OFObject.m
 
-INCLUDES = ${SRCS:.m=.h}	\
-	   NSBridging.h		\
-	   OFBridging.h		\
-	   ObjFW_Bridge.h
+INCLUDES := ${SRCS:.m=.h}	\
+	    NSBridging.h	\
+	    OFBridging.h	\
+	    ObjFW_Bridge.h
 
 SRCS += NSArray_OFArray.m		\
 	NSDictionary_OFDictionary.m	\
 	OFArray_NSArray.m		\
 	OFDictionary_NSDictionary.m	\

Index: src/bridge/module.modulemap
==================================================================
--- src/bridge/module.modulemap
+++ src/bridge/module.modulemap
@@ -1,5 +1,5 @@
 framework module ObjFW_Bridge {
-	umbrella header "ObjFW_Bridge/ObjFW_Bridge.h"
+	umbrella header "ObjFW_Bridge.h"
 
 	export *
 }

Index: src/module.modulemap
==================================================================
--- src/module.modulemap
+++ src/module.modulemap
@@ -1,7 +1,7 @@
 framework module ObjFW {
-	umbrella header "ObjFW/ObjFW.h"
+	umbrella header "ObjFW.h"
 
 	/*
 	 * These are included by atomic.h, but should never be included
 	 * directly.
 	 */