diff --git a/src/odoors/GNUmakefile b/src/odoors/GNUmakefile
index d98baf470a81c7271118861f16db84a885da80ee..8bef5cb84c8223469822783ca621d8bf9fcd7fe3 100644
--- a/src/odoors/GNUmakefile
+++ b/src/odoors/GNUmakefile
@@ -52,7 +52,7 @@ LD	:=	ld
 #
 # Compiler command-line flags.
 #
-CFLAGS	+=	-O2 -g -L.
+CFLAGS	+=	-O2 -g -L. -I../xpdev
 # /MTd /Zi - for debug
 #
 #------------------------------------------------------------------------------
@@ -85,7 +85,7 @@ endif
 #
 # Define primary target.
 #
-all: ${LIBDIR}libODoors${SHLIB} ${LIBDIR}libODoors${STATICLIB}
+all: ${LIBDIR}libODoors${SHLIB} ${LIBDIR}libODoors${STATICLIB} ex_diag
 #
 #------------------------------------------------------------------------------
 #
@@ -156,5 +156,8 @@ ${LIBDIR}libODoors${STATICLIB} : ${OBJECTS}
 ex_chat: ex_chat.c ${LIBDIR}libODoors${SHLIB}
 	$(CC) $(CFLAGS) ex_chat.c -o ex_chat -lODoors
 
+ex_diag: ex_diag.c ${LIBDIR}libODoors${SHLIB}
+	$(CC) $(CFLAGS) ex_diag.c -o ex_diag -lODoors
+
 #
 #------------------------------------------------------------------------------
diff --git a/src/odoors/ex_diag.c b/src/odoors/ex_diag.c
index c9da837e603f9b7490a953c273d00e185abcce84..651a751d87901e26fd86733d33569a1c13d29256 100644
--- a/src/odoors/ex_diag.c
+++ b/src/odoors/ex_diag.c
@@ -8,7 +8,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "opendoor.h"
+#include "OpenDoor.h"
+#include <genwrap.h>
 
 typedef enum
 {