From 3146e624c40143ba7f442c7241162505ba08ce03 Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Wed, 19 Jan 2022 11:08:13 +0000
Subject: [PATCH] Fix problems with check 0.15.2 (F36)

---
 tests/common/test_os_calls.c            | 3 ++-
 tests/common/test_string_calls.c        | 3 ++-
 tests/libxrdp/test_monitor_processing.c | 3 ++-
 tests/xrdp/test_bitmap_load.c           | 3 ++-
 tests/xrdp/test_xrdp_main.c             | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/tests/common/test_os_calls.c b/tests/common/test_os_calls.c
index 1c518e1d..ac785715 100644
--- a/tests/common/test_os_calls.c
+++ b/tests/common/test_os_calls.c
@@ -4,9 +4,10 @@
 #endif
 
 #include <stdlib.h>
-#include "test_common.h"
 #include "os_calls.h"
 
+#include "test_common.h"
+
 #ifndef TOP_SRCDIR
 #define TOP_SRCDIR "."
 #endif
diff --git a/tests/common/test_string_calls.c b/tests/common/test_string_calls.c
index 58dcaea0..1380357c 100644
--- a/tests/common/test_string_calls.c
+++ b/tests/common/test_string_calls.c
@@ -3,9 +3,10 @@
 #include "config_ac.h"
 #endif
 
-#include "test_common.h"
 #include "string_calls.h"
 
+#include "test_common.h"
+
 #define RESULT_LEN 1024
 
 START_TEST(test_strnjoin__when_src_is_null__returns_empty_string)
diff --git a/tests/libxrdp/test_monitor_processing.c b/tests/libxrdp/test_monitor_processing.c
index 969da780..951ffe68 100644
--- a/tests/libxrdp/test_monitor_processing.c
+++ b/tests/libxrdp/test_monitor_processing.c
@@ -2,10 +2,11 @@
 #include "config_ac.h"
 #endif
 
-#include "test_libxrdp.h"
 #include "libxrdp.h"
 #include "os_calls.h"
 
+#include "test_libxrdp.h"
+
 struct xrdp_sec *sec_layer;
 struct xrdp_rdp *rdp_layer;
 struct xrdp_session *session;
diff --git a/tests/xrdp/test_bitmap_load.c b/tests/xrdp/test_bitmap_load.c
index 42b5a325..5c25504e 100644
--- a/tests/xrdp/test_bitmap_load.c
+++ b/tests/xrdp/test_bitmap_load.c
@@ -2,9 +2,10 @@
 #include "config_ac.h"
 #endif
 
-#include "test_xrdp.h"
 #include "xrdp.h"
 
+#include "test_xrdp.h"
+
 /* Where the image files are located */
 #ifndef IMAGEDIR
 #define IMAGEDIR "."
diff --git a/tests/xrdp/test_xrdp_main.c b/tests/xrdp/test_xrdp_main.c
index eb118a1e..d56dcb37 100644
--- a/tests/xrdp/test_xrdp_main.c
+++ b/tests/xrdp/test_xrdp_main.c
@@ -33,9 +33,10 @@
 
 #include "log.h"
 #include "os_calls.h"
-#include "test_xrdp.h"
 #include <stdlib.h>
 
+#include "test_xrdp.h"
+
 int main (void)
 {
     int number_failed;