diff --git a/reactos/include/epsapi.h b/reactos/include/epsapi/epsapi.h
similarity index 100%
rename from reactos/include/epsapi.h
rename to reactos/include/epsapi/epsapi.h
diff --git a/reactos/lib/expat/lib/expat.h b/reactos/include/expat/expat.h
similarity index 100%
rename from reactos/lib/expat/lib/expat.h
rename to reactos/include/expat/expat.h
diff --git a/reactos/lib/expat/lib/expat_external.h b/reactos/include/expat/expat_external.h
similarity index 100%
rename from reactos/lib/expat/lib/expat_external.h
rename to reactos/include/expat/expat_external.h
diff --git a/reactos/include/fmifs.h b/reactos/include/fmifs/fmifs.h
similarity index 100%
rename from reactos/include/fmifs.h
rename to reactos/include/fmifs/fmifs.h
diff --git a/reactos/include/samlib.h b/reactos/include/samlib/samlib.h
similarity index 100%
rename from reactos/include/samlib.h
rename to reactos/include/samlib/samlib.h
diff --git a/reactos/lib/expat/lib/xmlparse.c b/reactos/lib/expat/lib/xmlparse.c
index b87acd4dfe5..5ac3fefaafa 100644
--- a/reactos/lib/expat/lib/xmlparse.c
+++ b/reactos/lib/expat/lib/xmlparse.c
@@ -16,7 +16,7 @@
 #include <expat_config.h>
 #endif /* ndef COMPILED_FROM_DSP */
 
-#include "expat.h"
+#include <expat/expat.h>
 
 #ifdef XML_UNICODE
 #define XML_ENCODE_MAX XML_UTF16_ENCODE_MAX
diff --git a/reactos/lib/expat/lib/xmlrole.c b/reactos/lib/expat/lib/xmlrole.c
index b32d8e73bc7..47f7c24c092 100644
--- a/reactos/lib/expat/lib/xmlrole.c
+++ b/reactos/lib/expat/lib/xmlrole.c
@@ -14,7 +14,7 @@
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
-#include "expat_external.h"
+#include <expat/expat_external.h>
 #include "internal.h"
 #include "xmlrole.h"
 #include "ascii.h"
diff --git a/reactos/lib/expat/lib/xmltok.c b/reactos/lib/expat/lib/xmltok.c
index be368949ee2..e4b7e7d51cf 100644
--- a/reactos/lib/expat/lib/xmltok.c
+++ b/reactos/lib/expat/lib/xmltok.c
@@ -14,7 +14,7 @@
 #endif
 #endif /* ndef COMPILED_FROM_DSP */
 
-#include "expat_external.h"
+#include <expat/expat_external.h>
 #include "internal.h"
 #include "xmltok.h"
 #include "nametab.h"
diff --git a/reactos/subsys/system/explorer/utility/xmlstorage.h b/reactos/subsys/system/explorer/utility/xmlstorage.h
index 8a0be9b2800..f3ef5cf781d 100644
--- a/reactos/subsys/system/explorer/utility/xmlstorage.h
+++ b/reactos/subsys/system/explorer/utility/xmlstorage.h
@@ -38,7 +38,7 @@
 
 #ifndef _XMLSTORAGE_H
 
-#include "expat.h"
+#include <expat/expat.h>
 
 #ifdef _MSC_VER
 #pragma comment(lib, "libexpat.lib")
diff --git a/reactos/subsys/system/ibrowser/utility/xmlstorage.h b/reactos/subsys/system/ibrowser/utility/xmlstorage.h
index 8a0be9b2800..f3ef5cf781d 100644
--- a/reactos/subsys/system/ibrowser/utility/xmlstorage.h
+++ b/reactos/subsys/system/ibrowser/utility/xmlstorage.h
@@ -38,7 +38,7 @@
 
 #ifndef _XMLSTORAGE_H
 
-#include "expat.h"
+#include <expat/expat.h>
 
 #ifdef _MSC_VER
 #pragma comment(lib, "libexpat.lib")