9 files changed, 18 insertions, 19 deletions
diff --git a/tests/unit/plugins/irc/test-irc-buffer.cpp b/tests/unit/plugins/irc/test-irc-buffer.cpp
index 46e5554a7..b0fd9472e 100644
--- a/tests/unit/plugins/irc/test-irc-buffer.cpp
+++ b/tests/unit/plugins/irc/test-irc-buffer.cpp
@@ -21,9 +21,10 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
-#include "tests/tests.h"
 #include "src/plugins/irc/irc-buffer.h"
 }
 
diff --git a/tests/unit/plugins/irc/test-irc-message.cpp b/tests/unit/plugins/irc/test-irc-message.cpp
index 774715311..ad469d46f 100644
--- a/tests/unit/plugins/irc/test-irc-message.cpp
+++ b/tests/unit/plugins/irc/test-irc-message.cpp
@@ -21,10 +21,11 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include "string.h"
-#include "tests/tests.h"
 #include "src/core/wee-config-file.h"
 #include "src/core/wee-hashtable.h"
 #include "src/core/wee-hook.h"
diff --git a/tests/unit/plugins/irc/test-irc-protocol.cpp b/tests/unit/plugins/irc/test-irc-protocol.cpp
index 3dd718726..ef269e2d6 100644
--- a/tests/unit/plugins/irc/test-irc-protocol.cpp
+++ b/tests/unit/plugins/irc/test-irc-protocol.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include <stdio.h>
@@ -54,8 +56,6 @@ extern char *irc_protocol_cap_to_enable (const char *capabilities,
                                          int sasl_requested);
 }
 
-#include "tests/tests.h"
-
 #define IRC_FAKE_SERVER "fake"
 #define IRC_MSG_005 "PREFIX=(ohv)@%+ MAXLIST=bqeI:100 MODES=4 "         \
     "NETWORK=StaticBox STATUSMSG=@+ CALLERID=g "                        \
diff --git a/tests/unit/plugins/irc/test-irc-server.cpp b/tests/unit/plugins/irc/test-irc-server.cpp
index d187b252d..3932bf9e3 100644
--- a/tests/unit/plugins/irc/test-irc-server.cpp
+++ b/tests/unit/plugins/irc/test-irc-server.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include <stdio.h>
@@ -31,8 +33,6 @@ extern "C"
 extern char *irc_server_build_autojoin (struct t_irc_server *server);
 }
 
-#include "tests/tests.h"
-
 #define IRC_FAKE_SERVER "fake"
 
 TEST_GROUP(IrcServer)
diff --git a/tests/unit/plugins/logger/test-logger-backlog.cpp b/tests/unit/plugins/logger/test-logger-backlog.cpp
index 2139f5f99..e81d1897f 100644
--- a/tests/unit/plugins/logger/test-logger-backlog.cpp
+++ b/tests/unit/plugins/logger/test-logger-backlog.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include <stdio.h>
@@ -34,9 +36,6 @@ extern void logger_backlog_display_line (struct t_gui_buffer *buffer,
                                          const char *line);
 }
 
-#include "tests/tests.h"
-
-
 TEST_GROUP(LoggerBacklog)
 {
 };
diff --git a/tests/unit/plugins/trigger/test-trigger-config.cpp b/tests/unit/plugins/trigger/test-trigger-config.cpp
index d7827dc10..44a79689b 100644
--- a/tests/unit/plugins/trigger/test-trigger-config.cpp
+++ b/tests/unit/plugins/trigger/test-trigger-config.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include <stdio.h>
@@ -28,8 +30,6 @@ extern "C"
 #include "src/plugins/trigger/trigger.h"
 }
 
-#include "tests/tests.h"
-
 #define WEE_CHECK_MODIFIER(__result, __modifier, __string)              \
     WEE_TEST_STR(                                                       \
         __result,                                                       \
diff --git a/tests/unit/plugins/trigger/test-trigger.cpp b/tests/unit/plugins/trigger/test-trigger.cpp
index dd1dbf514..12617d43c 100644
--- a/tests/unit/plugins/trigger/test-trigger.cpp
+++ b/tests/unit/plugins/trigger/test-trigger.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include <stdio.h>
@@ -30,8 +32,6 @@ extern "C"
 #include "src/plugins/trigger/trigger.h"
 }
 
-#include "tests/tests.h"
-
 #define WEE_CHECK_REGEX_SPLIT(__rc, __ret_regex_count, __str_regex)     \
     trigger_regex_free (&regex_count, &regex);                          \
     LONGS_EQUAL(__rc, trigger_regex_split (__str_regex,                 \
diff --git a/tests/unit/plugins/typing/test-typing-status.cpp b/tests/unit/plugins/typing/test-typing-status.cpp
index 5b08d72b3..ea3911f8a 100644
--- a/tests/unit/plugins/typing/test-typing-status.cpp
+++ b/tests/unit/plugins/typing/test-typing-status.cpp
@@ -21,6 +21,8 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include "src/core/wee-hashtable.h"
@@ -28,9 +30,6 @@ extern "C"
 #include "src/plugins/typing/typing-status.h"
 }
 
-#include "tests/tests.h"
-
-
 TEST_GROUP(TypingStatus)
 {
 };
diff --git a/tests/unit/plugins/typing/test-typing.cpp b/tests/unit/plugins/typing/test-typing.cpp
index 33d99cd69..805729858 100644
--- a/tests/unit/plugins/typing/test-typing.cpp
+++ b/tests/unit/plugins/typing/test-typing.cpp
@@ -21,14 +21,13 @@
 
 #include "CppUTest/TestHarness.h"
 
+#include "tests/tests.h"
+
 extern "C"
 {
 #include "src/plugins/typing/typing.h"
 }
 
-#include "tests/tests.h"
-
-
 TEST_GROUP(Typing)
 {
 };