diff --git a/worker/.clang-format b/worker/.clang-format
index 8e9955b0d2..e4b051bfbe 100644
--- a/worker/.clang-format
+++ b/worker/.clang-format
@@ -53,7 +53,7 @@ IncludeCategories:
     Priority: 3
   - Regex:    '"*"'
     Priority: 2
-  - Regex:    '^<(json|uv|openssl|srtp|usrsctp|libwebrtc)(.|/)'
+  - Regex:    '^<(flatbuffers|uv|openssl|srtp|usrsctp|libwebrtc)(.|/)'
     Priority: 4
   - Regex:    '<*>'
     Priority: 5
diff --git a/worker/include/Channel/ChannelRequest.hpp b/worker/include/Channel/ChannelRequest.hpp
index 0351204362..96f960f7d4 100644
--- a/worker/include/Channel/ChannelRequest.hpp
+++ b/worker/include/Channel/ChannelRequest.hpp
@@ -5,8 +5,8 @@
 #include "FBS/message.h"
 #include "FBS/request.h"
 #include "FBS/response.h"
-#include <absl/container/flat_hash_map.h>
 #include <flatbuffers/minireflect.h>
+#include <absl/container/flat_hash_map.h>
 #include <string>
 
 namespace Channel
diff --git a/worker/include/RTC/RtpPacket.hpp b/worker/include/RTC/RtpPacket.hpp
index 47a1dfc71d..0f555c4320 100644
--- a/worker/include/RTC/RtpPacket.hpp
+++ b/worker/include/RTC/RtpPacket.hpp
@@ -6,9 +6,9 @@
 #include "FBS/rtpPacket.h"
 #include "RTC/Codecs/PayloadDescriptorHandler.hpp"
 #include "RTC/RtcLogger.hpp"
+#include <flatbuffers/flatbuffers.h>
 #include <absl/container/flat_hash_map.h>
 #include <array>
-#include <flatbuffers/flatbuffers.h>
 #include <string>
 #include <vector>
 
diff --git a/worker/include/RTC/WebRtcServer.hpp b/worker/include/RTC/WebRtcServer.hpp
index d14b240b4e..8fede51c82 100644
--- a/worker/include/RTC/WebRtcServer.hpp
+++ b/worker/include/RTC/WebRtcServer.hpp
@@ -10,9 +10,9 @@
 #include "RTC/TransportTuple.hpp"
 #include "RTC/UdpSocket.hpp"
 #include "RTC/WebRtcTransport.hpp"
+#include <flatbuffers/flatbuffers.h>
 #include <absl/container/flat_hash_map.h>
 #include <absl/container/flat_hash_set.h>
-#include <flatbuffers/flatbuffers.h>
 #include <string>
 #include <vector>
 
diff --git a/worker/include/Worker.hpp b/worker/include/Worker.hpp
index b5d5b79024..9bb91b8fed 100644
--- a/worker/include/Worker.hpp
+++ b/worker/include/Worker.hpp
@@ -9,8 +9,8 @@
 #include "RTC/Shared.hpp"
 #include "RTC/WebRtcServer.hpp"
 #include "handles/SignalHandle.hpp"
-#include <absl/container/flat_hash_map.h>
 #include <flatbuffers/flatbuffer_builder.h>
+#include <absl/container/flat_hash_map.h>
 #include <string>
 
 class Worker : public Channel::ChannelSocket::Listener,
diff --git a/worker/src/RTC/RtpPacket.cpp b/worker/src/RTC/RtpPacket.cpp
index 94d197ab11..dae9b41e10 100644
--- a/worker/src/RTC/RtpPacket.cpp
+++ b/worker/src/RTC/RtpPacket.cpp
@@ -1,9 +1,9 @@
 #define MS_CLASS "RTC::RtpPacket"
 // #define MS_LOG_DEV_LEVEL 3
 
+#include "RTC/RtpPacket.hpp"
 #include "DepLibUV.hpp"
 #include "Logger.hpp"
-#include "RTC/RtpPacket.hpp"
 #include <cstring>  // std::memcpy(), std::memmove(), std::memset()
 #include <iterator> // std::ostream_iterator
 #include <sstream>  // std::ostringstream
diff --git a/worker/src/Settings.cpp b/worker/src/Settings.cpp
index c890b7361c..41a91f1592 100644
--- a/worker/src/Settings.cpp
+++ b/worker/src/Settings.cpp
@@ -5,8 +5,8 @@
 #include "Logger.hpp"
 #include "MediaSoupErrors.hpp"
 #include "Utils.hpp"
-#include <cctype> // isprint()
 #include <flatbuffers/flatbuffers.h>
+#include <cctype>   // isprint()
 #include <iterator> // std::ostream_iterator
 #include <mutex>
 #include <sstream> // std::ostringstream