Drop pointless "internal" directory level for already internal include files

Change-Id: I1ece44616704483cd4d9d2b6204329414f82a98c

49 files changed, 108 insertions, 108 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
diff --git a/shell/qa/zip/testzipimpl.hxx b/shell/qa/zip/testzipimpl.hxx
index 6a2afc0cfe27..8d81fec11fed 100644
--- a/shell/qa/zip/testzipimpl.hxx
+++ b/shell/qa/zip/testzipimpl.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
 #define INCLUDED_SHELL_QA_ZIP_TESTZIPIMPL_HXX
 
-#include "internal/zipfile.hxx"
+#include "zipfile.hxx"
 #include <string>
 #include <vector>
 #include <algorithm>
diff --git a/shell/qa/zip/ziptest.cxx b/shell/qa/zip/ziptest.cxx
index 5898a0183607..e89d2e8cfd03 100644
--- a/shell/qa/zip/ziptest.cxx
+++ b/shell/qa/zip/ziptest.cxx
@@ -32,7 +32,7 @@
 #include "cppunit/extensions/HelperMacros.h"
 #include "cppunit/plugin/TestPlugIn.h"
 #include <string>
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
 #include "testzipimpl.hxx"
 using namespace std;
 
diff --git a/shell/source/all/xml_parser.cxx b/shell/source/all/xml_parser.cxx
index 6d557213d639..3c4dd0bb893b 100644
--- a/shell/source/all/xml_parser.cxx
+++ b/shell/source/all/xml_parser.cxx
@@ -18,11 +18,11 @@
  */
 
 
-#include "internal/xml_parser.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
+#include "xml_parser.hxx"
+#include "i_xml_parser_event_handler.hxx"
 
 #ifdef _WIN32
-#include "internal/utilities.hxx"
+#include "utilities.hxx"
 #else
 #define UTF8ToWString(s) s
 #endif
diff --git a/shell/source/unix/sysshell/recently_used_file_handler.cxx b/shell/source/unix/sysshell/recently_used_file_handler.cxx
index 3049bcf6587a..0d5ded137199 100644
--- a/shell/source/unix/sysshell/recently_used_file_handler.cxx
+++ b/shell/source/unix/sysshell/recently_used_file_handler.cxx
@@ -29,8 +29,8 @@
 #include <osl/diagnose.h>
 #include "recently_used_file.hxx"
 
-#include "internal/xml_parser.hxx"
-#include "internal/i_xml_parser_event_handler.hxx"
+#include "xml_parser.hxx"
+#include "i_xml_parser_event_handler.hxx"
 
 #include <map>
 #include <vector>
diff --git a/shell/source/win32/ooofilereader/basereader.cxx b/shell/source/win32/ooofilereader/basereader.cxx
index 823618a1349f..d2e9773ce1c5 100644
--- a/shell/source/win32/ooofilereader/basereader.cxx
+++ b/shell/source/win32/ooofilereader/basereader.cxx
@@ -17,9 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/basereader.hxx"
+#include "basereader.hxx"
 
-#include "internal/xml_parser.hxx"
+#include "xml_parser.hxx"
 
 #include "assert.h"
 #include <memory>
diff --git a/shell/source/win32/ooofilereader/contentreader.cxx b/shell/source/win32/ooofilereader/contentreader.cxx
index f2dedcd73d8a..ef2b7748ed17 100644
--- a/shell/source/win32/ooofilereader/contentreader.cxx
+++ b/shell/source/win32/ooofilereader/contentreader.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/contentreader.hxx"
+#include "contentreader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
 #include "autostyletag.hxx"
diff --git a/shell/source/win32/ooofilereader/itag.hxx b/shell/source/win32/ooofilereader/itag.hxx
index d2b63b5b4c2f..234c31367fd0 100644
--- a/shell/source/win32/ooofilereader/itag.hxx
+++ b/shell/source/win32/ooofilereader/itag.hxx
@@ -21,8 +21,8 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_OOOFILEREADER_ITAG_HXX
 
-#include "internal/config.hxx"
-#include "internal/types.hxx"
+#include "config.hxx"
+#include "types.hxx"
 
 /***************************   interface of tag readers   ***************************/
 
