From 92452a393dcc0589b49f5b032d0d21c5aa85fcb8 Mon Sep 17 00:00:00 2001
From: David Rose <david@ddrose.com>
Date: Thu, 6 Apr 2006 14:08:50 +0000
Subject: [PATCH] better #includes

---
 pandatool/src/egg-mkfont/Sources.pp                 | 5 ++---
 pandatool/src/egg-mkfont/egg-mkfont_composite1.cxx  | 3 +++
 pandatool/src/eggcharbase/Sources.pp                | 1 +
 pandatool/src/eggcharbase/eggComponentData.cxx      | 1 +
 pandatool/src/eggcharbase/eggMatrixTablePointer.cxx | 2 +-
 pandatool/src/eggcharbase/eggSliderData.cxx         | 2 +-
 pandatool/src/flt/Sources.pp                        | 2 +-
 pandatool/src/flt/fltGroup.cxx                      | 1 +
 pandatool/src/flt/fltRecord.cxx                     | 1 +
 pandatool/src/flt/flt_composite1.cxx                | 1 +
 pandatool/src/palettizer/paletteImage.cxx           | 1 +
 pandatool/src/palettizer/textureImage.cxx           | 2 +-
 pandatool/src/palettizer/texturePosition.h          | 2 ++
 pandatool/src/palettizer/textureProperties.cxx      | 1 +
 14 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/pandatool/src/egg-mkfont/Sources.pp b/pandatool/src/egg-mkfont/Sources.pp
index 307a0c37c2..3e616134ea 100644
--- a/pandatool/src/egg-mkfont/Sources.pp
+++ b/pandatool/src/egg-mkfont/Sources.pp
@@ -12,13 +12,12 @@
 #begin bin_target
   #define TARGET egg-mkfont
   
-//  #define COMBINED_SOURCES $[TARGET]_composite1.cxx   
+  #define COMBINED_SOURCES $[TARGET]_composite1.cxx   
   
   #defer SOURCES \
     eggMakeFont.h \
     rangeDescription.h rangeDescription.I \
-    rangeIterator.h rangeIterator.I \
-    $[INCLUDED_SOURCES]
+    rangeIterator.h rangeIterator.I
 
   #define INCLUDED_SOURCES \
     eggMakeFont.cxx \
diff --git a/pandatool/src/egg-mkfont/egg-mkfont_composite1.cxx b/pandatool/src/egg-mkfont/egg-mkfont_composite1.cxx
index dbff12e568..aa44d51164 100644
--- a/pandatool/src/egg-mkfont/egg-mkfont_composite1.cxx
+++ b/pandatool/src/egg-mkfont/egg-mkfont_composite1.cxx
@@ -1,2 +1,5 @@
 
 #include "eggMakeFont.cxx"
+#include "rangeDescription.cxx"
+#include "rangeIterator.cxx"
+
diff --git a/pandatool/src/eggcharbase/Sources.pp b/pandatool/src/eggcharbase/Sources.pp
index b6bc265317..1f416f4f95 100644
--- a/pandatool/src/eggcharbase/Sources.pp
+++ b/pandatool/src/eggcharbase/Sources.pp
@@ -28,6 +28,7 @@
      eggJointPointer.cxx eggJointNodePointer.cxx \
      eggMatrixTablePointer.cxx eggScalarTablePointer.cxx \
      eggSliderData.cxx \
+     eggSliderPointer.cxx \
      eggVertexPointer.cxx 
 
   #define INSTALL_HEADERS \
diff --git a/pandatool/src/eggcharbase/eggComponentData.cxx b/pandatool/src/eggcharbase/eggComponentData.cxx
index b23f72d3cf..94edb50850 100644
--- a/pandatool/src/eggcharbase/eggComponentData.cxx
+++ b/pandatool/src/eggcharbase/eggComponentData.cxx
@@ -18,6 +18,7 @@
 
 #include "eggComponentData.h"
 #include "eggBackPointer.h"
+#include "nameUniquifier.h"
 
 #include "indent.h"
 
diff --git a/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx b/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
index 5ea37d78b6..dff73db7bc 100644
--- a/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
+++ b/pandatool/src/eggcharbase/eggMatrixTablePointer.cxx
@@ -17,8 +17,8 @@
 ////////////////////////////////////////////////////////////////////
 
 #include "eggMatrixTablePointer.h"
-
 #include "dcast.h"
+#include "eggSAnimData.h"
 #include "eggXfmAnimData.h"
 #include "eggXfmSAnim.h"
 
diff --git a/pandatool/src/eggcharbase/eggSliderData.cxx b/pandatool/src/eggcharbase/eggSliderData.cxx
index 4970005e42..a5b134efcc 100644
--- a/pandatool/src/eggcharbase/eggSliderData.cxx
+++ b/pandatool/src/eggcharbase/eggSliderData.cxx
@@ -20,7 +20,7 @@
 #include "eggVertexPointer.h"
 #include "eggScalarTablePointer.h"
 #include "eggSliderPointer.h"
