diff --git a/hipamd/include/hip/amd_detail/hip_vector_types.h b/hipamd/include/hip/amd_detail/hip_vector_types.h
index 72a828aaf2..c102750531 100644
--- a/hipamd/include/hip/amd_detail/hip_vector_types.h
+++ b/hipamd/include/hip/amd_detail/hip_vector_types.h
@@ -44,11 +44,12 @@ THE SOFTWARE.
     #endif
 
 #if defined(__cplusplus)
-#if !defined(__HIPCC_RTC__)
+// FIXME: Temporarily enable C++ headers while mainline headers is outdated.
+//#if !defined(__HIPCC_RTC__)
     #include <array>
     #include <iosfwd>
     #include <type_traits>
-#endif // !defined(__HIPCC_RTC__)
+//#endif // !defined(__HIPCC_RTC__)
 
     namespace hip_impl {
         template<typename, typename, unsigned int> struct Scalar_accessor;