Minor tweaks and clean ups.

simgear/scene/model/Makefile.am

@@ -4,8 +4,8 @@ lib_LIBRARIES = libsgmodel.a
 
 noinst_HEADERS =
 
-include_HEADERS = animation.hxx location.hxx
+include_HEADERS = animation.hxx location.hxx placement.hxx
 
-libsgmodel_a_SOURCES = animation.cxx location.cxx
+libsgmodel_a_SOURCES = animation.cxx location.cxx placement.cxx
 
 INCLUDES = -I$(top_srcdir)

simgear/scene/model/animation.hxx

@@ -22,16 +22,8 @@ SG_USING_STD(vector);
 
 
 // Don't pull in the headers, since we don't need them here.
-class ssgBranch;
-class ssgCutout;
-class ssgEntity;
-class ssgRangeSelector;
-class ssgSelector;
-class ssgTransform;
-
 class SGInterpTable;
 class FGCondition;
-class FGLocation;
 
 
 // Has anyone done anything *really* stupid, like making min and max macros?

simgear/scene/model/location.hxx

@@ -21,8 +21,8 @@
 // $Id$
 
 
-#ifndef _LOCATION_HXX
-#define _LOCATION_HXX
+#ifndef _SG_LOCATION_HXX
+#define _SG_LOCATION_HXX
 
 
 #ifndef __cplusplus                                                          
@@ -35,8 +35,6 @@
 
 #include <plib/sg.h>		// plib include
 
-// #include "fgfs.hxx"
-
 
 // Define a structure containing view information
 class FGLocation
@@ -184,4 +182,4 @@ private:
 };
 
 
-#endif // _LOCATION_HXX
+#endif // _SG_LOCATION_HXX