8 files changed, 39 insertions, 14 deletions
diff --git a/src/gallium/winsys/freedreno/drm/Makefile.sources b/src/gallium/winsys/freedreno/drm/Makefile.sources
index 18a8f283a8c..f0581dfb337 100644
--- a/src/gallium/winsys/freedreno/drm/Makefile.sources
+++ b/src/gallium/winsys/freedreno/drm/Makefile.sources
@@ -1,2 +1,3 @@
 C_SOURCES := \
+	freedreno_drm_public.h \
 	freedreno_drm_winsys.c
diff --git a/src/gallium/winsys/i915/drm/Makefile.sources b/src/gallium/winsys/i915/drm/Makefile.sources
index 1857442bf01..1e1f56247b1 100644
--- a/src/gallium/winsys/i915/drm/Makefile.sources
+++ b/src/gallium/winsys/i915/drm/Makefile.sources
@@ -2,4 +2,6 @@ C_SOURCES := \
 	i915_drm_batchbuffer.c \
 	i915_drm_buffer.c \
 	i915_drm_fence.c \
-	i915_drm_winsys.c
+	i915_drm_public.h \
+	i915_drm_winsys.c \
+	i915_drm_winsys.h
diff --git a/src/gallium/winsys/intel/drm/Makefile.sources b/src/gallium/winsys/intel/drm/Makefile.sources
index e11411ad1c6..18b2513f8e8 100644
--- a/src/gallium/winsys/intel/drm/Makefile.sources
+++ b/src/gallium/winsys/intel/drm/Makefile.sources
@@ -1,2 +1,4 @@
 C_SOURCES := \
-	intel_drm_winsys.c
+	intel_drm_public.h \
+	intel_drm_winsys.c \
+	intel_winsys.h
diff --git a/src/gallium/winsys/nouveau/drm/Makefile.sources b/src/gallium/winsys/nouveau/drm/Makefile.sources
index 43b8e8679ac..9f70e9f49da 100644
--- a/src/gallium/winsys/nouveau/drm/Makefile.sources
+++ b/src/gallium/winsys/nouveau/drm/Makefile.sources
@@ -1,2 +1,3 @@
 C_SOURCES := \
+	nouveau_drm_public.h \
 	nouveau_drm_winsys.c
diff --git a/src/gallium/winsys/radeon/drm/Makefile.am b/src/gallium/winsys/radeon/drm/Makefile.am
index b413b0b93a0..0320aca01f9 100644
--- a/src/gallium/winsys/radeon/drm/Makefile.am
+++ b/src/gallium/winsys/radeon/drm/Makefile.am
@@ -8,3 +8,5 @@ AM_CFLAGS = \
 noinst_LTLIBRARIES = libradeonwinsys.la
 
 libradeonwinsys_la_SOURCES = $(C_SOURCES)
+
+EXTRA_DIST = $(TOOLS_HDR)
diff --git a/src/gallium/winsys/radeon/drm/Makefile.sources b/src/gallium/winsys/radeon/drm/Makefile.sources
index 4ca5ebb1b34..d30969e174f 100644
--- a/src/gallium/winsys/radeon/drm/Makefile.sources
+++ b/src/gallium/winsys/radeon/drm/Makefile.sources
@@ -1,5 +1,13 @@
 C_SOURCES := \
 	radeon_drm_bo.c \
+	radeon_drm_bo.h \
 	radeon_drm_cs.c \
 	radeon_drm_cs_dump.c \
-	radeon_drm_winsys.c
+	radeon_drm_cs.h \
+	radeon_drm_public.h \
+	radeon_drm_winsys.c \
+	radeon_drm_winsys.h \
+	radeon_winsys.h
+
+TOOLS_HDR := \
+	radeon_ctx.h
diff --git a/src/gallium/winsys/svga/drm/Makefile.sources b/src/gallium/winsys/svga/drm/Makefile.sources
index 08aecd6bfaf..ab2b9321f3e 100644
--- a/src/gallium/winsys/svga/drm/Makefile.sources
+++ b/src/gallium/winsys/svga/drm/Makefile.sources
@@ -1,12 +1,20 @@
 C_SOURCES := \
-        vmw_buffer.c \
-        vmw_context.c  \
-        vmw_fence.c  \
-        vmw_screen.c  \
-        vmw_screen_dri.c  \
-        vmw_screen_ioctl.c  \
-        vmw_screen_pools.c  \
-        vmw_screen_svga.c  \
-        vmw_surface.c \
-        vmw_shader.c \
-        pb_buffer_simple_fenced.c
+	pb_buffer_simple_fenced.c \
+	svga_drm_public.h \
+	vmw_buffer.c \
+	vmw_buffer.h \
+	vmw_context.c \
+	vmw_context.h \
+	vmw_fence.c \
+	vmw_fence.h \
+	vmwgfx_drm.h \
+	vmw_screen.c \
+	vmw_screen_dri.c \
+	vmw_screen.h \
+	vmw_screen_ioctl.c \
+	vmw_screen_pools.c \
+	vmw_screen_svga.c \
+	vmw_surface.c \
+	vmw_surface.h \
+	vmw_shader.c \
+	vmw_shader.h
diff --git a/src/gallium/winsys/vc4/drm/Makefile.sources b/src/gallium/winsys/vc4/drm/Makefile.sources
index 97cf2eac47c..19cadf78070 100644
--- a/src/gallium/winsys/vc4/drm/Makefile.sources
+++ b/src/gallium/winsys/vc4/drm/Makefile.sources
@@ -1,2 +1,3 @@
 C_SOURCES := \
+	vc4_drm_public.h \
 	vc4_drm_winsys.c