diff --git a/shell/source/win32/ooofilereader/metainforeader.cxx b/shell/source/win32/ooofilereader/metainforeader.cxx
index b45b85041bad..0490b9505e8c 100644
--- a/shell/source/win32/ooofilereader/metainforeader.cxx
+++ b/shell/source/win32/ooofilereader/metainforeader.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
 #include "dummytag.hxx"
 #include "simpletag.hxx"
 #include "keywordstag.hxx"
diff --git a/shell/source/win32/shlxthandler/classfactory.cxx b/shell/source/win32/shlxthandler/classfactory.cxx
index 9ca1efedfaf0..4e15e853851b 100644
--- a/shell/source/win32/shlxthandler/classfactory.cxx
+++ b/shell/source/win32/shlxthandler/classfactory.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/global.hxx"
+#include "global.hxx"
 #include "classfactory.hxx"
-#include "internal/infotips.hxx"
-#include "internal/propsheets.hxx"
-#include "internal/columninfo.hxx"
+#include "infotips.hxx"
+#include "propsheets.hxx"
+#include "columninfo.hxx"
 #ifdef __MINGW32__
 #include <algorithm>
 using ::std::max;
 using ::std::min;
 #endif
-#include "internal/thumbviewer.hxx"
-#include "internal/shlxthdl.hxx"
+#include "thumbviewer.hxx"
+#include "shlxthdl.hxx"
 
 
 long CClassFactory::s_ServerLocks = 0;
diff --git a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
index c72c298f2edf..6cfbcda1a9fb 100644
--- a/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
+++ b/shell/source/win32/shlxthandler/columninfo/columninfo.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/global.hxx"
-#include "internal/columninfo.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "global.hxx"
+#include "columninfo.hxx"
+#include "fileextensions.hxx"
+#include "metainforeader.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
 
 #include <sal/macros.h>
 #include <malloc.h>
diff --git a/shell/source/win32/shlxthandler/infotips/infotips.cxx b/shell/source/win32/shlxthandler/infotips/infotips.cxx
index 6f309485c93d..d8fc781e87e6 100644
--- a/shell/source/win32/shlxthandler/infotips/infotips.cxx
+++ b/shell/source/win32/shlxthandler/infotips/infotips.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/global.hxx"
-#include "internal/infotips.hxx"
-#include "internal/shlxthdl.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/contentreader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/iso8601_converter.hxx"
-#include "internal/config.hxx"
-
-#include "internal/resource.h"
+#include "global.hxx"
+#include "infotips.hxx"
+#include "shlxthdl.hxx"
+#include "metainforeader.hxx"
+#include "contentreader.hxx"
+#include "utilities.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "iso8601_converter.hxx"
+#include "config.hxx"
+
+#include "resource.h"
 #include <stdio.h>
 #include <utility>
 #include <stdlib.h>
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
index ea266ac613d7..bbcdebb1f7d7 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.cxx
@@ -28,10 +28,10 @@
 
 //  Platform:   Windows 2000, Windows XP
 
-#include "internal/contentreader.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
+#include "contentreader.hxx"
+#include "metainforeader.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
 
 
 //  Include file    Purpose
@@ -66,7 +66,7 @@
 using ::std::min;
 #endif
 
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
 
 //C-------------------------------------------------------------------------
 //  Class:      COooFilter
diff --git a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
index bad8da14a8b9..b448951ed0d4 100644
--- a/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
+++ b/shell/source/win32/shlxthandler/ooofilt/ooofilt.hxx
@@ -20,7 +20,7 @@
 #ifndef INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
 #define INCLUDED_SHELL_SOURCE_WIN32_SHLXTHANDLER_OOOFILT_OOOFILT_HXX
 
-#include "internal/types.hxx"
+#include "types.hxx"
 
 //+-------------------------------------------------------------------------
 //  Contents:   LibreOffice filter declarations
diff --git a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
index f1fb3213cf94..57cf217700d3 100644
--- a/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
+++ b/shell/source/win32/shlxthandler/ooofilt/stream_helper.cxx
@@ -28,7 +28,7 @@
 
 #include <stdio.h>
 #include <objidl.h>
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
 
 BufferStream::BufferStream(IStream *str) :
     stream(str)
