diff --git a/darwin/OLD_uipriv_darwin.h b/darwin/OLD_uipriv_darwin.h
index d7dd96ac..5c277669 100644
--- a/darwin/OLD_uipriv_darwin.h
+++ b/darwin/OLD_uipriv_darwin.h
@@ -1,10 +1,3 @@
-// window.m
-@interface libuiNSWindow : NSWindow
-- (void)libui_doMove:(NSEvent *)initialEvent;
-- (void)libui_doResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge;
-@end
-extern uiWindow *windowFromNSWindow(NSWindow *);
-
 // alloc.m
 extern NSMutableArray *delegates;
 extern void initAlloc(void);
diff --git a/darwin/area.m b/darwin/area.m
index 1442479a..1db9233e 100644
--- a/darwin/area.m
+++ b/darwin/area.m
@@ -409,26 +409,26 @@ void uiAreaScrollTo(uiArea *a, double x, double y, double width, double height)
 
 void uiAreaBeginUserWindowMove(uiArea *a)
 {
-	libuiNSWindow *w;
+	uiprivNSWindow *w;
 
-	w = (libuiNSWindow *) [a->area window];
+	w = (uiprivNSWindow *) [a->area window];
 	if (w == nil)
 		return;		// TODO
 	if (a->dragevent == nil)
 		return;		// TODO
-	[w libui_doMove:a->dragevent];
+	[w uiprivDoMove:a->dragevent];
 }
 
 void uiAreaBeginUserWindowResize(uiArea *a, uiWindowResizeEdge edge)
 {
-	libuiNSWindow *w;
+	uiprivNSWindow *w;
 
-	w = (libuiNSWindow *) [a->area window];
+	w = (uiprivNSWindow *) [a->area window];
 	if (w == nil)
 		return;		// TODO
 	if (a->dragevent == nil)
 		return;		// TODO
-	[w libui_doResize:a->dragevent on:edge];
+	[w uiprivDoResize:a->dragevent on:edge];
 }
 
 uiArea *uiNewArea(uiAreaHandler *ah)
diff --git a/darwin/menu.m b/darwin/menu.m
index 41d322d9..153255cd 100644
--- a/darwin/menu.m
+++ b/darwin/menu.m
@@ -66,7 +66,7 @@ static void mapItemReleaser(void *key, void *value)
 	if (item->type == typeCheckbox)
 		uiMenuItemSetChecked(item, !uiMenuItemChecked(item));
 	// use the key window as the source of the menu event; it's the active window
-	(*(item->onClicked))(item, windowFromNSWindow([uiprivNSApp() keyWindow]), item->onClickedData);
+	(*(item->onClicked))(item, uiprivWindowFromNSWindow([uiprivNSApp() keyWindow]), item->onClickedData);
 }
 
 - (IBAction)onQuitClicked:(id)sender
diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h
index a7438e42..17723511 100644
--- a/darwin/uipriv_darwin.h
+++ b/darwin/uipriv_darwin.h
@@ -75,4 +75,11 @@ extern void uiprivDisableAutocorrect(NSTextView *);
 extern void uiprivFinishNewTextField(NSTextField *, BOOL);
 extern NSTextField *uiprivNewEditableTextField(void);
 
+// window.m
+@interface uiprivNSWindow : NSWindow
+- (void)uiprivDoMove:(NSEvent *)initialEvent;
+- (void)uiprivDoResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge;
+@end
+extern uiWindow *uiprivWindowFromNSWindow(NSWindow *);
+
 #import "OLD_uipriv_darwin.h"
diff --git a/darwin/window.m b/darwin/window.m
index 340caab9..0ade558d 100644
--- a/darwin/window.m
+++ b/darwin/window.m
@@ -18,14 +18,14 @@ struct uiWindow {
 	int borderless;
 };
 
-@implementation libuiNSWindow
+@implementation uiprivNSWindow
 
-- (void)libui_doMove:(NSEvent *)initialEvent
+- (void)uiprivDoMove:(NSEvent *)initialEvent
 {
 	doManualMove(self, initialEvent);
 }
 
-- (void)libui_doResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge
+- (void)uiprivDoResize:(NSEvent *)initialEvent on:(uiWindowResizeEdge)edge
 {
 	doManualResize(self, initialEvent, edge);
 }
@@ -375,7 +375,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
 
 	uiDarwinNewControl(uiWindow, w);
 
-	w->window = [[libuiNSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
+	w->window = [[uiprivNSWindow alloc] initWithContentRect:NSMakeRect(0, 0, (CGFloat) width, (CGFloat) height)
 		styleMask:defaultStyleMask
 		backing:NSBackingStoreBuffered
 		defer:YES];
@@ -397,7 +397,7 @@ uiWindow *uiNewWindow(const char *title, int width, int height, int hasMenubar)
 }
 
 // utility function for menus
-uiWindow *windowFromNSWindow(NSWindow *w)
+uiWindow *uiprivWindowFromNSWindow(NSWindow *w)
 {
 	if (w == nil)
 		return NULL;