Merge pull request #2124 from matt335672/fedora_check

Fix problems with check 0.15.2 (F36)

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

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)

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;

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 "."

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;