diff --git a/StarVMC/StarAgmlLib/AgMLExtension.cxx b/StarVMC/StarAgmlLib/AgMLExtension.cxx
index 5287b9bdb3f..de85e142434 100644
--- a/StarVMC/StarAgmlLib/AgMLExtension.cxx
+++ b/StarVMC/StarAgmlLib/AgMLExtension.cxx
@@ -13,3 +13,5 @@ AgMLExtension::AgMLExtension() : TGeoRCExtension(),
 {
   Grab();
 }
+
+void AgMLExtension::AddCut( TString cut, double value ){ mGstpar[cut] = value; }
diff --git a/StarVMC/StarAgmlLib/AgMLExtension.h b/StarVMC/StarAgmlLib/AgMLExtension.h
index 3d1d0bbef11..e379749d116 100644
--- a/StarVMC/StarAgmlLib/AgMLExtension.h
+++ b/StarVMC/StarAgmlLib/AgMLExtension.h
@@ -57,7 +57,7 @@ class AgMLExtension : public TGeoRCExtension {
 
   std::vector<AgMLScoring*> GetUserHits(){ return mHitScoring; }
 
-  void AddCut( TString cut, double value ){ mGstpar[cut] = value; }
+  void AddCut( TString cut, double value );
   std::map<TString,double>& GetCuts() { return mGstpar; }
   
  
diff --git a/StarVMC/StarAgmlLib/AgModule.cxx b/StarVMC/StarAgmlLib/AgModule.cxx
index 95c41d06912..29465ba7618 100644
--- a/StarVMC/StarAgmlLib/AgModule.cxx
+++ b/StarVMC/StarAgmlLib/AgModule.cxx
@@ -25,6 +25,8 @@ TDataSet *AgModule::Geom()
   else           return mGeomSet;
 };
 
+void AgModule::AddHitScoring( TString name, AgMLScoring* sc ){ mHitScoring[name] = sc; }
+
 // ---------------------------------------------------------------------------------------------
 AgBlock *AgModule::AddBlock( const Char_t *name, AgBlock *_block )
 {
diff --git a/StarVMC/StarAgmlLib/AgModule.h b/StarVMC/StarAgmlLib/AgModule.h
index dd0f3f5a1f6..c69e5a3d61d 100644
--- a/StarVMC/StarAgmlLib/AgModule.h
+++ b/StarVMC/StarAgmlLib/AgModule.h
@@ -40,7 +40,7 @@ class AgModule : public AgBlock
   void SetTrackingFlag( int flag ){ mTrackingFlag = flag; }
   int  GetTrackingFlag(){ return mTrackingFlag; }
 
-  void AddHitScoring( TString name, AgMLScoring* sc ){ mHitScoring[name] = sc; }
+  void AddHitScoring( TString name, AgMLScoring* sc );
   std::map<TString,AgMLScoring*> GetHitScoring(){ return mHitScoring; }
 
  private:
diff --git a/StarVMC/StarAgmlLib/AgShape.cxx b/StarVMC/StarAgmlLib/AgShape.cxx
index 66a0fd26a38..5ca97db14c9 100644
--- a/StarVMC/StarAgmlLib/AgShape.cxx
+++ b/StarVMC/StarAgmlLib/AgShape.cxx
@@ -626,6 +626,8 @@ Bool_t AgShape::morphed()
   return true; // No shapes match
 }
 
+std::vector< TString > &AgShape::parList(){ return mParList[mId]; }
+
 // =============================================================================================================
 Bool_t AgShape::parameterized()
 {
diff --git a/StarVMC/StarAgmlLib/AgShape.h b/StarVMC/StarAgmlLib/AgShape.h
index 63ab9a840a5..a58c8e9f7e0 100644
--- a/StarVMC/StarAgmlLib/AgShape.h
+++ b/StarVMC/StarAgmlLib/AgShape.h
@@ -67,7 +67,7 @@ class AgShape : public TNamed, public AgParameterList<double>
   Bool_t morphed();
 
   /// Return a list of the parameters which define this shape
-  std::vector< TString > &parList(){ return mParList[mId]; }
+  std::vector< TString > &parList();
 
   /// Returns true if the shape's parameters are to be set
   /// when positioned
diff --git a/StarVMC/StarAgmlLib/StarAgmlStacker.cxx b/StarVMC/StarAgmlLib/StarAgmlStacker.cxx
index 0e1bc6d1c07..a79aebeb2bd 100644
--- a/StarVMC/StarAgmlLib/StarAgmlStacker.cxx
+++ b/StarVMC/StarAgmlLib/StarAgmlStacker.cxx
@@ -129,6 +129,12 @@ TString StarAgmlStacker::realname( TString nname )
   return mRealnames[nname];
 }
 
+
+const std::vector<TString> &StarAgmlStacker::nicknames(const Char_t *name)
+{
+  return mNicknames[ TString(name) ];
+}
+
 // ---------------------------------------------------------------------------------------------------
 void StarAgmlStacker::Debug( const Char_t *name, const Char_t *flag )
 {
diff --git a/StarVMC/StarAgmlLib/StarAgmlStacker.h b/StarVMC/StarAgmlLib/StarAgmlStacker.h
index ea323dbaed6..809b6496682 100644
--- a/StarVMC/StarAgmlLib/StarAgmlStacker.h
+++ b/StarVMC/StarAgmlLib/StarAgmlStacker.h
@@ -35,10 +35,7 @@ class StarAgmlStacker : public TNamed
 
   virtual Bool_t SearchVolume( const AgShape &shape, const AgAttribute &attr )=0;
 			
-  const std::vector<TString> &nicknames(const Char_t *name)
-    {
-      return mNicknames[ TString(name) ];
-    }
+  const std::vector<TString> &nicknames(const Char_t *name);
 
   void Debug( const Char_t *name, const Char_t *flag="position" );
 
diff --git a/StarVMC/StarAgmlUtil/AgParameterList.cxx b/StarVMC/StarAgmlUtil/AgParameterList.cxx
index 00f74ac62a2..731a015ee25 100644
--- a/StarVMC/StarAgmlUtil/AgParameterList.cxx
+++ b/StarVMC/StarAgmlUtil/AgParameterList.cxx
@@ -1,2 +1 @@
 #include "AgParameterList.h"
-