diff --git a/composite/Makefile.am b/composite/Makefile.am
index d7bead137..c2f5123f2 100644
--- a/composite/Makefile.am
+++ b/composite/Makefile.am
@@ -2,6 +2,10 @@ noinst_LTLIBRARIES = libcomposite.la
 
 AM_CFLAGS = $(DIX_CFLAGS)
 
+if XORG
+sdk_HEADERS = compositeext.h
+endif
+
 libcomposite_la_SOURCES = 	\
 	compalloc.c		\
 	compext.c		\
diff --git a/composite/compinit.c b/composite/compinit.c
index a844017c1..ee269afa0 100644
--- a/composite/compinit.c
+++ b/composite/compinit.c
@@ -45,6 +45,7 @@
 #endif
 
 #include "compint.h"
+#include "compositeext.h"
 
 static int CompScreenPrivateKeyIndex;
 DevPrivateKey CompScreenPrivateKey = &CompScreenPrivateKeyIndex;
diff --git a/composite/compint.h b/composite/compint.h
index 1c19ccd39..fd2fea153 100644
--- a/composite/compint.h
+++ b/composite/compint.h
@@ -224,10 +224,6 @@ CompositeExtensionInit (void);
  * compinit.c
  */
 
-Bool
-CompositeRegisterAlternateVisuals (ScreenPtr pScreen,
-				   VisualID *vids, int nVisuals);
-
 Bool
 compScreenInit (ScreenPtr pScreen);
 
diff --git a/composite/compositeext.h b/composite/compositeext.h
new file mode 100644
index 000000000..b20bab158
--- /dev/null
+++ b/composite/compositeext.h
@@ -0,0 +1,38 @@
+/*
+ * Copyright © 2009 NVIDIA Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
+#ifndef _COMPOSITEEXT_H_
+#define _COMPOSITEEXT_H_
+
+#include "misc.h"
+#include "scrnintstr.h"
+
+extern _X_EXPORT Bool CompositeRegisterAlternateVisuals(ScreenPtr pScreen,
+                                                        VisualID *vids,
+                                                        int nVisuals);
+
+#endif /* _COMPOSITEEXT_H_ */