Included testhooks.h from uipriv.h and test.h, to make things easier to write (we won't have to keep remembering to include it in every file) and to clean up (ditto, but for removal).

common/controls.c

@@ -1,6 +1,5 @@
 // 8 june 2019
 #include "uipriv.h"
-#include "testhooks.h"
 
 struct controlType {
 	uint32_t id;

common/errors.c

@@ -1,6 +1,5 @@
 // 12 may 2019
 #include "uipriv.h"
-#include "testhooks.h"
 
 #define internalErrorPrefix "libui internal error"
 // TODO add debugging advice?

common/main.c

@@ -1,6 +1,5 @@
 // 19 april 2019
 #include "uipriv.h"
-#include "testhooks.h"
 
 enum {
 	stateUninitialized,

common/uipriv.h

@@ -9,6 +9,7 @@
 #ifdef uiprivOSHeader
 #include uiprivOSHeader
 #endif
+#include "testhooks.h"
 
 #ifdef __cplusplus
 extern "C" {

test/controls.c

@@ -1,6 +1,5 @@
 // 8 june 2019
 #include "test.h"
-#include "../common/testhooks.h"
 
 static bool vtableNopInit(uiControl *c, void *implData, void *initData)
 {

test/errors.c

@@ -1,7 +1,6 @@
 // 28 may 2019
 #include "test.h"
 #include "thread.h"
-#include "../common/testhooks.h"
 
 // Do not put any test cases in this file; they will not be run.
 

test/initmain.c

@@ -1,7 +1,6 @@
 // 10 april 2019
 #include "test.h"
 #include "thread.h"
-#include "../common/testhooks.h"
 
 static void testImplInitFailureFull(const char *file, long line)
 {

test/test.h

@@ -11,6 +11,7 @@
 #ifdef libuiOSHeader
 #include libuiOSHeader
 #endif
+#include "../common/testhooks.h"
 
 #ifdef __cplusplus
 extern "C" {