diff --git a/src/xrt/auxiliary/d3d/d3d_d3d11_allocator.cpp b/src/xrt/auxiliary/d3d/d3d_d3d11_allocator.cpp
index 681bf1bb9..5c967a89d 100644
--- a/src/xrt/auxiliary/d3d/d3d_d3d11_allocator.cpp
+++ b/src/xrt/auxiliary/d3d/d3d_d3d11_allocator.cpp
@@ -26,7 +26,6 @@
 #include <wil/com.h>
 #include <wil/result.h>
 
-#include <inttypes.h>
 #include <memory>
 
 #define DEFAULT_CATCH(...)                                                                                             \
diff --git a/src/xrt/auxiliary/d3d/d3d_d3d11_fence.cpp b/src/xrt/auxiliary/d3d/d3d_d3d11_fence.cpp
index b88022984..70df2b201 100644
--- a/src/xrt/auxiliary/d3d/d3d_d3d11_fence.cpp
+++ b/src/xrt/auxiliary/d3d/d3d_d3d11_fence.cpp
@@ -22,7 +22,6 @@
 #include <wil/com.h>
 #include <wil/result.h>
 
-#include <inttypes.h>
 #include <memory>
 
 using namespace std::chrono;
diff --git a/src/xrt/auxiliary/d3d/d3d_d3d12_allocator.cpp b/src/xrt/auxiliary/d3d/d3d_d3d12_allocator.cpp
index 26f5c76b3..0295116d6 100644
--- a/src/xrt/auxiliary/d3d/d3d_d3d12_allocator.cpp
+++ b/src/xrt/auxiliary/d3d/d3d_d3d12_allocator.cpp
@@ -26,7 +26,6 @@
 #include <wil/com.h>
 #include <wil/result.h>
 
-#include <inttypes.h>
 #include <memory>
 
 #define DEFAULT_CATCH(...)                                                                                             \
diff --git a/src/xrt/auxiliary/d3d/d3d_d3d12_fence.cpp b/src/xrt/auxiliary/d3d/d3d_d3d12_fence.cpp
index 4974f4e87..fa410cf62 100644
--- a/src/xrt/auxiliary/d3d/d3d_d3d12_fence.cpp
+++ b/src/xrt/auxiliary/d3d/d3d_d3d12_fence.cpp
@@ -23,7 +23,6 @@
 #include <wil/com.h>
 #include <wil/result.h>
 
-#include <inttypes.h>
 #include <memory>
 
 using namespace std::chrono;
diff --git a/src/xrt/auxiliary/ogl/ogl_helpers.c b/src/xrt/auxiliary/ogl/ogl_helpers.c
index 631ff0f19..23be37850 100644
--- a/src/xrt/auxiliary/ogl/ogl_helpers.c
+++ b/src/xrt/auxiliary/ogl/ogl_helpers.c
@@ -13,7 +13,6 @@
 #include "ogl_helpers.h"
 #include "ogl_api.h" // IWYU pragma: keep
 
