diff --git a/panda/src/pnmimagetypes/Sources.pp b/panda/src/pnmimagetypes/Sources.pp
index 5731aa0d03..5b879f4404 100644
--- a/panda/src/pnmimagetypes/Sources.pp
+++ b/panda/src/pnmimagetypes/Sources.pp
@@ -13,13 +13,12 @@
   #define SOURCES  \
      config_pnmimagetypes.h pnmFileTypeAlias.h pnmFileTypeBMP.h  \
      pnmFileTypeIMG.h  \
+     pnmFileTypePNG.h \
      pnmFileTypePNM.h \
      pnmFileTypeSGI.h pnmFileTypeSoftImage.h  \
      pnmFileTypeTGA.h \
      pnmFileTypeTIFF.h \
-     pnmFileTypeJPG.h \
-    // These are separate because of png's silly setjmp problem.
-     pnmFileTypePNG.h pnmFileTypePNG.cxx
+     pnmFileTypeJPG.h
 
   #define INCLUDED_SOURCES  \
      config_pnmimagetypes.cxx pnmFileTypeAlias.cxx  \
@@ -27,6 +26,7 @@
      pnmFileTypeBMP.cxx \
      pnmFileTypeIMG.cxx \
      pnmFileTypeJPG.cxx pnmFileTypeJPGReader.cxx pnmFileTypeJPGWriter.cxx \
+     pnmFileTypePNG.cxx \
      pnmFileTypePNM.cxx \
      pnmFileTypeSGI.cxx \
      pnmFileTypeSGIReader.cxx pnmFileTypeSGIWriter.cxx  \
diff --git a/panda/src/pnmimagetypes/pnmFileTypePNG.h b/panda/src/pnmimagetypes/pnmFileTypePNG.h
index 800b3e3395..9f32cb3769 100755
--- a/panda/src/pnmimagetypes/pnmFileTypePNG.h
+++ b/panda/src/pnmimagetypes/pnmFileTypePNG.h
@@ -19,12 +19,12 @@
 
 #ifdef HAVE_PNG
 
-#include <png.h>
-
 #include "pnmFileType.h"
 #include "pnmReader.h"
 #include "pnmWriter.h"
 
+#include <png.h>
+
 ////////////////////////////////////////////////////////////////////
 //       Class : PNMFileTypePNG
 // Description : For reading and writing PNG files.
diff --git a/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx b/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx
index 78505852ba..fdae30cad3 100644
--- a/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx
+++ b/panda/src/pnmimagetypes/pnmimagetypes_composite2.cxx
@@ -1,3 +1,4 @@
+#include "pnmFileTypePNG.cxx"
 #include "pnmFileTypeTIFF.cxx"
 #include "pnmFileTypePNM.cxx"
 #include "pnmFileTypeSGI.cxx"