diff --git a/test/xi2/protocol-common.h b/test/xi2/protocol-common.h
index 88c0bc864..0a533652c 100644
--- a/test/xi2/protocol-common.h
+++ b/test/xi2/protocol-common.h
@@ -20,10 +20,10 @@
  *  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  *  DEALINGS IN THE SOFTWARE.
  */
+#ifndef PROTOCOL_COMMON_H
+#define PROTOCOL_COMMON_H
 
-#ifdef HAVE_DIX_CONFIG_H
 #include <dix-config.h>
-#endif
 
 #include "dix/resource_priv.h"
 
@@ -34,9 +34,6 @@
 
 #include "tests.h"
 
-#ifndef PROTOCOL_COMMON_H
-#define PROTOCOL_COMMON_H
-
 /* Check default values in a reply */
 #define reply_check_defaults(rep, len, type) \
     { \