21 files changed, 15 insertions, 15 deletions
diff --git a/shell/inc/internal/basereader.hxx b/shell/inc/basereader.hxx
index def9292f2b5e..577684c0f3f9 100644
--- a/shell/inc/internal/basereader.hxx
+++ b/shell/inc/basereader.hxx
@@ -20,14 +20,14 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_BASEREADER_HXX
 
-#include "internal/global.hxx"
-#include "internal/types.hxx"
-#include "internal/config.hxx"
-#include "internal/utilities.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
-
-#include "internal/xml_parser.hxx"
-#include "internal/zipfile.hxx"
+#include "global.hxx"
+#include "types.hxx"
+#include "config.hxx"
+#include "utilities.hxx"
+#include "i_xml_parser_event_handler.hxx"
+
+#include "xml_parser.hxx"
+#include "zipfile.hxx"
 
 class CBaseReader : public i_xml_parser_event_handler
 {
diff --git a/shell/inc/internal/columninfo.hxx b/shell/inc/columninfo.hxx
index 8009e58f01cb..8009e58f01cb 100644
--- a/shell/inc/internal/columninfo.hxx
+++ b/shell/inc/columninfo.hxx
diff --git a/shell/inc/internal/config.hxx b/shell/inc/config.hxx
index b65079166e39..b65079166e39 100644
--- a/shell/inc/internal/config.hxx
+++ b/shell/inc/config.hxx
diff --git a/shell/inc/internal/contentreader.hxx b/shell/inc/contentreader.hxx
index c64e868941d2..2b20e98fcff7 100644
--- a/shell/inc/internal/contentreader.hxx
+++ b/shell/inc/contentreader.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_CONTENTREADER_HXX
 
-#include "internal/basereader.hxx"
+#include "basereader.hxx"
 #include <stack>
 
 class ITag;
diff --git a/shell/inc/internal/fileextensions.hxx b/shell/inc/fileextensions.hxx
index 53c91064b2a8..0c46a40dd1af 100644
--- a/shell/inc/internal/fileextensions.hxx
+++ b/shell/inc/fileextensions.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_FILEEXTENSIONS_HXX
 
-#include "internal/global.hxx"
+#include "global.hxx"
 
 #include <string>
 
diff --git a/shell/inc/internal/global.hxx b/shell/inc/global.hxx
index 59696523a740..59696523a740 100644
--- a/shell/inc/internal/global.hxx
+++ b/shell/inc/global.hxx
diff --git a/shell/inc/internal/i_xml_parser_event_handler.hxx b/shell/inc/i_xml_parser_event_handler.hxx
index 48dd746fbd2c..48dd746fbd2c 100644
--- a/shell/inc/internal/i_xml_parser_event_handler.hxx
+++ b/shell/inc/i_xml_parser_event_handler.hxx
diff --git a/shell/inc/internal/infotips.hxx b/shell/inc/infotips.hxx
index 275be8e30ff3..275be8e30ff3 100644
--- a/shell/inc/internal/infotips.hxx
+++ b/shell/inc/infotips.hxx
diff --git a/shell/inc/internal/iso8601_converter.hxx b/shell/inc/iso8601_converter.hxx
index ee682823cf4f..ee682823cf4f 100644
--- a/shell/inc/internal/iso8601_converter.hxx
+++ b/shell/inc/iso8601_converter.hxx
diff --git a/shell/inc/internal/metainforeader.hxx b/shell/inc/metainforeader.hxx
index 047bf77683c0..814f658a8e6a 100644
--- a/shell/inc/internal/metainforeader.hxx
+++ b/shell/inc/metainforeader.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_METAINFOREADER_HXX
 
-#include "internal/basereader.hxx"
-#include "internal/types.hxx"
+#include "basereader.hxx"
+#include "types.hxx"
 #include <stack>
 
 class ITag;
diff --git a/shell/inc/internal/propertyhdl.hxx b/shell/inc/propertyhdl.hxx
index 0985b411ca69..0985b411ca69 100644
--- a/shell/inc/internal/propertyhdl.hxx
+++ b/shell/inc/propertyhdl.hxx
diff --git a/shell/inc/internal/propsheets.hxx b/shell/inc/propsheets.hxx
index 6e134b8095dd..f427856d15d4 100644
--- a/shell/inc/internal/propsheets.hxx
+++ b/shell/inc/propsheets.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_PROPSHEETS_HXX
 
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/inc/internal/registry.hxx b/shell/inc/registry.hxx
index 5738064658e8..5738064658e8 100644
--- a/shell/inc/internal/registry.hxx
+++ b/shell/inc/registry.hxx
diff --git a/shell/inc/internal/resource.h b/shell/inc/resource.h
index e17d3b81cabf..e17d3b81cabf 100644
--- a/shell/inc/internal/resource.h
+++ b/shell/inc/resource.h
diff --git a/shell/inc/internal/shlxthdl.hxx b/shell/inc/shlxthdl.hxx
index b972c57fa1c2..b972c57fa1c2 100644
--- a/shell/inc/internal/shlxthdl.hxx
+++ b/shell/inc/shlxthdl.hxx
diff --git a/shell/inc/internal/stream_helper.hxx b/shell/inc/stream_helper.hxx
index 306366d1741d..ec9af1bd829d 100644
--- a/shell/inc/internal/stream_helper.hxx
+++ b/shell/inc/stream_helper.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
 #define INCLUDED_SHELL_INC_INTERNAL_STREAM_HELPER_HXX
 
-#include "internal/types.hxx"
+#include "types.hxx"
 
 struct IStream;
 
diff --git a/shell/inc/internal/thumbviewer.hxx b/shell/inc/thumbviewer.hxx
index 0620476c2835..0620476c2835 100644
--- a/shell/inc/internal/thumbviewer.hxx
+++ b/shell/inc/thumbviewer.hxx
diff --git a/shell/inc/internal/types.hxx b/shell/inc/types.hxx
index bfc0cd94324a..bfc0cd94324a 100644
--- a/shell/inc/internal/types.hxx
+++ b/shell/inc/types.hxx
diff --git a/shell/inc/internal/utilities.hxx b/shell/inc/utilities.hxx
index efc7c2d20f17..0351e910658f 100644
--- a/shell/inc/internal/utilities.hxx
+++ b/shell/inc/utilities.hxx
@@ -31,7 +31,7 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
-#include "internal/types.hxx"
+#include "types.hxx"
 
 #include <string>
 #define STRSAFE_NO_DEPRECATE
diff --git a/shell/inc/internal/xml_parser.hxx b/shell/inc/xml_parser.hxx
index 484b055a98ab..484b055a98ab 100644
--- a/shell/inc/internal/xml_parser.hxx
+++ b/shell/inc/xml_parser.hxx
diff --git a/shell/inc/internal/zipfile.hxx b/shell/inc/zipfile.hxx
index 4f4b4c2331b1..4f4b4c2331b1 100644
--- a/shell/inc/internal/zipfile.hxx
+++ b/shell/inc/zipfile.hxx