-#include <inttypes.h>
 
 /*!
  * Check for OpenGL errors, context needs to be current.
diff --git a/src/xrt/auxiliary/os/os_ble_dbus.c b/src/xrt/auxiliary/os/os_ble_dbus.c
index 99b1d16a9..01e93b851 100644
--- a/src/xrt/auxiliary/os/os_ble_dbus.c
+++ b/src/xrt/auxiliary/os/os_ble_dbus.c
@@ -20,7 +20,6 @@
 #include <unistd.h>
 #include <string.h>
 #include <time.h>
-#include <inttypes.h>
 #include <dbus/dbus.h>
 
 
diff --git a/src/xrt/auxiliary/os/os_time.cpp b/src/xrt/auxiliary/os/os_time.cpp
index 56772e7f5..02a0908d0 100644
--- a/src/xrt/auxiliary/os/os_time.cpp
+++ b/src/xrt/auxiliary/os/os_time.cpp
@@ -17,7 +17,6 @@
 
 #ifdef XRT_OS_WINDOWS
 
-#include <inttypes.h>
 #include <chrono>
 
 extern "C" uint64_t
diff --git a/src/xrt/auxiliary/tracking/t_tracker_psvr.cpp b/src/xrt/auxiliary/tracking/t_tracker_psvr.cpp
index 513cb653c..ca180dc4a 100644
--- a/src/xrt/auxiliary/tracking/t_tracker_psvr.cpp
+++ b/src/xrt/auxiliary/tracking/t_tracker_psvr.cpp
@@ -35,7 +35,6 @@
 #include <Hungarian.hpp>
 #include <Eigen/Eigen>
 #include <opencv2/opencv.hpp>
-#include <inttypes.h>
 
 
 DEBUG_GET_ONCE_LOG_OPTION(psvr_log, "PSVR_TRACKING_LOG", U_LOGGING_WARN)
diff --git a/src/xrt/auxiliary/util/u_imu_sink_force_monotonic.c b/src/xrt/auxiliary/util/u_imu_sink_force_monotonic.c
index 6f6a0a8c6..b0cbf45c4 100644
--- a/src/xrt/auxiliary/util/u_imu_sink_force_monotonic.c
+++ b/src/xrt/auxiliary/util/u_imu_sink_force_monotonic.c
@@ -11,7 +11,6 @@
 #include "util/u_trace_marker.h"
 #include "util/u_logging.h"
 
-#include <inttypes.h>
 
 /*!
  * An @ref xrt_imu_sink splitter.
diff --git a/src/xrt/auxiliary/util/u_live_stats.cpp b/src/xrt/auxiliary/util/u_live_stats.cpp
index c8b7b3a19..817debcaf 100644
--- a/src/xrt/auxiliary/util/u_live_stats.cpp
+++ b/src/xrt/auxiliary/util/u_live_stats.cpp
@@ -9,7 +9,6 @@
 
 #include "u_live_stats.h"
 
-#include <inttypes.h>
 #include <algorithm>
 
 
diff --git a/src/xrt/auxiliary/util/u_pacing_app.c b/src/xrt/auxiliary/util/u_pacing_app.c
index bcb8445c5..204e82b5c 100644
--- a/src/xrt/auxiliary/util/u_pacing_app.c
+++ b/src/xrt/auxiliary/util/u_pacing_app.c
@@ -20,7 +20,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <inttypes.h>
 
 DEBUG_GET_ONCE_LOG_OPTION(log_level, "U_PACING_APP_LOG", U_LOGGING_WARN)
 DEBUG_GET_ONCE_FLOAT_OPTION(min_app_time_ms, "U_PACING_APP_MIN_TIME_MS", 1.0f)
diff --git a/src/xrt/auxiliary/util/u_pacing_compositor.c b/src/xrt/auxiliary/util/u_pacing_compositor.c
index 15269b6af..e5c919102 100644
--- a/src/xrt/auxiliary/util/u_pacing_compositor.c
+++ b/src/xrt/auxiliary/util/u_pacing_compositor.c
@@ -19,7 +19,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <inttypes.h>
 
 DEBUG_GET_ONCE_LOG_OPTION(log_level, "U_PACING_COMPOSITOR_LOG", U_LOGGING_WARN)
 
diff --git a/src/xrt/auxiliary/util/u_pacing_compositor_fake.c b/src/xrt/auxiliary/util/u_pacing_compositor_fake.c
index b3d740ec8..158cd6577 100644
--- a/src/xrt/auxiliary/util/u_pacing_compositor_fake.c
+++ b/src/xrt/auxiliary/util/u_pacing_compositor_fake.c
@@ -21,7 +21,6 @@
 
 #include <stdio.h>
 #include <assert.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/auxiliary/util/u_sink_force_genlock.c b/src/xrt/auxiliary/util/u_sink_force_genlock.c
index c4e9b3cb0..bc77ac9b9 100644
--- a/src/xrt/auxiliary/util/u_sink_force_genlock.c
+++ b/src/xrt/auxiliary/util/u_sink_force_genlock.c
@@ -16,7 +16,6 @@
 
 #include <stdio.h>
 #include <pthread.h>
-#include <inttypes.h>
 
 
 /*!
diff --git a/src/xrt/auxiliary/util/u_system_helpers.c b/src/xrt/auxiliary/util/u_system_helpers.c
index 15b0a765d..824ca9e25 100644
--- a/src/xrt/auxiliary/util/u_system_helpers.c
+++ b/src/xrt/auxiliary/util/u_system_helpers.c
@@ -17,7 +17,6 @@
 
 #include <assert.h>
 #include <limits.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/auxiliary/util/u_trace_marker.c b/src/xrt/auxiliary/util/u_trace_marker.c
index 595f15a7e..f57aa4152 100644
--- a/src/xrt/auxiliary/util/u_trace_marker.c
+++ b/src/xrt/auxiliary/util/u_trace_marker.c
@@ -16,7 +16,6 @@
 #include "util/u_debug.h"
 #include "util/u_trace_marker.h"
 
-#include <inttypes.h>
 
 
 #ifdef U_TRACE_PERCETTO
diff --git a/src/xrt/auxiliary/vk/vk_print.c b/src/xrt/auxiliary/vk/vk_print.c
index b564c5335..a2df4a0f8 100644
--- a/src/xrt/auxiliary/vk/vk_print.c
+++ b/src/xrt/auxiliary/vk/vk_print.c
@@ -12,7 +12,6 @@
 #include "util/u_pretty_print.h"
 #include "vk/vk_helpers.h"
 
-#include <inttypes.h>
 
 /*
  *
diff --git a/src/xrt/compositor/client/comp_d3d11_client.cpp b/src/xrt/compositor/client/comp_d3d11_client.cpp
index eb5c6a55f..0db394ef6 100644
--- a/src/xrt/compositor/client/comp_d3d11_client.cpp
+++ b/src/xrt/compositor/client/comp_d3d11_client.cpp
@@ -38,7 +38,6 @@
 #include <wil/result_macros.h>
 
 #include <assert.h>
-#include <inttypes.h>
 #include <memory>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/xrt/compositor/client/comp_d3d12_client.cpp b/src/xrt/compositor/client/comp_d3d12_client.cpp
index 22fe14b12..314c5e106 100644
--- a/src/xrt/compositor/client/comp_d3d12_client.cpp
+++ b/src/xrt/compositor/client/comp_d3d12_client.cpp
@@ -37,7 +37,6 @@
 #include <wil/result_macros.h>
 
 #include <assert.h>
-#include <inttypes.h>
 #include <memory>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/xrt/compositor/client/comp_d3d_common.cpp b/src/xrt/compositor/client/comp_d3d_common.cpp
index 639f8123e..b82fb904b 100644
--- a/src/xrt/compositor/client/comp_d3d_common.cpp
+++ b/src/xrt/compositor/client/comp_d3d_common.cpp
@@ -13,7 +13,6 @@
 #include "util/u_logging.h"
 #include "util/u_time.h"
 
-#include <inttypes.h>
 
 
 #define D3D_COMMON_SPEW(log_level, ...) U_LOG_IFL_T(log_level, __VA_ARGS__);
diff --git a/src/xrt/compositor/client/comp_gl_client.c b/src/xrt/compositor/client/comp_gl_client.c
index 9b8380649..979891264 100644
--- a/src/xrt/compositor/client/comp_gl_client.c
+++ b/src/xrt/compositor/client/comp_gl_client.c
@@ -30,7 +30,6 @@
 #include "util/u_logging.h"
 #include "util/u_trace_marker.h"
 
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/compositor/client/comp_gl_eglimage_swapchain.c b/src/xrt/compositor/client/comp_gl_eglimage_swapchain.c
index 36a931cac..e1662c35d 100644
--- a/src/xrt/compositor/client/comp_gl_eglimage_swapchain.c
+++ b/src/xrt/compositor/client/comp_gl_eglimage_swapchain.c
@@ -31,7 +31,6 @@
 #include "client/comp_egl_client.h"
 #include "client/comp_gl_eglimage_swapchain.h"
 
-#include <inttypes.h>
 
 #ifdef XRT_GRAPHICS_BUFFER_HANDLE_IS_AHARDWAREBUFFER
 #include <android/hardware_buffer.h>
diff --git a/src/xrt/compositor/client/comp_gl_memobj_swapchain.c b/src/xrt/compositor/client/comp_gl_memobj_swapchain.c
index e1a2a044b..931899a53 100644
--- a/src/xrt/compositor/client/comp_gl_memobj_swapchain.c
+++ b/src/xrt/compositor/client/comp_gl_memobj_swapchain.c
@@ -23,7 +23,6 @@
 #include "client/comp_gl_client.h"
 #include "client/comp_gl_memobj_swapchain.h"
 
-#include <inttypes.h>
 
 /*!
  * Down-cast helper.
diff --git a/src/xrt/compositor/main/comp_renderer.c b/src/xrt/compositor/main/comp_renderer.c
index 4716c8a71..1b295a324 100644
--- a/src/xrt/compositor/main/comp_renderer.c
+++ b/src/xrt/compositor/main/comp_renderer.c
@@ -47,7 +47,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <math.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/compositor/main/comp_target_swapchain.c b/src/xrt/compositor/main/comp_target_swapchain.c
index 70778a3a2..82457657f 100644
--- a/src/xrt/compositor/main/comp_target_swapchain.c
+++ b/src/xrt/compositor/main/comp_target_swapchain.c
@@ -21,7 +21,6 @@
 
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/compositor/main/comp_window_direct.c b/src/xrt/compositor/main/comp_window_direct.c
index 92d4449a0..9950c5070 100644
--- a/src/xrt/compositor/main/comp_window_direct.c
+++ b/src/xrt/compositor/main/comp_window_direct.c
@@ -8,7 +8,6 @@
  * @ingroup comp_main
  */
 
