diff --git a/src/xrt/compositor/null/null_compositor.c b/src/xrt/compositor/null/null_compositor.c
index d3ce385c4..7b514ca2e 100644
--- a/src/xrt/compositor/null/null_compositor.c
+++ b/src/xrt/compositor/null/null_compositor.c
@@ -4,7 +4,7 @@
  * @file
  * @brief  Null compositor implementation.
  *
- * Based on src/xrt/compositor/main/comp_compositor.c
+ * Originally based on src/xrt/compositor/main/comp_compositor.c
  *
  * @author Jakob Bornecrantz <jakob@collabora.com>
  * @author Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
diff --git a/src/xrt/compositor/null/null_compositor.h b/src/xrt/compositor/null/null_compositor.h
index a0b5c1ed3..2f686d9fd 100644
--- a/src/xrt/compositor/null/null_compositor.h
+++ b/src/xrt/compositor/null/null_compositor.h
@@ -1,10 +1,10 @@
-// Copyright 2019-2022, Collabora, Ltd.
+// Copyright 2019-2024, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 /*!
  * @file
- * @brief  Header for null compositor.
+ * @brief Internal header for null compositor.
  *
- * Based on src/xrt/compositor/main/comp_compositor.h
+ * Originally based on src/xrt/compositor/main/comp_compositor.h
  *
  * @author Jakob Bornecrantz <jakob@collabora.com>
  * @author Lubosz Sarnecki <lubosz.sarnecki@collabora.com>
@@ -14,22 +14,23 @@
 
 #pragma once
 
-#include "xrt/xrt_gfx_vk.h"
 #include "xrt/xrt_instance.h"
 
-#include "os/os_time.h"
-
-#include "util/u_threading.h"
 #include "util/u_logging.h"
 #include "util/u_pacing.h"
 
 #include "util/comp_base.h"
 
+#include <stdint.h>
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct xrt_device;
+struct u_pacing_compositor;
+
 /*!
  * @defgroup comp_null Null compositor
  * @ingroup xrt
diff --git a/src/xrt/compositor/null/null_interfaces.h b/src/xrt/compositor/null/null_interfaces.h
index 92ffad215..5bb23d3f1 100644
--- a/src/xrt/compositor/null/null_interfaces.h
+++ b/src/xrt/compositor/null/null_interfaces.h
@@ -1,4 +1,4 @@
-// Copyright 2019-2022, Collabora, Ltd.
+// Copyright 2019-2024, Collabora, Ltd.
 // SPDX-License-Identifier: BSL-1.0
 /*!
  * @file
@@ -11,7 +11,7 @@
 
 #pragma once
 
-#include "xrt/xrt_compiler.h"
+#include "xrt/xrt_results.h"
 
 
 #ifdef __cplusplus