From 531b10fa4c854e0c1860b5125ce1154f8a4ebf2c Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Thu, 16 Mar 2023 00:49:43 +0000
Subject: [PATCH] xrt: Tidy various header includes

---
 src/xrt/auxiliary/util/u_hand_simulation.h  |  2 ++
 src/xrt/auxiliary/util/u_tracked_imu_3dof.c |  3 +--
 src/xrt/drivers/ht_ctrl_emu/ht_ctrl_emu.cpp | 12 ++++++------
 src/xrt/drivers/multi_wrapper/multi.c       | 12 +++++++-----
 src/xrt/drivers/qwerty/qwerty_device.c      | 19 ++++++++++---------
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/xrt/auxiliary/util/u_hand_simulation.h b/src/xrt/auxiliary/util/u_hand_simulation.h
index b09e7ebdf..d91ec4a4b 100644
--- a/src/xrt/auxiliary/util/u_hand_simulation.h
+++ b/src/xrt/auxiliary/util/u_hand_simulation.h
@@ -10,9 +10,11 @@
 #pragma once
 
 #include "xrt/xrt_defines.h"
+
 #include "util/u_misc.h"
 #include "util/u_hand_tracking.h"
 
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/src/xrt/auxiliary/util/u_tracked_imu_3dof.c b/src/xrt/auxiliary/util/u_tracked_imu_3dof.c
index 06c64a1dc..6c0db909b 100644
--- a/src/xrt/auxiliary/util/u_tracked_imu_3dof.c
+++ b/src/xrt/auxiliary/util/u_tracked_imu_3dof.c
@@ -8,8 +8,7 @@
  */
 
 #include "util/u_misc.h"
-
-#include "u_tracked_imu_3dof.h"
+#include "util/u_tracked_imu_3dof.h"
 
 
 static void
diff --git a/src/xrt/drivers/ht_ctrl_emu/ht_ctrl_emu.cpp b/src/xrt/drivers/ht_ctrl_emu/ht_ctrl_emu.cpp
index aa8af5f32..a0b224603 100644
--- a/src/xrt/drivers/ht_ctrl_emu/ht_ctrl_emu.cpp
+++ b/src/xrt/drivers/ht_ctrl_emu/ht_ctrl_emu.cpp
@@ -9,24 +9,24 @@
  * @ingroup drv_cemu
  */
 
-#include "ht_ctrl_emu_interface.h"
-
 #include "xrt/xrt_defines.h"
+#include "xrt/xrt_device.h"
+
+#include "os/os_time.h"
 
 #include "math/m_api.h"
 #include "math/m_space.h"
 #include "math/m_vec3.h"
 
+#include "util/u_var.h"
+#include "util/u_time.h"
 #include "util/u_misc.h"
 #include "util/u_debug.h"
-#include "util/u_time.h"
 #include "util/u_device.h"
 #include "util/u_distortion_mesh.h"
-#include "util/u_var.h"
 #include "util/u_config_json.h"
 
-#include "os/os_time.h"
-#include "xrt/xrt_device.h"
+#include "ht_ctrl_emu_interface.h"
 
 #include <assert.h>
 #include <stdio.h>
diff --git a/src/xrt/drivers/multi_wrapper/multi.c b/src/xrt/drivers/multi_wrapper/multi.c
index 34734c99b..0eef63de6 100644
--- a/src/xrt/drivers/multi_wrapper/multi.c
+++ b/src/xrt/drivers/multi_wrapper/multi.c
@@ -7,14 +7,16 @@
  * @ingroup drv_multi
  */
 
-#include "multi.h"
-#include "util/u_misc.h"
-#include "util/u_device.h"
-#include "util/u_debug.h"
-
 #include "math/m_api.h"
 #include "math/m_space.h"
 
+#include "util/u_misc.h"
+#include "util/u_debug.h"
+#include "util/u_device.h"
+
+#include "multi.h"
+
+
 DEBUG_GET_ONCE_LOG_OPTION(multi_log, "MULTI_LOG", U_LOGGING_WARN)
 
 #define MULTI_TRACE(d, ...) U_LOG_XDEV_IFL_T(&d->base, d->log_level, __VA_ARGS__)
diff --git a/src/xrt/drivers/qwerty/qwerty_device.c b/src/xrt/drivers/qwerty/qwerty_device.c
index 552444cd1..c7d346948 100644
--- a/src/xrt/drivers/qwerty/qwerty_device.c
+++ b/src/xrt/drivers/qwerty/qwerty_device.c
@@ -7,24 +7,25 @@
  * @ingroup drv_qwerty
  */
 
-#include "qwerty_device.h"
-
-#include "util/u_misc.h"
-#include "util/u_device.h"
-#include "util/u_distortion_mesh.h"
-#include "util/u_var.h"
-#include "util/u_logging.h"
-#include "util/u_time.h"
+#include "xrt/xrt_device.h"
 
 #include "math/m_api.h"
 #include "math/m_space.h"
 #include "math/m_mathinclude.h"
 
-#include "xrt/xrt_device.h"
+#include "util/u_device.h"
+#include "util/u_distortion_mesh.h"
+#include "util/u_var.h"
+#include "util/u_logging.h"
+#include "util/u_time.h"
+#include "util/u_misc.h"
+
+#include "qwerty_device.h"
 
 #include <stdio.h>
 #include <assert.h>
 
+
 #define QWERTY_HMD_INITIAL_MOVEMENT_SPEED 0.002f // in meters per frame
 #define QWERTY_HMD_INITIAL_LOOK_SPEED 0.02f      // in radians per frame
 #define QWERTY_CONTROLLER_INITIAL_MOVEMENT_SPEED 0.005f