diff --git a/dix/Makefile.am b/dix/Makefile.am
index 45da45fcb..182311e5e 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -35,9 +35,7 @@ libdix_la_SOURCES = 	\
 	swaprep.c	\
 	swapreq.c	\
 	tables.c	\
-	window.c	\
-	strcasecmp.c	\
-	strcasestr.c
+	window.c
 
 EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
 
diff --git a/os/Makefile.am b/os/Makefile.am
index 16e4bfacc..16ecc15ae 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -18,6 +18,8 @@ libos_la_SOURCES = 	\
 	osdep.h		\
 	osinit.c	\
 	utils.c		\
+	strcasecmp.c	\
+	strcasestr.c	\
 	xdmauth.c	\
 	xstrans.c	\
 	xprintf.c	\
diff --git a/dix/strcasecmp.c b/os/strcasecmp.c
similarity index 100%
rename from dix/strcasecmp.c
rename to os/strcasecmp.c
diff --git a/dix/strcasestr.c b/os/strcasestr.c
similarity index 100%
rename from dix/strcasestr.c
rename to os/strcasestr.c