diff --git a/src/xtd.core/CMakeLists.txt b/src/xtd.core/CMakeLists.txt
index efad4e8473b..9700a05dc68 100644
--- a/src/xtd.core/CMakeLists.txt
+++ b/src/xtd.core/CMakeLists.txt
@@ -34,7 +34,7 @@ add_sources(
   include/xtd/arithmetic_exception
   include/xtd/array.h
   include/xtd/array
-  include/xtd/array.hpp
+  include/xtd/array_.h
   include/xtd/array_1.h
   include/xtd/array_2.h
   include/xtd/array_3.h
@@ -55,7 +55,7 @@ add_sources(
   include/xtd/basic_array.h
   include/xtd/basic_string.h
   include/xtd/basic_string
-  include/xtd/basic_string.hpp
+  include/xtd/basic_string_.h
   include/xtd/beep.h
   include/xtd/beep
   include/xtd/bit_converter.h
diff --git a/src/xtd.core/include/xtd/array.h b/src/xtd.core/include/xtd/array.h
index 1a824575335..f584ce2f969 100644
--- a/src/xtd.core/include/xtd/array.h
+++ b/src/xtd.core/include/xtd/array.h
@@ -105,5 +105,5 @@ namespace xtd {
 #include "array_2.h"
 #include "array_3.h"
 #include "array_static.h"
-#include "array.hpp"
+#include "array_.h"
 #undef __XTD_ARRAY_INTERNAL__
diff --git a/src/xtd.core/include/xtd/array.hpp b/src/xtd.core/include/xtd/array_.h
similarity index 100%
rename from src/xtd.core/include/xtd/array.hpp
rename to src/xtd.core/include/xtd/array_.h
diff --git a/src/xtd.core/include/xtd/basic_string.h b/src/xtd.core/include/xtd/basic_string.h
index e43b6c31ebc..65d0eb8705d 100644
--- a/src/xtd.core/include/xtd/basic_string.h
+++ b/src/xtd.core/include/xtd/basic_string.h
@@ -3718,5 +3718,5 @@ namespace xtd {
 }
 
 #define __XTD_BASIC_STRING_INTERNAL__
-#include "basic_string.hpp"
+#include "basic_string_.h"
 #undef __XTD_BASIC_STRING_INTERNAL__
diff --git a/src/xtd.core/include/xtd/basic_string.hpp b/src/xtd.core/include/xtd/basic_string_.h
similarity index 100%
rename from src/xtd.core/include/xtd/basic_string.hpp
rename to src/xtd.core/include/xtd/basic_string_.h
diff --git a/src/xtd.forms.native.wxwidgets/CMakeLists.txt b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
index 5472a0a7f25..98b1225853b 100644
--- a/src/xtd.forms.native.wxwidgets/CMakeLists.txt
+++ b/src/xtd.forms.native.wxwidgets/CMakeLists.txt
@@ -26,7 +26,7 @@ add_sources(
   include/xtd/forms/native/wxwidgets/control_handler
   include/xtd/forms/native/wxwidgets/control_wrapper.h
   include/xtd/forms/native/wxwidgets/control_wrapper
-  include/xtd/forms/native/wxwidgets/control_wrapper.hpp
+  include/xtd/forms/native/wxwidgets/control_wrapper_.h
   include/xtd/forms/native/wxwidgets/dark_mode.h
   include/xtd/forms/native/wxwidgets/dark_mode
   include/xtd/forms/native/wxwidgets/iwx_evt.h
diff --git a/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_handler.h b/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_handler.h
index a2abd895014..b70bd2fb08b 100644
--- a/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_handler.h
+++ b/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_handler.h
@@ -158,4 +158,4 @@ namespace xtd {
   }
 }
 
-#include "control_wrapper.hpp"
+#include "control_wrapper_.h"
diff --git a/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_wrapper.hpp b/src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_wrapper_.h
similarity index 100%
rename from src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_wrapper.hpp
rename to src/xtd.forms.native.wxwidgets/include/xtd/forms/native/wxwidgets/control_wrapper_.h