diff --git a/new/uipriv_darwin.h b/new/darwin/uipriv_darwin.h
similarity index 95%
rename from new/uipriv_darwin.h
rename to new/darwin/uipriv_darwin.h
index 8516e9a..36de1f1 100644
--- a/new/uipriv_darwin.h
+++ b/new/darwin/uipriv_darwin.h
@@ -2,8 +2,8 @@
 #define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_7
 #define MAC_OS_X_VERSION_MAX_ALLOWED MAC_OS_X_VERSION_10_7
 #import <Cocoa/Cocoa.h>
-#import "uipriv.h"
-#import "ui_darwin.h"
+#import "../uipriv.h"
+#import "../ui_darwin.h"
 
 #define toNSString(str) [NSString stringWithUTF8String:(str)]
 #define fromNSString(str) [(str) UTF8String]
diff --git a/new/uipriv_unix.h b/new/unix/uipriv_unix.h
similarity index 85%
rename from new/uipriv_unix.h
rename to new/unix/uipriv_unix.h
index 1af388b..2178ab0 100644
--- a/new/uipriv_unix.h
+++ b/new/unix/uipriv_unix.h
@@ -4,8 +4,8 @@
 #define GDK_VERSION_MIN_REQUIRED GDK_VERSION_3_4
 #define GDK_VERSION_MAX_ALLOWED GDK_VERSION_3_4
 #include <gtk/gtk.h>
-#include "uipriv.h"
-#include "ui_unix.h"
+#include "../uipriv.h"
+#include "../ui_unix.h"
 
 #define gtkXMargin 12
 #define gtkYMargin 12
diff --git a/new/uipriv_windows.h b/new/windows/uipriv_windows.h
similarity index 97%
rename from new/uipriv_windows.h
rename to new/windows/uipriv_windows.h
index 9d3d276..4ba0f5a 100644
--- a/new/uipriv_windows.h
+++ b/new/windows/uipriv_windows.h
@@ -25,8 +25,8 @@
 #include <stdarg.h>
 #include <oleacc.h>
 #include <stdio.h>
-#include "uipriv.h"
-#include "ui_windows.h"
+#include "../uipriv.h"
+#include "../ui_windows.h"
 
 // ui internal window messages
 enum {