diff --git a/ChangeLog b/ChangeLog
index 8e31fe0c3..90e276d23 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-04-17  Donnie Berkholz  <spyderous@gentoo.org>
+
+	reviewed by: Adam Jackson
+
+	* exa/Makefile.am:
+	* randr/Makefile.am:
+	Bug #6628: Wrap a couple more SDK headers in if XORG, as per Dave Airlie's
+	commit on 2006-01-18.
+
 2006-04-17  Donnie Berkholz  <spyderous@gentoo.org>
 
 	reviewed by: Adam Jackson
diff --git a/exa/Makefile.am b/exa/Makefile.am
index a4992052d..c9cbf9b45 100644
--- a/exa/Makefile.am
+++ b/exa/Makefile.am
@@ -1,6 +1,8 @@
 noinst_LTLIBRARIES = libexa.la
 
+if XORG
 sdk_HEADERS = exa.h
+endif
 
 INCLUDES = \
 	$(XORG_INCS) \
diff --git a/randr/Makefile.am b/randr/Makefile.am
index 307014201..753eebb54 100644
--- a/randr/Makefile.am
+++ b/randr/Makefile.am
@@ -2,7 +2,9 @@ noinst_LTLIBRARIES = librandr.la
 
 AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
 
+if XORG
 sdk_HEADERS = randrstr.h
+endif
 
 librandr_la_SOURCES =	\
 	mirandr.c	\