diff --git a/src/arch/hsail/gpu_isa.hh b/src/arch/hsail/gpu_isa.hh
index caee776f19..831ad6ed53 100644
--- a/src/arch/hsail/gpu_isa.hh
+++ b/src/arch/hsail/gpu_isa.hh
@@ -42,8 +42,6 @@
 #include "base/misc.hh"
 #include "gpu-compute/misc.hh"
 
-class Wavefront;
-
 namespace HsailISA
 {
     typedef uint64_t MiscReg;
@@ -51,7 +49,7 @@ namespace HsailISA
     class GPUISA
     {
       public:
-        GPUISA(Wavefront &wf) : wavefront(wf)
+        GPUISA()
         {
         }
 
@@ -74,9 +72,6 @@ namespace HsailISA
         {
             return old_pc + sizeof(RawMachInst);
         }
-
-      private:
-        Wavefront &wavefront;
     };
 }
 
diff --git a/src/gpu-compute/wavefront.cc b/src/gpu-compute/wavefront.cc
index cce76044f9..de36dd54f0 100644
--- a/src/gpu-compute/wavefront.cc
+++ b/src/gpu-compute/wavefront.cc
@@ -49,7 +49,7 @@ WavefrontParams::create()
 }
 
 Wavefront::Wavefront(const Params *p)
-  : SimObject(p), callArgMem(nullptr), _gpuISA(*this)
+  : SimObject(p), callArgMem(nullptr), _gpuISA()
 {
     lastTrace = 0;
     simdId = p->simdId;