diff --git a/fixesproto.pc.in b/fixesproto.pc.in
index 454ed8d..fabce86 100644
--- a/fixesproto.pc.in
+++ b/fixesproto.pc.in
@@ -7,3 +7,4 @@ Name: FixesProto
 Description: X Fixes extension headers
 Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
+Requires: xextproto >= 7.0.99.1
diff --git a/xfixesproto.h b/xfixesproto.h
index 571706e..545e325 100644
--- a/xfixesproto.h
+++ b/xfixesproto.h
@@ -47,9 +47,7 @@
 
 #include <X11/Xmd.h>
 #include <X11/extensions/xfixeswire.h>
-#define _SHAPE_SERVER_
-#include <X11/extensions/shape.h>
-#undef _SHAPE_SERVER_
+#include <X11/extensions/shapeconst.h>
 
 #define Window CARD32
 #define Drawable CARD32