fix include guards

Author: atkurtul

include/nbl/builtin/hlsl/mpl.hlsl

@@ -4,13 +4,10 @@
 #ifndef _NBL_BUILTIN_HLSL_MPL_INCLUDED_
 #define _NBL_BUILTIN_HLSL_MPL_INCLUDED_
 
-#ifdef __HLSL_VERSION
+
 #include <nbl/builtin/hlsl/type_traits.hlsl>
 #include <nbl/builtin/hlsl/bit.hlsl>
-#else
-#include <bit>
 
-#endif
 
 namespace nbl
 {

include/nbl/builtin/hlsl/type_traits.hlsl

@@ -7,9 +7,11 @@
 // C++ headers
 #ifndef __HLSL_VERSION
 #include <type_traits>
-#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
 #endif
 
+// include cpp_compat.hlsl through matrix.hlsl for HLSL and glm::* typedefs for C++
+
+#include <nbl/builtin/hlsl/cpp_compat/matrix.hlsl>
 // Since HLSL currently doesnt allow type aliases we declare them as seperate structs thus they are (WORKAROUND)s
 /*
   // helper class