diff --git a/src/xrt/auxiliary/math/m_base.cpp b/src/xrt/auxiliary/math/m_base.cpp
index 0cca0d469..20602a134 100644
--- a/src/xrt/auxiliary/math/m_base.cpp
+++ b/src/xrt/auxiliary/math/m_base.cpp
@@ -9,8 +9,11 @@
  * @author Nis Madsen <nima_zero_one@protonmail.com>
  * @ingroup aux_math
  */
+// IWYU pragma: no_include "src/Core/DenseBase.h"
+// IWYU pragma: no_include "src/Core/MatrixBase.h"
+
+#include "math/m_api.h" // IWYU pragma: associated
 
-#include "math/m_api.h"
 #include "math/m_eigen_interop.hpp"
 #include "math/m_vec3.h"
 
diff --git a/src/xrt/auxiliary/math/m_filter_fifo.h b/src/xrt/auxiliary/math/m_filter_fifo.h
index c0b35a39e..e08f9e7b7 100644
--- a/src/xrt/auxiliary/math/m_filter_fifo.h
+++ b/src/xrt/auxiliary/math/m_filter_fifo.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "xrt/xrt_defines.h"
+#include "xrt/xrt_defines.h" // IWYU pragma: keep
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/xrt/auxiliary/math/m_quatexpmap.cpp b/src/xrt/auxiliary/math/m_quatexpmap.cpp
index 43be6657c..f4590c798 100644
--- a/src/xrt/auxiliary/math/m_quatexpmap.cpp
+++ b/src/xrt/auxiliary/math/m_quatexpmap.cpp
@@ -9,6 +9,7 @@
  *
  * Based in part on inc/osvr/Util/EigenQuatExponentialMap.h in OSVR-Core
  */
+// IWYU pragma: no_include "src/Core/MatrixBase.h"
 
 #include "math/m_api.h"
 #include "math/m_eigen_interop.hpp"
