Perhaps this is the permutation of headers that will please everything

src/test/test_tortls.c

@@ -9,11 +9,6 @@
 #include <winsock2.h>
 #endif
 
-#include "or.h"
-#include "torlog.h"
-#include "config.h"
-#include "tortls.h"
-
 #ifdef __GNUC__
 #define GCC_VERSION (__GNUC__ * 100 + __GNUC_MINOR__)
 #endif
@@ -42,6 +37,11 @@
 #endif
 #endif
 
+#include "or.h"
+#include "torlog.h"
+#include "config.h"
+#include "tortls.h"
+
 #include "test.h"
 #include "log_test_helpers.h"
 #define NS_MODULE tortls