diff --git a/rocclr/compiler/lib/include/v0_8/acl.h b/rocclr/compiler/lib/include/v0_8/acl.h
index ba2669196c..4c44eb0fee 100644
--- a/rocclr/compiler/lib/include/v0_8/acl.h
+++ b/rocclr/compiler/lib/include/v0_8/acl.h
@@ -282,8 +282,6 @@ void aclDumpBinary(const aclBinary *bin);
 //!--------------------------------------------------------------------------!//
 // Functions that deal with kenel statistics.
 //!--------------------------------------------------------------------------!//
-void aclGetKstatsR800(const void* shader,
-       aclKernelStats &kstats, const char* chip_id);
 void aclGetKstatsSI(const void* shader,
        aclKernelStats &kstats);
 acl_error ACL_API_ENTRY
diff --git a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
index a92192b33b..7f0cd50697 100644
--- a/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
+++ b/rocclr/compiler/lib/utils/v0_8/libUtils.cpp
@@ -413,12 +413,7 @@ aclutInsertKernelStatistics(aclCompiler *cl, aclBinary *bin)
     if (family >= FAMILY_R600 &&
 	    family <= FAMILY_CZ) {
 	  aclKernelStats kstats = {0};
-      if (family < FAMILY_SI) {
-        aclGetKstatsR800(isa, kstats, chipName);
-      }
-      else {
-        aclGetKstatsSI(isa, kstats);
-      }
+      aclGetKstatsSI(isa, kstats);
 	  kstats.wavefrontsize = 64; // FIXME: Hardcoded for now.
 	  const oclBIFSymbolStruct* symbol = findBIF30SymStruct(symKernelStats);
 	  assert(symbol && "symbol not found");
diff --git a/rocclr/runtime/device/gpu/gpukernel.cpp b/rocclr/runtime/device/gpu/gpukernel.cpp
index a6857b39e2..8eb574eed6 100644
--- a/rocclr/runtime/device/gpu/gpukernel.cpp
+++ b/rocclr/runtime/device/gpu/gpukernel.cpp
@@ -12,7 +12,7 @@
 #include "utils/options.hpp"
 
 #include "acl.h"
-#include "SCShadersR678XXCommon.h"
+#include "SCCommon.h"
 
 #include <string>
 #include <memory>