diff --git a/src/xtd.core/src/xtd/io/binary_reader.cpp b/src/xtd.core/src/xtd/io/binary_reader.cpp
index 984a7a89a010..fb9e40c9de04 100644
--- a/src/xtd.core/src/xtd/io/binary_reader.cpp
+++ b/src/xtd.core/src/xtd/io/binary_reader.cpp
@@ -1,10 +1,10 @@
-#include "../../../include/xtd/io/binary_reader"
-#include "../../../include/xtd/io/end_of_stream_exception"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/bit_converter"
+#include "../../../include/xtd/io/binary_reader.h"
+#include "../../../include/xtd/io/end_of_stream_exception.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/bit_converter.h"
 
 using namespace std;
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/binary_writer.cpp b/src/xtd.core/src/xtd/io/binary_writer.cpp
index b89345b4c9cf..f53f29f1c0b5 100644
--- a/src/xtd.core/src/xtd/io/binary_writer.cpp
+++ b/src/xtd.core/src/xtd/io/binary_writer.cpp
@@ -1,11 +1,11 @@
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/bit_converter"
-#include "../../../include/xtd/unauthorized_access_exception"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/binary_writer"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/bit_converter.h"
+#include "../../../include/xtd/unauthorized_access_exception.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/binary_writer.h"
 
 using namespace std;
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/directory.cpp b/src/xtd.core/src/xtd/io/directory.cpp
index b624cc60f7d2..787edbd13bc2 100644
--- a/src/xtd.core/src/xtd/io/directory.cpp
+++ b/src/xtd.core/src/xtd/io/directory.cpp
@@ -1,16 +1,16 @@
-#include "../../../include/xtd/io/directory"
-#include "../../../include/xtd/io/file_info"
-#include "../../../include/xtd/io/directory_info"
-#include "../../../include/xtd/io/directory_not_found_exception"
-#include "../../../include/xtd/io/drive_info"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/path_too_long_exception"
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/not_supported_exception"
-#include "../../../include/xtd/unauthorized_access_exception"
-#include "../../../include/xtd/diagnostics/debug"
+#include "../../../include/xtd/io/directory.h"
+#include "../../../include/xtd/io/file_info.h"
+#include "../../../include/xtd/io/directory_info.h"
+#include "../../../include/xtd/io/directory_not_found_exception.h"
+#include "../../../include/xtd/io/drive_info.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/path_too_long_exception.h"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/not_supported_exception.h"
+#include "../../../include/xtd/unauthorized_access_exception.h"
+#include "../../../include/xtd/diagnostics/debug.h"
 #include <algorithm>
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/directory>
diff --git a/src/xtd.core/src/xtd/io/directory_info.cpp b/src/xtd.core/src/xtd/io/directory_info.cpp
index 6c981177c137..1d405517feda 100644
--- a/src/xtd.core/src/xtd/io/directory_info.cpp
+++ b/src/xtd.core/src/xtd/io/directory_info.cpp
@@ -1,16 +1,16 @@
-#include "../../../include/xtd/io/directory"
-#include "../../../include/xtd/io/directory_info"
-#include "../../../include/xtd/io/directory_not_found_exception"
-#include "../../../include/xtd/io/file_attributes"
-#include "../../../include/xtd/io/file_info"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/path_too_long_exception"
-#include "../../../include/xtd/security/security_exception"
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/as"
-#include "../../../include/xtd/not_implemented_exception"
-#include "../../../include/xtd/unauthorized_access_exception"
+#include "../../../include/xtd/io/directory.h"
+#include "../../../include/xtd/io/directory_info.h"
+#include "../../../include/xtd/io/directory_not_found_exception.h"
+#include "../../../include/xtd/io/file_attributes.h"
+#include "../../../include/xtd/io/file_info.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/path_too_long_exception.h"
+#include "../../../include/xtd/security/security_exception.h"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/as.h"
+#include "../../../include/xtd/not_implemented_exception.h"
+#include "../../../include/xtd/unauthorized_access_exception.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/directory>
 #include <xtd/native/file_system>
