3 files changed, 9 insertions, 10 deletions
diff --git a/xorg-server/damageext/Makefile.am b/xorg-server/damageext/Makefile.am
index b082fd2cf..4d4cf4478 100644
--- a/xorg-server/damageext/Makefile.am
+++ b/xorg-server/damageext/Makefile.am
@@ -1,8 +1,7 @@
-noinst_LTLIBRARIES = libdamageext.la
-
-AM_CFLAGS = $(DIX_CFLAGS)
-
-libdamageext_la_SOURCES = 	\
-	damageext.c		\
-	damageext.h		\
-	damageextint.h
+noinst_LTLIBRARIES = libdamageext.la
+
+AM_CFLAGS = $(DIX_CFLAGS)
+
+libdamageext_la_SOURCES = 	\
+	damageext.c		\
+	damageextint.h
diff --git a/xorg-server/damageext/damageext.c b/xorg-server/damageext/damageext.c
index f21f71ca8..8f4a72795 100644
--- a/xorg-server/damageext/damageext.c
+++ b/xorg-server/damageext/damageext.c
@@ -26,6 +26,7 @@
 
 #include "damageextint.h"
 #include "protocol-versions.h"
+#include "extinit.h"
 
 static unsigned char DamageReqCode;
 static int DamageEventBase;
@@ -154,7 +155,7 @@ ProcDamageQueryVersion(ClientPtr client)
         swapl(&rep.majorVersion);
         swapl(&rep.minorVersion);
     }
-    WriteToClient(client, sizeof(xDamageQueryVersionReply), (char *) &rep);
+    WriteToClient(client, sizeof(xDamageQueryVersionReply), &rep);
     return Success;
 }
 
diff --git a/xorg-server/damageext/damageextint.h b/xorg-server/damageext/damageextint.h
index b7e63e077..272337922 100644
--- a/xorg-server/damageext/damageextint.h
+++ b/xorg-server/damageext/damageextint.h
@@ -37,7 +37,6 @@
 #include "windowstr.h"
 #include "selection.h"
 #include "scrnintstr.h"
-#include "damageext.h"
 #include "damage.h"
 #include "xfixes.h"