diff --git a/.clang-format b/.clang-format
index 11b8857a..a98456fe 100644
--- a/.clang-format
+++ b/.clang-format
@@ -21,11 +21,17 @@ NamespaceIndentation: All
 #IncludeBlocks: Regroup
 IncludeCategories:
   - Regex: '^(<|")(common.hpp|strings.hpp|version.hpp|obs.h)("|>)'
-    Priority: 0
+    Priority: 100
+  - Regex: '^<obs-'
+    Priority: 150
   - Regex: '^<'
-    Priority: 10
+    Priority: 200
+  - Regex: '^<Q'
+    Priority: 250
   - Regex: '^"'
-    Priority: 20
+    Priority: 300
+  - Regex: '.moc"$'
+    Priority: 300
 SortIncludes: true
  
 # Alignment
diff --git a/source/encoders/ffmpeg-encoder.cpp b/source/encoders/ffmpeg-encoder.cpp
index 9f981666..d53a7dd5 100644
--- a/source/encoders/ffmpeg-encoder.cpp
+++ b/source/encoders/ffmpeg-encoder.cpp
@@ -35,12 +35,12 @@
 extern "C" {
 #pragma warning(push)
 #pragma warning(disable : 4244)
+#include <obs-avc.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/dict.h>
 #include <libavutil/frame.h>
 #include <libavutil/opt.h>
 #include <libavutil/pixdesc.h>
-#include <obs-avc.h>
 #pragma warning(pop)
 }
 
diff --git a/source/encoders/ffmpeg-encoder.hpp b/source/encoders/ffmpeg-encoder.hpp
index 727637f3..be8513f8 100644
--- a/source/encoders/ffmpeg-encoder.hpp
+++ b/source/encoders/ffmpeg-encoder.hpp
@@ -38,9 +38,9 @@ extern "C" {
 #pragma warning(push)
 #pragma warning(disable : 4242 4244 4365)
 #endif
+#include <obs-properties.h>
 #include <libavcodec/avcodec.h>
 #include <libavutil/frame.h>
-#include <obs-properties.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/source/encoders/handlers/nvenc_h264_handler.cpp b/source/encoders/handlers/nvenc_h264_handler.cpp
index 41023c9c..b6be1c79 100644
--- a/source/encoders/handlers/nvenc_h264_handler.cpp
+++ b/source/encoders/handlers/nvenc_h264_handler.cpp
@@ -33,8 +33,8 @@ extern "C" {
 #pragma warning(push)
 #pragma warning(disable : 4242 4244 4365)
 #endif
-#include <libavutil/opt.h>
 #include <obs-module.h>
+#include <libavutil/opt.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
diff --git a/source/transitions/transition-shader.cpp b/source/transitions/transition-shader.cpp
index b4ec6fb6..cb8ad2df 100644
--- a/source/transitions/transition-shader.cpp
+++ b/source/transitions/transition-shader.cpp
@@ -17,9 +17,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
+#include "transition-shader.hpp"
 #include "strings.hpp"
 #include <stdexcept>
-#include "transition-shader.hpp"
 #include "utility.hpp"
 
 #define ST "Transition.Shader"