From 992de3818411062e9860d3081b8fd3c3053476aa Mon Sep 17 00:00:00 2001
From: curt <curt>
Date: Fri, 9 May 2003 19:37:28 +0000
Subject: [PATCH] Minor tweaks and clean ups.

---
 simgear/scene/model/Makefile.am   | 4 ++--
 simgear/scene/model/animation.hxx | 8 --------
 simgear/scene/model/location.hxx  | 8 +++-----
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/simgear/scene/model/Makefile.am b/simgear/scene/model/Makefile.am
index 661f294c..f0dcd8e5 100644
--- a/simgear/scene/model/Makefile.am
+++ b/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)
diff --git a/simgear/scene/model/animation.hxx b/simgear/scene/model/animation.hxx
index a59c0404..76cf8233 100644
--- a/simgear/scene/model/animation.hxx
+++ b/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?
diff --git a/simgear/scene/model/location.hxx b/simgear/scene/model/location.hxx
index 0cba6378..f7b141d0 100644
--- a/simgear/scene/model/location.hxx
+++ b/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
-- 
2.39.5