@@ -22,6 +23,7 @@
 // anonymous namespace for internal types
 namespace {
 template <typename Scalar> struct FourthRootMachineEps;
+
 template <> struct FourthRootMachineEps<double>
 {
 	/// machine epsilon is 1e-53, so fourth root is roughly 1e-13
diff --git a/src/xrt/auxiliary/ogl/egl_api.h b/src/xrt/auxiliary/ogl/egl_api.h
index 0758cdbc7..af786e050 100644
--- a/src/xrt/auxiliary/ogl/egl_api.h
+++ b/src/xrt/auxiliary/ogl/egl_api.h
@@ -9,4 +9,4 @@
 
 #pragma once
 
-#include "glad/egl.h"
+#include "glad/egl.h" // IWYU pragma: export
diff --git a/src/xrt/auxiliary/ogl/ogl_api.h b/src/xrt/auxiliary/ogl/ogl_api.h
index a56509f24..44d9cbfe1 100644
--- a/src/xrt/auxiliary/ogl/ogl_api.h
+++ b/src/xrt/auxiliary/ogl/ogl_api.h
@@ -9,4 +9,4 @@
 
 #pragma once
 
-#include "glad/gl.h"
+#include "glad/gl.h" // IWYU pragma: export
diff --git a/src/xrt/auxiliary/ogl/ogl_helpers.c b/src/xrt/auxiliary/ogl/ogl_helpers.c
index eb91c3afd..8b04e3d48 100644
--- a/src/xrt/auxiliary/ogl/ogl_helpers.c
+++ b/src/xrt/auxiliary/ogl/ogl_helpers.c
@@ -11,7 +11,7 @@
 #include "util/u_logging.h"
 
 #include "ogl_helpers.h"
-#include "ogl_api.h"
+#include "ogl_api.h" // IWYU pragma: keep
 
 #include <inttypes.h>
 
diff --git a/src/xrt/auxiliary/tracking/t_imu.cpp b/src/xrt/auxiliary/tracking/t_imu.cpp
index ebb586e11..1f28b1c28 100644
--- a/src/xrt/auxiliary/tracking/t_imu.cpp
+++ b/src/xrt/auxiliary/tracking/t_imu.cpp
@@ -7,6 +7,7 @@
  * @author Ryan Pavlik <ryan.pavlik@collabora.com>
  * @ingroup aux_tracking
  */
+// IWYU pragma: no_include "src/Core/MatrixBase.h"
 
 #include "tracking/t_imu.h"
 #include "tracking/t_imu_fusion.hpp"
diff --git a/src/xrt/auxiliary/util/u_json.h b/src/xrt/auxiliary/util/u_json.h
index 6fb7cfae2..e7f5ae206 100644
--- a/src/xrt/auxiliary/util/u_json.h
+++ b/src/xrt/auxiliary/util/u_json.h
@@ -13,7 +13,7 @@
 #include "xrt/xrt_compiler.h"
 #include "xrt/xrt_defines.h"
 
-#include "cjson/cJSON.h"
+#include <cjson/cJSON.h> // IWYU pragma: export
 
 
 #ifdef __cplusplus
diff --git a/src/xrt/auxiliary/util/u_misc.h b/src/xrt/auxiliary/util/u_misc.h
index b92b3b058..45040ba0f 100644
--- a/src/xrt/auxiliary/util/u_misc.h
+++ b/src/xrt/auxiliary/util/u_misc.h
@@ -10,7 +10,7 @@
 #pragma once
 
 #include <stdlib.h> // for calloc
-#include <string.h> // for memset
+#include <string.h> // for memset // IWYU pragma: keep
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/src/xrt/auxiliary/util/u_template_historybuf_const_iterator.inl b/src/xrt/auxiliary/util/u_template_historybuf_const_iterator.inl
index 937433aa3..e5c010c26 100644
--- a/src/xrt/auxiliary/util/u_template_historybuf_const_iterator.inl
+++ b/src/xrt/auxiliary/util/u_template_historybuf_const_iterator.inl
@@ -7,6 +7,9 @@
  * @author Ryan Pavlik <ryan.pavlik@collabora.com>
  * @ingroup aux_util
  */
+#pragma once
+
+// IWYU pragma: private, include "util/u_template_historybuf.hpp"
 
 #include <stddef.h>
 #include <type_traits>
diff --git a/src/xrt/auxiliary/util/u_template_historybuf_impl_helpers.hpp b/src/xrt/auxiliary/util/u_template_historybuf_impl_helpers.hpp
index 1f3ebd631..1203a284f 100644
--- a/src/xrt/auxiliary/util/u_template_historybuf_impl_helpers.hpp
+++ b/src/xrt/auxiliary/util/u_template_historybuf_impl_helpers.hpp
@@ -12,6 +12,8 @@
 
 #pragma once
 
+// IWYU pragma: private, include "util/u_template_historybuf.hpp"
+
 #include <algorithm>
 #include <assert.h>
 #include <stdlib.h>
diff --git a/src/xrt/auxiliary/util/u_template_historybuf_iterator.inl b/src/xrt/auxiliary/util/u_template_historybuf_iterator.inl
index 15e8bf805..972f78792 100644
--- a/src/xrt/auxiliary/util/u_template_historybuf_iterator.inl
+++ b/src/xrt/auxiliary/util/u_template_historybuf_iterator.inl
@@ -7,6 +7,9 @@
  * @author Ryan Pavlik <ryan.pavlik@collabora.com>
  * @ingroup aux_util
  */
+#pragma once
+
+// IWYU pragma: private, include "util/u_template_historybuf.hpp"
 
 #include <stddef.h>
 #include <type_traits>
diff --git a/src/xrt/auxiliary/util/u_time.h b/src/xrt/auxiliary/util/u_time.h
index e4b74ede7..18da5ad5a 100644
--- a/src/xrt/auxiliary/util/u_time.h
+++ b/src/xrt/auxiliary/util/u_time.h
@@ -20,7 +20,7 @@
 #include "xrt/xrt_compiler.h"
 
 #include <stdint.h>
-#include <time.h>
+#include <time.h> // IWYU pragma: keep
 
 #if defined(XRT_ENV_MINGW)
 // That define is needed before to include windows.h, to avoid a collision
diff --git a/src/xrt/auxiliary/util/u_trace_marker.h b/src/xrt/auxiliary/util/u_trace_marker.h
index afdf822ba..e8948a9fd 100644
--- a/src/xrt/auxiliary/util/u_trace_marker.h
+++ b/src/xrt/auxiliary/util/u_trace_marker.h
@@ -12,7 +12,7 @@
 #include "xrt/xrt_compiler.h"
 #include "xrt/xrt_config_os.h"
 #include "xrt/xrt_config_have.h"
-#include "xrt/xrt_config_build.h"
+#include "xrt/xrt_config_build.h" // IWYU pragma: keep
 
 #include <stdio.h>
 
diff --git a/src/xrt/auxiliary/util/u_var.h b/src/xrt/auxiliary/util/u_var.h
index 232ee0eb8..485e318a8 100644
--- a/src/xrt/auxiliary/util/u_var.h
+++ b/src/xrt/auxiliary/util/u_var.h
@@ -9,7 +9,7 @@
 
 #pragma once
 
-#include "xrt/xrt_defines.h"
+#include "xrt/xrt_defines.h" // IWYU pragma: keep
 
 #include "util/u_logging.h"
 
diff --git a/src/xrt/drivers/vf/vf_driver.c b/src/xrt/drivers/vf/vf_driver.c
index cefb12bb2..418ee2747 100644
--- a/src/xrt/drivers/vf/vf_driver.c
+++ b/src/xrt/drivers/vf/vf_driver.c
@@ -9,6 +9,8 @@
  * @ingroup drv_vf
  */
 
+#include "vf_interface.h" // IWYU pragma: associated
+
 #include "os/os_time.h"
 #include "os/os_threading.h"
 
@@ -21,7 +23,6 @@
 #include "util/u_logging.h"
 #include "util/u_trace_marker.h"
 
-#include "vf_interface.h"
 
 #include <stdio.h>
 #include <assert.h>
diff --git a/src/xrt/drivers/vive/vive_lighthouse.c b/src/xrt/drivers/vive/vive_lighthouse.c
index b2eaa5952..6e686dd61 100644
--- a/src/xrt/drivers/vive/vive_lighthouse.c
+++ b/src/xrt/drivers/vive/vive_lighthouse.c
@@ -7,6 +7,8 @@
  * @author Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
  * @ingroup drv_vive
  */
+// IWYU pragma: no_include <asm/int-ll64.h>
+// IWYU pragma: no_include <linux/byteorder/little_endian.h>
 
 #include <asm/byteorder.h>
 #include <stdint.h>
diff --git a/src/xrt/include/xrt/xrt_openxr_includes.h b/src/xrt/include/xrt/xrt_openxr_includes.h
index d81493eac..e6a561e6b 100644
--- a/src/xrt/include/xrt/xrt_openxr_includes.h
+++ b/src/xrt/include/xrt/xrt_openxr_includes.h
@@ -46,9 +46,9 @@ typedef __eglMustCastToProperFunctionPointerType (*PFNEGLGETPROCADDRESSPROC)(con
 #include <time.h>
 #endif
 
-#include "openxr/openxr.h"
-#include "openxr/openxr_platform.h"
-#include "openxr/loader_interfaces.h"
+#include "openxr/openxr.h"            // IWYU pragma: export
+#include "openxr/openxr_platform.h"   // IWYU pragma: export
+#include "openxr/loader_interfaces.h" // IWYU pragma: export
 
 #include "openxr/XR_MNDX_hydra.h"
 #include "openxr/XR_MNDX_system_buttons.h"
diff --git a/src/xrt/include/xrt/xrt_vulkan_includes.h b/src/xrt/include/xrt/xrt_vulkan_includes.h
index 1edcb4e97..2ee560905 100644
--- a/src/xrt/include/xrt/xrt_vulkan_includes.h
+++ b/src/xrt/include/xrt/xrt_vulkan_includes.h
@@ -18,7 +18,7 @@
 #include "xrt/xrt_windows.h"
 
 #define VK_NO_PROTOTYPES
-#include <vulkan/vulkan.h>
+#include <vulkan/vulkan.h> // IWYU pragma: export
 
 // Dealing with underscore compat.
 #ifndef VK_KHR_MAINTENANCE_1_EXTENSION_NAME
diff --git a/src/xrt/state_trackers/oxr/oxr_api_space.c b/src/xrt/state_trackers/oxr/oxr_api_space.c
index e0a4b7f67..0c9b85f2e 100644
--- a/src/xrt/state_trackers/oxr/oxr_api_space.c
+++ b/src/xrt/state_trackers/oxr/oxr_api_space.c
@@ -12,7 +12,7 @@
 #include "util/u_debug.h"
 #include "util/u_trace_marker.h"
 
-#include "math/m_api.h"
+#include "math/m_api.h" // IWYU pragma: keep
 
 #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 a22a7ec51..b675fc145 100644
--- a/src/xrt/state_trackers/oxr/oxr_session.c
+++ b/src/xrt/state_trackers/oxr/oxr_session.c
@@ -10,15 +10,17 @@
  */
 
 #include "xrt/xrt_device.h"
-#include "xrt/xrt_config_build.h"
-#include "xrt/xrt_config_have.h"
+#include "xrt/xrt_config_build.h" // IWYU pragma: keep
+#include "xrt/xrt_config_have.h"  // IWYU pragma: keep
 
 #ifdef XR_USE_PLATFORM_XLIB
-#include "xrt/xrt_gfx_xlib.h"
+#include "xrt/xrt_gfx_xlib.h" // IWYU pragma: keep
+
 #endif // XR_USE_PLATFORM_XLIB
 
 #ifdef XRT_HAVE_VULKAN
-#include "xrt/xrt_gfx_vk.h"
+#include "xrt/xrt_gfx_vk.h" // IWYU pragma: keep
+
 #endif // XRT_HAVE_VULKAN
 
 #include "os/os_time.h"