Cleaned #include directives so C standard library headers are sorted and so each source file only includes one header file. This makes things clenaer, and alos allows us to more properly strip unneeded headers later.

common/alloc.c

@@ -1,9 +1,4 @@
 // 16 may 2019
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "ui.h"
 #include "uipriv.h"
 
 #define sharedbitsPrefix uipriv

common/errors.c

@@ -1,7 +1,4 @@
 // 12 may 2019
-#include <stdarg.h>
-#include <stdio.h>
-#include "ui.h"
 #include "uipriv.h"
 #include "testhooks.h"
 

common/events.c

@@ -1,7 +1,4 @@
 // 15 may 2019
-#include <stdlib.h>
-#include <string.h>
-#include "ui.h"
 #include "uipriv.h"
 
 struct handler {

common/init.c

@@ -1,8 +1,4 @@
 // 19 april 2019
-#include <stdarg.h>
-#include <stdio.h>
-#include <string.h>
-#include "ui.h"
 #include "uipriv.h"
 
 // TODO rename this file to main.c

common/uipriv.h

@@ -1,6 +1,13 @@
 // 19 april 2019
-
+#include <errno.h>
 #include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "ui.h"
+#ifdef uiprivOSHeader
+#include uiprivOSHeader
+#endif
 
 #ifdef __cplusplus
 extern "C" {
@@ -31,6 +38,7 @@ extern bool uiprivSysCheckThread(void);
 
 // alloc.c
 #define sharedbitsPrefix uipriv
+// TODO determine if we need the ../ or not, and if not, figure out if we should use it everywhere (including ui.h) or not
 #include "../sharedbits/alloc_header.h"
 #include "../sharedbits/array_header.h"
 #define uiprivArrayStaticInit(T, grow, whatstr) { NULL, 0, 0, sizeof (T), grow, whatstr }

darwin/uipriv_darwin.h

@@ -6,8 +6,7 @@
 #import <dlfcn.h>		// see future.m
 #import <pthread.h>
 #import <stdlib.h>
-#import "../ui.h"
+#define uiprivOSHeader "../ui_darwin.h"
-#import "../ui_darwin.h"
 #import "../common/uipriv.h"
 
 #if __has_feature(objc_arc)

test/events.c

@@ -1,6 +1,4 @@
 // 18 may 2019
-#include <stdlib.h>
-#include <string.h>
 #include "test.h"
 
 // TODO:

test/initmain.c

@@ -1,7 +1,4 @@
 // 10 april 2019
-#include <inttypes.h>
-#include <string.h>
-#include "lib/thread.h"
 #include "test.h"
 
 testingSet *beforeTests = NULL;

test/main.c

@@ -1,6 +1,4 @@
 // 10 april 2019
-#include <stdio.h>
-#include <string.h>
 #include "test.h"
 
 void timeoutMain(void *data)

test/noinitwrongthread.c

@@ -1,9 +1,4 @@
 // 28 may 2019
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "lib/thread.h"
 #include "test.h"
 
 struct errorCase {

test/test.h

@@ -1,7 +1,13 @@
 // 28 april 2019
+#include <errno.h>
+#include <inttypes.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include "../ui.h"
 #include "../common/testhooks.h"
 #include "lib/testing.h"
+#include "lib/thread.h"
 #include "lib/timer.h"
 
 #define diff(t, clause, fmt, got, want) testingTErrorf(t, "%s:\ngot  " fmt "\nwant " fmt, clause, got, want)

unix/uipriv_unix.h

@@ -5,12 +5,11 @@
 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_10
 #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_10
 #include <gtk/gtk.h>
-#include <math.h>
 #include <dlfcn.h>		// see future.c
 #include <langinfo.h>
+#include <inttypes.h>
+#include <math.h>
 #include <string.h>
 #include <stdlib.h>
-#include <inttypes.h>
+#define uiprivOSHeader "../ui_unix.h"
-#include "../ui.h"
-#include "../ui_unix.h"
 #include "../common/uipriv.h"

windows/uipriv_windows.hpp

@@ -1,8 +1,7 @@
 // 21 april 2016
 #include "winapi.hpp"
 #include "winhresult.hpp"
-#include "../ui.h"
+#define uiprivOSHeader "../ui_windows.h"
-#include "../ui_windows.h"
 #include "../common/uipriv.h"
 //TODO#include "compilerver.hpp"