diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
index 9446b966742658d3023c6c2110c2040326a0a4c0..9d37e09b187792e6e24b071fd80182449143f363 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestD.h
@@ -24,20 +24,11 @@
 #ifndef ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 # define ATHENAPOOLTESTDATA_ATHENAPOOLTESTD_H
 
-//<<<<<< INCLUDES                                                       >>>>>>
 
 #include "AthenaPoolTestData/AthenaPoolTestC.h"
 //#include "CLHEP/Geometry/Point3D.h"
-//#include <string>
+#include <string>
 
-//<<<<<< PUBLIC DEFINES                                                 >>>>>>
-//<<<<<< PUBLIC CONSTANTS                                               >>>>>>
-//<<<<<< PUBLIC TYPES                                                   >>>>>>
-//<<<<<< PUBLIC VARIABLES                                               >>>>>>
-//<<<<<< PUBLIC FUNCTIONS                                               >>>>>>
-//<<<<<< CLASS DECLARATIONS                                             >>>>>>
-
-class string;
 
 class AthenaPoolTestD : public AthenaPoolTestC 
 {
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
index 5f8e351d074e5aed2ac4e74b508c2f70c9a57338..e0bac7cb0e65079e221fe81b014fad4e7411c126 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapData.h
@@ -39,7 +39,6 @@ public:
 
     AthenaPoolTestMapData();
     AthenaPoolTestMapData (const std::vector< Deposit >& deposits, int simDataWord = 0);
-    AthenaPoolTestMapData (const AthenaPoolTestMapData& other);
     virtual ~AthenaPoolTestMapData();
 
     int word() const;                           // Get the packed simdata word
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
index 0f59c36b23d9335b3e2596be0669a2f074116b56..159dadc56575328a6353725cdf145f9c778621cf 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/AthenaPoolTestMapDataLink.h
@@ -41,7 +41,6 @@ public:
     AthenaPoolTestMapDataLink();
     AthenaPoolTestMapDataLink(index_type barCode, index_type eventIndex = 0);
     AthenaPoolTestMapDataLink(const MyDummyClass* p, index_type eventIndex = 0);
-    AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs);
     //@}
   
     /// \name indexing accessors (e.g. for writing)
@@ -56,7 +55,6 @@ public:
     public:
 	ExtendedBarCode();
 	ExtendedBarCode(index_type barcode, index_type eventIndex);
-	ExtendedBarCode(const ExtendedBarCode& rhs);
 
 	unsigned long  barcode() const;
 	unsigned short eventIndex() const;
@@ -79,9 +77,6 @@ inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(index_type ba
     assert(eventIndex < std::numeric_limits<unsigned short>::max()); 
 }
 
-inline AthenaPoolTestMapDataLink::ExtendedBarCode::ExtendedBarCode(const ExtendedBarCode& rhs) :
-    m_BC(rhs.m_BC), m_evtIndex(rhs.m_evtIndex) {}
-
 inline unsigned long \
 AthenaPoolTestMapDataLink::ExtendedBarCode::barcode() const
 {
@@ -105,11 +100,6 @@ inline
 AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const MyDummyClass* /*p*/, index_type eventIndex) :
     m_particle(0), m_extBarcode(0, eventIndex) {}
 
-inline
-AthenaPoolTestMapDataLink::AthenaPoolTestMapDataLink(const AthenaPoolTestMapDataLink& rhs) : 
-    m_particle(rhs.m_particle),
-    m_extBarcode(rhs.m_extBarcode) {}
-
 inline int 
 AthenaPoolTestMapDataLink::barcode() const 
 { return int(m_extBarcode.barcode()); } //FIXME ret type
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
index 2b4eec7b2edb4016e5516b3a7fee52e7fdd5817f..c1886604fe6fddc21159df8abecb3c6d754d1215 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/AthenaPoolTestData/TrigPath.h
@@ -19,8 +19,9 @@
 #include <string>
 #include <set>
 
-struct TrigPath
+class TrigPath
 {
+public:
 	TrigPath() : pathID(-1), l1bit(-1), l2bit(0) {}
 	TrigPath(int l1, int l2, int p) : 
 		pathID(p), l1bit(l1), l2bit(l2) {}
diff --git a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
index 287d8e68d81744c096d3204936d6da10c3f5b634..e3d8020b9a0f817425eebc180612c2af877f626c 100755
--- a/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
+++ b/AtlasTest/DatabaseTest/AthenaPoolTestData/src/AthenaPoolTestMapData.cxx
@@ -40,12 +40,6 @@ AthenaPoolTestMapData::AthenaPoolTestMapData (const std::vector<Deposit>& deposi
     m_deposits = deposits;
 }
 
-AthenaPoolTestMapData::AthenaPoolTestMapData (const AthenaPoolTestMapData& other)
-    :m_word(other.m_word),
-     m_deposits(other.m_deposits)
-{}
-
-
 AthenaPoolTestMapData::~AthenaPoolTestMapData()
 {
     //    delete[] m_p_deposits;