diff --git a/PowerEditor/visual.net/notepadPlus.sln b/PowerEditor/visual.net/notepadPlus.sln
index 788eac0c2e5b..09442f9b40a9 100644
--- a/PowerEditor/visual.net/notepadPlus.sln
+++ b/PowerEditor/visual.net/notepadPlus.sln
@@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Notepad++", "notepadPlus.vc
 		{FBE04237-9C7B-4973-9C60-505975998B39} = {FBE04237-9C7B-4973-9C60-505975998B39}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSciLexer", "..\..\scintilla\win32\libSciLexer.vcxproj", "{FBE04237-9C7B-4973-9C60-505975998B39}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSciLexer", "..\..\scintilla\win32\SciLexer.vcxproj", "{FBE04237-9C7B-4973-9C60-505975998B39}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/scintilla/boostregex/AnsiDocumentIterator.h b/boostregex/AnsiDocumentIterator.h
similarity index 100%
rename from scintilla/boostregex/AnsiDocumentIterator.h
rename to boostregex/AnsiDocumentIterator.h
diff --git a/scintilla/boostregex/BoostRegExSearch.cxx b/boostregex/BoostRegExSearch.cxx
similarity index 100%
rename from scintilla/boostregex/BoostRegExSearch.cxx
rename to boostregex/BoostRegExSearch.cxx
diff --git a/scintilla/boostregex/UTF8DocumentIterator.cxx b/boostregex/UTF8DocumentIterator.cxx
similarity index 100%
rename from scintilla/boostregex/UTF8DocumentIterator.cxx
rename to boostregex/UTF8DocumentIterator.cxx
diff --git a/scintilla/boostregex/UTF8DocumentIterator.h b/boostregex/UTF8DocumentIterator.h
similarity index 100%
rename from scintilla/boostregex/UTF8DocumentIterator.h
rename to boostregex/UTF8DocumentIterator.h
diff --git a/scintilla/boostregex/boost/assert/source_location.hpp b/boostregex/boost/assert/source_location.hpp
similarity index 100%
rename from scintilla/boostregex/boost/assert/source_location.hpp
rename to boostregex/boost/assert/source_location.hpp
diff --git a/scintilla/boostregex/boost/config.hpp b/boostregex/boost/config.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config.hpp
rename to boostregex/boost/config.hpp
diff --git a/scintilla/boostregex/boost/config/abi/borland_prefix.hpp b/boostregex/boost/config/abi/borland_prefix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi/borland_prefix.hpp
rename to boostregex/boost/config/abi/borland_prefix.hpp
diff --git a/scintilla/boostregex/boost/config/abi/borland_suffix.hpp b/boostregex/boost/config/abi/borland_suffix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi/borland_suffix.hpp
rename to boostregex/boost/config/abi/borland_suffix.hpp
diff --git a/scintilla/boostregex/boost/config/abi/msvc_prefix.hpp b/boostregex/boost/config/abi/msvc_prefix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi/msvc_prefix.hpp
rename to boostregex/boost/config/abi/msvc_prefix.hpp
diff --git a/scintilla/boostregex/boost/config/abi/msvc_suffix.hpp b/boostregex/boost/config/abi/msvc_suffix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi/msvc_suffix.hpp
rename to boostregex/boost/config/abi/msvc_suffix.hpp
diff --git a/scintilla/boostregex/boost/config/abi_prefix.hpp b/boostregex/boost/config/abi_prefix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi_prefix.hpp
rename to boostregex/boost/config/abi_prefix.hpp
diff --git a/scintilla/boostregex/boost/config/abi_suffix.hpp b/boostregex/boost/config/abi_suffix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/abi_suffix.hpp
rename to boostregex/boost/config/abi_suffix.hpp
diff --git a/scintilla/boostregex/boost/config/auto_link.hpp b/boostregex/boost/config/auto_link.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/auto_link.hpp
rename to boostregex/boost/config/auto_link.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/borland.hpp b/boostregex/boost/config/compiler/borland.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/borland.hpp
rename to boostregex/boost/config/compiler/borland.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/clang.hpp b/boostregex/boost/config/compiler/clang.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/clang.hpp
rename to boostregex/boost/config/compiler/clang.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/codegear.hpp b/boostregex/boost/config/compiler/codegear.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/codegear.hpp
rename to boostregex/boost/config/compiler/codegear.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/comeau.hpp b/boostregex/boost/config/compiler/comeau.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/comeau.hpp
rename to boostregex/boost/config/compiler/comeau.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/common_edg.hpp b/boostregex/boost/config/compiler/common_edg.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/common_edg.hpp
rename to boostregex/boost/config/compiler/common_edg.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/compaq_cxx.hpp b/boostregex/boost/config/compiler/compaq_cxx.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/compaq_cxx.hpp
rename to boostregex/boost/config/compiler/compaq_cxx.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/cray.hpp b/boostregex/boost/config/compiler/cray.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/cray.hpp
rename to boostregex/boost/config/compiler/cray.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/diab.hpp b/boostregex/boost/config/compiler/diab.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/diab.hpp
rename to boostregex/boost/config/compiler/diab.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/digitalmars.hpp b/boostregex/boost/config/compiler/digitalmars.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/digitalmars.hpp
rename to boostregex/boost/config/compiler/digitalmars.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/gcc.hpp b/boostregex/boost/config/compiler/gcc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/gcc.hpp
rename to boostregex/boost/config/compiler/gcc.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/gcc_xml.hpp b/boostregex/boost/config/compiler/gcc_xml.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/gcc_xml.hpp
rename to boostregex/boost/config/compiler/gcc_xml.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/greenhills.hpp b/boostregex/boost/config/compiler/greenhills.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/greenhills.hpp
rename to boostregex/boost/config/compiler/greenhills.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/hp_acc.hpp b/boostregex/boost/config/compiler/hp_acc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/hp_acc.hpp
rename to boostregex/boost/config/compiler/hp_acc.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/intel.hpp b/boostregex/boost/config/compiler/intel.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/intel.hpp
rename to boostregex/boost/config/compiler/intel.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/kai.hpp b/boostregex/boost/config/compiler/kai.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/kai.hpp
rename to boostregex/boost/config/compiler/kai.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/metrowerks.hpp b/boostregex/boost/config/compiler/metrowerks.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/metrowerks.hpp
rename to boostregex/boost/config/compiler/metrowerks.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/mpw.hpp b/boostregex/boost/config/compiler/mpw.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/mpw.hpp
rename to boostregex/boost/config/compiler/mpw.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/nvcc.hpp b/boostregex/boost/config/compiler/nvcc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/nvcc.hpp
rename to boostregex/boost/config/compiler/nvcc.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/pathscale.hpp b/boostregex/boost/config/compiler/pathscale.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/pathscale.hpp
rename to boostregex/boost/config/compiler/pathscale.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/pgi.hpp b/boostregex/boost/config/compiler/pgi.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/pgi.hpp
rename to boostregex/boost/config/compiler/pgi.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/sgi_mipspro.hpp b/boostregex/boost/config/compiler/sgi_mipspro.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/sgi_mipspro.hpp
rename to boostregex/boost/config/compiler/sgi_mipspro.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/sunpro_cc.hpp b/boostregex/boost/config/compiler/sunpro_cc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/sunpro_cc.hpp
rename to boostregex/boost/config/compiler/sunpro_cc.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/vacpp.hpp b/boostregex/boost/config/compiler/vacpp.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/vacpp.hpp
rename to boostregex/boost/config/compiler/vacpp.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/visualc.hpp b/boostregex/boost/config/compiler/visualc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/visualc.hpp
rename to boostregex/boost/config/compiler/visualc.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/xlcpp.hpp b/boostregex/boost/config/compiler/xlcpp.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/xlcpp.hpp
rename to boostregex/boost/config/compiler/xlcpp.hpp
diff --git a/scintilla/boostregex/boost/config/compiler/xlcpp_zos.hpp b/boostregex/boost/config/compiler/xlcpp_zos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/compiler/xlcpp_zos.hpp
rename to boostregex/boost/config/compiler/xlcpp_zos.hpp
diff --git a/scintilla/boostregex/boost/config/detail/posix_features.hpp b/boostregex/boost/config/detail/posix_features.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/detail/posix_features.hpp
rename to boostregex/boost/config/detail/posix_features.hpp
diff --git a/scintilla/boostregex/boost/config/detail/select_compiler_config.hpp b/boostregex/boost/config/detail/select_compiler_config.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/detail/select_compiler_config.hpp
rename to boostregex/boost/config/detail/select_compiler_config.hpp
diff --git a/scintilla/boostregex/boost/config/detail/select_platform_config.hpp b/boostregex/boost/config/detail/select_platform_config.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/detail/select_platform_config.hpp
rename to boostregex/boost/config/detail/select_platform_config.hpp
diff --git a/scintilla/boostregex/boost/config/detail/select_stdlib_config.hpp b/boostregex/boost/config/detail/select_stdlib_config.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/detail/select_stdlib_config.hpp
rename to boostregex/boost/config/detail/select_stdlib_config.hpp
diff --git a/scintilla/boostregex/boost/config/detail/suffix.hpp b/boostregex/boost/config/detail/suffix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/detail/suffix.hpp
rename to boostregex/boost/config/detail/suffix.hpp
diff --git a/scintilla/boostregex/boost/config/header_deprecated.hpp b/boostregex/boost/config/header_deprecated.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/header_deprecated.hpp
rename to boostregex/boost/config/header_deprecated.hpp
diff --git a/scintilla/boostregex/boost/config/helper_macros.hpp b/boostregex/boost/config/helper_macros.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/helper_macros.hpp
rename to boostregex/boost/config/helper_macros.hpp
diff --git a/scintilla/boostregex/boost/config/no_tr1/cmath.hpp b/boostregex/boost/config/no_tr1/cmath.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/no_tr1/cmath.hpp
rename to boostregex/boost/config/no_tr1/cmath.hpp
diff --git a/scintilla/boostregex/boost/config/no_tr1/complex.hpp b/boostregex/boost/config/no_tr1/complex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/no_tr1/complex.hpp
rename to boostregex/boost/config/no_tr1/complex.hpp
diff --git a/scintilla/boostregex/boost/config/no_tr1/functional.hpp b/boostregex/boost/config/no_tr1/functional.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/no_tr1/functional.hpp
rename to boostregex/boost/config/no_tr1/functional.hpp
diff --git a/scintilla/boostregex/boost/config/no_tr1/memory.hpp b/boostregex/boost/config/no_tr1/memory.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/no_tr1/memory.hpp
rename to boostregex/boost/config/no_tr1/memory.hpp
diff --git a/scintilla/boostregex/boost/config/no_tr1/utility.hpp b/boostregex/boost/config/no_tr1/utility.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/no_tr1/utility.hpp
rename to boostregex/boost/config/no_tr1/utility.hpp
diff --git a/scintilla/boostregex/boost/config/platform/aix.hpp b/boostregex/boost/config/platform/aix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/aix.hpp
rename to boostregex/boost/config/platform/aix.hpp
diff --git a/scintilla/boostregex/boost/config/platform/amigaos.hpp b/boostregex/boost/config/platform/amigaos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/amigaos.hpp
rename to boostregex/boost/config/platform/amigaos.hpp
diff --git a/scintilla/boostregex/boost/config/platform/beos.hpp b/boostregex/boost/config/platform/beos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/beos.hpp
rename to boostregex/boost/config/platform/beos.hpp
diff --git a/scintilla/boostregex/boost/config/platform/bsd.hpp b/boostregex/boost/config/platform/bsd.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/bsd.hpp
rename to boostregex/boost/config/platform/bsd.hpp
diff --git a/scintilla/boostregex/boost/config/platform/cloudabi.hpp b/boostregex/boost/config/platform/cloudabi.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/cloudabi.hpp
rename to boostregex/boost/config/platform/cloudabi.hpp
diff --git a/scintilla/boostregex/boost/config/platform/cray.hpp b/boostregex/boost/config/platform/cray.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/cray.hpp
rename to boostregex/boost/config/platform/cray.hpp
diff --git a/scintilla/boostregex/boost/config/platform/cygwin.hpp b/boostregex/boost/config/platform/cygwin.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/cygwin.hpp
rename to boostregex/boost/config/platform/cygwin.hpp
diff --git a/scintilla/boostregex/boost/config/platform/haiku.hpp b/boostregex/boost/config/platform/haiku.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/haiku.hpp
rename to boostregex/boost/config/platform/haiku.hpp
diff --git a/scintilla/boostregex/boost/config/platform/hpux.hpp b/boostregex/boost/config/platform/hpux.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/hpux.hpp
rename to boostregex/boost/config/platform/hpux.hpp
diff --git a/scintilla/boostregex/boost/config/platform/irix.hpp b/boostregex/boost/config/platform/irix.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/irix.hpp
rename to boostregex/boost/config/platform/irix.hpp
diff --git a/scintilla/boostregex/boost/config/platform/linux.hpp b/boostregex/boost/config/platform/linux.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/linux.hpp
rename to boostregex/boost/config/platform/linux.hpp
diff --git a/scintilla/boostregex/boost/config/platform/macos.hpp b/boostregex/boost/config/platform/macos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/macos.hpp
rename to boostregex/boost/config/platform/macos.hpp
diff --git a/scintilla/boostregex/boost/config/platform/qnxnto.hpp b/boostregex/boost/config/platform/qnxnto.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/qnxnto.hpp
rename to boostregex/boost/config/platform/qnxnto.hpp
diff --git a/scintilla/boostregex/boost/config/platform/solaris.hpp b/boostregex/boost/config/platform/solaris.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/solaris.hpp
rename to boostregex/boost/config/platform/solaris.hpp
diff --git a/scintilla/boostregex/boost/config/platform/symbian.hpp b/boostregex/boost/config/platform/symbian.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/symbian.hpp
rename to boostregex/boost/config/platform/symbian.hpp
diff --git a/scintilla/boostregex/boost/config/platform/vms.hpp b/boostregex/boost/config/platform/vms.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/vms.hpp
rename to boostregex/boost/config/platform/vms.hpp
diff --git a/scintilla/boostregex/boost/config/platform/vxworks.hpp b/boostregex/boost/config/platform/vxworks.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/vxworks.hpp
rename to boostregex/boost/config/platform/vxworks.hpp
diff --git a/scintilla/boostregex/boost/config/platform/win32.hpp b/boostregex/boost/config/platform/win32.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/win32.hpp
rename to boostregex/boost/config/platform/win32.hpp
diff --git a/scintilla/boostregex/boost/config/platform/zos.hpp b/boostregex/boost/config/platform/zos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/platform/zos.hpp
rename to boostregex/boost/config/platform/zos.hpp
diff --git a/scintilla/boostregex/boost/config/pragma_message.hpp b/boostregex/boost/config/pragma_message.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/pragma_message.hpp
rename to boostregex/boost/config/pragma_message.hpp
diff --git a/scintilla/boostregex/boost/config/requires_threads.hpp b/boostregex/boost/config/requires_threads.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/requires_threads.hpp
rename to boostregex/boost/config/requires_threads.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/dinkumware.hpp b/boostregex/boost/config/stdlib/dinkumware.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/dinkumware.hpp
rename to boostregex/boost/config/stdlib/dinkumware.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/libcomo.hpp b/boostregex/boost/config/stdlib/libcomo.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/libcomo.hpp
rename to boostregex/boost/config/stdlib/libcomo.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/libcpp.hpp b/boostregex/boost/config/stdlib/libcpp.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/libcpp.hpp
rename to boostregex/boost/config/stdlib/libcpp.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/libstdcpp3.hpp b/boostregex/boost/config/stdlib/libstdcpp3.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/libstdcpp3.hpp
rename to boostregex/boost/config/stdlib/libstdcpp3.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/modena.hpp b/boostregex/boost/config/stdlib/modena.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/modena.hpp
rename to boostregex/boost/config/stdlib/modena.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/msl.hpp b/boostregex/boost/config/stdlib/msl.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/msl.hpp
rename to boostregex/boost/config/stdlib/msl.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/roguewave.hpp b/boostregex/boost/config/stdlib/roguewave.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/roguewave.hpp
rename to boostregex/boost/config/stdlib/roguewave.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/sgi.hpp b/boostregex/boost/config/stdlib/sgi.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/sgi.hpp
rename to boostregex/boost/config/stdlib/sgi.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/stlport.hpp b/boostregex/boost/config/stdlib/stlport.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/stlport.hpp
rename to boostregex/boost/config/stdlib/stlport.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/vacpp.hpp b/boostregex/boost/config/stdlib/vacpp.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/vacpp.hpp
rename to boostregex/boost/config/stdlib/vacpp.hpp
diff --git a/scintilla/boostregex/boost/config/stdlib/xlcpp_zos.hpp b/boostregex/boost/config/stdlib/xlcpp_zos.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/stdlib/xlcpp_zos.hpp
rename to boostregex/boost/config/stdlib/xlcpp_zos.hpp
diff --git a/scintilla/boostregex/boost/config/user.hpp b/boostregex/boost/config/user.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/user.hpp
rename to boostregex/boost/config/user.hpp
diff --git a/scintilla/boostregex/boost/config/warning_disable.hpp b/boostregex/boost/config/warning_disable.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/warning_disable.hpp
rename to boostregex/boost/config/warning_disable.hpp
diff --git a/scintilla/boostregex/boost/config/workaround.hpp b/boostregex/boost/config/workaround.hpp
similarity index 100%
rename from scintilla/boostregex/boost/config/workaround.hpp
rename to boostregex/boost/config/workaround.hpp
diff --git a/scintilla/boostregex/boost/cstdint.hpp b/boostregex/boost/cstdint.hpp
similarity index 100%
rename from scintilla/boostregex/boost/cstdint.hpp
rename to boostregex/boost/cstdint.hpp
diff --git a/scintilla/boostregex/boost/current_function.hpp b/boostregex/boost/current_function.hpp
similarity index 100%
rename from scintilla/boostregex/boost/current_function.hpp
rename to boostregex/boost/current_function.hpp
diff --git a/scintilla/boostregex/boost/exception/all.hpp b/boostregex/boost/exception/all.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/all.hpp
rename to boostregex/boost/exception/all.hpp
diff --git a/scintilla/boostregex/boost/exception/current_exception_cast.hpp b/boostregex/boost/exception/current_exception_cast.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/current_exception_cast.hpp
rename to boostregex/boost/exception/current_exception_cast.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/clone_current_exception.hpp b/boostregex/boost/exception/detail/clone_current_exception.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/clone_current_exception.hpp
rename to boostregex/boost/exception/detail/clone_current_exception.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/error_info_impl.hpp b/boostregex/boost/exception/detail/error_info_impl.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/error_info_impl.hpp
rename to boostregex/boost/exception/detail/error_info_impl.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/exception_ptr.hpp b/boostregex/boost/exception/detail/exception_ptr.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/exception_ptr.hpp
rename to boostregex/boost/exception/detail/exception_ptr.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/is_output_streamable.hpp b/boostregex/boost/exception/detail/is_output_streamable.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/is_output_streamable.hpp
rename to boostregex/boost/exception/detail/is_output_streamable.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/object_hex_dump.hpp b/boostregex/boost/exception/detail/object_hex_dump.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/object_hex_dump.hpp
rename to boostregex/boost/exception/detail/object_hex_dump.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/shared_ptr.hpp b/boostregex/boost/exception/detail/shared_ptr.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/shared_ptr.hpp
rename to boostregex/boost/exception/detail/shared_ptr.hpp
diff --git a/scintilla/boostregex/boost/exception/detail/type_info.hpp b/boostregex/boost/exception/detail/type_info.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/detail/type_info.hpp
rename to boostregex/boost/exception/detail/type_info.hpp
diff --git a/scintilla/boostregex/boost/exception/diagnostic_information.hpp b/boostregex/boost/exception/diagnostic_information.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/diagnostic_information.hpp
rename to boostregex/boost/exception/diagnostic_information.hpp
diff --git a/scintilla/boostregex/boost/exception/enable_current_exception.hpp b/boostregex/boost/exception/enable_current_exception.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/enable_current_exception.hpp
rename to boostregex/boost/exception/enable_current_exception.hpp
diff --git a/scintilla/boostregex/boost/exception/enable_error_info.hpp b/boostregex/boost/exception/enable_error_info.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/enable_error_info.hpp
rename to boostregex/boost/exception/enable_error_info.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_api_function.hpp b/boostregex/boost/exception/errinfo_api_function.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_api_function.hpp
rename to boostregex/boost/exception/errinfo_api_function.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_at_line.hpp b/boostregex/boost/exception/errinfo_at_line.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_at_line.hpp
rename to boostregex/boost/exception/errinfo_at_line.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_errno.hpp b/boostregex/boost/exception/errinfo_errno.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_errno.hpp
rename to boostregex/boost/exception/errinfo_errno.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_file_handle.hpp b/boostregex/boost/exception/errinfo_file_handle.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_file_handle.hpp
rename to boostregex/boost/exception/errinfo_file_handle.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_file_name.hpp b/boostregex/boost/exception/errinfo_file_name.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_file_name.hpp
rename to boostregex/boost/exception/errinfo_file_name.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_file_open_mode.hpp b/boostregex/boost/exception/errinfo_file_open_mode.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_file_open_mode.hpp
rename to boostregex/boost/exception/errinfo_file_open_mode.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_nested_exception.hpp b/boostregex/boost/exception/errinfo_nested_exception.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_nested_exception.hpp
rename to boostregex/boost/exception/errinfo_nested_exception.hpp
diff --git a/scintilla/boostregex/boost/exception/errinfo_type_info_name.hpp b/boostregex/boost/exception/errinfo_type_info_name.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/errinfo_type_info_name.hpp
rename to boostregex/boost/exception/errinfo_type_info_name.hpp
diff --git a/scintilla/boostregex/boost/exception/error_info.hpp b/boostregex/boost/exception/error_info.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/error_info.hpp
rename to boostregex/boost/exception/error_info.hpp
diff --git a/scintilla/boostregex/boost/exception/exception.hpp b/boostregex/boost/exception/exception.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/exception.hpp
rename to boostregex/boost/exception/exception.hpp
diff --git a/scintilla/boostregex/boost/exception/get_error_info.hpp b/boostregex/boost/exception/get_error_info.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/get_error_info.hpp
rename to boostregex/boost/exception/get_error_info.hpp
diff --git a/scintilla/boostregex/boost/exception/info.hpp b/boostregex/boost/exception/info.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/info.hpp
rename to boostregex/boost/exception/info.hpp
diff --git a/scintilla/boostregex/boost/exception/info_tuple.hpp b/boostregex/boost/exception/info_tuple.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/info_tuple.hpp
rename to boostregex/boost/exception/info_tuple.hpp
diff --git a/scintilla/boostregex/boost/exception/to_string.hpp b/boostregex/boost/exception/to_string.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/to_string.hpp
rename to boostregex/boost/exception/to_string.hpp
diff --git a/scintilla/boostregex/boost/exception/to_string_stub.hpp b/boostregex/boost/exception/to_string_stub.hpp
similarity index 100%
rename from scintilla/boostregex/boost/exception/to_string_stub.hpp
rename to boostregex/boost/exception/to_string_stub.hpp
diff --git a/scintilla/boostregex/boost/regex.hpp b/boostregex/boost/regex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex.hpp
rename to boostregex/boost/regex.hpp
diff --git a/scintilla/boostregex/boost/regex/concepts.hpp b/boostregex/boost/regex/concepts.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/concepts.hpp
rename to boostregex/boost/regex/concepts.hpp
diff --git a/scintilla/boostregex/boost/regex/config.hpp b/boostregex/boost/regex/config.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/config.hpp
rename to boostregex/boost/regex/config.hpp
diff --git a/scintilla/boostregex/boost/regex/config/borland.hpp b/boostregex/boost/regex/config/borland.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/config/borland.hpp
rename to boostregex/boost/regex/config/borland.hpp
diff --git a/scintilla/boostregex/boost/regex/config/cwchar.hpp b/boostregex/boost/regex/config/cwchar.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/config/cwchar.hpp
rename to boostregex/boost/regex/config/cwchar.hpp
diff --git a/scintilla/boostregex/boost/regex/icu.hpp b/boostregex/boost/regex/icu.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/icu.hpp
rename to boostregex/boost/regex/icu.hpp
diff --git a/scintilla/boostregex/boost/regex/mfc.hpp b/boostregex/boost/regex/mfc.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/mfc.hpp
rename to boostregex/boost/regex/mfc.hpp
diff --git a/scintilla/boostregex/boost/regex/pattern_except.hpp b/boostregex/boost/regex/pattern_except.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/pattern_except.hpp
rename to boostregex/boost/regex/pattern_except.hpp
diff --git a/scintilla/boostregex/boost/regex/pending/object_cache.hpp b/boostregex/boost/regex/pending/object_cache.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/pending/object_cache.hpp
rename to boostregex/boost/regex/pending/object_cache.hpp
diff --git a/scintilla/boostregex/boost/regex/pending/static_mutex.hpp b/boostregex/boost/regex/pending/static_mutex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/pending/static_mutex.hpp
rename to boostregex/boost/regex/pending/static_mutex.hpp
diff --git a/scintilla/boostregex/boost/regex/pending/unicode_iterator.hpp b/boostregex/boost/regex/pending/unicode_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/pending/unicode_iterator.hpp
rename to boostregex/boost/regex/pending/unicode_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/regex_traits.hpp b/boostregex/boost/regex/regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/regex_traits.hpp
rename to boostregex/boost/regex/regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/user.hpp b/boostregex/boost/regex/user.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/user.hpp
rename to boostregex/boost/regex/user.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/basic_regex.hpp b/boostregex/boost/regex/v5/basic_regex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/basic_regex.hpp
rename to boostregex/boost/regex/v5/basic_regex.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/basic_regex_creator.hpp b/boostregex/boost/regex/v5/basic_regex_creator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/basic_regex_creator.hpp
rename to boostregex/boost/regex/v5/basic_regex_creator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/basic_regex_parser.hpp b/boostregex/boost/regex/v5/basic_regex_parser.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/basic_regex_parser.hpp
rename to boostregex/boost/regex/v5/basic_regex_parser.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/c_regex_traits.hpp b/boostregex/boost/regex/v5/c_regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/c_regex_traits.hpp
rename to boostregex/boost/regex/v5/c_regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/char_regex_traits.hpp b/boostregex/boost/regex/v5/char_regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/char_regex_traits.hpp
rename to boostregex/boost/regex/v5/char_regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/cpp_regex_traits.hpp b/boostregex/boost/regex/v5/cpp_regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/cpp_regex_traits.hpp
rename to boostregex/boost/regex/v5/cpp_regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/cregex.hpp b/boostregex/boost/regex/v5/cregex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/cregex.hpp
rename to boostregex/boost/regex/v5/cregex.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/error_type.hpp b/boostregex/boost/regex/v5/error_type.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/error_type.hpp
rename to boostregex/boost/regex/v5/error_type.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/icu.hpp b/boostregex/boost/regex/v5/icu.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/icu.hpp
rename to boostregex/boost/regex/v5/icu.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/indexed_bit_flag.hpp b/boostregex/boost/regex/v5/indexed_bit_flag.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/indexed_bit_flag.hpp
rename to boostregex/boost/regex/v5/indexed_bit_flag.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/iterator_category.hpp b/boostregex/boost/regex/v5/iterator_category.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/iterator_category.hpp
rename to boostregex/boost/regex/v5/iterator_category.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/iterator_traits.hpp b/boostregex/boost/regex/v5/iterator_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/iterator_traits.hpp
rename to boostregex/boost/regex/v5/iterator_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/match_flags.hpp b/boostregex/boost/regex/v5/match_flags.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/match_flags.hpp
rename to boostregex/boost/regex/v5/match_flags.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/match_results.hpp b/boostregex/boost/regex/v5/match_results.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/match_results.hpp
rename to boostregex/boost/regex/v5/match_results.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/mem_block_cache.hpp b/boostregex/boost/regex/v5/mem_block_cache.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/mem_block_cache.hpp
rename to boostregex/boost/regex/v5/mem_block_cache.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/object_cache.hpp b/boostregex/boost/regex/v5/object_cache.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/object_cache.hpp
rename to boostregex/boost/regex/v5/object_cache.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/pattern_except.hpp b/boostregex/boost/regex/v5/pattern_except.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/pattern_except.hpp
rename to boostregex/boost/regex/v5/pattern_except.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/perl_matcher.hpp b/boostregex/boost/regex/v5/perl_matcher.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/perl_matcher.hpp
rename to boostregex/boost/regex/v5/perl_matcher.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/perl_matcher_common.hpp b/boostregex/boost/regex/v5/perl_matcher_common.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/perl_matcher_common.hpp
rename to boostregex/boost/regex/v5/perl_matcher_common.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/perl_matcher_non_recursive.hpp b/boostregex/boost/regex/v5/perl_matcher_non_recursive.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/perl_matcher_non_recursive.hpp
rename to boostregex/boost/regex/v5/perl_matcher_non_recursive.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/primary_transform.hpp b/boostregex/boost/regex/v5/primary_transform.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/primary_transform.hpp
rename to boostregex/boost/regex/v5/primary_transform.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regbase.hpp b/boostregex/boost/regex/v5/regbase.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regbase.hpp
rename to boostregex/boost/regex/v5/regbase.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex.hpp b/boostregex/boost/regex/v5/regex.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex.hpp
rename to boostregex/boost/regex/v5/regex.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_format.hpp b/boostregex/boost/regex/v5/regex_format.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_format.hpp
rename to boostregex/boost/regex/v5/regex_format.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_fwd.hpp b/boostregex/boost/regex/v5/regex_fwd.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_fwd.hpp
rename to boostregex/boost/regex/v5/regex_fwd.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_grep.hpp b/boostregex/boost/regex/v5/regex_grep.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_grep.hpp
rename to boostregex/boost/regex/v5/regex_grep.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_iterator.hpp b/boostregex/boost/regex/v5/regex_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_iterator.hpp
rename to boostregex/boost/regex/v5/regex_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_match.hpp b/boostregex/boost/regex/v5/regex_match.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_match.hpp
rename to boostregex/boost/regex/v5/regex_match.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_merge.hpp b/boostregex/boost/regex/v5/regex_merge.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_merge.hpp
rename to boostregex/boost/regex/v5/regex_merge.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_raw_buffer.hpp b/boostregex/boost/regex/v5/regex_raw_buffer.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_raw_buffer.hpp
rename to boostregex/boost/regex/v5/regex_raw_buffer.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_replace.hpp b/boostregex/boost/regex/v5/regex_replace.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_replace.hpp
rename to boostregex/boost/regex/v5/regex_replace.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_search.hpp b/boostregex/boost/regex/v5/regex_search.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_search.hpp
rename to boostregex/boost/regex/v5/regex_search.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_split.hpp b/boostregex/boost/regex/v5/regex_split.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_split.hpp
rename to boostregex/boost/regex/v5/regex_split.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_token_iterator.hpp b/boostregex/boost/regex/v5/regex_token_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_token_iterator.hpp
rename to boostregex/boost/regex/v5/regex_token_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_traits.hpp b/boostregex/boost/regex/v5/regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_traits.hpp
rename to boostregex/boost/regex/v5/regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_traits_defaults.hpp b/boostregex/boost/regex/v5/regex_traits_defaults.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_traits_defaults.hpp
rename to boostregex/boost/regex/v5/regex_traits_defaults.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/regex_workaround.hpp b/boostregex/boost/regex/v5/regex_workaround.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/regex_workaround.hpp
rename to boostregex/boost/regex/v5/regex_workaround.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/states.hpp b/boostregex/boost/regex/v5/states.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/states.hpp
rename to boostregex/boost/regex/v5/states.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/sub_match.hpp b/boostregex/boost/regex/v5/sub_match.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/sub_match.hpp
rename to boostregex/boost/regex/v5/sub_match.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/syntax_type.hpp b/boostregex/boost/regex/v5/syntax_type.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/syntax_type.hpp
rename to boostregex/boost/regex/v5/syntax_type.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/u32regex_iterator.hpp b/boostregex/boost/regex/v5/u32regex_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/u32regex_iterator.hpp
rename to boostregex/boost/regex/v5/u32regex_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/u32regex_token_iterator.hpp b/boostregex/boost/regex/v5/u32regex_token_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/u32regex_token_iterator.hpp
rename to boostregex/boost/regex/v5/u32regex_token_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/unicode_iterator.hpp b/boostregex/boost/regex/v5/unicode_iterator.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/unicode_iterator.hpp
rename to boostregex/boost/regex/v5/unicode_iterator.hpp
diff --git a/scintilla/boostregex/boost/regex/v5/w32_regex_traits.hpp b/boostregex/boost/regex/v5/w32_regex_traits.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex/v5/w32_regex_traits.hpp
rename to boostregex/boost/regex/v5/w32_regex_traits.hpp
diff --git a/scintilla/boostregex/boost/regex_fwd.hpp b/boostregex/boost/regex_fwd.hpp
similarity index 100%
rename from scintilla/boostregex/boost/regex_fwd.hpp
rename to boostregex/boost/regex_fwd.hpp
diff --git a/scintilla/boostregex/boost/throw_exception.hpp b/boostregex/boost/throw_exception.hpp
similarity index 100%
rename from scintilla/boostregex/boost/throw_exception.hpp
rename to boostregex/boost/throw_exception.hpp
diff --git a/scintilla/boostregex/nppSpecifics.mak b/boostregex/nppSpecifics.mak
similarity index 100%
rename from scintilla/boostregex/nppSpecifics.mak
rename to boostregex/nppSpecifics.mak
diff --git a/scintilla/win32/DepGen.py b/scintilla/win32/DepGen.py
index 7aeac27b4b42..563cae2a1c10 100644
--- a/scintilla/win32/DepGen.py
+++ b/scintilla/win32/DepGen.py
@@ -13,8 +13,8 @@
 topComment = "# Created by DepGen.py. To recreate, run DepGen.py.\n"
 
 def Generate():
