diff -up libXext-1.0.99.2/src/DPMS.c.jx libXext-1.0.99.2/src/DPMS.c
--- libXext-1.0.99.2/src/DPMS.c.jx	2009-07-15 23:33:08.000000000 -0400
+++ libXext-1.0.99.2/src/DPMS.c	2009-07-16 17:17:34.000000000 -0400
@@ -38,7 +38,7 @@ Equipment Corporation.
 #endif
 #include <X11/Xlibint.h>
 #include <X11/extensions/dpms.h>
-#include <X11/extensions/dpmsstr.h>
+#include <X11/extensions/dpmsproto.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
 #include <stdio.h>
diff -up libXext-1.0.99.2/src/XMultibuf.c.jx libXext-1.0.99.2/src/XMultibuf.c
--- libXext-1.0.99.2/src/XMultibuf.c.jx	2009-07-15 23:33:08.000000000 -0400
+++ libXext-1.0.99.2/src/XMultibuf.c	2009-07-16 17:19:02.000000000 -0400
@@ -36,7 +36,7 @@ in this Software without prior written a
 #include <stdio.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#include <X11/extensions/multibufst.h>
+#include <X11/extensions/multibufproto.h>
 #include <X11/extensions/multibuf.h>
 
 static XExtensionInfo _multibuf_info_data;
diff -up libXext-1.0.99.2/src/XSecurity.c.jx libXext-1.0.99.2/src/XSecurity.c
--- libXext-1.0.99.2/src/XSecurity.c.jx	2009-07-15 23:33:08.000000000 -0400
+++ libXext-1.0.99.2/src/XSecurity.c	2009-07-16 17:19:32.000000000 -0400
@@ -33,7 +33,7 @@ in this Software without prior written a
 #include <stdio.h>
 #include <X11/extensions/Xext.h>
 #include <X11/extensions/extutil.h>
-#include <X11/extensions/securstr.h>
+#include <X11/extensions/securproto.h>
 #include <X11/extensions/security.h>
 
 static XExtensionInfo _Security_info_data;