diff --git a/src/gallium/winsys/sw/dri/Makefile.am b/src/gallium/winsys/sw/dri/Makefile.am
index 182825e6695..1917b00ca8e 100644
--- a/src/gallium/winsys/sw/dri/Makefile.am
+++ b/src/gallium/winsys/sw/dri/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -27,4 +28,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libswdri.la
 
-libswdri_la_SOURCES = dri_sw_winsys.c
+libswdri_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/dri/Makefile.sources b/src/gallium/winsys/sw/dri/Makefile.sources
new file mode 100644
index 00000000000..5f9178fdb53
--- /dev/null
+++ b/src/gallium/winsys/sw/dri/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	dri_sw_winsys.c \
+	dri_sw_winsys.h
diff --git a/src/gallium/winsys/sw/dri/SConscript b/src/gallium/winsys/sw/dri/SConscript
index f8e1fa6cfd8..434d13bd6f8 100644
--- a/src/gallium/winsys/sw/dri/SConscript
+++ b/src/gallium/winsys/sw/dri/SConscript
@@ -11,13 +11,10 @@ if env['platform'] in ('linux', 'sunos'):
     env.Append(CPPPATH = [
         '#/src/gallium/include',
         '#/src/gallium/auxiliary',
-        '#/src/gallium/drivers',
     ])
 
     ws_dri = env.ConvenienceLibrary(
         target = 'ws_dri',
-        source = [
-           'dri_sw_winsys.c',
-        ]
+        source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
     )
     Export('ws_dri')
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.am b/src/gallium/winsys/sw/fbdev/Makefile.am
index 93abe816185..2953376d288 100644
--- a/src/gallium/winsys/sw/fbdev/Makefile.am
+++ b/src/gallium/winsys/sw/fbdev/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -27,4 +28,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libfbdev.la
 
-libfbdev_la_SOURCES = fbdev_sw_winsys.c
+libfbdev_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/fbdev/Makefile.sources b/src/gallium/winsys/sw/fbdev/Makefile.sources
new file mode 100644
index 00000000000..dd48051cfd5
--- /dev/null
+++ b/src/gallium/winsys/sw/fbdev/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	fbdev_sw_winsys.c \
+	fbdev_sw_winsys.h
diff --git a/src/gallium/winsys/sw/fbdev/SConscript b/src/gallium/winsys/sw/fbdev/SConscript
index 3b5b4ff1c07..bf504ad28d8 100644
--- a/src/gallium/winsys/sw/fbdev/SConscript
+++ b/src/gallium/winsys/sw/fbdev/SConscript
@@ -11,13 +11,10 @@ if env['platform'] == 'linux':
     env.Append(CPPPATH = [
         '#/src/gallium/include',
         '#/src/gallium/auxiliary',
-        '#/src/gallium/drivers',
     ])
 
     ws_fbdev = env.ConvenienceLibrary(
         target = 'ws_fbdev',
-        source = [
-           'fbdev_sw_winsys.c',
-        ]
+        source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
     )
     Export('ws_fbdev')
diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.am b/src/gallium/winsys/sw/kms-dri/Makefile.am
index cb3b61deea6..8162553289d 100644
--- a/src/gallium/winsys/sw/kms-dri/Makefile.am
+++ b/src/gallium/winsys/sw/kms-dri/Makefile.am
@@ -21,6 +21,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -29,4 +30,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libswkmsdri.la
 
-libswkmsdri_la_SOURCES = kms_dri_sw_winsys.c
+libswkmsdri_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/kms-dri/Makefile.sources b/src/gallium/winsys/sw/kms-dri/Makefile.sources
new file mode 100644
index 00000000000..4bf832bdb80
--- /dev/null
+++ b/src/gallium/winsys/sw/kms-dri/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	kms_dri_sw_winsys.c \
+	kms_dri_sw_winsys.h
diff --git a/src/gallium/winsys/sw/kms-dri/SConscript b/src/gallium/winsys/sw/kms-dri/SConscript
index 0a6c335cbd7..e7dd721dd13 100644
--- a/src/gallium/winsys/sw/kms-dri/SConscript
+++ b/src/gallium/winsys/sw/kms-dri/SConscript
@@ -12,15 +12,12 @@ env = env.Clone()
 env.PkgUseModules('DRM')
 
 env.Append(CPPPATH = [
-#    'include',
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
 ])
 
 ws_kms_dri = env.ConvenienceLibrary(
     target = 'ws_kms_dri',
-    source = [
-       'kms_dri_sw_winsys.c',
-    ]
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
 )
 Export('ws_kms_dri')
diff --git a/src/gallium/winsys/sw/null/Makefile.am b/src/gallium/winsys/sw/null/Makefile.am
index 17b52ccd617..5446623c61b 100644
--- a/src/gallium/winsys/sw/null/Makefile.am
+++ b/src/gallium/winsys/sw/null/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -27,4 +28,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libws_null.la
 
