diff --git a/reactos/CMakeLists.txt b/reactos/CMakeLists.txt
index 16c2f6d68bb..0bb4e80b32b 100644
--- a/reactos/CMakeLists.txt
+++ b/reactos/CMakeLists.txt
@@ -199,12 +199,6 @@ else()
         include_directories(${REACTOS_SOURCE_DIR}/include/reactos/arm)
     endif()
 
-    if(MSVC)
-        include_directories(include/crt/msc)
-    else()
-        include_directories(include/crt/mingw32)
-    endif()
-
     add_dependency_header()
 
     add_subdirectory(include/psdk)
diff --git a/reactos/include/crt/float.h b/reactos/include/crt/float.h
index 6870b0c570c..cd3c191a4ed 100644
--- a/reactos/include/crt/float.h
+++ b/reactos/include/crt/float.h
@@ -16,17 +16,17 @@
  *
  */
 
+#ifndef _MINGW_FLOAT_H_
+#define _MINGW_FLOAT_H_
+
 #if defined(__GNUC__)
-#include <gcc_float.h>
+#include "mingw32/gcc_float.h"
 #elif defined(_MSC_VER)
-#include <msc_float.h>
+#include "msc/msc_float.h"
 #else
 #error
 #endif
 
-#ifndef _MINGW_FLOAT_H_
-#define _MINGW_FLOAT_H_
-
 #include <crtdefs.h>
 
 /*
diff --git a/reactos/include/crt/intrin.h b/reactos/include/crt/intrin.h
new file mode 100644
index 00000000000..bd2be25900e
--- /dev/null
+++ b/reactos/include/crt/intrin.h
@@ -0,0 +1,10 @@
+
+#pragma once
+
+#ifdef __MINGW32__
+#  include "mingw32/intrin.h"
+#elif defined(_MSC_VER)
+#  include "msc/intrin.h"
+#else
+#  error Please implement intrinsics for your target compiler
+#endif