$NetBSD$

--- mi/miinitext.c.orig	2009-10-12 02:52:40.000000000 +0000
+++ mi/miinitext.c
@@ -162,10 +162,11 @@ typedef void (*InitExtension)(INITARGS);
 #ifdef MITSHM
 #define _XSHM_SERVER_
 #include <X11/extensions/shmstr.h>
+#include <X11/extensions/shmproto.h>
 #endif
 #ifdef XTEST
 #define _XTEST_SERVER_
-#include <X11/extensions/XTest.h>
+#include <X11/extensions/xtestconst.h>
 #endif
 #ifdef XKB
 #include <X11/extensions/XKB.h>