-#include <inttypes.h>
 
 #include "comp_window_direct.h"
 
diff --git a/src/xrt/compositor/main/comp_window_direct_randr.c b/src/xrt/compositor/main/comp_window_direct_randr.c
index 2d773b3f8..4c5336c1e 100644
--- a/src/xrt/compositor/main/comp_window_direct_randr.c
+++ b/src/xrt/compositor/main/comp_window_direct_randr.c
@@ -17,7 +17,6 @@
 
 #include "main/comp_window_direct.h"
 
-#include <inttypes.h>
 
 /*
  *
diff --git a/src/xrt/compositor/multi/comp_multi_compositor.c b/src/xrt/compositor/multi/comp_multi_compositor.c
index dd43722d6..063c27078 100644
--- a/src/xrt/compositor/multi/comp_multi_compositor.c
+++ b/src/xrt/compositor/multi/comp_multi_compositor.c
@@ -29,7 +29,6 @@
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #ifdef XRT_GRAPHICS_SYNC_HANDLE_IS_FD
 #include <unistd.h>
diff --git a/src/xrt/compositor/util/comp_swapchain.c b/src/xrt/compositor/util/comp_swapchain.c
index 6f13be182..e4bedebb7 100644
--- a/src/xrt/compositor/util/comp_swapchain.c
+++ b/src/xrt/compositor/util/comp_swapchain.c
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <inttypes.h>
 #include <errno.h>
 
 
diff --git a/src/xrt/drivers/euroc/euroc_player.cpp b/src/xrt/drivers/euroc/euroc_player.cpp
index 0d127fdbe..35a3300e2 100644
--- a/src/xrt/drivers/euroc/euroc_player.cpp
+++ b/src/xrt/drivers/euroc/euroc_player.cpp
@@ -31,7 +31,6 @@
 #include <fstream>
 #include <future>
 #include <thread>
-#include <inttypes.h>
 
 //! @see euroc_player_playback_config
 DEBUG_GET_ONCE_LOG_OPTION(euroc_log, "EUROC_LOG", U_LOGGING_WARN)
diff --git a/src/xrt/drivers/realsense/rs_ddev.c b/src/xrt/drivers/realsense/rs_ddev.c
index 8248ba492..7d99399d7 100644
--- a/src/xrt/drivers/realsense/rs_ddev.c
+++ b/src/xrt/drivers/realsense/rs_ddev.c
@@ -37,7 +37,6 @@
 #include <stdio.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 
 /*!
diff --git a/src/xrt/drivers/rift_s/rift_s.c b/src/xrt/drivers/rift_s/rift_s.c
index 71e918780..7cdc9aae2 100644
--- a/src/xrt/drivers/rift_s/rift_s.c
+++ b/src/xrt/drivers/rift_s/rift_s.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_vec3.h"
diff --git a/src/xrt/drivers/rift_s/rift_s_camera.c b/src/xrt/drivers/rift_s/rift_s_camera.c
index c48e1f8cb..8a6d5cbcf 100644
--- a/src/xrt/drivers/rift_s/rift_s_camera.c
+++ b/src/xrt/drivers/rift_s/rift_s_camera.c
@@ -17,7 +17,6 @@
  */
 #include <asm/byteorder.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "rift_s.h"
 #include "rift_s_camera.h"
