diff --git a/src/THcAerogelHit.h b/src/THcAerogelHit.h
index 0c8ac63327be3dcfbcbe809f055da216e86c0b0d..c007c84ff544c17767109abc9aef5c80f38a106e 100644
--- a/src/THcAerogelHit.h
+++ b/src/THcAerogelHit.h
@@ -6,6 +6,7 @@
 class THcAerogelHit : public THcHodoscopeHit {
 
  public:
+  friend class THcAerogel;
  
  protected:
 
diff --git a/src/THcCherenkovHit.h b/src/THcCherenkovHit.h
index 67ef4c13c1e0a344a06803a581d81b869d79e426..de1180c7b11493c289d24fd172bc1dc35ebe2709 100644
--- a/src/THcCherenkovHit.h
+++ b/src/THcCherenkovHit.h
@@ -6,6 +6,7 @@
 class THcCherenkovHit : public THcHodoscopeHit {
 
  public:
+  friend class THcCherenkov;
  
  protected:
 
diff --git a/src/THcHodoscopeHit.h b/src/THcHodoscopeHit.h
index 0bac2d1a1f9a231325dfb83a2a31e58f1ef95e67..853e8f24706d04fe073633ead7c928658e6153ff 100644
--- a/src/THcHodoscopeHit.h
+++ b/src/THcHodoscopeHit.h
@@ -6,8 +6,9 @@
 class THcHodoscopeHit : public THcRawHit {
 
  public:
+  friend class THcScintillatorPlane;
 
- THcHodoscopeHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), 
+  THcHodoscopeHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), 
     fADC_pos(-1), fADC_neg(-1),
     fTDC_pos(-1), fTDC_neg(-1) {
   }
@@ -23,13 +24,12 @@ class THcHodoscopeHit : public THcRawHit {
   //  virtual Bool_t  IsSortable () const {return kTRUE; }
   //  virtual Int_t   Compare(const TObject* obj) const;
 
+ protected:
   Int_t fADC_pos;
   Int_t fADC_neg;
   Int_t fTDC_pos;
   Int_t fTDC_neg;
 
- protected:
-
  private:
 
   ClassDef(THcHodoscopeHit, 0);	// Hodoscope hit class
diff --git a/src/THcRawDCHit.h b/src/THcRawDCHit.h
index 4eb2c55ad9755ce6a179807c415e38bd8dbe408f..05a6b2084963f3a3b62992e8c70e03a4879a52ea 100644
--- a/src/THcRawDCHit.h
+++ b/src/THcRawDCHit.h
@@ -8,6 +8,8 @@
 class THcRawDCHit : public THcRawHit {
 
 public:
+  friend class THcDriftChamberPlane;
+  friend class THcDC;
 
   THcRawDCHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), 
     fNHits(0) {
@@ -24,10 +26,10 @@ public:
   virtual Bool_t  IsSortable () const {return kTRUE; }
   virtual Int_t   Compare(const TObject* obj) const;
 
-  Int_t fNHits;
-  Int_t fTDC[MAXHITS];
 
 protected:
+  Int_t fNHits;
+  Int_t fTDC[MAXHITS];
 
 private:
 
diff --git a/src/THcRawShowerHit.h b/src/THcRawShowerHit.h
index 1671ddcbfcc7645315c2e99e7440c1b40927d067..0384295b96051c5757c9731ed4f9828eb128a76a 100644
--- a/src/THcRawShowerHit.h
+++ b/src/THcRawShowerHit.h
@@ -6,8 +6,9 @@
 class THcRawShowerHit : public THcRawHit {
 
  public:
+  friend class THcShowerPlane;
 
- THcRawShowerHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), 
+  THcRawShowerHit(Int_t plane=0, Int_t counter=0) : THcRawHit(plane, counter), 
     fADC_pos(-1), fADC_neg(-1){
   }
   THcRawShowerHit& operator=( const THcRawShowerHit& );
@@ -22,11 +23,10 @@ class THcRawShowerHit : public THcRawHit {
   //  virtual Bool_t  IsSortable () const {return kTRUE; }
   //  virtual Int_t   Compare(const TObject* obj) const;
 
+ protected:
   Int_t fADC_pos;
   Int_t fADC_neg;
 
- protected:
-
  private:
 
   ClassDef(THcRawShowerHit, 0);	// Shower hit class