diff --git a/client/NetdClient.cpp b/client/NetdClient.cpp
index fce362e..0c9d185 100644
--- a/client/NetdClient.cpp
+++ b/client/NetdClient.cpp
@@ -16,15 +16,17 @@
 
 #include "NetdClient.h"
 
+#include <errno.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include <atomic>
+
 #include "Fwmark.h"
 #include "FwmarkClient.h"
 #include "FwmarkCommand.h"
 #include "resolv_netid.h"
 
-#include <atomic>
-#include <sys/socket.h>
-#include <unistd.h>
-
 namespace {
 
 std::atomic_uint netIdForProcess(NETID_UNSET);
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 061060f..14f0da7 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -15,6 +15,7 @@
  */
 
 #include <dirent.h>
+#include <errno.h>
 
 #define LOG_TAG "InterfaceController"
 #include <cutils/log.h>
diff --git a/server/NetdConstants.cpp b/server/NetdConstants.cpp
index 4823c91..8423fd6 100644
--- a/server/NetdConstants.cpp
+++ b/server/NetdConstants.cpp
@@ -14,14 +14,15 @@
  * limitations under the License.
  */
 
+#include <ctype.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <netdb.h>
+#include <net/if.h>
 #include <netinet/in.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/wait.h>
-#include <ctype.h>
-#include <net/if.h>
 
 #define LOG_TAG "Netd"
 
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 140c0d3..4cb145b 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -16,6 +16,15 @@
 
 #include "RouteController.h"
 
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <linux/fib_rules.h>
+#include <net/if.h>
+#include <sys/stat.h>
+
+#include <map>
+
 #include "Fwmark.h"
 #include "UidRanges.h"
 
@@ -24,13 +33,6 @@
 #include "logwrap/logwrap.h"
 #include "resolv_netid.h"
 
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <linux/fib_rules.h>
-#include <map>
-#include <net/if.h>
-#include <sys/stat.h>
-
 namespace {
 
 // BEGIN CONSTANTS --------------------------------------------------------------------------------