diff --git a/src/xrt/drivers/rift_s/rift_s_controller.c b/src/xrt/drivers/rift_s/rift_s_controller.c
index 3550deeaf..33bfc5819 100644
--- a/src/xrt/drivers/rift_s/rift_s_controller.c
+++ b/src/xrt/drivers/rift_s/rift_s_controller.c
@@ -20,7 +20,6 @@
 #include <string.h>
 #include <stdio.h>
 #include <assert.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_space.h"
diff --git a/src/xrt/drivers/rift_s/rift_s_hmd.c b/src/xrt/drivers/rift_s/rift_s_hmd.c
index 63a86de1e..c28ee74de 100644
--- a/src/xrt/drivers/rift_s/rift_s_hmd.c
+++ b/src/xrt/drivers/rift_s/rift_s_hmd.c
@@ -26,7 +26,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_vec3.h"
diff --git a/src/xrt/drivers/rift_s/rift_s_tracker.c b/src/xrt/drivers/rift_s/rift_s_tracker.c
index b73b06818..40f286c85 100644
--- a/src/xrt/drivers/rift_s/rift_s_tracker.c
+++ b/src/xrt/drivers/rift_s/rift_s_tracker.c
@@ -21,7 +21,6 @@
 #include <stdio.h>
 #include <time.h>
 #include <assert.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_clock_tracking.h"