-	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx", "../boostregex/*.cxx"]
-	includes = ["../include", "../src", "../lexlib", "../boostregex"]
+	sources = ["../src/*.cxx", "../lexlib/*.cxx", "../lexers/*.cxx"]
+	includes = ["../include", "../src", "../lexlib"]
 
 	# Create the dependencies file for g++
 	deps = Dependencies.FindDependencies(["../win32/*.cxx"] + sources,  ["../win32"] + includes, ".o", "../win32/")
diff --git a/scintilla/win32/SciLexer.vcxproj b/scintilla/win32/SciLexer.vcxproj
index b2e993c0cfd3..57c75471a649 100644
--- a/scintilla/win32/SciLexer.vcxproj
+++ b/scintilla/win32/SciLexer.vcxproj
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|ARM64">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|ARM64">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|Win32">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
+    <ProjectConfiguration Include="Unicode Debug|x64">
+      <Configuration>Unicode Debug</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|ARM64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|ARM64">
+      <Configuration>Unicode Release</Configuration>
       <Platform>ARM64</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|Win32">
+      <Configuration>Unicode Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
+    <ProjectConfiguration Include="Unicode Release|x64">
+      <Configuration>Unicode Release</Configuration>
       <Platform>x64</Platform>
     </ProjectConfiguration>
   </ItemGroup>
@@ -30,31 +30,33 @@
     <ProjectGuid>{FBE04237-9C7B-4973-9C60-505975998B39}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>SciLexer</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup>
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <CharacterSet>Unicode</CharacterSet>
     <PlatformToolset>v141</PlatformToolset>
+    <TargetName>lib$(ProjectName)</TargetName>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'" Label="Configuration">
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
@@ -71,8 +73,8 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;SCI_OWNREGEX;SCI_NAMESPACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;..\..\boostregex</AdditionalIncludeDirectories>
       <BrowseInformation>true</BrowseInformation>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <MinimalRebuild>false</MinimalRebuild>
@@ -84,63 +86,78 @@
       <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'">
     <ClCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
+    <Lib>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Lib>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'">
     <ClCompile>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <Optimization>MinSpace</Optimization>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -151,6 +168,7 @@
     <ClCompile Include="..\lexers\*.cxx" />
     <ClCompile Include="..\lexlib\*.cxx" />
     <ClCompile Include="..\src\*.cxx" />
+    <ClCompile Include="..\..\boostregex\*.cxx" />
     <ClCompile Include="..\win32\HanjaDic.cxx" />
     <ClCompile Include="..\win32\PlatWin.cxx" />
     <ClCompile Include="..\win32\ScintillaWin.cxx" />
@@ -161,6 +179,7 @@
     <ClInclude Include="..\src\*.h" />
     <ClInclude Include="..\lexlib\*.h" />
     <ClInclude Include="..\win32\*.h" />
+    <ClInclude Include="..\..\boostregex\*.h" />
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\win32\ScintRes.rc" />
diff --git a/scintilla/win32/deps.mak b/scintilla/win32/deps.mak
index 4bcc6bcea62b..3bbeb5a0d7a2 100644
--- a/scintilla/win32/deps.mak
+++ b/scintilla/win32/deps.mak
@@ -1454,18 +1454,6 @@ LexNull.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexObjC.o: \
-	../lexers/LexObjC.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h
 LexOpal.o: \
 	../lexers/LexOpal.cxx \
 	../include/ILexer.h \
@@ -1744,18 +1732,6 @@ LexScriptol.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexSearchResult.o: \
-	../lexers/LexSearchResult.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/PropSetSimple.h \
-	../lexlib/Accessor.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h
 LexSmalltalk.o: \
 	../lexers/LexSmalltalk.cxx \
 	../include/ILexer.h \
@@ -1939,18 +1915,6 @@ LexTxt2tags.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-LexUser.o: \
-	../lexers/LexUser.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/LexerModule.h \
-	../lexlib/PropSetSimple.h
 LexVB.o: \
 	../lexers/LexVB.cxx \
 	../include/ILexer.h \
@@ -2025,42 +1989,3 @@ LexYAML.o: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-BoostRegExSearch.o: \
-	../boostregex/BoostRegExSearch.cxx \
-	../include/Scintilla.h \
-	../include/Sci_Position.h \
-	../include/Platform.h \
-	../include/ILoader.h \
-	../include/ILexer.h \
-	../src/Position.h \
-	../src/UniqueString.h \
-	../src/SplitVector.h \
-	../src/Partitioning.h \
-	../src/RunStyles.h \
-	../src/ContractionState.h \
-	../src/CellBuffer.h \
-	../src/CharClassify.h \
-	../src/Decoration.h \
-	../src/CaseFolder.h \
-	../lexlib/CharacterCategory.h \
-	../src/Document.h \
-	../src/UniConversion.h \
-	../boostregex/UTF8DocumentIterator.h \
-	../boostregex/AnsiDocumentIterator.h \
-	../include/BoostRegexSearch.h
-UTF8DocumentIterator.o: \
-	../boostregex/UTF8DocumentIterator.cxx \
-	../include/ILoader.h \
-	../include/Sci_Position.h \
-	../include/ILexer.h \
-	../include/Scintilla.h \
-	../lexlib/CharacterCategory.h \
-	../src/Position.h \
-	../src/SplitVector.h \
-	../src/Partitioning.h \
-	../src/RunStyles.h \
-	../src/CellBuffer.h \
-	../src/CharClassify.h \
-	../src/Decoration.h \
-	../src/CaseFolder.h \
-	../src/Document.h
diff --git a/scintilla/win32/libSciLexer.vcxproj b/scintilla/win32/libSciLexer.vcxproj
deleted file mode 100644
index 98d5358f62d5..000000000000
--- a/scintilla/win32/libSciLexer.vcxproj
+++ /dev/null
@@ -1,189 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Unicode Debug|ARM64">
-      <Configuration>Unicode Debug</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Unicode Debug|Win32">
-      <Configuration>Unicode Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Unicode Debug|x64">
-      <Configuration>Unicode Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Unicode Release|ARM64">
-      <Configuration>Unicode Release</Configuration>
-      <Platform>ARM64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Unicode Release|Win32">
-      <Configuration>Unicode Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Unicode Release|x64">
-      <Configuration>Unicode Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{FBE04237-9C7B-4973-9C60-505975998B39}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>SciLexer</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup>
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'" Label="Configuration">
-    <UseDebugLibraries>true</UseDebugLibraries>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'" Label="Configuration">
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup>
-    <ClCompile>
-      <WarningLevel>Level4</WarningLevel>
-      <PreprocessorDefinitions>WIN32;SCI_LEXER;_CRT_SECURE_NO_DEPRECATE;_SCL_SECURE_NO_WARNINGS;_WINDOWS;_USRDLL;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES;SCI_OWNREGEX;SCI_NAMESPACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>..\include;..\src;..\lexlib;..\boostregex</AdditionalIncludeDirectories>
-      <BrowseInformation>true</BrowseInformation>
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <MinimalRebuild>false</MinimalRebuild>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gdi32.lib;imm32.lib;ole32.lib;oleaut32.lib;msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|Win32'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|x64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Debug|ARM64'">
-    <ClCompile>
-      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-    </ClCompile>
-    <Link>
-      <LinkTimeCodeGeneration>Default</LinkTimeCodeGeneration>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|Win32'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-    <Lib>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Lib>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|x64'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Unicode Release|ARM64'">
-    <ClCompile>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <Optimization>MinSpace</Optimization>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\lexers\*.cxx" />
-    <ClCompile Include="..\lexlib\*.cxx" />
-    <ClCompile Include="..\src\*.cxx" />
-    <ClCompile Include="..\boostregex\*.cxx" />
-    <ClCompile Include="..\win32\HanjaDic.cxx" />
-    <ClCompile Include="..\win32\PlatWin.cxx" />
-    <ClCompile Include="..\win32\ScintillaWin.cxx" />
-    <ClCompile Include="..\win32\ScintillaDLL.cxx" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\include\*.h" />
-    <ClInclude Include="..\src\*.h" />
-    <ClInclude Include="..\lexlib\*.h" />
-    <ClInclude Include="..\win32\*.h" />
-    <ClInclude Include="..\boostregex\*.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="..\win32\ScintRes.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/scintilla/win32/makefile b/scintilla/win32/makefile
index 7ddb3cf75b21..3e2129da1e97 100644
--- a/scintilla/win32/makefile
+++ b/scintilla/win32/makefile
@@ -20,7 +20,7 @@ WARNINGS = -Wpedantic -Wall
 
 ifdef CLANG
 CXX = clang++
-DEFINES += -D_CRT_SECURE_NO_DEPRECATE -DSCI_OWNREGEX
+DEFINES += -D_CRT_SECURE_NO_DEPRECATE
 else
 # MinGW GCC
 LIBSMINGW = -lstdc++
@@ -43,13 +43,13 @@ else
 DEL = rm -f
 endif
 
-vpath %.h ../src ../include ../lexlib ../boostregex
-vpath %.cxx ../src ../lexlib ../lexers ../boostregex
+vpath %.h ../src ../include ../lexlib
+vpath %.cxx ../src ../lexlib ../lexers
 
 LDFLAGS=-shared -static -mwindows
 LIBS=-lgdi32 -luser32 -limm32 -lole32 -luuid -loleaut32 -lmsimg32 $(LIBSMINGW)
 
-INCLUDES=-I ../include -I ../src -I../lexlib -I../boostregex
+INCLUDES=-I ../include -I ../src -I../lexlib
 
 BASE_FLAGS += $(WARNINGS)
 
@@ -70,13 +70,13 @@ CXX_ALL_FLAGS =$(DEFINES) $(INCLUDES) $(CXX_BASE_FLAGS)
 all:	$(COMPONENT) $(LEXCOMPONENT) $(LIBSCI) $(LIBLEX) 
 
 clean:
-	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI)) $(call normalize,$(LIBLEX))
+	$(DEL) *.exe *.o *.a *.obj *.dll *.res *.map *.plist $(call normalize,$(LIBSCI))
 
 %.o: %.cxx
 	$(CXX) $(CXX_ALL_FLAGS) $(CXXFLAGS) -c $<
 
 analyze:
-	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx ../boostregex/*.cxx
+	$(CXX) --analyze $(CXX_ALL_FLAGS) $(CXXFLAGS) *.cxx ../src/*.cxx ../lexlib/*.cxx ../lexers/*.cxx
 
 depend deps.mak:
 	$(PYTHON) DepGen.py
@@ -116,11 +116,6 @@ SRC_OBJS = \
 	ViewStyle.o \
 	XPM.o
 
-# + boost regex addons for own regex
-BOOST_OBJS = \
-	BoostRegExSearch.o\
-	UTF8DocumentIterator.o
-
 # Required by lexers
 LEXLIB_OBJS = \
 	Accessor.o \
@@ -136,7 +131,6 @@ LEXLIB_OBJS = \
 # Required by libraries and DLLs that include lexing
 SCILEX_OBJS=\
 	$(SRC_OBJS) \
-	$(BOOST_OBJS) \
 	$(LEXLIB_OBJS) \
 	$(LEX_OBJS) \
 	HanjaDic.o \
@@ -146,7 +140,6 @@ SCILEX_OBJS=\
 
 COMPONENT_OBJS = \
 	$(SRC_OBJS) \
-	$(BOOST_OBJS) \
 	Accessor.o \
 	Catalogue.o \
 	HanjaDic.o \
diff --git a/scintilla/win32/nmdeps.mak b/scintilla/win32/nmdeps.mak
index 900075967590..7d51e164efb5 100644
--- a/scintilla/win32/nmdeps.mak
+++ b/scintilla/win32/nmdeps.mak
@@ -1454,18 +1454,6 @@ $(DIR_O)/LexNull.obj: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-$(DIR_O)/LexObjC.obj: \
-	../lexers/LexObjC.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h
 $(DIR_O)/LexOpal.obj: \
 	../lexers/LexOpal.cxx \
 	../include/ILexer.h \
@@ -1744,18 +1732,6 @@ $(DIR_O)/LexScriptol.obj: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-$(DIR_O)/LexSearchResult.obj: \
-	../lexers/LexSearchResult.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/PropSetSimple.h \
-	../lexlib/Accessor.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/CharacterSet.h \
-	../lexlib/LexerModule.h
 $(DIR_O)/LexSmalltalk.obj: \
 	../lexers/LexSmalltalk.cxx \
 	../include/ILexer.h \
@@ -1939,18 +1915,6 @@ $(DIR_O)/LexTxt2tags.obj: \
 	../lexlib/StyleContext.h \
 	../lexlib/CharacterSet.h \
 	../lexlib/LexerModule.h
-$(DIR_O)/LexUser.obj: \
-	../lexers/LexUser.cxx \
-	../include/ILexer.h \
-	../include/Sci_Position.h \
-	../lexlib/LexAccessor.h \
-	../lexlib/Accessor.h \
-	../lexlib/StyleContext.h \
-	../lexlib/WordList.h \
-	../include/Scintilla.h \
-	../include/SciLexer.h \
-	../lexlib/LexerModule.h \
-	../lexlib/PropSetSimple.h
 $(DIR_O)/LexVB.obj: \
 	../lexers/LexVB.cxx \
 	../include/ILexer.h \
diff --git a/scintilla/win32/scintilla.mak b/scintilla/win32/scintilla.mak
index bfa798d97eab..ee76c1bf1d1b 100644
--- a/scintilla/win32/scintilla.mak
+++ b/scintilla/win32/scintilla.mak
@@ -236,7 +236,7 @@ LEX_OBJS=\
 #--Autogenerated -- end of automatically generated section
 
 # To have PCRE boost regex with header only is integrated and not just the one from std
-!INCLUDE ../boostregex/nppSpecifics.mak
+!INCLUDE ../../boostregex/nppSpecifics.mak
 
 # Required by lexers
 LEXLIB_OBJS = \