diff --git a/src/xtd.core/src/xtd/io/drive_info.cpp b/src/xtd.core/src/xtd/io/drive_info.cpp
index 9c0dc76de820..7b7660fd3520 100644
--- a/src/xtd.core/src/xtd/io/drive_info.cpp
+++ b/src/xtd.core/src/xtd/io/drive_info.cpp
@@ -1,6 +1,6 @@
-#include "../../../include/xtd/io/drive_info"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/argument_exception"
+#include "../../../include/xtd/io/drive_info.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/argument_exception.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/drive>
 #undef __XTD_CORE_NATIVE_LIBRARY__
diff --git a/src/xtd.core/src/xtd/io/file.cpp b/src/xtd.core/src/xtd/io/file.cpp
index d0d18ef2dfa1..84683ba5c584 100644
--- a/src/xtd.core/src/xtd/io/file.cpp
+++ b/src/xtd.core/src/xtd/io/file.cpp
@@ -1,11 +1,11 @@
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/diagnostics/stack_frame"
-#include "../../../include/xtd/unauthorized_access_exception"
-#include "../../../include/xtd/io/directory"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/path_too_long_exception"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/diagnostics/stack_frame.h"
+#include "../../../include/xtd/unauthorized_access_exception.h"
+#include "../../../include/xtd/io/directory.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/path_too_long_exception.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/file>
 #include <xtd/native/file_system>
diff --git a/src/xtd.core/src/xtd/io/file_info.cpp b/src/xtd.core/src/xtd/io/file_info.cpp
index 92c041b3f94b..c10703686232 100644
--- a/src/xtd.core/src/xtd/io/file_info.cpp
+++ b/src/xtd.core/src/xtd/io/file_info.cpp
@@ -1,9 +1,9 @@
-#include "../../../include/xtd/io/file_info"
-#include "../../../include/xtd/io/file_attributes"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/directory_info"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/argument_exception"
+#include "../../../include/xtd/io/file_info.h"
+#include "../../../include/xtd/io/file_attributes.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/directory_info.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/argument_exception.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/file>
 #include <xtd/native/file_system>
diff --git a/src/xtd.core/src/xtd/io/file_system_info.cpp b/src/xtd.core/src/xtd/io/file_system_info.cpp
index a8beab488ea7..5c724327fc3a 100644
--- a/src/xtd.core/src/xtd/io/file_system_info.cpp
+++ b/src/xtd.core/src/xtd/io/file_system_info.cpp
@@ -1,9 +1,9 @@
-#include "../../../include/xtd/io/file_system_info"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/path_too_long_exception"
-#include "../../../include/xtd/as"
-#include "../../../include/xtd/platform_not_supported_exception"
+#include "../../../include/xtd/io/file_system_info.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/path_too_long_exception.h"
+#include "../../../include/xtd/as.h"
+#include "../../../include/xtd/platform_not_supported_exception.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/file_system>
 #undef __XTD_CORE_NATIVE_LIBRARY__
diff --git a/src/xtd.core/src/xtd/io/path.cpp b/src/xtd.core/src/xtd/io/path.cpp
index 1e62bc42f7c1..18654196ce33 100644
--- a/src/xtd.core/src/xtd/io/path.cpp
+++ b/src/xtd.core/src/xtd/io/path.cpp
@@ -1,8 +1,8 @@
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/drive_info"
-#include "../../../include/xtd/as"
-#include "../../../include/xtd/environment"
-#include "../../../include/xtd/random"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/drive_info.h"
+#include "../../../include/xtd/as.h"
+#include "../../../include/xtd/environment.h"
+#include "../../../include/xtd/random.h"
 #define __XTD_CORE_NATIVE_LIBRARY__
 #include <xtd/native/path>
 #include <xtd/native/file_system>
