diff --git a/projects/rocprofiler/cmake_modules/env.cmake b/projects/rocprofiler/cmake_modules/env.cmake
index d762b7429b..b2fd2fbab5 100644
--- a/projects/rocprofiler/cmake_modules/env.cmake
+++ b/projects/rocprofiler/cmake_modules/env.cmake
@@ -31,7 +31,6 @@ add_definitions ( -DUNIX_OS )
 add_definitions ( -DLINUX )
 add_definitions ( -D__AMD64__ )
 add_definitions ( -D__x86_64__ )
-add_definitions ( -DAMD_INTERNAL_BUILD )
 add_definitions ( -DLITTLEENDIAN_CPU=1 )
 add_definitions ( -DHSA_LARGE_MODEL= )
 add_definitions ( -DHSA_DEPRECATED= )
diff --git a/projects/rocprofiler/src/core/hsa_proxy_queue.h b/projects/rocprofiler/src/core/hsa_proxy_queue.h
index dd4999b989..3713bfaca8 100644
--- a/projects/rocprofiler/src/core/hsa_proxy_queue.h
+++ b/projects/rocprofiler/src/core/hsa_proxy_queue.h
@@ -30,6 +30,7 @@ THE SOFTWARE.
 
 #include "core/proxy_queue.h"
 #include "util/exception.h"
+#include "util/hsa_rsrc_factory.h"
 
 namespace rocprofiler {
 extern decltype(hsa_queue_destroy)* hsa_queue_destroy_fn;
diff --git a/projects/rocprofiler/src/core/proxy_queue.h b/projects/rocprofiler/src/core/proxy_queue.h
index 42e6c63be4..e719fed4c7 100644
--- a/projects/rocprofiler/src/core/proxy_queue.h
+++ b/projects/rocprofiler/src/core/proxy_queue.h
@@ -24,7 +24,7 @@ THE SOFTWARE.
 #define _SRC_CORE_PROXY_QUEUE_H
 
 #include <hsa.h>
-#include <hsa_api_trace.h>
+#include <string.h>
 #include <atomic>
 #include <map>
 #include <mutex>
diff --git a/projects/rocprofiler/src/core/rocprofiler.cpp b/projects/rocprofiler/src/core/rocprofiler.cpp
index b5c0a02c28..7258772e66 100644
--- a/projects/rocprofiler/src/core/rocprofiler.cpp
+++ b/projects/rocprofiler/src/core/rocprofiler.cpp
@@ -23,7 +23,6 @@ THE SOFTWARE.
 #include "inc/rocprofiler.h"
 
 #include <hsa.h>
-#include <hsa_api_trace.h>
 #include <string.h>
 
 #include <sstream>
diff --git a/projects/rocprofiler/src/util/hsa_rsrc_factory.h b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
index 737e459084..b0f11be73c 100644
--- a/projects/rocprofiler/src/util/hsa_rsrc_factory.h
+++ b/projects/rocprofiler/src/util/hsa_rsrc_factory.h
@@ -25,6 +25,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef SRC_UTIL_HSA_RSRC_FACTORY_H_
 #define SRC_UTIL_HSA_RSRC_FACTORY_H_
 
+#define AMD_INTERNAL_BUILD
+
 #include <hsa.h>
 #include <hsa_api_trace.h>
 #include <hsa_ext_amd.h>
diff --git a/projects/rocprofiler/test/util/hsa_rsrc_factory.h b/projects/rocprofiler/test/util/hsa_rsrc_factory.h
index 3108463b20..2edb0fd813 100644
--- a/projects/rocprofiler/test/util/hsa_rsrc_factory.h
+++ b/projects/rocprofiler/test/util/hsa_rsrc_factory.h
@@ -25,6 +25,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #ifndef TEST_UTIL_HSA_RSRC_FACTORY_H_
 #define TEST_UTIL_HSA_RSRC_FACTORY_H_
 
+#define AMD_INTERNAL_BUILD
+
 #include <hsa.h>
 #include <hsa_api_trace.h>
 #include <hsa_ext_amd.h>