From a4693f3162f89d2e3e4caaadfbb5787eac59dc11 Mon Sep 17 00:00:00 2001
From: Jakob Bornecrantz <jakob@collabora.com>
Date: Fri, 21 Aug 2020 12:15:57 +0100
Subject: [PATCH] st/oxr: Include m_mathinclude.h and tidy includes

---
 src/xrt/state_trackers/oxr/oxr_session.c | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/xrt/state_trackers/oxr/oxr_session.c b/src/xrt/state_trackers/oxr/oxr_session.c
index b1519b40b..e234ffa43 100644
--- a/src/xrt/state_trackers/oxr/oxr_session.c
+++ b/src/xrt/state_trackers/oxr/oxr_session.c
@@ -7,26 +7,25 @@
  * @ingroup oxr_main
  */
 
+#include "xrt/xrt_device.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <assert.h>
-#include <inttypes.h>
+#ifdef XR_USE_PLATFORM_XLIB
+#include "xrt/xrt_gfx_xlib.h"
+#endif // XR_USE_PLATFORM_XLIB
+
+#ifdef XRT_HAVE_VULKAN
+#include "xrt/xrt_gfx_vk.h"
+#endif // XRT_HAVE_VULKAN
+
+#include "os/os_time.h"
 
 #include "util/u_debug.h"
 #include "util/u_misc.h"
 #include "util/u_time.h"
-#include "os/os_time.h"
 
 #include "math/m_api.h"
+#include "math/m_mathinclude.h"
 
-#include "xrt/xrt_device.h"
-#ifdef XR_USE_PLATFORM_XLIB
-#include "xrt/xrt_gfx_xlib.h"
-#endif // XR_USE_PLATFORM_XLIB
-#ifdef XRT_HAVE_VULKAN
-#include "xrt/xrt_gfx_vk.h"
-#endif // XRT_HAVE_VULKAN
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
@@ -35,6 +34,11 @@
 #include "oxr_chain.h"
 #include "oxr_api_verify.h"
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+#include <inttypes.h>
+
 
 DEBUG_GET_ONCE_BOOL_OPTION(dynamic_prediction, "OXR_DYNAMIC_PREDICTION", true)
 DEBUG_GET_ONCE_NUM_OPTION(ipd, "OXR_DEBUG_IPD_MM", 63)