diff --git a/hw/xwin/Makefile.am b/hw/xwin/Makefile.am
index 5ffba1274..a88528901 100644
--- a/hw/xwin/Makefile.am
+++ b/hw/xwin/Makefile.am
@@ -167,7 +167,14 @@ AM_CFLAGS = -DHAVE_XWIN_CONFIG_H $(DIX_CFLAGS) \
 
 dist_man1_MANS = XWin.man XWinrc.man
 
+GLX_EXTRAS = \
+	windows/ChangeLog \
+	windows/glwindows.h \
+	windows/glwrap.c \
+	windows/indirect.c
+
 EXTRA_DIST = \
+	$(GLX_EXTRAS) \
 	_usr_X11R6_lib_X11_system.XWinrc \
 	X-boxed.ico \
 	X.ico \
diff --git a/GL/windows/ChangeLog b/hw/xwin/glx/ChangeLog
similarity index 100%
rename from GL/windows/ChangeLog
rename to hw/xwin/glx/ChangeLog
diff --git a/GL/windows/glwindows.h b/hw/xwin/glx/glwindows.h
similarity index 100%
rename from GL/windows/glwindows.h
rename to hw/xwin/glx/glwindows.h
diff --git a/GL/windows/glwrap.c b/hw/xwin/glx/glwrap.c
similarity index 100%
rename from GL/windows/glwrap.c
rename to hw/xwin/glx/glwrap.c
diff --git a/GL/windows/indirect.c b/hw/xwin/glx/indirect.c
similarity index 100%
rename from GL/windows/indirect.c
rename to hw/xwin/glx/indirect.c