diff --git a/libvncclient/tight.c b/libvncclient/tight.c
index 64883e5..df01812 100644
--- a/libvncclient/tight.c
+++ b/libvncclient/tight.c
@@ -23,6 +23,8 @@
 #ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
 
+#include "turbojpeg.h"
+
 /*
  * tight.c - handle ``tight'' encoding.
  *
diff --git a/rfb/rfbclient.h b/rfb/rfbclient.h
index ec6ee55..87f4eaa 100644
--- a/rfb/rfbclient.h
+++ b/rfb/rfbclient.h
@@ -52,7 +52,6 @@
 #endif
 #include <rfb/rfbproto.h>
 #include <rfb/keysym.h>
-#include "turbojpeg.h"
 
 #ifdef LIBVNCSERVER_HAVE_SASL
 #include <sasl/sasl.h>
@@ -428,7 +427,7 @@ typedef struct _rfbClient {
 #ifdef LIBVNCSERVER_HAVE_LIBZ
 #ifdef LIBVNCSERVER_HAVE_LIBJPEG
 	/** JPEG decoder state. */
-	tjhandle tjhnd;
+	void *tjhnd;
 
 #endif
 #endif