diff --git a/direct/src/showbase/showBase.cxx b/direct/src/showbase/showBase.cxx
index 77296e93af..2a8ed76dc1 100644
--- a/direct/src/showbase/showBase.cxx
+++ b/direct/src/showbase/showBase.cxx
@@ -36,6 +36,7 @@
 #include <appTraverser.h>
 #include <collisionTraverser.h>
 #include <get_config_path.h>
+#include <allAttributesWrapper.h>
 
 ConfigureDef(config_showbase);
 ConfigureFn(config_showbase) {
diff --git a/pandatool/src/egg-palettize/filenameUnifier.cxx b/pandatool/src/egg-palettize/filenameUnifier.cxx
index 373633aff4..5c1c8ae28b 100644
--- a/pandatool/src/egg-palettize/filenameUnifier.cxx
+++ b/pandatool/src/egg-palettize/filenameUnifier.cxx
@@ -121,6 +121,9 @@ make_user_filename(Filename filename) {
 //               caches the operation so that repeated calls to
 //               filenames in the same directory will tend to be
 //               faster.
+//
+//               Also guarantees that the directory containing the
+//               filename exists by making it if it does not.
 ////////////////////////////////////////////////////////////////////
 void FilenameUnifier::
 make_canonical(Filename &filename) {
@@ -137,6 +140,7 @@ make_canonical(Filename &filename) {
     return;
   }
 
+  filename.make_dir();
   filename.make_canonical();
   _canonical_filenames.insert(CanonicalFilenames::value_type(dirname, filename.get_dirname()));
 }