diff --git a/panda/CMakeLists.txt b/panda/CMakeLists.txt
index 61652662dd..84d78f05ab 100644
--- a/panda/CMakeLists.txt
+++ b/panda/CMakeLists.txt
@@ -13,6 +13,7 @@ add_subdirectory(src/linmath)
 add_subdirectory(src/event)
 add_subdirectory(src/mathutil)
 add_subdirectory(src/gsgbase)
+add_subdirectory(src/pnmimage)
 
 #add_subdirectory(src/gobj)
 #add_subdirectory(src/pgraph)
diff --git a/panda/src/pnmimage/CMakeLists.txt b/panda/src/pnmimage/CMakeLists.txt
new file mode 100644
index 0000000000..aea7e8716f
--- /dev/null
+++ b/panda/src/pnmimage/CMakeLists.txt
@@ -0,0 +1,34 @@
+set(P3PNMIMAGE_HEADERS
+  config_pnmimage.h
+  pfmFile.I pfmFile.h
+  pnmbitio.h
+  pnmBrush.h pnmBrush.I
+  pnmFileType.h pnmFileTypeRegistry.h pnmImage.I 
+  pnmImage.h pnmImageHeader.I pnmImageHeader.h 
+  pnmPainter.h pnmPainter.I
+  pnmReader.I
+  pnmReader.h pnmWriter.I pnmWriter.h pnmimage_base.h
+  ppmcmap.h
+)
+
+set(P3PNMIMAGE_SOURCES
+  config_pnmimage.cxx
+  pfmFile.cxx
+  pnm-image-filter.cxx
+  pnmbitio.cxx
+  pnmBrush.cxx
+  pnmFileType.cxx 
+  pnmFileTypeRegistry.cxx pnmImage.cxx pnmImageHeader.cxx 
+  pnmPainter.cxx
+  pnmReader.cxx pnmWriter.cxx pnmimage_base.cxx
+  ppmcmap.cxx
+)
+
+if(HAVE_EIGEN)
+  include_directories(${EIGEN3_INCLUDE_DIR})
+endif()
+
+composite_sources(p3pnmimage P3PNMIMAGE_SOURCES)
+add_library(p3pnmimage ${P3PNMIMAGE_HEADERS} ${P3PNMIMAGE_SOURCES})
+target_link_libraries(p3pnmimage p3mathutil)
+target_interrogate(p3pnmimage ALL)
\ No newline at end of file
diff --git a/panda/src/pnmimage/pnm-image-filter.cxx b/panda/src/pnmimage/pnm-image-filter.cxx
index ae687a8b16..0de628050a 100644
--- a/panda/src/pnmimage/pnm-image-filter.cxx
+++ b/panda/src/pnmimage/pnm-image-filter.cxx
@@ -35,6 +35,7 @@
 #include "pandabase.h"
 #include <math.h>
 #include "cmath.h"
+#include "thread.h"
 
 #include "pnmImage.h"
 #include "pfmFile.h"
diff --git a/panda/src/pnmimage/pnmBrush.cxx b/panda/src/pnmimage/pnmBrush.cxx
index 8e93eabdab..d6105c030f 100644
--- a/panda/src/pnmimage/pnmBrush.cxx
+++ b/panda/src/pnmimage/pnmBrush.cxx
@@ -13,6 +13,7 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pnmBrush.h"
+#include "pnmImage.h"
 #include "config_pnmimage.h"
 #include "cmath.h"
 
diff --git a/panda/src/pnmimage/pnmPainter.cxx b/panda/src/pnmimage/pnmPainter.cxx
index 7b4ec50ea9..60bd988498 100644
--- a/panda/src/pnmimage/pnmPainter.cxx
+++ b/panda/src/pnmimage/pnmPainter.cxx
@@ -13,7 +13,6 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "pnmPainter.h"
-#include "pnmBrush.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: PNMPainter::Constructor
diff --git a/panda/src/pnmimage/pnmPainter.h b/panda/src/pnmimage/pnmPainter.h
index 93a5b6db44..edc50cc9ae 100644
--- a/panda/src/pnmimage/pnmPainter.h
+++ b/panda/src/pnmimage/pnmPainter.h
@@ -16,6 +16,7 @@
 #define PNMPAINTER_H
 
 #include "pandabase.h"
+#include "pnmBrush.h"
 
 class PNMImage;