diff --git a/BridgingHeader.h b/BridgingHeader.h
deleted file mode 100644
index 7374330..0000000
--- a/BridgingHeader.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// GCDWebServer Core
-#import "GCDWebServer.h"
-#import "GCDWebServerConnection.h"
-#import "GCDWebServerFunctions.h"
-#import "GCDWebServerHTTPStatusCodes.h"
-#import "GCDWebServerResponse.h"
-#import "GCDWebServerRequest.h"
-
-// GCDWebServer Requests
-#import "GCDWebServerDataRequest.h"
-#import "GCDWebServerFileRequest.h"
-#import "GCDWebServerMultiPartFormRequest.h"
-#import "GCDWebServerURLEncodedFormRequest.h"
-
-// GCDWebServer Responses
-#import "GCDWebServerDataResponse.h"
-#import "GCDWebServerErrorResponse.h"
-#import "GCDWebServerFileResponse.h"
-#import "GCDWebServerStreamedResponse.h"
-
-// GCDWebUploader
-#import "GCDWebUploader.h"
-
-// GCDWebDAVServer
-#import "GCDWebDAVServer.h"
diff --git a/GCDWebServer.xcodeproj/project.pbxproj b/GCDWebServer.xcodeproj/project.pbxproj
index b914778..a514b5f 100644
--- a/GCDWebServer.xcodeproj/project.pbxproj
+++ b/GCDWebServer.xcodeproj/project.pbxproj
@@ -296,7 +296,6 @@
 		E221129C1690B7BA0048D2B2 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS6.0.sdk/System/Library/Frameworks/MobileCoreServices.framework; sourceTree = DEVELOPER_DIR; };
 		E24039251BA09207000B7089 /* Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		E24039311BA092B7000B7089 /* Tests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Tests.m; sourceTree = "<group>"; };
-		E24A3BE021E2795700C58878 /* BridgingHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = SOURCE_ROOT; };
 		E24A3C4021E2940600C58878 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
 		E28BAE1618F99C810095C089 /* GCDWebServer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GCDWebServer.h; sourceTree = "<group>"; };
 		E28BAE1718F99C810095C089 /* GCDWebServer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GCDWebServer.m; sourceTree = "<group>"; };
@@ -437,7 +436,6 @@
 		08FB7794FE84155DC02AAC07 /* LittleCMS */ = {
 			isa = PBXGroup;
 			children = (
-				E24A3BE021E2795700C58878 /* BridgingHeader.h */,
 				E28BAE1418F99C810095C089 /* GCDWebServer */,
 				E2A0E80718F3432600C580B1 /* GCDWebDAVServer */,
 				E2BE850618E77ECA0061360B /* GCDWebUploader */,
@@ -1181,7 +1179,6 @@
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServers";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
-				SWIFT_OBJC_BRIDGING_HEADER = BridgingHeader.h;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 4.2;
 				WARNING_CFLAGS = (
@@ -1221,7 +1218,6 @@
 				HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
 				PRODUCT_BUNDLE_IDENTIFIER = "net.pol-online.GCDWebServers";
 				SWIFT_COMPILATION_MODE = wholemodule;
-				SWIFT_OBJC_BRIDGING_HEADER = BridgingHeader.h;
 				SWIFT_TREAT_WARNINGS_AS_ERRORS = YES;
 				SWIFT_VERSION = 4.2;
 				WARNING_CFLAGS = "-Wall";
diff --git a/format-source.sh b/format-source.sh
index e93fba6..4c35aa7 100755
--- a/format-source.sh
+++ b/format-source.sh
@@ -15,8 +15,6 @@ if [[ ! -f "build/swiftformat" ]]; then
   mv "build/SwiftFormat-0.37.2/CommandLineTool/swiftformat" "build/swiftformat"
 fi
 
-clang-format -style=file -i *.h
-
 pushd "GCDWebServer/Core"
 clang-format -style=file -i *.h *.m
 popd
diff --git a/iOS/ViewController.swift b/iOS/ViewController.swift
index 21b4c06..9fd6789 100644
--- a/iOS/ViewController.swift
+++ b/iOS/ViewController.swift
@@ -25,6 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import GCDWebServers
 import UIKit
 
 class ViewController: UIViewController {
diff --git a/tvOS/ViewController.swift b/tvOS/ViewController.swift
index 21b4c06..9fd6789 100644
--- a/tvOS/ViewController.swift
+++ b/tvOS/ViewController.swift
@@ -25,6 +25,7 @@
  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import GCDWebServers
 import UIKit
 
 class ViewController: UIViewController {