diff --git a/autogit/include/watchman/linux/linux_watchman.hpp b/autogit/include/watchman/linux/linux_watchman.hpp
index 55b48ad6a..8aa37d522 100644
--- a/autogit/include/watchman/linux/linux_watchman.hpp
+++ b/autogit/include/watchman/linux/linux_watchman.hpp
@@ -11,6 +11,13 @@
 
 #pragma once
 
+#include <type_traits>
+#include <utility>
+#include <string>
+#include <string_view>
+#include <array>
+#include <memory>
+
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/posix/stream_descriptor.hpp>
@@ -20,13 +27,6 @@
 #include <boost/bimap.hpp>
 #include <boost/throw_exception.hpp>
 
-#include <type_traits>
-#include <utility>
-#include <string>
-#include <string_view>
-#include <array>
-#include <memory>
-
 #include <sys/inotify.h>
 
 #include "watchman/notify_event.hpp"
diff --git a/autogit/include/watchman/notify_event.hpp b/autogit/include/watchman/notify_event.hpp
index 19883368a..0826cf0d5 100644
--- a/autogit/include/watchman/notify_event.hpp
+++ b/autogit/include/watchman/notify_event.hpp
@@ -11,8 +11,8 @@
 
 #pragma once
 
-#include <boost/filesystem.hpp>
 #include <vector>
+#include <boost/filesystem.hpp>
 
 namespace watchman {
 	namespace fs = boost::filesystem;
diff --git a/autogit/include/watchman/windows/windows_watchman.hpp b/autogit/include/watchman/windows/windows_watchman.hpp
index 3b1d0cda5..a039dadab 100644
--- a/autogit/include/watchman/windows/windows_watchman.hpp
+++ b/autogit/include/watchman/windows/windows_watchman.hpp
@@ -11,6 +11,12 @@
 
 #pragma once
 
+#include <type_traits>
+#include <utility>
+#include <string>
+#include <string_view>
+#include <memory>
+
 #include <boost/asio/any_io_executor.hpp>
 #include <boost/asio/async_result.hpp>
 #include <boost/asio/associated_cancellation_slot.hpp>
@@ -21,12 +27,6 @@
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_error.hpp>
 
-#include <type_traits>
-#include <utility>
-#include <string>
-#include <string_view>
-#include <memory>
-
 #ifndef WIN32_LEAN_AND_MEAN
 # define WIN32_LEAN_AND_MEAN
 #endif // !WIN32_LEAN_AND_MEAN