diff --git a/include/hip/hip_ext.h b/include/hip/hip_ext.h
index 319f5694d0..044d7fec55 100644
--- a/include/hip/hip_ext.h
+++ b/include/hip/hip_ext.h
@@ -80,7 +80,7 @@ HIP_PUBLIC_API
  * @brief This HIP API is deprecated, please use hipExtModuleLaunchKernel() instead.
  *
  */
-DEPRECATED("use hipExtModuleLaunchKernel instead")
+HIP_DEPRECATED("use hipExtModuleLaunchKernel instead")
 HIP_PUBLIC_API
 extern "C" hipError_t hipHccModuleLaunchKernel(hipFunction_t f, uint32_t globalWorkSizeX,
                                     uint32_t globalWorkSizeY, uint32_t globalWorkSizeZ,
diff --git a/include/hip/hip_runtime_api.h b/include/hip/hip_runtime_api.h
index bede4a6409..f62b5d389a 100644
--- a/include/hip/hip_runtime_api.h
+++ b/include/hip/hip_runtime_api.h
@@ -577,11 +577,11 @@ enum hipGPUDirectRDMAWritesOrdering {
 #include <hip/texture_types.h>
 #include <hip/surface_types.h>
 #if defined(_MSC_VER)
-#define DEPRECATED(msg) __declspec(deprecated(msg))
+#define HIP_DEPRECATED(msg) __declspec(deprecated(msg))
 #else // !defined(_MSC_VER)
-#define DEPRECATED(msg) __attribute__ ((deprecated(msg)))
+#define HIP_DEPRECATED(msg) __attribute__ ((deprecated(msg)))
 #endif // !defined(_MSC_VER)
-#define DEPRECATED_MSG "This API is marked as deprecated and may not be supported in future releases. For more details please refer https://github.com/ROCm/HIP/blob/develop/docs/reference/deprecated_api_list.md"
+#define HIP_DEPRECATED_MSG "This API is marked as deprecated and might not be supported in future releases. For more details please refer https://github.com/ROCm/HIP/blob/develop/docs/reference/deprecated_api_list.md"
 #define HIP_LAUNCH_PARAM_BUFFER_POINTER ((void*)0x01)
 #define HIP_LAUNCH_PARAM_BUFFER_SIZE ((void*)0x02)
 #define HIP_LAUNCH_PARAM_END ((void*)0x03)
@@ -3415,7 +3415,7 @@ hipError_t hipExtMallocWithFlags(void** ptr, size_t sizeBytes, unsigned int flag
  *
  *  @warning  This API is deprecated, use hipHostAlloc() instead
  */
-DEPRECATED("use hipHostAlloc instead")
+HIP_DEPRECATED("use hipHostAlloc instead")
 hipError_t hipMallocHost(void** ptr, size_t size);
 /**
  *  @brief Allocate pinned host memory [Deprecated]
@@ -3429,7 +3429,7 @@ hipError_t hipMallocHost(void** ptr, size_t size);
  *
  *  @warning  This API is deprecated, use hipHostAlloc() instead
  */
-DEPRECATED("use hipHostAlloc instead")
+HIP_DEPRECATED("use hipHostAlloc instead")
 hipError_t hipMemAllocHost(void** ptr, size_t size);
 // end doxygen deprecated management memory
 /**
@@ -5110,7 +5110,7 @@ hipError_t hipMemcpy2DArrayToArray(hipArray_t dst, size_t wOffsetDst, size_t hOf
  *  hipMemcpyAsync
  *  @warning  This API is deprecated.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipMemcpyToArray(hipArray_t dst, size_t wOffset, size_t hOffset, const void* src,
                             size_t count, hipMemcpyKind kind);
 /**
@@ -5131,7 +5131,7 @@ hipError_t hipMemcpyToArray(hipArray_t dst, size_t wOffset, size_t hOffset, cons
  * hipMemcpyAsync
  * @warning  This API is deprecated.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipMemcpyFromArray(void* dst, hipArray_const_t srcArray, size_t wOffset, size_t hOffset,
                               size_t count, hipMemcpyKind kind);
 /**
@@ -5389,7 +5389,7 @@ hipError_t hipMemcpyPeerAsync(void* dst, int dstDeviceId, const void* src, int s
  * NVIDIA platform.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxCreate(hipCtx_t* ctx, unsigned int flags, hipDevice_t device);
 /**
  * @brief Destroy a HIP context [Deprecated]
@@ -5404,7 +5404,7 @@ hipError_t hipCtxCreate(hipCtx_t* ctx, unsigned int flags, hipDevice_t device);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxDestroy(hipCtx_t ctx);
 /**
  * @brief Pop the current/default context and return the popped context [Deprecated]
@@ -5419,7 +5419,7 @@ hipError_t hipCtxDestroy(hipCtx_t ctx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxPopCurrent(hipCtx_t* ctx);
 /**
  * @brief Push the context to be set as current/ default context [Deprecated]
@@ -5434,7 +5434,7 @@ hipError_t hipCtxPopCurrent(hipCtx_t* ctx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxPushCurrent(hipCtx_t ctx);
 /**
  * @brief Set the passed context as current/default [Deprecated]
@@ -5449,7 +5449,7 @@ hipError_t hipCtxPushCurrent(hipCtx_t ctx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxSetCurrent(hipCtx_t ctx);
 /**
  * @brief Get the handle of the current/ default context [Deprecated]
@@ -5464,7 +5464,7 @@ hipError_t hipCtxSetCurrent(hipCtx_t ctx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetCurrent(hipCtx_t* ctx);
 /**
  * @brief Get the handle of the device associated with current/default context [Deprecated]
@@ -5479,7 +5479,7 @@ hipError_t hipCtxGetCurrent(hipCtx_t* ctx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetDevice(hipDevice_t* device);
 /**
  * @brief Returns the approximate HIP api version.
@@ -5501,7 +5501,7 @@ hipError_t hipCtxGetDevice(hipDevice_t* device);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetApiVersion(hipCtx_t ctx, int* apiVersion);
 /**
  * @brief Get Cache configuration for a specific function [Deprecated]
@@ -5519,7 +5519,7 @@ hipError_t hipCtxGetApiVersion(hipCtx_t ctx, int* apiVersion);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetCacheConfig(hipFuncCache_t* cacheConfig);
 /**
  * @brief Set L1/Shared cache partition [Deprecated]
@@ -5537,7 +5537,7 @@ hipError_t hipCtxGetCacheConfig(hipFuncCache_t* cacheConfig);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxSetCacheConfig(hipFuncCache_t cacheConfig);
 /**
  * @brief Set Shared memory bank configuration  [Deprecated]
@@ -5555,7 +5555,7 @@ hipError_t hipCtxSetCacheConfig(hipFuncCache_t cacheConfig);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxSetSharedMemConfig(hipSharedMemConfig config);
 /**
  * @brief Get Shared memory bank configuration [Deprecated]
@@ -5573,7 +5573,7 @@ hipError_t hipCtxSetSharedMemConfig(hipSharedMemConfig config);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetSharedMemConfig(hipSharedMemConfig* pConfig);
 /**
  * @brief Blocks until the default context has completed all preceding requested tasks [Deprecated]
@@ -5589,7 +5589,7 @@ hipError_t hipCtxGetSharedMemConfig(hipSharedMemConfig* pConfig);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxSynchronize(void);
 /**
  * @brief Return flags used for creating default context [Deprecated]
@@ -5604,7 +5604,7 @@ hipError_t hipCtxSynchronize(void);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxGetFlags(unsigned int* flags);
 /**
  * @brief Enables direct access to memory allocations in a peer context [Deprecated]
@@ -5628,7 +5628,7 @@ hipError_t hipCtxGetFlags(unsigned int* flags);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxEnablePeerAccess(hipCtx_t peerCtx, unsigned int flags);
 /**
  * @brief Disable direct access from current context's virtual address space to memory allocations
@@ -5649,7 +5649,7 @@ hipError_t hipCtxEnablePeerAccess(hipCtx_t peerCtx, unsigned int flags);
  * @warning  This API is deprecated on the AMD platform, only for equivalent cuCtx driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipCtxDisablePeerAccess(hipCtx_t peerCtx);
 
 /**
@@ -5667,7 +5667,7 @@ hipError_t hipCtxDisablePeerAccess(hipCtx_t peerCtx);
  * @warning  This API is deprecated on the AMD platform, only for equivalent driver API on the
  * NVIDIA platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipDevicePrimaryCtxGetState(hipDevice_t dev, unsigned int* flags, int* active);
 /**
  * @brief Release the primary context on the GPU.
@@ -5684,7 +5684,7 @@ hipError_t hipDevicePrimaryCtxGetState(hipDevice_t dev, unsigned int* flags, int
  * @warning  This API is deprecated on the AMD platform, only for equivalent driver API on the NVIDIA
  * platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipDevicePrimaryCtxRelease(hipDevice_t dev);
 /**
  * @brief Retain the primary context on the GPU [Deprecated]
@@ -5700,7 +5700,7 @@ hipError_t hipDevicePrimaryCtxRelease(hipDevice_t dev);
  * @warning  This API is deprecated on the AMD platform, only for equivalent driver API on the NVIDIA
  * platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipDevicePrimaryCtxRetain(hipCtx_t* pctx, hipDevice_t dev);
 /**
  * @brief Resets the primary context on the GPU [Deprecated]
@@ -5715,7 +5715,7 @@ hipError_t hipDevicePrimaryCtxRetain(hipCtx_t* pctx, hipDevice_t dev);
  * @warning  This API is deprecated on the AMD platform, only for equivalent driver API on the NVIDIA
  * platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipDevicePrimaryCtxReset(hipDevice_t dev);
 /**
  * @brief Set flags for the primary context [Deprecated]
@@ -5731,7 +5731,7 @@ hipError_t hipDevicePrimaryCtxReset(hipDevice_t dev);
  * @warning  This API is deprecated on the AMD platform, only for equivalent driver API on the NVIDIA
  * platform.
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipDevicePrimaryCtxSetFlags(hipDevice_t dev, unsigned int flags);
 // doxygen end Context Management
 /**
@@ -6108,7 +6108,7 @@ hipError_t hipOccupancyMaxPotentialBlockSize(int* gridSize, int* blockSize,
  * @returns  #hipErrorNotSupported
  * @warning : hipProfilerStart API is deprecated, use roctracer/rocTX instead.
  */
-DEPRECATED("use roctracer/rocTX instead")
+HIP_DEPRECATED("use roctracer/rocTX instead")
 hipError_t hipProfilerStart();
 /**
  * @brief Stop recording of profiling information [Deprecated]
@@ -6116,7 +6116,7 @@ hipError_t hipProfilerStart();
  * @returns  #hipErrorNotSupported
  * @warning  hipProfilerStart API is deprecated, use roctracer/rocTX instead.
  */
-DEPRECATED("use roctracer/rocTX instead")
+HIP_DEPRECATED("use roctracer/rocTX instead")
 hipError_t hipProfilerStop();
 // doxygen end profiler
 /**
@@ -6566,7 +6566,7 @@ hipError_t hipMipmappedArrayGetLevel(
  * @returns #hipSuccess, #hipErrorInvalidValue
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipBindTextureToMipmappedArray(
     const textureReference* tex,
     hipMipmappedArray_const_t mipmappedArray,
@@ -6582,7 +6582,7 @@ hipError_t hipBindTextureToMipmappedArray(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipGetTextureReference(
     const textureReference** texref,
     const void* symbol);
@@ -6597,7 +6597,7 @@ hipError_t hipGetTextureReference(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetBorderColor(float* pBorderColor, const textureReference* texRef);
 
 /**
@@ -6611,7 +6611,7 @@ hipError_t hipTexRefGetBorderColor(float* pBorderColor, const textureReference*
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetArray(hipArray_t* pArray, const textureReference* texRef);
 
 /**
@@ -6625,7 +6625,7 @@ hipError_t hipTexRefGetArray(hipArray_t* pArray, const textureReference* texRef)
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetAddressMode(
     textureReference* texRef,
     int dim,
@@ -6642,7 +6642,7 @@ hipError_t hipTexRefSetAddressMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetArray(
     textureReference* tex,
     hipArray_const_t array,
@@ -6658,7 +6658,7 @@ hipError_t hipTexRefSetArray(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetFilterMode(
     textureReference* texRef,
     enum hipTextureFilterMode fm);
@@ -6673,7 +6673,7 @@ hipError_t hipTexRefSetFilterMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetFlags(
     textureReference* texRef,
     unsigned int Flags);
@@ -6689,7 +6689,7 @@ hipError_t hipTexRefSetFlags(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetFormat(
     textureReference* texRef,
     hipArray_Format fmt,
@@ -6708,7 +6708,7 @@ hipError_t hipTexRefSetFormat(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipBindTexture(
     size_t* offset,
     const textureReference* tex,
@@ -6731,7 +6731,7 @@ hipError_t hipBindTexture(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipBindTexture2D(
     size_t* offset,
     const textureReference* tex,
@@ -6752,7 +6752,7 @@ hipError_t hipBindTexture2D(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipBindTextureToArray(
     const textureReference* tex,
     hipArray_const_t array,
@@ -6768,7 +6768,7 @@ hipError_t hipBindTextureToArray(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipGetTextureAlignmentOffset(
     size_t* offset,
     const textureReference* texref);
@@ -6782,7 +6782,7 @@ hipError_t hipGetTextureAlignmentOffset(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipUnbindTexture(const textureReference* tex);
 /**
  * @brief Gets the address for a texture reference [Deprecated]
@@ -6795,7 +6795,7 @@ hipError_t hipUnbindTexture(const textureReference* tex);
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetAddress(
     hipDeviceptr_t* dev_ptr,
     const textureReference* texRef);
@@ -6811,7 +6811,7 @@ hipError_t hipTexRefGetAddress(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetAddressMode(
     enum hipTextureAddressMode* pam,
     const textureReference* texRef,
@@ -6827,7 +6827,7 @@ hipError_t hipTexRefGetAddressMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetFilterMode(
     enum hipTextureFilterMode* pfm,
     const textureReference* texRef);
@@ -6842,7 +6842,7 @@ hipError_t hipTexRefGetFilterMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetFlags(
     unsigned int* pFlags,
     const textureReference* texRef);
@@ -6858,7 +6858,7 @@ hipError_t hipTexRefGetFlags(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetFormat(
     hipArray_Format* pFormat,
     int* pNumChannels,
@@ -6874,7 +6874,7 @@ hipError_t hipTexRefGetFormat(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetMaxAnisotropy(
     int* pmaxAnsio,
     const textureReference* texRef);
@@ -6889,7 +6889,7 @@ hipError_t hipTexRefGetMaxAnisotropy(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetMipmapFilterMode(
     enum hipTextureFilterMode* pfm,
     const textureReference* texRef);
@@ -6904,7 +6904,7 @@ hipError_t hipTexRefGetMipmapFilterMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetMipmapLevelBias(
     float* pbias,
     const textureReference* texRef);
@@ -6920,7 +6920,7 @@ hipError_t hipTexRefGetMipmapLevelBias(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetMipmapLevelClamp(
     float* pminMipmapLevelClamp,
     float* pmaxMipmapLevelClamp,
@@ -6936,7 +6936,7 @@ hipError_t hipTexRefGetMipmapLevelClamp(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefGetMipMappedArray(
     hipMipmappedArray_t* pArray,
     const textureReference* texRef);
@@ -6953,7 +6953,7 @@ hipError_t hipTexRefGetMipMappedArray(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetAddress(
     size_t* ByteOffset,
     textureReference* texRef,
@@ -6972,7 +6972,7 @@ hipError_t hipTexRefSetAddress(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetAddress2D(
     textureReference* texRef,
     const HIP_ARRAY_DESCRIPTOR* desc,
@@ -6989,7 +6989,7 @@ hipError_t hipTexRefSetAddress2D(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetMaxAnisotropy(
     textureReference* texRef,
     unsigned int maxAniso);
@@ -7004,7 +7004,7 @@ hipError_t hipTexRefSetMaxAnisotropy(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetBorderColor(
     textureReference* texRef,
     float* pBorderColor);
@@ -7019,7 +7019,7 @@ hipError_t hipTexRefSetBorderColor(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetMipmapFilterMode(
     textureReference* texRef,
     enum hipTextureFilterMode fm);
@@ -7034,7 +7034,7 @@ hipError_t hipTexRefSetMipmapFilterMode(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetMipmapLevelBias(
     textureReference* texRef,
     float bias);
@@ -7050,7 +7050,7 @@ hipError_t hipTexRefSetMipmapLevelBias(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetMipmapLevelClamp(
     textureReference* texRef,
     float minMipMapLevelClamp,
@@ -7067,7 +7067,7 @@ hipError_t hipTexRefSetMipmapLevelClamp(
  * @warning This API is deprecated.
  *
  */
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 hipError_t hipTexRefSetMipmappedArray(
     textureReference* texRef,
     struct hipMipmappedArray* mipmappedArray,
@@ -9320,7 +9320,7 @@ inline hipError_t hipExtLaunchMultiKernelMultiDevice(hipLaunchParams* launchPara
  *
  */
 template <class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTexture(size_t* offset, const struct texture<T, dim, readMode>& tex,
                                         const void* devPtr, size_t size = UINT_MAX) {
     return hipBindTexture(offset, &tex, devPtr, &tex.channelDesc, size);
@@ -9340,7 +9340,7 @@ static inline hipError_t hipBindTexture(size_t* offset, const struct texture<T,
  *
  */
 template <class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t
     hipBindTexture(size_t* offset, const struct texture<T, dim, readMode>& tex, const void* devPtr,
                    const struct hipChannelFormatDesc& desc, size_t size = UINT_MAX) {
@@ -9362,7 +9362,7 @@ static inline hipError_t
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTexture2D(
     size_t *offset,
     const struct texture<T, dim, readMode> &tex,
@@ -9390,7 +9390,7 @@ static inline hipError_t hipBindTexture2D(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTexture2D(
   size_t *offset,
   const struct texture<T, dim, readMode> &tex,
@@ -9414,7 +9414,7 @@ static inline hipError_t hipBindTexture2D(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToArray(
     const struct texture<T, dim, readMode> &tex,
     hipArray_const_t array)
@@ -9436,7 +9436,7 @@ static inline hipError_t hipBindTextureToArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToArray(
     const struct texture<T, dim, readMode> &tex,
     hipArray_const_t array,
@@ -9456,7 +9456,7 @@ static inline hipError_t hipBindTextureToArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToMipmappedArray(
     const struct texture<T, dim, readMode> &tex,
     hipMipmappedArray_const_t mipmappedArray)
@@ -9483,7 +9483,7 @@ static inline hipError_t hipBindTextureToMipmappedArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipBindTextureToMipmappedArray(
     const struct texture<T, dim, readMode> &tex,
     hipMipmappedArray_const_t mipmappedArray,
@@ -9502,7 +9502,7 @@ static inline hipError_t hipBindTextureToMipmappedArray(
  *
  */
 template<class T, int dim, enum hipTextureReadMode readMode>
-DEPRECATED(DEPRECATED_MSG)
+HIP_DEPRECATED(HIP_DEPRECATED_MSG)
 static inline hipError_t hipUnbindTexture(
     const struct texture<T, dim, readMode> &tex)
 {