diff --git a/Makefile b/Makefile
index 6dfe81a..c72e409 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,8 @@ VNCSERVERLIB=-L. -lvncserver -L/usr/local/lib -lz -ljpeg
 # The code for 3 Bytes/Pixel is not very efficient!
 FLAG24 = -DALLOW24BPP
 
-OPTFLAGS=-g # -Wall
-#OPTFLAGS=-O2 -Wall
+#OPTFLAGS=-g # -Wall
+OPTFLAGS=-O2 -Wall
 CFLAGS=$(OPTFLAGS) $(PTHREADDEF) $(FLAG24) $(INCLUDES)
 RANLIB=ranlib
 
diff --git a/x11vnc.c b/x11vnc.c
index 894402c..3a423b0 100644
--- a/x11vnc.c
+++ b/x11vnc.c
@@ -4,6 +4,7 @@
 
 #include <X11/Xlib.h>
 #include <X11/keysym.h>
+#include <X11/extensions/XTest.h>
 #ifndef NO_SHM
 #include <X11/extensions/XShm.h>
 #include <sys/shm.h>