diff --git a/panda/src/express/typedef.h b/panda/src/express/typedef.h
index fbb0995e58..3a636fb4d6 100644
--- a/panda/src/express/typedef.h
+++ b/panda/src/express/typedef.h
@@ -18,12 +18,16 @@
 #ifndef TYPEDEF_H
 #define TYPEDEF_H
 
-#include <pandabase.h>
+#include "pandabase.h"
+#include "numeric_types.h"
 
 typedef unsigned char uchar;
 typedef unsigned short ushort;
 typedef unsigned int uint;
 typedef unsigned long ulong;
 
+typedef PN_int64 longlong;
+typedef PN_uint64 ulonglong;
+
 
 #endif
diff --git a/panda/src/pnmimagetypes/config_pnmimagetypes.cxx b/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
index 99cf5ece85..154e617efc 100644
--- a/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
+++ b/panda/src/pnmimagetypes/config_pnmimagetypes.cxx
@@ -29,6 +29,9 @@
 #ifdef HAVE_JPEG
   #include "pnmFileTypeJPG.h"
 #endif
+#ifdef HAVE_JPEG2000
+  #include "pnmFileTypeJPG2000.h"
+#endif
 #include "sgi.h"
 
 #include <config_pnmimage.h>
diff --git a/panda/src/pnmimagetypes/pnmFileTypeJPG2000.h b/panda/src/pnmimagetypes/pnmFileTypeJPG2000.h
index 872ee8109a..07203d66ea 100644
--- a/panda/src/pnmimagetypes/pnmFileTypeJPG2000.h
+++ b/panda/src/pnmimagetypes/pnmFileTypeJPG2000.h
@@ -29,8 +29,12 @@
 #include <windows.h>  // we need to include this before jpeglib.
 #endif
 
+#include "typedef.h"  // jasper requires this first.
 #include <jasper/jasper.h>
 
+// Undo jasper-inflicted damage.
+#undef bool
+
 ////////////////////////////////////////////////////////////////////
 //       Class : PNMFileTypeJPG2000
 // Description : For reading and writing Jpeg2000 files.