diff --git a/glamor/Makefile.am b/glamor/Makefile.am
index aaf0aab17..847daa2a8 100644
--- a/glamor/Makefile.am
+++ b/glamor/Makefile.am
@@ -49,6 +49,13 @@ libglamor_la_SOURCES = \
 	glamor_sync.c \
 	glamor.h
 
+if GLX
+AM_CFLAGS += -I$(top_srcdir)/glx
+libglamor_la_SOURCES += \
+	glamor_glx_provider.c \
+	glamor_glx_provider.h
+endif
+
 if XV
 libglamor_la_SOURCES += \
 	glamor_xv.c
diff --git a/hw/xfree86/glamor_egl/Makefile.am b/hw/xfree86/glamor_egl/Makefile.am
index e697c8296..741eb11d5 100644
--- a/hw/xfree86/glamor_egl/Makefile.am
+++ b/hw/xfree86/glamor_egl/Makefile.am
@@ -33,6 +33,7 @@ libglamoregl_la_LDFLAGS = \
 	$()
 
 libglamoregl_la_LIBADD = \
+	$(top_builddir)/glx/libglx.la \
 	$(top_builddir)/glamor/libglamor.la \
 	$()