diff --git a/nvapi.h b/nvapi.h
index 846ca2f..74dd923 100644
--- a/nvapi.h
+++ b/nvapi.h
@@ -11080,7 +11080,7 @@ NVAPI_INTERFACE NvAPI_D3D11_SetNvShaderExtnSlot(__in IUnknown *pDev,
 
 #endif //defined (__cplusplus) && (defined(__d3d11_h__) || defined(__d3d11_1_h__))
 
-#if defined (__cplusplus) && defined (__d3d12_h__)
+#if defined (__d3d12_h__)
 
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -18263,7 +18263,7 @@ NVAPI_INTERFACE NvAPI_D3D11_GetResourceGPUVirtualAddress(__in  ID3D11Device*
 #endif //defined(__cplusplus) && defined(__d3d11_h__)
 
 
-#if defined(__cplusplus) && defined(__d3d12_h__)
+#if defined(__d3d12_h__)
 //! Flags specifying raytracing thread reordering hardware support.
 //! Additional flags will be added as support becomes available.
 //!
@@ -18339,7 +18339,7 @@ NVAPI_INTERFACE NvAPI_D3D12_GetRaytracingCaps(
     __in    size_t dataSize);
 #endif // defined(__cplusplus) && defined(__d3d12_h__)
 
-#if defined(__cplusplus) && defined(__d3d12_h__) && defined(__ID3D12Device5_INTERFACE_DEFINED__) && defined(__ID3D12GraphicsCommandList4_INTERFACE_DEFINED__)
+#if defined(__d3d12_h__) && defined(__ID3D12Device5_INTERFACE_DEFINED__) && defined(__ID3D12GraphicsCommandList4_INTERFACE_DEFINED__)
 
 //! Flags specifying validation behaviour for raytracing operations.
 //! \ingroup dx