diff --git a/src/xrt/drivers/survive/survive_driver.c b/src/xrt/drivers/survive/survive_driver.c
index 0e1060eba..8bcc41db4 100644
--- a/src/xrt/drivers/survive/survive_driver.c
+++ b/src/xrt/drivers/survive/survive_driver.c
@@ -15,7 +15,6 @@
 #include <string.h>
 #include <assert.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_space.h"
diff --git a/src/xrt/drivers/wmr/wmr_camera.c b/src/xrt/drivers/wmr/wmr_camera.c
index ff72c7169..eb213e36d 100644
--- a/src/xrt/drivers/wmr/wmr_camera.c
+++ b/src/xrt/drivers/wmr/wmr_camera.c
@@ -14,7 +14,6 @@
 #include <libusb.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "os/os_threading.h"
diff --git a/src/xrt/drivers/wmr/wmr_source.c b/src/xrt/drivers/wmr/wmr_source.c
index 7c0546b3c..9b3cf7c48 100644
--- a/src/xrt/drivers/wmr/wmr_source.c
+++ b/src/xrt/drivers/wmr/wmr_source.c
@@ -23,7 +23,6 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include <inttypes.h>
 
 #define WMR_SOURCE_STR "WMR Source"
 
diff --git a/src/xrt/include/xrt/xrt_compiler.h b/src/xrt/include/xrt/xrt_compiler.h
index 904989e77..50c39a432 100644
--- a/src/xrt/include/xrt/xrt_compiler.h
+++ b/src/xrt/include/xrt/xrt_compiler.h
@@ -16,6 +16,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <inttypes.h>
 
 #ifdef _MSC_VER
 #include <intrin.h>
diff --git a/src/xrt/ipc/server/ipc_server_mainloop_android.c b/src/xrt/ipc/server/ipc_server_mainloop_android.c
index 47743d3bb..461ca4c38 100644
--- a/src/xrt/ipc/server/ipc_server_mainloop_android.c
+++ b/src/xrt/ipc/server/ipc_server_mainloop_android.c
@@ -22,7 +22,6 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/xrt/ipc/server/ipc_server_mainloop_linux.c b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
index 97f1d2ca7..d364fbed3 100644
--- a/src/xrt/ipc/server/ipc_server_mainloop_linux.c
+++ b/src/xrt/ipc/server/ipc_server_mainloop_linux.c
@@ -27,7 +27,6 @@
 
 #include <stdlib.h>
 #include <unistd.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/xrt/ipc/server/ipc_server_process.c b/src/xrt/ipc/server/ipc_server_process.c
index 732703408..6b6da45a4 100644
--- a/src/xrt/ipc/server/ipc_server_process.c
+++ b/src/xrt/ipc/server/ipc_server_process.c
@@ -34,7 +34,6 @@
 #include "server/ipc_server_interface.h"
 
 #include <stdlib.h>
-#include <inttypes.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/xrt/state_trackers/gui/gui_scene_record.c b/src/xrt/state_trackers/gui/gui_scene_record.c
index d3ceae9c6..1ec0489f4 100644
--- a/src/xrt/state_trackers/gui/gui_scene_record.c
+++ b/src/xrt/state_trackers/gui/gui_scene_record.c
@@ -41,7 +41,6 @@
 #include "stb_image_write.h"
 
 #include <assert.h>