diff --git a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
index 1f8e7aacf4ea..4e02b2574415 100644
--- a/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
+++ b/shell/source/win32/shlxthandler/prophdl/propertyhdl.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/global.hxx"
-#include "internal/propertyhdl.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "global.hxx"
+#include "propertyhdl.hxx"
+#include "fileextensions.hxx"
+#include "metainforeader.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
 
 #include <propkey.h>
 #include <propvarutil.h>
@@ -31,7 +31,7 @@
 #include <malloc.h>
 #include <strsafe.h>
 
-#include "internal/stream_helper.hxx"
+#include "stream_helper.hxx"
 
 
 // Module global
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
index 4d4bafa75711..668f253a757a 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.cxx
@@ -22,12 +22,12 @@
 #pragma warning (disable : 4786 4503)
 #endif
 #include "document_statistic.hxx"
-#include "internal/utilities.hxx"
-#include "internal/metainforeader.hxx"
-#include "internal/resource.h"
-#include "internal/fileextensions.hxx"
-#include "internal/config.hxx"
-#include "internal/iso8601_converter.hxx"
+#include "utilities.hxx"
+#include "metainforeader.hxx"
+#include "resource.h"
+#include "fileextensions.hxx"
+#include "config.hxx"
+#include "iso8601_converter.hxx"
 
 const bool READONLY  = false;
 
diff --git a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
index 1a4a21d6c7ab..ae979a536967 100644
--- a/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
+++ b/shell/source/win32/shlxthandler/propsheets/document_statistic.hxx
@@ -23,7 +23,7 @@
 #include <utility>
 #include <string>
 #include <vector>
-#include "internal/metainforeader.hxx"
+#include "metainforeader.hxx"
 
 
 struct statistic_item
diff --git a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
index 90d6b7fd9d1d..caaf1e5222cc 100644
--- a/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/listviewbuilder.cxx
@@ -24,12 +24,12 @@
 
 #include "listviewbuilder.hxx"
 #include "document_statistic.hxx"
-#include "internal/utilities.hxx"
-#include "internal/config.hxx"
+#include "utilities.hxx"
+#include "config.hxx"
 
 #include <commctrl.h>
 #include <tchar.h>
