diff --git a/include/extension.h b/include/extension.h
index c7f51b9d1..f0560d7ef 100644
--- a/include/extension.h
+++ b/include/extension.h
@@ -47,7 +47,9 @@ SOFTWARE.
 #ifndef EXTENSION_H
 #define EXTENSION_H
 
-_XFUNCPROTOBEGIN
+#include <X11/Xfuncproto.h>
+
+#include "dixstruct.h"
 
 extern _X_EXPORT unsigned short StandardMinorOpcode(ClientPtr /*client */ );
 
@@ -60,5 +62,4 @@ extern _X_EXPORT void InitExtensions(int argc, char **argv);
 
 extern _X_EXPORT void CloseDownExtensions(void);
 
-_XFUNCPROTOEND
 #endif                          /* EXTENSION_H */