diff --git a/bsd-core/radeon/Makefile b/bsd-core/radeon/Makefile
index 7b1ab7a1..cc510f32 100644
--- a/bsd-core/radeon/Makefile
+++ b/bsd-core/radeon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD	= radeon
-SRCS    = radeon_bufs.c radeon_context.c radeon_cp.c radeon_drv.c radeon_state.c
+SRCS    = radeon_bufs.c radeon_cp.c radeon_drv.c radeon_state.c
 SRCS   += device_if.h bus_if.h pci_if.h
 CFLAGS += ${DEBUG_FLAGS} -I..
 KERN    = /usr/src/sys
diff --git a/bsd-core/sis/Makefile b/bsd-core/sis/Makefile
index 6f0de62d..07ea8063 100644
--- a/bsd-core/sis/Makefile
+++ b/bsd-core/sis/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD	= sis
-SRCS    = sis_context.c sis_drv.c sis_ds.c sis_mm.c
+SRCS    = sis_drv.c
 SRCS   += device_if.h bus_if.h pci_if.h
 CFLAGS += ${DEBUG_FLAGS} -I..
 KERN    = /usr/src/sys
diff --git a/bsd/Imakefile b/bsd/Imakefile
index cc3e6f9a..664c07c8 100644
--- a/bsd/Imakefile
+++ b/bsd/Imakefile
@@ -21,11 +21,11 @@ LinkFileList(tdfxinc, $(LINUXDRM)/tdfx.h $(LINUXDRM)/tdfx_drv.c, tdfx, .)
 
 LinkFileList(r128inc, $(LINUXDRM)/r128.h $(LINUXDRM)/r128_cce.c $(LINUXDRM)/r128_drv.c $(LINUXDRM)/r128_drv.h $(LINUXDRM)/r128_state.c, r128, .)
 
-LinkFileList(radeoninc, $(LINUXDRM)/radeon.h $(LINUXDRM)/radeon_context.c $(LINUXDRM)/radeon_drv.h $(LINUXDRM)/radeon_bufs.c $(LINUXDRM)/radeon_cp.c $(LINUXDRM)/radeon_drv.c $(LINUXDRM)/radeon_state.c, radeon, .)
+LinkFileList(radeoninc, $(LINUXDRM)/radeon.h $(LINUXDRM)/radeon_drv.h $(LINUXDRM)/radeon_bufs.c $(LINUXDRM)/radeon_cp.c $(LINUXDRM)/radeon_drv.c $(LINUXDRM)/radeon_state.c, radeon, .)
 
 LinkFileList(i810inc, $(LINUXDRM)/i810.h $(LINUXDRM)/i810_dma.c $(LINUXDRM)/i810_drv.c $(LINUXDRM)/i810_drv.h, i810, .)
 
-LinkFileList(sisinc, $(LINUXDRM)/sis_context.c $(LINUXDRM)/sis_drv.c $(LINUXDRM)/sis_drv.h $(LINUXDRM)/sis_ds.h $(LINUXDRM)/sis_ds.c $(LINUXDRM)/sis_mm.c, sis, .)
+LinkFileList(sisinc, $(LINUXDRM)/sis.h $(LINUXDRM)/sis_drv.c $(LINUXDRM)/sis_drv.h $(LINUXDRM)/sis_drm.h, sis, .)
 
 LinkSourceFile(ati_pcigart.h,$(XF86OSSRC)/linux/drm/kernel)
 LinkSourceFile(drm_auth.h,$(XF86OSSRC)/linux/drm/kernel)
diff --git a/bsd/radeon/Makefile b/bsd/radeon/Makefile
index 7b1ab7a1..cc510f32 100644
--- a/bsd/radeon/Makefile
+++ b/bsd/radeon/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD	= radeon
-SRCS    = radeon_bufs.c radeon_context.c radeon_cp.c radeon_drv.c radeon_state.c
+SRCS    = radeon_bufs.c radeon_cp.c radeon_drv.c radeon_state.c
 SRCS   += device_if.h bus_if.h pci_if.h
 CFLAGS += ${DEBUG_FLAGS} -I..
 KERN    = /usr/src/sys
diff --git a/bsd/sis/Makefile b/bsd/sis/Makefile
index 6f0de62d..07ea8063 100644
--- a/bsd/sis/Makefile
+++ b/bsd/sis/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 KMOD	= sis
-SRCS    = sis_context.c sis_drv.c sis_ds.c sis_mm.c
+SRCS    = sis_drv.c
 SRCS   += device_if.h bus_if.h pci_if.h
 CFLAGS += ${DEBUG_FLAGS} -I..
 KERN    = /usr/src/sys