diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -21,10 +21,10 @@
 #include <util/strencodings.h>
 #include <util/system.h>
 
-#include <boost/algorithm/string.hpp>
-
 #include <univalue.h>
 
+#include <boost/algorithm/string.hpp>
+
 #include <cstdio>
 #include <memory>
 
diff --git a/src/qt/rpcconsole.cpp b/src/qt/rpcconsole.cpp
--- a/src/qt/rpcconsole.cpp
+++ b/src/qt/rpcconsole.cpp
@@ -28,6 +28,8 @@
 #include <db_cxx.h>
 #endif
 
+#include <univalue.h>
+
 #include <QKeyEvent>
 #include <QMenu>
 #include <QMessageBox>
@@ -40,8 +42,6 @@
 #include <QTime>
 #include <QTimer>
 
-#include <univalue.h>
-
 // TODO: add a scrollback limit, as there is currently none
 // TODO: make it possible to filter out categories (esp debug messages when
 // implemented)
diff --git a/src/qt/test/apptests.cpp b/src/qt/test/apptests.cpp
--- a/src/qt/test/apptests.cpp
+++ b/src/qt/test/apptests.cpp
@@ -25,6 +25,8 @@
 
 #include <test/setup_common.h>
 
+#include <univalue.h>
+
 #include <QAction>
 #include <QEventLoop>
 #include <QLineEdit>
@@ -47,8 +49,6 @@
 #include <QtTest/QtTestGui>
 // clang-format on
 
-#include <univalue.h>
-
 #include <string>
 
 namespace {
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -16,11 +16,11 @@
 
 #include <test/setup_common.h>
 
+#include <univalue.h>
+
 #include <QDir>
 #include <QtGlobal>
 
-#include <univalue.h>
-
 static UniValue rpcNestedTest_rpc(const Config &config,
                                   const JSONRPCRequest &request) {
     if (request.fHelp) {
diff --git a/src/test/blockfilter_tests.cpp b/src/test/blockfilter_tests.cpp
--- a/src/test/blockfilter_tests.cpp
+++ b/src/test/blockfilter_tests.cpp
@@ -12,10 +12,10 @@
 #include <test/data/blockfilters.json.h>
 #include <test/setup_common.h>
 
-#include <boost/test/unit_test.hpp>
-
 #include <univalue.h>
 
+#include <boost/test/unit_test.hpp>
+
 BOOST_AUTO_TEST_SUITE(blockfilter_tests)
 
 BOOST_AUTO_TEST_CASE(gcsfilter_test) {