diff --git a/src/xrt/ipc/client/ipc_client.h b/src/xrt/ipc/client/ipc_client.h
index 86422637f..708d86a61 100644
--- a/src/xrt/ipc/client/ipc_client.h
+++ b/src/xrt/ipc/client/ipc_client.h
@@ -12,12 +12,13 @@
 
 #include "xrt/xrt_compiler.h"
 #include "xrt/xrt_config_os.h"
-#include "shared/ipc_protocol.h"
-#include "shared/ipc_utils.h"
 
 #include "util/u_threading.h"
 #include "util/u_logging.h"
 
+#include "shared/ipc_protocol.h"
+#include "shared/ipc_utils.h"
+
 #include <stdio.h>
 
 
diff --git a/src/xrt/ipc/client/ipc_client_compositor.c b/src/xrt/ipc/client/ipc_client_compositor.c
index 01fc8da11..5f5cd8738 100644
--- a/src/xrt/ipc/client/ipc_client_compositor.c
+++ b/src/xrt/ipc/client/ipc_client_compositor.c
@@ -13,14 +13,12 @@
 #include "xrt/xrt_defines.h"
 #include "xrt/xrt_config_os.h"
 
-#include "util/u_misc.h"
-#include "util/u_handles.h"
-#include "util/u_trace_marker.h"
 
 #include "os/os_time.h"
 
-#include "util/u_wait.h"
 #include "util/u_misc.h"
+#include "util/u_wait.h"
+#include "util/u_handles.h"
 #include "util/u_trace_marker.h"
 
 #include "shared/ipc_protocol.h"
diff --git a/src/xrt/ipc/client/ipc_client_device.c b/src/xrt/ipc/client/ipc_client_device.c
index 0f4a3adf9..b698c5ab3 100644
--- a/src/xrt/ipc/client/ipc_client_device.c
+++ b/src/xrt/ipc/client/ipc_client_device.c
@@ -7,12 +7,6 @@
  * @ingroup ipc_client
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
-
 #include "xrt/xrt_device.h"
 
 #include "os/os_time.h"
@@ -27,6 +21,12 @@
 #include "client/ipc_client.h"
 #include "ipc_client_generated.h"
 
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
 
 /*
  *
diff --git a/src/xrt/ipc/client/ipc_client_hmd.c b/src/xrt/ipc/client/ipc_client_hmd.c
index 82b40cf06..07b484eae 100644
--- a/src/xrt/ipc/client/ipc_client_hmd.c
+++ b/src/xrt/ipc/client/ipc_client_hmd.c
@@ -7,11 +7,6 @@
  * @ingroup ipc_client
  */
 
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
 
 #include "xrt/xrt_device.h"
 
@@ -28,6 +23,12 @@
 #include "client/ipc_client.h"
 #include "ipc_client_generated.h"
 
+#include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+
 
 /*
  *
diff --git a/src/xrt/ipc/client/ipc_client_instance.c b/src/xrt/ipc/client/ipc_client_instance.c
index c17493e4a..e5080e206 100644
--- a/src/xrt/ipc/client/ipc_client_instance.c
+++ b/src/xrt/ipc/client/ipc_client_instance.c
@@ -16,8 +16,9 @@
 #include "xrt/xrt_config_os.h"
 #include "xrt/xrt_config_android.h"
 
-#include "util/u_misc.h"
 #include "util/u_var.h"
+#include "util/u_misc.h"
+#include "util/u_file.h"
 #include "util/u_debug.h"
 #include "util/u_git_tag.h"
 #include "util/u_system_helpers.h"
@@ -25,7 +26,6 @@
 #include "shared/ipc_protocol.h"
 #include "client/ipc_client.h"
 #include "ipc_client_generated.h"
-#include "util/u_file.h"
 
 #include <stdio.h>
 #if !defined(XRT_OS_WINDOWS)
@@ -34,7 +34,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/mman.h>
-#include <sys/un.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <unistd.h>