diff --git a/src/xtd.core/src/xtd/io/stream_reader.cpp b/src/xtd.core/src/xtd/io/stream_reader.cpp
index ffc24066aca7..aa810f5ae980 100644
--- a/src/xtd.core/src/xtd/io/stream_reader.cpp
+++ b/src/xtd.core/src/xtd/io/stream_reader.cpp
@@ -1,8 +1,8 @@
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/stream_reader"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/stream_reader.h"
 
 using namespace std;
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/stream_writer.cpp b/src/xtd.core/src/xtd/io/stream_writer.cpp
index 677f088628d8..cad604b10a59 100644
--- a/src/xtd.core/src/xtd/io/stream_writer.cpp
+++ b/src/xtd.core/src/xtd/io/stream_writer.cpp
@@ -1,11 +1,11 @@
-#include "../../../include/xtd/argument_exception"
-#include "../../../include/xtd/unauthorized_access_exception"
-#include "../../../include/xtd/io/io_exception"
-#include "../../../include/xtd/io/file_not_found_exception"
-#include "../../../include/xtd/io/file"
-#include "../../../include/xtd/io/path"
-#include "../../../include/xtd/io/stream_writer"
-#include "../../../include/xtd/diagnostics/debug"
+#include "../../../include/xtd/argument_exception.h"
+#include "../../../include/xtd/unauthorized_access_exception.h"
+#include "../../../include/xtd/io/io_exception.h"
+#include "../../../include/xtd/io/file_not_found_exception.h"
+#include "../../../include/xtd/io/file.h"
+#include "../../../include/xtd/io/path.h"
+#include "../../../include/xtd/io/stream_writer.h"
+#include "../../../include/xtd/diagnostics/debug.h"
 
 using namespace std;
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/string_reader.cpp b/src/xtd.core/src/xtd/io/string_reader.cpp
index cd4e08cd8b17..458e7b5aa007 100644
--- a/src/xtd.core/src/xtd/io/string_reader.cpp
+++ b/src/xtd.core/src/xtd/io/string_reader.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/xtd/io/string_reader"
+#include "../../../include/xtd/io/string_reader.h"
 
 using namespace std;
 using namespace xtd::io;
diff --git a/src/xtd.core/src/xtd/io/string_writer.cpp b/src/xtd.core/src/xtd/io/string_writer.cpp
index aa621bcb5159..a3a405e08492 100644
--- a/src/xtd.core/src/xtd/io/string_writer.cpp
+++ b/src/xtd.core/src/xtd/io/string_writer.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/xtd/io/string_writer"
+#include "../../../include/xtd/io/string_writer.h"
 
 using namespace std;
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/text_reader.cpp b/src/xtd.core/src/xtd/io/text_reader.cpp
index 270bb7d55871..258a65f9c3d0 100644
--- a/src/xtd.core/src/xtd/io/text_reader.cpp
+++ b/src/xtd.core/src/xtd/io/text_reader.cpp
@@ -1,5 +1,5 @@
-#include "../../../include/xtd/io/text_reader"
-#include "../../../include/xtd/argument_out_of_range_exception"
+#include "../../../include/xtd/io/text_reader.h"
+#include "../../../include/xtd/argument_out_of_range_exception.h"
 #include <mutex>
 
 using namespace xtd;
diff --git a/src/xtd.core/src/xtd/io/text_writer.cpp b/src/xtd.core/src/xtd/io/text_writer.cpp
index 8742611f6ffd..f8147585bd79 100644
--- a/src/xtd.core/src/xtd/io/text_writer.cpp
+++ b/src/xtd.core/src/xtd/io/text_writer.cpp
@@ -1,4 +1,4 @@
-#include "../../../include/xtd/io/text_writer"
+#include "../../../include/xtd/io/text_writer.h"
 #include <mutex>
 
 std::recursive_mutex __synchronized_text_writer_mutex__;