Moved all the common stuff in a new folder common/. This is part of the makefile simplification.

common/areaevents.c

@@ -1,5 +1,5 @@
 // 29 march 2014
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 /*

common/control.c

@@ -1,5 +1,5 @@
 // 26 may 2015
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 struct controlBase {

common/matrix.c

@@ -1,6 +1,6 @@
 // 11 october 2015
 #include <math.h>
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 void setIdentity(uiDrawMatrix *m)

common/menu.c

@@ -1,5 +1,5 @@
 // 29 may 2015
-#include "ui.h"
+#include "../ui.h"
 
 static uintmax_t type_uiMenu = 0;
 static uintmax_t type_uiMenuItem = 0;

common/ptrarray.c

@@ -1,6 +1,6 @@
 // 5 may 2015
 #include <string.h>
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 struct ptrArray *newPtrArray(void)

common/shouldquit.c

@@ -1,5 +1,5 @@
 // 9 may 2015
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 static int defaultOnShouldQuit(void *data)

common/types.c

@@ -1,5 +1,5 @@
 // 17 may 2015
-#include "ui.h"
+#include "../ui.h"
 #include "uipriv.h"
 
 struct typeinfo {

darwin/uipriv_darwin.h

@@ -4,7 +4,7 @@
 #import <Cocoa/Cocoa.h>
 #import "../ui.h"
 #import "../ui_darwin.h"
-#import "../uipriv.h"
+#import "../common/uipriv.h"
 
 #define toNSString(str) [NSString stringWithUTF8String:(str)]
 #define fromNSString(str) [(str) UTF8String]

unix/uipriv_unix.h

@@ -9,7 +9,7 @@
 #include <gtk/gtk.h>
 #include "../ui.h"
 #include "../ui_unix.h"
-#include "../uipriv.h"
+#include "../common/uipriv.h"
 
 #define gtkXMargin 12
 #define gtkYMargin 12

windows/uipriv_windows.h

@@ -2,7 +2,7 @@
 #include "winapi.h"
 #include "../ui.h"
 #include "../ui_windows.h"
-#include "../uipriv.h"
+#include "../common/uipriv.h"
 #include "resources.h"
 #include "compilerver.h"