diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
index ba1db8d5e8..39dd282c72 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/inc/addrinterface.h
@@ -18,11 +18,7 @@
 // Includes should be before extern "C"
 #include "addrtypes.h"
 
-#if defined(__cplusplus)
-extern "C"
-{
-#endif
-
+namespace rocr {
 #define ADDRLIB_VERSION_MAJOR 8
 #define ADDRLIB_VERSION_MINOR 10
 #define ADDRLIB_VERSION ((ADDRLIB_VERSION_MAJOR << 16) | ADDRLIB_VERSION_MINOR)
@@ -3720,7 +3716,7 @@ typedef struct _ADDR2_COMPUTE_NONBLOCKCOMPRESSEDVIEW_INPUT
     AddrResourceType      resourceType;      ///< Surface type
     AddrFormat            format;            ///< Surface format
     UINT_32               width;             ///< Width of mip0 in texels (not in compressed block)
-    UINT_32               height;            ///< Height of mip0 in texels (not in compressed block) 
+    UINT_32               height;            ///< Height of mip0 in texels (not in compressed block)
     UINT_32               numSlices;         ///< Number surface slice/depth of mip0
     UINT_32               numMipLevels;      ///< Total mipmap levels.
     UINT_32               pipeBankXor;       ///< Combined swizzle used to do bank/pipe rotation
@@ -4496,9 +4492,5 @@ ADDR_E_RETURNCODE ADDR_API Addr3ComputeSlicePipeBankXor(
     const ADDR3_COMPUTE_SLICE_PIPEBANKXOR_INPUT* pIn,
     ADDR3_COMPUTE_SLICE_PIPEBANKXOR_OUTPUT*      pOut);
 
-
-#if defined(__cplusplus)
-}
-#endif
-
+} // namespace rocr
 #endif // __ADDR_INTERFACE_H__
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
index 80386996a4..0bc83678d4 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/addrinterface.cpp
@@ -19,6 +19,7 @@
 
 #include "addrcommon.h"
 
+namespace rocr {
 using namespace Addr;
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -2152,3 +2153,4 @@ ADDR_E_RETURNCODE ADDR_API Addr3ComputeSlicePipeBankXor(
 
     return returnCode;
 }
+} //namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
index 28770bf8fe..8948925747 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrcommon.h
@@ -184,6 +184,7 @@
    } while (0)
 #endif
 
+namespace rocr {
 namespace Addr
 {
 
@@ -1073,6 +1074,7 @@ static inline UINT_32 ShiftRight(
 }
 
 } // Addr
+} // namespace rocr
 
 #endif // __ADDR_COMMON_H__
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
index e42d2624ad..615d8f0e39 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.cpp
@@ -16,6 +16,7 @@
 #include "addrelemlib.h"
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -1816,3 +1817,4 @@ BOOL_32 ElemLib::IsMacroPixelPacked(
 }
 
 }
+} //namespace rocr
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
index 0d1da9e7f4..3352279dec 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrelemlib.h
@@ -21,6 +21,7 @@
 #include "addrobject.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -257,6 +258,6 @@ private:
 };
 
 } //Addr
-
+} //namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
index f67acde32d..d7d322f8d7 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.cpp
@@ -63,6 +63,7 @@ UINT_32 __umoddi3(UINT_64 n, UINT_32 base)
 
 #endif // __APPLE__
 
+namespace rocr {
 namespace Addr
 {
 
@@ -233,7 +234,6 @@ ADDR_E_RETURNCODE Lib::Create(
                 break;
         }
     }
-    
     if(pLib == NULL)
     {
         returnCode = ADDR_OUTOFMEMORY;
@@ -658,3 +658,4 @@ UINT_32 Lib::GetBpe(AddrFormat format) const
 }
 
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
index 7a1f59dc1c..cce002ab19 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib.h
@@ -39,6 +39,7 @@
 #define CIASICIDGFXENGINE_ARCTICISLAND 0x0000000D
 #endif
 
+namespace rocr {
 namespace Addr
 {
 
@@ -409,5 +410,5 @@ Lib* Gfx10HwlInit(const Client* pClient);
 Lib* Gfx11HwlInit(const Client* pClient);
 Lib* Gfx12HwlInit(const Client* pClient);
 } // Addr
-
+} // namespace rocr
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
index 34a866c5d7..c99d0af0a3 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.cpp
@@ -17,6 +17,7 @@
 #include "addrlib1.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -4055,3 +4056,4 @@ ADDR_E_RETURNCODE Lib::ComputePrtInfo(
 
 } // V1
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
index f447767603..8b5dde2061 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib1.h
@@ -19,6 +19,7 @@
 
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -523,6 +524,7 @@ private:
 
 } // V1
 } // Addr
+} // namespace rocr
 
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
index 55a87cdd15..43d4c0f9db 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.cpp
@@ -18,6 +18,7 @@
 #include "addrlib2.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -2159,4 +2160,5 @@ VOID Lib::ValidateStereoInfo(
 
 } // V2
 } // Addr
+} // namespace rocr
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
index d652244ec3..5abf58f038 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib2.h
@@ -19,6 +19,7 @@
 
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -998,6 +999,6 @@ private:
 
 } // V2
 } // Addr
