diff --git a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
index c857e5ce6f..d8b58f910c 100644
--- a/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
+++ b/projects/clr/hipamd/include/hip/amd_detail/amd_hip_vector_types.h
@@ -44,12 +44,11 @@ THE SOFTWARE.
     #endif
 
 #if defined(__cplusplus)
-// FIXME: Temporarily enable C++ headers while mainline headers is outdated.
-//#if !defined(__HIPCC_RTC__)
+#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;