diff --git a/src/xrt/compositor/main/comp_compositor.c b/src/xrt/compositor/main/comp_compositor.c
index 8b15c81b9..cdcb2594f 100644
--- a/src/xrt/compositor/main/comp_compositor.c
+++ b/src/xrt/compositor/main/comp_compositor.c
@@ -42,7 +42,6 @@
  * behavior.
  */
 
-#include "xrt/xrt_gfx_native.h"
 #include "xrt/xrt_config_have.h"
 
 #include "os/os_time.h"
diff --git a/src/xrt/compositor/multi/comp_multi_compositor.c b/src/xrt/compositor/multi/comp_multi_compositor.c
index 19a40fce1..1bb74098f 100644
--- a/src/xrt/compositor/multi/comp_multi_compositor.c
+++ b/src/xrt/compositor/multi/comp_multi_compositor.c
@@ -8,12 +8,10 @@
  * @ingroup comp_multi
  */
 
-#include "util/u_wait.h"
-#include "xrt/xrt_gfx_native.h"
-
 #include "os/os_time.h"
 
 #include "util/u_var.h"
+#include "util/u_wait.h"
 #include "util/u_misc.h"
 #include "util/u_time.h"
 #include "util/u_debug.h"
diff --git a/src/xrt/compositor/multi/comp_multi_system.c b/src/xrt/compositor/multi/comp_multi_system.c
index 4a06198a1..cc3dfb39a 100644
--- a/src/xrt/compositor/multi/comp_multi_system.c
+++ b/src/xrt/compositor/multi/comp_multi_system.c
@@ -8,10 +8,8 @@
  * @ingroup comp_multi
  */
 
-#include "os/os_threading.h"
-#include "xrt/xrt_gfx_native.h"
-
 #include "os/os_time.h"
+#include "os/os_threading.h"
 
 #include "util/u_var.h"
 #include "util/u_misc.h"
diff --git a/src/xrt/compositor/null/null_compositor.c b/src/xrt/compositor/null/null_compositor.c
index a9d4655e6..758220857 100644
--- a/src/xrt/compositor/null/null_compositor.c
+++ b/src/xrt/compositor/null/null_compositor.c
@@ -12,8 +12,6 @@
  * @ingroup comp_null
  */
 
-#include "xrt/xrt_gfx_native.h"
-
 #include "os/os_time.h"
 
 #include "util/u_misc.h"
diff --git a/src/xrt/include/xrt/xrt_gfx_native.h b/src/xrt/include/xrt/xrt_gfx_native.h
deleted file mode 100644
index 5dc89f1f4..000000000
--- a/src/xrt/include/xrt/xrt_gfx_native.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2019-2022, Collabora, Ltd.
-// SPDX-License-Identifier: BSL-1.0
-/*!
- * @file
- * @brief  Header defining a XRT graphics provider.
- * @author Jakob Bornecrantz <jakob@collabora.com>
- * @ingroup xrt_iface
- */
-
-#pragma once
-
-#include "xrt/xrt_device.h"
-#include "xrt/xrt_compositor.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/*!
- * Creates the main system compositor (and its nested native compositor).
- *
- * @ingroup xrt_iface
- * @relates xrt_system_compositor
- */
-xrt_result_t
-xrt_gfx_provider_create_system(struct xrt_device *xdev, struct xrt_system_compositor **out_xsysc);
-
-
-#ifdef __cplusplus
-}
-#endif
diff --git a/src/xrt/ipc/client/ipc_client_instance.c b/src/xrt/ipc/client/ipc_client_instance.c
index f27fbde18..c17493e4a 100644
--- a/src/xrt/ipc/client/ipc_client_instance.c
+++ b/src/xrt/ipc/client/ipc_client_instance.c
@@ -12,7 +12,6 @@
 #endif
 
 #include "xrt/xrt_instance.h"
-#include "xrt/xrt_gfx_native.h"
 #include "xrt/xrt_handles.h"
 #include "xrt/xrt_config_os.h"
 #include "xrt/xrt_config_android.h"
diff --git a/src/xrt/ipc/server/ipc_server_handler.c b/src/xrt/ipc/server/ipc_server_handler.c
index 06aacf0e3..20fd71de9 100644
--- a/src/xrt/ipc/server/ipc_server_handler.c
+++ b/src/xrt/ipc/server/ipc_server_handler.c
@@ -7,8 +7,6 @@
  * @ingroup ipc_server
  */
 
-#include "xrt/xrt_gfx_native.h"
-
 #include "util/u_misc.h"
 #include "util/u_handles.h"
 #include "util/u_trace_marker.h"
diff --git a/src/xrt/ipc/server/ipc_server_per_client_thread.c b/src/xrt/ipc/server/ipc_server_per_client_thread.c
index 547ffc046..c239fc7d6 100644
--- a/src/xrt/ipc/server/ipc_server_per_client_thread.c
+++ b/src/xrt/ipc/server/ipc_server_per_client_thread.c
@@ -8,8 +8,6 @@
  * @ingroup ipc_server
  */
 
-#include "xrt/xrt_gfx_native.h"
-
 #include "util/u_misc.h"
 
 #include "server/ipc_server.h"
diff --git a/src/xrt/targets/common/target_instance.c b/src/xrt/targets/common/target_instance.c
index 94c2d50f0..a1f08fe1f 100644
--- a/src/xrt/targets/common/target_instance.c
+++ b/src/xrt/targets/common/target_instance.c
@@ -6,7 +6,6 @@
  * @author Jakob Bornecrantz <jakob@collabora.com>
  */
 
-#include "xrt/xrt_gfx_native.h"
 #include "xrt/xrt_system.h"
 #include "xrt/xrt_config_build.h"
 
diff --git a/src/xrt/targets/sdl_test/sdl_compositor.c b/src/xrt/targets/sdl_test/sdl_compositor.c
index 730bf7e53..3a897b83d 100644
--- a/src/xrt/targets/sdl_test/sdl_compositor.c
+++ b/src/xrt/targets/sdl_test/sdl_compositor.c
@@ -12,8 +12,6 @@
  * @ingroup sdl_test
  */
 
-#include "xrt/xrt_gfx_native.h"
-
 #include "os/os_time.h"
 
 #include "util/u_misc.h"