-
+} // namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.cpp
index db6090b1cb..a2e6c36050 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.cpp
@@ -18,6 +18,7 @@
 #include "addrlib3.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V3
@@ -1069,3 +1070,4 @@ ADDR_E_RETURNCODE Lib::ApplyCustomizedPitchHeight(
 
 } // V3
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.h
index f57125501b..6b7a1818bf 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrlib3.h
@@ -19,6 +19,7 @@
 
 #include "addrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V3
@@ -411,5 +412,6 @@ private:
 
 } // V3
 } // Addr
+} // namespace rocr
 
 #endif
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
index 82a94d3d23..f3d3fff274 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.cpp
@@ -17,6 +17,7 @@
 #include "addrinterface.h"
 #include "addrobject.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -220,3 +221,4 @@ VOID Object::DebugPrint(
 }
 
 } // Addr
+} // namespace rocr
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
index db76cb6ca3..57205e5b20 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/addrobject.h
@@ -20,6 +20,7 @@
 #include "addrtypes.h"
 #include "addrcommon.h"
 
+namespace rocr {
 namespace Addr
 {
 
@@ -74,4 +75,5 @@ private:
 };
 
 } // Addr
+} // namespace rocr
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
index 068a991947..74644e75e4 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.cpp
@@ -11,6 +11,7 @@
 #include "addrcommon.h"
 #include "coord.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -584,3 +585,4 @@ BOOL_32 CoordEq::operator!=(const CoordEq& b)
 
 } // V2
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.h
index 2e8011550e..95c4fca681 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/core/coord.h
@@ -11,6 +11,7 @@
 #ifndef __COORD_H
 #define __COORD_H
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -124,6 +125,6 @@ private:
 
 } // V2
 } // Addr
-
+} // namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
index 0b6b1e1cc1..f476b39843 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10SwizzlePattern.h
@@ -16,7 +16,7 @@
 #ifndef __GFX10_SWIZZLE_PATTERN_H__
 #define __GFX10_SWIZZLE_PATTERN_H__
 
-
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -6017,5 +6017,6 @@ const UINT_64 GFX10_CMASK_SW_PATTERN[][17] =
 
 }// V2
 } // Addr
