diff --git a/GL/apple/Makefile.am b/GL/apple/Makefile.am
index d3c05ccc7..33ad15714 100644
--- a/GL/apple/Makefile.am
+++ b/GL/apple/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS = \
 	-I$(top_srcdir)/GL/glx \
 	-I$(top_srcdir)/GL/include \
 	-I$(top_srcdir)/GL/mesa/glapi \
-	-I$(top_srcdir)/hw/darwin/quartz \
-	-I$(top_srcdir)/hw/darwin/quartz/cr \
+	-I$(top_srcdir)/hw/xquartz \
+	-I$(top_srcdir)/hw/xquartz/xpr \
 	-I$(top_srcdir)/miext/damage
 
 if HAVE_AGL_FRAMEWORK
@@ -17,3 +17,8 @@ libAGLcore_a_SOURCES = aglGlx.c \
 		       $(top_srcdir)/hw/darwin/quartz/xpr/x-hash.h \
 		       $(top_srcdir)/hw/dmx/glxProxy/compsize.c
 endif
+
+#noinst_LIBRARIES = libCGLcore.a 
+#libCGLcore_a_SOURCES = \
+#	indirect.c \
+#	$(top_srcdir)/hw/dmx/glxProxy/compsize.c