-#include "internal/resource.h"
+#include "resource.h"
 
 
 list_view_builder_ptr create_list_view_builder(
diff --git a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
index aa938e53a405..af5b21401b11 100644
--- a/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
+++ b/shell/source/win32/shlxthandler/propsheets/propsheets.cxx
@@ -17,12 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/config.hxx"
-#include "internal/global.hxx"
+#include "config.hxx"
+#include "global.hxx"
 
-#include "internal/propsheets.hxx"
-#include "internal/utilities.hxx"
-#include "internal/resource.h"
+#include "propsheets.hxx"
+#include "utilities.hxx"
+#include "resource.h"
 #include "listviewbuilder.hxx"
 
 #if defined _MSC_VER
diff --git a/shell/source/win32/shlxthandler/res/rcheader.txt b/shell/source/win32/shlxthandler/res/rcheader.txt
index 065bf2a3a11e..42fb81ee54e5 100644
--- a/shell/source/win32/shlxthandler/res/rcheader.txt
+++ b/shell/source/win32/shlxthandler/res/rcheader.txt
@@ -3,7 +3,7 @@
 #define CB_ADDSTRING	(WM_USER+3)
 #define IDC_STATIC	(-1)
 
-#include "internal/resource.h"
+#include "resource.h"
 
 MANIFEST_RESOURCE_ID RT_MANIFEST "shlxthdl.manifest"
 
diff --git a/shell/source/win32/shlxthandler/shlxthdl.cxx b/shell/source/win32/shlxthandler/shlxthdl.cxx
index 821e91b2f747..e168618dba98 100644
--- a/shell/source/win32/shlxthandler/shlxthdl.cxx
+++ b/shell/source/win32/shlxthandler/shlxthdl.cxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/config.hxx"
-#include "internal/global.hxx"
-#include "internal/shlxthdl.hxx"
+#include "config.hxx"
+#include "global.hxx"
+#include "shlxthdl.hxx"
 #include "classfactory.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/utilities.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "utilities.hxx"
 
 #include <tchar.h>
 #include <string>
diff --git a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
index 84e77f25bb41..63f1eec74c5a 100644
--- a/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
+++ b/shell/source/win32/shlxthandler/thumbviewer/thumbviewer.cxx
@@ -20,17 +20,17 @@
 #ifndef DONT_HAVE_GDIPLUS
 
 
-#include "internal/global.hxx"
+#include "global.hxx"
 
-#include "internal/thumbviewer.hxx"
-#include "internal/shlxthdl.hxx"
-#include "internal/registry.hxx"
-#include "internal/fileextensions.hxx"
-#include "internal/config.hxx"
-#include "internal/zipfile.hxx"
-#include "internal/utilities.hxx"
+#include "thumbviewer.hxx"
+#include "shlxthdl.hxx"
+#include "registry.hxx"
+#include "fileextensions.hxx"
+#include "config.hxx"
+#include "zipfile.hxx"
+#include "utilities.hxx"
 
-#include "internal/resource.h"
+#include "resource.h"
 
 #include <stdio.h>
 #include <utility>
diff --git a/shell/source/win32/shlxthandler/util/fileextensions.cxx b/shell/source/win32/shlxthandler/util/fileextensions.cxx
index 8d0028d42fdf..607421cc51f3 100644
--- a/shell/source/win32/shlxthandler/util/fileextensions.cxx
+++ b/shell/source/win32/shlxthandler/util/fileextensions.cxx
@@ -18,7 +18,7 @@
  */
 
 #include "algorithm"
-#include "internal/fileextensions.hxx"
+#include "fileextensions.hxx"
 #include <sal/macros.h>
 
 
diff --git a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
index a033978d2c5e..36ab617441e6 100644
--- a/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
+++ b/shell/source/win32/shlxthandler/util/iso8601_converter.cxx
@@ -21,8 +21,8 @@
 
 #include <stdlib.h>
 
-#include "internal/iso8601_converter.hxx"
-#include "internal/utilities.hxx"
+#include "iso8601_converter.hxx"
+#include "utilities.hxx"
 
 #include <sstream>
 #include <iomanip>
diff --git a/shell/source/win32/shlxthandler/util/registry.cxx b/shell/source/win32/shlxthandler/util/registry.cxx
index ed000debeff9..f74b09f59f45 100644
--- a/shell/source/win32/shlxthandler/util/registry.cxx
+++ b/shell/source/win32/shlxthandler/util/registry.cxx
@@ -26,7 +26,7 @@
 #pragma warning(pop)
 #endif
 #include <malloc.h>
-#include "internal/registry.hxx"
+#include "registry.hxx"
 
 #if defined _MSC_VER
 #pragma warning(push, 1)
diff --git a/shell/source/win32/shlxthandler/util/utilities.cxx b/shell/source/win32/shlxthandler/util/utilities.cxx
index 18ccdb0096ec..c372db495396 100644
--- a/shell/source/win32/shlxthandler/util/utilities.cxx
+++ b/shell/source/win32/shlxthandler/util/utilities.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/config.hxx"
-#include "internal/utilities.hxx"
+#include "config.hxx"
+#include "utilities.hxx"
 
 #ifdef _WIN32_WINNT_WINBLUE
 #include <VersionHelpers.h>
diff --git a/shell/source/win32/zipfile/zipexcptn.cxx b/shell/source/win32/zipfile/zipexcptn.cxx
index f42165022eed..23e90e6c38de 100644
--- a/shell/source/win32/zipfile/zipexcptn.cxx
+++ b/shell/source/win32/zipfile/zipexcptn.cxx
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "internal/global.hxx"
+#include "global.hxx"
 #include "zipexcptn.hxx"
 
 
diff --git a/shell/source/win32/zipfile/zipfile.cxx b/shell/source/win32/zipfile/zipfile.cxx
index c701f8ef7ff9..f4cab6277ccc 100644
--- a/shell/source/win32/zipfile/zipfile.cxx
+++ b/shell/source/win32/zipfile/zipfile.cxx
@@ -18,10 +18,10 @@
  */
 
 #include "zipexcptn.hxx"
-#include "internal/zipfile.hxx"
-#include "internal/global.hxx"
-#include "internal/types.hxx"
-#include "internal/stream_helper.hxx"
+#include "zipfile.hxx"
+#include "global.hxx"
+#include "types.hxx"
+#include "stream_helper.hxx"
 
 #include <malloc.h>
 #include <algorithm>