diff --git a/include/hip_runtime.h b/include/hip_runtime.h
index 0594726c90..de2a49d975 100644
--- a/include/hip_runtime.h
+++ b/include/hip_runtime.h
@@ -43,7 +43,7 @@ THE SOFTWARE.
 #include <stdlib.h>
 #include <assert.h>
 
-#ifdef __cplusplus
+#if __cplusplus > 199711L
 #include <thread>
 #endif
 
diff --git a/include/hip_runtime_api.h b/include/hip_runtime_api.h
index 2c827a8bef..61e2b17407 100644
--- a/include/hip_runtime_api.h
+++ b/include/hip_runtime_api.h
@@ -81,10 +81,8 @@ typedef struct hipDeviceProp_t {
     int maxThreadsDim[3];                       ///< Max number of threads in each dimension (XYZ) of a block.
     int maxGridSize[3];                         ///< Max grid dimensions (XYZ).
     int clockRate;                              ///< Max clock frequency of the multiProcessors in khz.
-#ifdef USE_ROCR_20
     int memoryClockRate;                        ///< Max global memory clock frequency in khz.
     int memoryBusWidth;                         ///< Global memory bus width in bits.
-#endif
     size_t totalConstMem;                       ///< Size of shared memory region (in bytes).
     int major;                                  ///< Major compute capability.  On HCC, this is an approximation and features may differ from CUDA CC.  See the arch feature flags for portable ways to query feature caps.
     int minor;                                  ///< Minor compute capability.  On HCC, this is an approximation and features may differ from CUDA CC.  See the arch feature flags for portable ways to query feature caps.
@@ -135,7 +133,7 @@ typedef struct hipPointerAttribute_t {
 
 
 /*
- * @brief hipError_t
+ asdasd* @brief hipError_t
  * @enum
  * @ingroup Enumerations
  */
@@ -175,10 +173,8 @@ typedef enum hipDeviceAttribute_t {
     hipDeviceAttributeWarpSize,                             ///< Warp size in threads.
     hipDeviceAttributeMaxRegistersPerBlock,                 ///< Maximum number of 32-bit registers available to a thread block. This number is shared by all thread blocks simultaneously resident on a multiprocessor.
     hipDeviceAttributeClockRate,                            ///< Peak clock frequency in kilohertz.
-#ifdef USE_ROCR_20
     hipDeviceAttributeMemoryClockRate,                      ///< Peak memory clock frequency in kilohertz.
     hipDeviceAttributeMemoryBusWidth,                       ///< Global memory bus width in bits.
-#endif
     hipDeviceAttributeMultiprocessorCount,                  ///< Number of multiprocessors on the device.
     hipDeviceAttributeComputeMode,                          ///< Compute mode that device is currently in.
     hipDeviceAttributeL2CacheSize,                          ///< Size of L2 cache in bytes. 0 if the device doesn't have L2 cache.
diff --git a/samples/1_Utils/hipInfo/hipInfo.cpp b/samples/1_Utils/hipInfo/hipInfo.cpp
index 19e8cfc210..824ab17d37 100644
--- a/samples/1_Utils/hipInfo/hipInfo.cpp
+++ b/samples/1_Utils/hipInfo/hipInfo.cpp
@@ -82,10 +82,8 @@ void printDeviceProp (int deviceId)
     cout << setw(w1) << "maxThreadsPerMultiProcessor: " << props.maxThreadsPerMultiProcessor << endl;
     cout << setw(w1) << "isMultiGpuBoard: " << props.isMultiGpuBoard << endl;
     cout << setw(w1) << "clockRate: " << (float)props.clockRate / 1000.0 << " Mhz" << endl;
-#ifdef USE_ROCR_20
     cout << setw(w1) << "memoryClockRate: " << (float)props.memoryClockRate / 1000.0 << " Mhz" << endl;
     cout << setw(w1) << "memoryBusWidth: " << props.memoryBusWidth << endl;
-#endif
     cout << setw(w1) << "clockInstructionRate: " << (float)props.clockInstructionRate / 1000.0 << " Mhz" << endl;
     cout << setw(w1) << "totalGlobalMem: " << fixed << setprecision(2) << bytesToGB(props.totalGlobalMem) << " GB" << endl;
     cout << setw(w1) << "maxSharedMemoryPerMultiProcessor: " << fixed << setprecision(2) << bytesToGB(props.maxSharedMemoryPerMultiProcessor) << " GB" << endl;
diff --git a/src/hip_hcc.cpp b/src/hip_hcc.cpp
index b5ab9863ba..c2b4d5ffe7 100644
--- a/src/hip_hcc.cpp
+++ b/src/hip_hcc.cpp
@@ -792,7 +792,7 @@ hipError_t ihipDevice_t::getProperties(hipDeviceProp_t* prop)
     // Group memory will not be paged out, so, the physical memory size is the total shared memory size, and also equal to the group region size.
     prop->maxSharedMemoryPerMultiProcessor = prop->totalGlobalMem;
 
-#ifdef USE_ROCR_20
+#ifdef USE_ROCR_V2
     // Get Max memory clock frequency
     err = hsa_region_get_info(*am_region, (hsa_region_info_t)HSA_AMD_REGION_INFO_MAX_CLOCK_FREQUENCY, &prop->memoryClockRate);
     DeviceErrorCheck(err);
@@ -1269,7 +1269,7 @@ hipError_t hipDeviceGetAttribute(int* pi, hipDeviceAttribute_t attr, int device)
             *pi = prop->regsPerBlock; break;
         case hipDeviceAttributeClockRate:
             *pi = prop->clockRate; break;
-#ifdef USE_ROCR_20
+#ifdef USE_ROCR_V2
         case hipDeviceAttributeMemoryClockRate:
             *pi = prop->memoryClockRate; break;
         case hipDeviceAttributeMemoryBusWidth:
diff --git a/tests/src/hipGetDeviceAttribute.cpp b/tests/src/hipGetDeviceAttribute.cpp
index 4471f532f5..0073dfeed7 100644
--- a/tests/src/hipGetDeviceAttribute.cpp
+++ b/tests/src/hipGetDeviceAttribute.cpp
@@ -67,10 +67,8 @@ int main(int argc, char *argv[])
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeWarpSize, props.warpSize));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMaxRegistersPerBlock, props.regsPerBlock));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeClockRate, props.clockRate));
-#ifdef USE_ROCR_20
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMemoryClockRate, props.memoryClockRate));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMemoryBusWidth, props.memoryBusWidth));
-#endif
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeMultiprocessorCount, props.multiProcessorCount));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeIsMultiGpuBoard, props.isMultiGpuBoard));
     CHECK(test_hipDeviceGetAttribute(deviceId, hipDeviceAttributeComputeMode, props.computeMode));