diff --git a/OpenVPN Adapter/OpenVPNAdapter.mm b/OpenVPN Adapter/OpenVPNAdapter.mm
index 5003260..c34f6c1 100644
--- a/OpenVPN Adapter/OpenVPNAdapter.mm	
+++ b/OpenVPN Adapter/OpenVPNAdapter.mm	
@@ -6,13 +6,11 @@
 //
 //
 
-#import "OpenVPNAdapter.h"
-
 #define OPENVPN_EXTERN extern
 
+#import <NetworkExtension/NetworkExtension.h>
 #import <client/ovpncli.hpp>
 #import <openvpn/tun/client/tunbase.hpp>
-#import <NetworkExtension/NetworkExtension.h>
 #import "OpenVPNAdapterEvent.h"
 #import "OpenVPNCredentials+Internal.h"
 #import "OpenVPNConfiguration+Internal.h"
@@ -24,6 +22,7 @@
 #import "OpenVPNProperties+Internal.h"
 #import "OpenVPNSessionToken+Internal.h"
 #import "OpenVPNTransportStats+Internal.h"
+#import "OpenVPNAdapter.h"
 
 class Client;
 
diff --git a/OpenVPN Adapter/OpenVPNNetworkSettingsBuilder.m b/OpenVPN Adapter/OpenVPNNetworkSettingsBuilder.m
index 7f34051..c9292d4 100644
--- a/OpenVPN Adapter/OpenVPNNetworkSettingsBuilder.m	
+++ b/OpenVPN Adapter/OpenVPNNetworkSettingsBuilder.m	
@@ -5,8 +5,8 @@
 //  Created by Jonathan Downing on 12/10/2017.
 //
 
-#import "OpenVPNNetworkSettingsBuilder.h"
 #import <NetworkExtension/NetworkExtension.h>
+#import "OpenVPNNetworkSettingsBuilder.h"
 
 @interface OpenVPNNetworkSettingsBuilder ()
 @property (nonatomic) NSMutableArray<NSString *> *ipv4LocalAddresses;
diff --git a/OpenVPN Adapter/OpenVPNPacketFlowAdapter.mm b/OpenVPN Adapter/OpenVPNPacketFlowAdapter.mm
index c63c36b..daa3c6e 100644
--- a/OpenVPN Adapter/OpenVPNPacketFlowAdapter.mm	
+++ b/OpenVPN Adapter/OpenVPNPacketFlowAdapter.mm	
@@ -5,9 +5,9 @@
 //  Created by Jonathan Downing on 12/10/2017.
 //
 
-#import "OpenVPNPacketFlowAdapter.h"
 #import <NetworkExtension/NetworkExtension.h>
 #import <openvpn/ip/ip.hpp>
+#import "OpenVPNPacketFlowAdapter.h"
 
 @interface OpenVPNPacketFlowAdapter () {
     CFSocketRef _openVPNClientSocket;