diff --git a/dix/Makefile.am b/dix/Makefile.am
index a1f02c1..1732bd6 100644
--- a/dix/Makefile.am
+++ b/dix/Makefile.am
@@ -36,6 +36,8 @@ libdix_la_SOURCES = 	\
 libxpstubs_la_SOURCES =	\
 	xpstubs.c
 
+dix_O_SOURCES =
+
 INCLUDES = -I$(top_srcdir)/Xprint
 
 EXTRA_DIST = buildatoms BuiltInAtoms CHANGES Xserver.d Xserver-dtrace.h.in
diff --git a/hw/darwin/Makefile.am b/hw/darwin/Makefile.am
index 3e28d32..9a1b8e6 100644
--- a/hw/darwin/Makefile.am
+++ b/hw/darwin/Makefile.am
@@ -36,7 +36,7 @@ Xquartz_SOURCES = \
                   $(top_srcdir)/Xi/stubs.c \
                   apple/X11Application.m \
                   apple/X11Controller.m \
-                  quartz/Xserver.m \
+                  quartz/XServer.m \
                   quartz/Preferences.m \
                   quartz/applewm.c \
                   quartz/keysym2ucs.c \
diff --git a/os/Makefile.am b/os/Makefile.am
index d8d1405..7ff9543 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -29,6 +29,8 @@ libos_la_SOURCES = 	\
 	xprintf.c	\
 	$(XORG_SRCS)
 
+os_O_SOURCES =
+
 if XCSECURITY
 libos_la_SOURCES += $(XCSECURITY_SRCS)
 endif