diff --git a/arch/sparc/faults.cc b/arch/sparc/faults.cc
index 9831a7679..a26015aae 100644
--- a/arch/sparc/faults.cc
+++ b/arch/sparc/faults.cc
@@ -179,13 +179,13 @@ TrapType      AsyncDataError::_trapType = 0x040;
 FaultPriority AsyncDataError::_priority = 2;
 FaultStat     AsyncDataError::_count;
 
-//The enumerated faults
-
 FaultName     CleanWindow::_name = "clean_win";
-TrapType      CleanWindow::_baseTrapType = 0x024;
+TrapType      CleanWindow::_trapType = 0x024;
 FaultPriority CleanWindow::_priority = 10;
 FaultStat     CleanWindow::_count;
 
+//The enumerated faults
+
 FaultName     InterruptLevelN::_name = "interrupt_n";
 TrapType      InterruptLevelN::_baseTrapType = 0x041;
 FaultStat     InterruptLevelN::_count;
diff --git a/arch/sparc/faults.hh b/arch/sparc/faults.hh
index 985407c26..36a72930a 100644
--- a/arch/sparc/faults.hh
+++ b/arch/sparc/faults.hh
@@ -468,6 +468,20 @@ class AsyncDataError : public SparcFault
     FaultStat & countStat() {return _count;}
 };
 
+class CleanWindow : public SparcFault
+{
+  private:
+    static FaultName _name;
+    static TrapType _trapType;
+    static FaultPriority _priority;
+    static FaultStat _count;
+  public:
+    FaultName name() {return _name;}
+    TrapType trapType() {return _trapType;}
+    FaultPriority priority() {return _priority;}
+    FaultStat & countStat() {return _count;}
+};
+
 class EnumeratedFault : public SparcFault
 {
   protected:
@@ -478,21 +492,6 @@ class EnumeratedFault : public SparcFault
     TrapType trapType() {return baseTrapType() + _n;}
 };
 
-class CleanWindow : public EnumeratedFault
-{
-  private:
-    static FaultName _name;
-    static TrapType _baseTrapType;
-    static FaultPriority _priority;
-    static FaultStat _count;
-    TrapType baseTrapType() {return _baseTrapType;}
-  public:
-    CleanWindow(uint32_t n) : EnumeratedFault(n) {;}
-    FaultName name() {return _name;}
-    FaultPriority priority() {return _priority;}
-    FaultStat & countStat() {return _count;}
-};
-
 class InterruptLevelN : public EnumeratedFault
 {
   private: