diff --git a/hipamd/include/hip/amd_detail/amd_hip_gl_interop.h b/hipamd/include/hip/amd_detail/amd_hip_gl_interop.h
index 3cdb2248db..5ab79c9a01 100644
--- a/hipamd/include/hip/amd_detail/amd_hip_gl_interop.h
+++ b/hipamd/include/hip/amd_detail/amd_hip_gl_interop.h
@@ -23,6 +23,9 @@ THE SOFTWARE.
 #ifndef HIP_INCLUDE_AMD_HIP_GL_INTEROP_H
 #define HIP_INCLUDE_AMD_HIP_GL_INTEROP_H
 
+#if defined(__cplusplus)
+extern "C" {
+#endif
 /**
  *-------------------------------------------------------------------------------------------------
  *-------------------------------------------------------------------------------------------------
@@ -89,4 +92,7 @@ hipError_t hipGraphicsGLRegisterBuffer(hipGraphicsResource** resource, GLuint bu
 hipError_t hipGraphicsGLRegisterImage(hipGraphicsResource** resource, GLuint image,
                                       GLenum target, unsigned int flags);
 
-#endif
\ No newline at end of file
+#if defined(__cplusplus)
+}
+#endif /* __cplusplus */
+#endif /* HIP_INCLUDE_AMD_HIP_GL_INTEROP_H */
diff --git a/hipamd/include/hip/amd_detail/hip_prof_str.h b/hipamd/include/hip/amd_detail/hip_prof_str.h
index b9d390ddd0..8e527ca6bd 100644
--- a/hipamd/include/hip/amd_detail/hip_prof_str.h
+++ b/hipamd/include/hip/amd_detail/hip_prof_str.h
@@ -7,6 +7,8 @@
 #define _HIP_PROF_STR_H
 #define HIP_PROF_VER 1
 
+#include <hip/amd_detail/amd_hip_gl_interop.h>
+
 // HIP API callbacks ID enumeration
 enum hip_api_id_t {
   HIP_API_ID_NONE = 0,