-#include <inttypes.h>
 
 
 struct camera_window
diff --git a/src/xrt/state_trackers/gui/gui_widget_native_images.c b/src/xrt/state_trackers/gui/gui_widget_native_images.c
index a926f5416..351937e3e 100644
--- a/src/xrt/state_trackers/gui/gui_widget_native_images.c
+++ b/src/xrt/state_trackers/gui/gui_widget_native_images.c
@@ -18,7 +18,6 @@
 #include "gui_widget_native_images.h"
 
 #include <assert.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/state_trackers/gui/gui_window_record.c b/src/xrt/state_trackers/gui/gui_window_record.c
index d13e15ef2..1a243adb6 100644
--- a/src/xrt/state_trackers/gui/gui_window_record.c
+++ b/src/xrt/state_trackers/gui/gui_window_record.c
@@ -42,7 +42,6 @@
 #include "stb_image_write.h"
 
 #include <assert.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/state_trackers/oxr/oxr_api_action.c b/src/xrt/state_trackers/oxr/oxr_api_action.c
index ddd53ced5..e112255eb 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_action.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_action.c
@@ -22,7 +22,6 @@
 #include "oxr_subaction.h"
 
 #include <stdio.h>
-#include <inttypes.h>
 
 #include "bindings/b_generated_bindings.h"
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_body_tracking.c b/src/xrt/state_trackers/oxr/oxr_api_body_tracking.c
index 0de5ad6fb..1a46d32db 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_body_tracking.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_body_tracking.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "util/u_trace_marker.h"
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_face_tracking.c b/src/xrt/state_trackers/oxr/oxr_api_face_tracking.c
index 4dd2343a2..5f3caffd4 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_face_tracking.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_face_tracking.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "util/u_trace_marker.h"
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_instance.c b/src/xrt/state_trackers/oxr/oxr_api_instance.c
index 3c84ee6c2..33161981d 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_instance.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_instance.c
@@ -32,7 +32,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 DEBUG_GET_ONCE_BOOL_OPTION(ignore_openxr_version, "OXR_IGNORE_OPENXR_VERSION", false)
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_passthrough.c b/src/xrt/state_trackers/oxr/oxr_api_passthrough.c
index 81cbead2a..03cb9687b 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_passthrough.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_passthrough.c
@@ -20,7 +20,6 @@
 #include "oxr_subaction.h"
 
 #include <stdio.h>