+} // namespace rocr
 
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
index f79289e113..324697b739 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.cpp
@@ -21,7 +21,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 /**
@@ -3121,7 +3121,7 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlGetPreferredSurfaceSetting(
                         // Iterate through all block types
                         for (UINT_32 i = AddrBlockLinear; i < AddrBlockMaxTiledType; i++)
                         {
-                            if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                            if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                             {
                                 localIn.swizzleMode = swMode[i];
 
@@ -3195,7 +3195,7 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlGetPreferredSurfaceSetting(
                             for (UINT_32 i = AddrBlockMicro; i < AddrBlockMaxTiledType; i++)
                             {
                                 if ((i != minSizeBlk) &&
-                                    Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                                    Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                                 {
                                     if (Addr2BlockTypeWithinMemoryBudget(
                                             minSize,
@@ -4802,3 +4802,4 @@ ADDR_E_RETURNCODE Gfx10Lib::HwlComputeSurfaceInfoLinear(
 
 } // V2
 } // Addr
+} // namespace rocr
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
index a8421e92ad..9dbaefe0eb 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx10/gfx10addrlib.h
@@ -20,6 +20,7 @@
 #include "coord.h"
 #include "gfx10SwizzlePattern.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -571,6 +572,7 @@ private:
 
 } // V2
 } // Addr
+} // namespace rocr
 
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11SwizzlePattern.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11SwizzlePattern.h
index e8adff6ac4..1cdf846056 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11SwizzlePattern.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11SwizzlePattern.h
@@ -16,7 +16,7 @@
 #ifndef __GFX11_SWIZZLE_PATTERN_H__
 #define __GFX11_SWIZZLE_PATTERN_H__
 
-
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -3036,5 +3036,5 @@ const UINT_64 GFX11_HTILE_SW_PATTERN[][18] =
 
 }// V2
 } // Addr
-
+} // namespace rocr
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.cpp
index e5206be496..bcaa539d4e 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.cpp
@@ -20,7 +20,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 /**
@@ -2645,7 +2645,7 @@ ADDR_E_RETURNCODE Gfx11Lib::HwlGetPreferredSurfaceSetting(
 
                         for (UINT_32 i = AddrBlockLinear; i < AddrBlockMaxTiledType; i++)
                         {
-                            if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                            if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                             {
                                 localIn.swizzleMode = swMode[i];
 
@@ -2708,7 +2708,7 @@ ADDR_E_RETURNCODE Gfx11Lib::HwlGetPreferredSurfaceSetting(
                             for (UINT_32 i = AddrBlockMicro; i < AddrBlockMaxTiledType; i++)
                             {
                                 if ((i != minSizeBlk) &&
-                                    Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                                    Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                                 {
                                     if (Addr2BlockTypeWithinMemoryBudget(minSize, padSize[i], 0, 0, pIn->memoryBudget) == FALSE)
                                     {
@@ -4494,3 +4494,4 @@ ADDR_E_RETURNCODE Gfx11Lib::HwlComputeSurfaceInfoLinear(
 
 } // V2
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.h
index b07c989126..78ffc46b4e 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx11/gfx11addrlib.h
@@ -20,6 +20,7 @@
 #include "coord.h"
 #include "gfx11SwizzlePattern.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -517,6 +518,6 @@ private:
 
 } // V2
 } // Addr
-
+} // namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12SwizzlePattern.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12SwizzlePattern.h
index b29fbb8ef4..55508066d8 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12SwizzlePattern.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12SwizzlePattern.h
@@ -16,6 +16,7 @@
 #ifndef __GFX12_SWIZZLE_PATTERN_H__
 #define __GFX12_SWIZZLE_PATTERN_H__
 
+namespace rocr {
 namespace Addr
 {
 namespace V3
@@ -275,5 +276,5 @@ namespace V3
 
 } // V3
 } // Addr
-
+} // namespace
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.cpp
index 509ede1e15..1b2e5e563d 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.cpp
@@ -20,7 +20,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 /**
@@ -1310,3 +1310,4 @@ void Gfx12Lib::SanityCheckSurfSize(
 
 } // V3
 } // Addr
+} // namespace rocr
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.h
index c56fe719b0..902a60b82a 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx12/gfx12addrlib.h
@@ -20,6 +20,7 @@
 #include "coord.h"
 #include "gfx12SwizzlePattern.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V3
@@ -213,5 +214,5 @@ private:
 
 } // V3
 } // Addr
-
+} // namespace rocr
 #endif
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
index 65e491ff4a..d98fd8058a 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.cpp
@@ -21,7 +21,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 
@@ -3761,7 +3761,7 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlGetPreferredSurfaceSetting(
 
                     for (UINT_32 i = AddrBlockLinear; i < AddrBlockMaxTiledType; i++)
                     {
-                        if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                        if (Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                         {
                             localIn.swizzleMode = swMode[i];
 
@@ -3820,7 +3820,7 @@ ADDR_E_RETURNCODE Gfx9Lib::HwlGetPreferredSurfaceSetting(
                         for (UINT_32 i = AddrBlockMicro; i < AddrBlockMaxTiledType; i++)
                         {
                             if ((i != minSizeBlk) &&
-                                Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<::AddrBlockType>(i)))
+                                Addr2IsBlockTypeAvailable(allowedBlockSet, static_cast<rocr::AddrBlockType>(i)))
                             {
                                 if (Addr2BlockTypeWithinMemoryBudget(minSize, padSize[i], 0, 0, pIn->memoryBudget) == FALSE)
                                 {
@@ -5218,3 +5218,4 @@ VOID Gfx9Lib::ComputeThinBlockDimension(
 
 } // V2
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
index 6a0fa661ac..990a55db26 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/gfx9/gfx9addrlib.h
@@ -19,6 +19,7 @@
 #include "addrlib2.h"
 #include "coord.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V2
@@ -631,6 +632,6 @@ private:
 
 } // V2
 } // Addr
-
+} // namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
index aedfb0acb6..81f39a239f 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.cpp
@@ -21,7 +21,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-
+namespace rocr {
 namespace Addr
 {
 
@@ -2335,3 +2335,4 @@ BOOL_32 CiLib::CheckTcCompatibility(
 
 } // V1
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
index 060d30e343..997f0ba418 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/ciaddrlib.h
@@ -19,6 +19,7 @@
 #include "addrlib1.h"
 #include "siaddrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -188,7 +189,7 @@ private:
 
 } // V1
 } // Addr
-
+} // namespace rocr
 #endif
 
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
index 48e2440874..ee9a0a9eba 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.cpp
@@ -14,6 +14,7 @@
 
 #include "egbaddrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -4143,3 +4144,4 @@ UINT_32 EgBasedLib::HwlStereoCheckRightOffsetPadding(
 
 } // V1
 } // Addr
+} // namespace rocr
\ No newline at end of file
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
index e855585048..4a203c7d39 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/egbaddrlib.h
@@ -18,6 +18,7 @@
 
 #include "addrlib1.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -407,6 +408,6 @@ protected:
 
 } // V1
 } // Addr
-
+} // namespace rocr
 #endif
 
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
index afe00ae81a..4abbed2b97 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.cpp
@@ -20,6 +20,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////////////////////////////////////
+namespace rocr {
 namespace Addr
 {
 
@@ -3858,3 +3859,4 @@ BOOL_32 SiLib::IsEquationSupported(
 
 } // V1
 } // Addr
+} // namespace rocr
diff --git a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
index d0dd841ceb..c8de9b9040 100644
--- a/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
+++ b/projects/rocr-runtime/runtime/hsa-runtime/image/addrlib/src/r800/siaddrlib.h
@@ -19,6 +19,7 @@
 #include "addrlib1.h"
 #include "egbaddrlib.h"
 
+namespace rocr {
 namespace Addr
 {
 namespace V1
@@ -326,6 +327,6 @@ private:
 
 } // V1
 } // Addr
-
+} // namespace rocr
 #endif