diff --git a/header_template.hpp.in b/header_template.hpp.in
index e676774..627fefd 100644
--- a/header_template.hpp.in
+++ b/header_template.hpp.in
@@ -23,11 +23,18 @@
 #ifndef @include_guard@
 #define @include_guard@
 
-#if defined(__GNUC__)
+#ifndef ROCM_HEADER_WRAPPER_WERROR
+#define ROCM_HEADER_WRAPPER_WERROR @deprecated_error@
+#endif
+#if ROCM_HEADER_WRAPPER_WERROR  /* ROCM_HEADER_WRAPPER_WERROR 1 */
 #error "This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with roctracer"
+#else      /* ROCM_HEADER_WRAPPER_WERROR 0 */
+#if defined(__GNUC__)
+#warning "This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with roctracer"
 #else
 #pragma message("This file is deprecated. Use file from include path /opt/rocm-ver/include/ and prefix with roctracer")
 #endif
+#endif /* ROCM_HEADER_WRAPPER_WERROR */
 
 @include_statements@
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e1366e6..80598d2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -247,5 +247,19 @@ if(NOT ENABLE_ASAN_PACKAGING)
 endif()
 
 if(FILE_REORG_BACKWARD_COMPATIBILITY)
+## To enable/disable #error in wrapper header files
+  if(NOT DEFINED ROCM_HEADER_WRAPPER_WERROR)
+    if(DEFINED ENV{ROCM_HEADER_WRAPPER_WERROR})
+      set(ROCM_HEADER_WRAPPER_WERROR "$ENV{ROCM_HEADER_WRAPPER_WERROR}"
+                CACHE STRING "Header wrapper warnings as errors.")
+    else()
+      set(ROCM_HEADER_WRAPPER_WERROR "ON" CACHE STRING "Header wrapper warnings as errors.")
+    endif()
+  endif()
+  if(ROCM_HEADER_WRAPPER_WERROR)
+    set(deprecated_error 1)
+  else()
+    set(deprecated_error 0)
+  endif()
   include(${PROJECT_SOURCE_DIR}/roctracer-backward-compat.cmake)
 endif()