diff --git a/pandatool/src/converter/Sources.pp b/pandatool/src/converter/Sources.pp
index f8d3d66bfd..8310857d73 100644
--- a/pandatool/src/converter/Sources.pp
+++ b/pandatool/src/converter/Sources.pp
@@ -8,14 +8,10 @@
     m
 
   #define SOURCES \
-    animationConvert.cxx animationConvert.h \
-    distanceUnit.cxx distanceUnit.h \
     somethingToEggConverter.I somethingToEggConverter.cxx \
     somethingToEggConverter.h
 
   #define INSTALL_HEADERS \
-    animationConvert.h \
-    distanceUnit.h \
     somethingToEggConverter.I somethingToEggConverter.h
 
 #end ss_lib_target
diff --git a/pandatool/src/pandatoolbase/Sources.pp b/pandatool/src/pandatoolbase/Sources.pp
index ddf445f1d1..2af3870f58 100644
--- a/pandatool/src/pandatoolbase/Sources.pp
+++ b/pandatool/src/pandatoolbase/Sources.pp
@@ -2,9 +2,13 @@
   #define TARGET pandatoolbase
   
   #define SOURCES \
+    animationConvert.cxx animationConvert.h \
+    distanceUnit.cxx distanceUnit.h \
     pandatoolbase.cxx pandatoolbase.h pandatoolsymbols.h
 
   #define INSTALL_HEADERS \
+    animationConvert.h \
+    distanceUnit.h \
     pandatoolbase.h pandatoolsymbols.h
 
 #end ss_lib_target
diff --git a/pandatool/src/converter/animationConvert.cxx b/pandatool/src/pandatoolbase/animationConvert.cxx
similarity index 100%
rename from pandatool/src/converter/animationConvert.cxx
rename to pandatool/src/pandatoolbase/animationConvert.cxx
diff --git a/pandatool/src/converter/animationConvert.h b/pandatool/src/pandatoolbase/animationConvert.h
similarity index 100%
rename from pandatool/src/converter/animationConvert.h
rename to pandatool/src/pandatoolbase/animationConvert.h
diff --git a/pandatool/src/converter/distanceUnit.cxx b/pandatool/src/pandatoolbase/distanceUnit.cxx
similarity index 99%
rename from pandatool/src/converter/distanceUnit.cxx
rename to pandatool/src/pandatoolbase/distanceUnit.cxx
index d441520237..1a735bd410 100644
--- a/pandatool/src/converter/distanceUnit.cxx
+++ b/pandatool/src/pandatoolbase/distanceUnit.cxx
@@ -18,8 +18,8 @@
 
 #include "distanceUnit.h"
 
-#include <string_utils.h>
-#include <notify.h>
+#include "string_utils.h"
+#include "notify.h"
 
 ////////////////////////////////////////////////////////////////////
 //     Function: format_abbrev_unit
diff --git a/pandatool/src/converter/distanceUnit.h b/pandatool/src/pandatoolbase/distanceUnit.h
similarity index 98%
rename from pandatool/src/converter/distanceUnit.h
rename to pandatool/src/pandatoolbase/distanceUnit.h
index b21e99324c..db927ae3a0 100644
--- a/pandatool/src/converter/distanceUnit.h
+++ b/pandatool/src/pandatoolbase/distanceUnit.h
@@ -19,7 +19,7 @@
 #ifndef DISTANCEUNIT_H
 #define DISTANCEUNIT_H
 
-#include <pandatoolbase.h>
+#include "pandatoolbase.h"
 
 ////////////////////////////////////////////////////////////////////
 //        Enum : DistanceUnit
diff --git a/pandatool/src/progbase/Sources.pp b/pandatool/src/progbase/Sources.pp
index a82109add7..c47a764361 100644
--- a/pandatool/src/progbase/Sources.pp
+++ b/pandatool/src/progbase/Sources.pp
@@ -1,7 +1,7 @@
 #begin ss_lib_target
   #define TARGET progbase
   #define LOCAL_LIBS \
-    converter pandatoolbase
+    pandatoolbase
   #define OTHER_LIBS \
     pnmimage:c linmath:c putil:c express:c panda:m pystub dtool