-
+#include "dcast.h"
 #include "eggPrimitive.h"
 #include "eggVertex.h"
 #include "eggSAnimData.h"
diff --git a/pandatool/src/flt/Sources.pp b/pandatool/src/flt/Sources.pp
index 8b38053c46..a0b6ae4c08 100644
--- a/pandatool/src/flt/Sources.pp
+++ b/pandatool/src/flt/Sources.pp
@@ -26,7 +26,7 @@
      fltTransformRotateAboutEdge.h fltTransformRotateAboutPoint.h  \
      fltTransformRotateScale.h fltTransformScale.h  \
      fltTransformTranslate.h fltUnsupportedRecord.h \
-     fltVectorRecord.cxx fltVectorRecord.h \
+     fltVectorRecord.h \
      fltVertex.I fltVertex.h fltVertexList.h 
     
  #define INCLUDED_SOURCES \
diff --git a/pandatool/src/flt/fltGroup.cxx b/pandatool/src/flt/fltGroup.cxx
index 1dc0af95f3..d3c1b2fd47 100644
--- a/pandatool/src/flt/fltGroup.cxx
+++ b/pandatool/src/flt/fltGroup.cxx
@@ -19,6 +19,7 @@
 #include "fltGroup.h"
 #include "fltRecordReader.h"
 #include "fltRecordWriter.h"
+#include "fltHeader.h"
 
 TypeHandle FltGroup::_type_handle;
 
diff --git a/pandatool/src/flt/fltRecord.cxx b/pandatool/src/flt/fltRecord.cxx
index ad3bc8fa8c..644abb3d07 100644
--- a/pandatool/src/flt/fltRecord.cxx
+++ b/pandatool/src/flt/fltRecord.cxx
@@ -33,6 +33,7 @@
 #include "fltInstanceRef.h"
 #include "fltUnsupportedRecord.h"
 #include "fltExternalReference.h"
+#include "fltVectorRecord.h"
 #include "config_flt.h"
 
 #include "dcast.h"
diff --git a/pandatool/src/flt/flt_composite1.cxx b/pandatool/src/flt/flt_composite1.cxx
index 3b4bcd66da..8c9f9fd29c 100644
--- a/pandatool/src/flt/flt_composite1.cxx
+++ b/pandatool/src/flt/flt_composite1.cxx
@@ -35,6 +35,7 @@
 #include "fltTransformScale.cxx"
 #include "fltTransformTranslate.cxx"
 #include "fltUnsupportedRecord.cxx"
+#include "fltVectorRecord.cxx"
 #include "fltVertex.cxx"
 #include "fltVertexList.cxx"
 
diff --git a/pandatool/src/palettizer/paletteImage.cxx b/pandatool/src/palettizer/paletteImage.cxx
index 0fbeac99d0..651f89a2af 100644
--- a/pandatool/src/palettizer/paletteImage.cxx
+++ b/pandatool/src/palettizer/paletteImage.cxx
@@ -30,6 +30,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "string_utils.h"
 
 #include <algorithm>
 
diff --git a/pandatool/src/palettizer/textureImage.cxx b/pandatool/src/palettizer/textureImage.cxx
index 90ba57849f..21af35ce6c 100644
--- a/pandatool/src/palettizer/textureImage.cxx
+++ b/pandatool/src/palettizer/textureImage.cxx
@@ -24,7 +24,7 @@
 #include "paletteImage.h"
 #include "texturePlacement.h"
 #include "filenameUnifier.h"
-
+#include "string_utils.h"
 #include "indent.h"
 #include "datagram.h"
 #include "datagramIterator.h"
diff --git a/pandatool/src/palettizer/texturePosition.h b/pandatool/src/palettizer/texturePosition.h
index a27a2cc251..bf6c84242e 100644
--- a/pandatool/src/palettizer/texturePosition.h
+++ b/pandatool/src/palettizer/texturePosition.h
@@ -25,6 +25,8 @@
 #include "luse.h"
 #include "eggTexture.h"
 
+class FactoryParams;
+
 ////////////////////////////////////////////////////////////////////
 //       Class : TexturePosition
 // Description : This represents a particular position of a texture
diff --git a/pandatool/src/palettizer/textureProperties.cxx b/pandatool/src/palettizer/textureProperties.cxx
index 13bd4ade22..df35dad355 100644
--- a/pandatool/src/palettizer/textureProperties.cxx
+++ b/pandatool/src/palettizer/textureProperties.cxx
@@ -23,6 +23,7 @@
 #include "datagramIterator.h"
 #include "bamReader.h"
 #include "bamWriter.h"
+#include "string_utils.h"
 
 TypeHandle TextureProperties::_type_handle;