-libws_null_la_SOURCES = null_sw_winsys.c
+libws_null_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/null/Makefile.sources b/src/gallium/winsys/sw/null/Makefile.sources
new file mode 100644
index 00000000000..b72310bca14
--- /dev/null
+++ b/src/gallium/winsys/sw/null/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	null_sw_winsys.c \
+	null_sw_winsys.h
diff --git a/src/gallium/winsys/sw/null/SConscript b/src/gallium/winsys/sw/null/SConscript
index b7176e0bbb8..6236498af2e 100644
--- a/src/gallium/winsys/sw/null/SConscript
+++ b/src/gallium/winsys/sw/null/SConscript
@@ -9,14 +9,11 @@ env = env.Clone()
 env.Append(CPPPATH = [
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
-    '#/src/gallium/drivers',
 ])
 
 ws_null = env.ConvenienceLibrary(
     target = 'ws_null',
-    source = [
-       'null_sw_winsys.c',
-    ]
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
 )
 env.Alias('ws_null', ws_null)
 Export('ws_null')
diff --git a/src/gallium/winsys/sw/wayland/Makefile.am b/src/gallium/winsys/sw/wayland/Makefile.am
index 0cb47a17343..443ff192c6a 100644
--- a/src/gallium/winsys/sw/wayland/Makefile.am
+++ b/src/gallium/winsys/sw/wayland/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -28,4 +29,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libws_wayland.la
 
-libws_wayland_la_SOURCES = wayland_sw_winsys.c
+libws_wayland_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/wayland/Makefile.sources b/src/gallium/winsys/sw/wayland/Makefile.sources
new file mode 100644
index 00000000000..570ccc6712a
--- /dev/null
+++ b/src/gallium/winsys/sw/wayland/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	wayland_sw_winsys.c \
+	wayland_sw_winsys.h
diff --git a/src/gallium/winsys/sw/wrapper/Makefile.am b/src/gallium/winsys/sw/wrapper/Makefile.am
index d8bbd9e097d..4b30c4456e8 100644
--- a/src/gallium/winsys/sw/wrapper/Makefile.am
+++ b/src/gallium/winsys/sw/wrapper/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -27,4 +28,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libwsw.la
 
-libwsw_la_SOURCES = wrapper_sw_winsys.c
+libwsw_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/wrapper/Makefile.sources b/src/gallium/winsys/sw/wrapper/Makefile.sources
new file mode 100644
index 00000000000..742e49b1c37
--- /dev/null
+++ b/src/gallium/winsys/sw/wrapper/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	wrapper_sw_winsys.c \
+	wrapper_sw_winsys.h
diff --git a/src/gallium/winsys/sw/wrapper/SConscript b/src/gallium/winsys/sw/wrapper/SConscript
index 4c60488df0b..9ff9bf6d1fa 100644
--- a/src/gallium/winsys/sw/wrapper/SConscript
+++ b/src/gallium/winsys/sw/wrapper/SConscript
@@ -9,13 +9,10 @@ env = env.Clone()
 env.Append(CPPPATH = [
     '#/src/gallium/include',
     '#/src/gallium/auxiliary',
-    '#/src/gallium/drivers',
 ])
 
 ws_wrapper = env.ConvenienceLibrary(
     target = 'ws_wrapper',
-    source = [
-       'wrapper_sw_winsys.c',
-    ]
+    source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
 )
 Export('ws_wrapper')
diff --git a/src/gallium/winsys/sw/xlib/Makefile.am b/src/gallium/winsys/sw/xlib/Makefile.am
index a38189c0fee..825a8fdb5e1 100644
--- a/src/gallium/winsys/sw/xlib/Makefile.am
+++ b/src/gallium/winsys/sw/xlib/Makefile.am
@@ -20,6 +20,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 # DEALINGS IN THE SOFTWARE.
 
+include Makefile.sources
 include $(top_srcdir)/src/gallium/Automake.inc
 
 AM_CFLAGS = \
@@ -28,4 +29,4 @@ AM_CFLAGS = \
 
 noinst_LTLIBRARIES = libws_xlib.la
 
-libws_xlib_la_SOURCES = xlib_sw_winsys.c
+libws_xlib_la_SOURCES = $(C_SOURCES)
diff --git a/src/gallium/winsys/sw/xlib/Makefile.sources b/src/gallium/winsys/sw/xlib/Makefile.sources
new file mode 100644
index 00000000000..fc6a56d4993
--- /dev/null
+++ b/src/gallium/winsys/sw/xlib/Makefile.sources
@@ -0,0 +1,3 @@
+C_SOURCES := \
+	xlib_sw_winsys.c \
+	xlib_sw_winsys.h
diff --git a/src/gallium/winsys/sw/xlib/SConscript b/src/gallium/winsys/sw/xlib/SConscript
index 3a8c75dfdaf..64db2013936 100644
--- a/src/gallium/winsys/sw/xlib/SConscript
+++ b/src/gallium/winsys/sw/xlib/SConscript
@@ -11,14 +11,11 @@ if env['platform'] in ('cygwin', 'darwin', 'freebsd', 'linux', 'sunos'):
     env.Append(CPPPATH = [
         '#/src/gallium/include',
         '#/src/gallium/auxiliary',
-        '#/src/gallium/drivers',
     ])
 
     ws_xlib = env.ConvenienceLibrary(
         target = 'ws_xlib',
-        source = [
-           'xlib_sw_winsys.c',
-        ]
+        source = env.ParseSourceList('Makefile.sources', 'C_SOURCES'),
     )
     env.Alias('ws_xlib', ws_xlib)
     Export('ws_xlib')