-#include <inttypes.h>
 
 XrResult
 oxr_xrCreateGeometryInstanceFB(XrSession session,
diff --git a/src/xrt/state_trackers/oxr/oxr_api_session.c b/src/xrt/state_trackers/oxr/oxr_api_session.c
index d8d92d0bc..1292290b7 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_session.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_session.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "xrt/xrt_compiler.h"
 
diff --git a/src/xrt/state_trackers/oxr/oxr_api_space.c b/src/xrt/state_trackers/oxr/oxr_api_space.c
index 772566661..8526b6644 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_space.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_space.c
@@ -28,7 +28,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/state_trackers/oxr/oxr_api_swapchain.c b/src/xrt/state_trackers/oxr/oxr_api_swapchain.c
index 0af55f426..20f371312 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_swapchain.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_swapchain.c
@@ -23,7 +23,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 
 XRAPI_ATTR XrResult XRAPI_CALL
diff --git a/src/xrt/state_trackers/oxr/oxr_api_xdev.c b/src/xrt/state_trackers/oxr/oxr_api_xdev.c
index ac525edff..3d44669e7 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_xdev.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_xdev.c
@@ -22,7 +22,6 @@
 #include "oxr_api_funcs.h"
 #include "oxr_api_verify.h"
 
-#include <inttypes.h>
 
 
 #ifdef OXR_HAVE_MNDX_xdev_space
diff --git a/src/xrt/state_trackers/oxr/oxr_body_tracking.c b/src/xrt/state_trackers/oxr/oxr_body_tracking.c
index 6beb77a2c..ff345a28b 100644
--- a/src/xrt/state_trackers/oxr/oxr_body_tracking.c
+++ b/src/xrt/state_trackers/oxr/oxr_body_tracking.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "math/m_api.h"
 #include "math/m_mathinclude.h"
diff --git a/src/xrt/state_trackers/oxr/oxr_face_tracking.c b/src/xrt/state_trackers/oxr/oxr_face_tracking.c
index 39c0412e2..a78732675 100644
--- a/src/xrt/state_trackers/oxr/oxr_face_tracking.c
+++ b/src/xrt/state_trackers/oxr/oxr_face_tracking.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 
 #include "oxr_objects.h"
 #include "oxr_logger.h"
diff --git a/src/xrt/state_trackers/oxr/oxr_session.c b/src/xrt/state_trackers/oxr/oxr_session.c
index 421778030..77de55c6d 100644
--- a/src/xrt/state_trackers/oxr/oxr_session.c
+++ b/src/xrt/state_trackers/oxr/oxr_session.c
@@ -49,7 +49,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <inttypes.h>
 
 
 DEBUG_GET_ONCE_NUM_OPTION(ipd, "OXR_DEBUG_IPD_MM", 63)
diff --git a/src/xrt/state_trackers/oxr/oxr_session_frame_end.c b/src/xrt/state_trackers/oxr/oxr_session_frame_end.c
index 63b79b4e5..6a00268e1 100644
--- a/src/xrt/state_trackers/oxr/oxr_session_frame_end.c
+++ b/src/xrt/state_trackers/oxr/oxr_session_frame_end.c
@@ -35,7 +35,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/state_trackers/oxr/oxr_system.c b/src/xrt/state_trackers/oxr/oxr_system.c
index bf97ff47f..cc1beed34 100644
--- a/src/xrt/state_trackers/oxr/oxr_system.c
+++ b/src/xrt/state_trackers/oxr/oxr_system.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <inttypes.h>
 #include <assert.h>
 
 #include "xrt/xrt_device.h"
diff --git a/src/xrt/state_trackers/oxr/oxr_vulkan.c b/src/xrt/state_trackers/oxr/oxr_vulkan.c
index 9f709b70b..1d3734ff8 100644
--- a/src/xrt/state_trackers/oxr/oxr_vulkan.c
+++ b/src/xrt/state_trackers/oxr/oxr_vulkan.c
@@ -10,7 +10,6 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <inttypes.h>
 
 #include "util/u_misc.h"
 #include "util/u_debug.h"
diff --git a/src/xrt/state_trackers/oxr/oxr_xdev.c b/src/xrt/state_trackers/oxr/oxr_xdev.c
index 13d4c0502..7619b6fa6 100644
--- a/src/xrt/state_trackers/oxr/oxr_xdev.c
+++ b/src/xrt/state_trackers/oxr/oxr_xdev.c
@@ -21,7 +21,6 @@
 #include "xrt/xrt_defines.h"
 
 #include <stdio.h>
-#include <inttypes.h>
 
 
 /*
diff --git a/src/xrt/state_trackers/prober/p_dump.c b/src/xrt/state_trackers/prober/p_dump.c
index ea5e821f9..80b3519f7 100644
--- a/src/xrt/state_trackers/prober/p_dump.c
+++ b/src/xrt/state_trackers/prober/p_dump.c
@@ -17,7 +17,6 @@
 
 #include <stdio.h>
 #include <string.h>
-#include <inttypes.h>
 
 
 #define P(...)                                                                                                         \
diff --git a/src/xrt/state_trackers/prober/p_udev.c b/src/xrt/state_trackers/prober/p_udev.c
index 95078c235..145c959dc 100644
--- a/src/xrt/state_trackers/prober/p_udev.c
+++ b/src/xrt/state_trackers/prober/p_udev.c
@@ -14,7 +14,6 @@
 #include <assert.h>
 #include <string.h>
 #include <libudev.h>
-#include <inttypes.h>
 #include <linux/hidraw.h>
 
 
diff --git a/src/xrt/targets/sdl_test/sdl_swapchain.c b/src/xrt/targets/sdl_test/sdl_swapchain.c
index 648d49abb..23be92b07 100644
--- a/src/xrt/targets/sdl_test/sdl_swapchain.c
+++ b/src/xrt/targets/sdl_test/sdl_swapchain.c
@@ -12,7 +12,6 @@
 #include "util/u_handles.h"
 #include "ogl/ogl_helpers.h"
 
-#include <inttypes.h>
 
 
 static void