diff --git a/darwin/OLD_uipriv_darwin.h b/darwin/OLD_uipriv_darwin.h
index 998ab36c..299db15b 100644
--- a/darwin/OLD_uipriv_darwin.h
+++ b/darwin/OLD_uipriv_darwin.h
@@ -1,15 +1,3 @@
-// draw.m
-extern uiDrawContext *newContext(CGContextRef, CGFloat);
-extern void freeContext(uiDrawContext *);
-
-// fontbutton.m
-extern BOOL uiprivFontButtonInhibitSendAction(SEL sel, id from, id to);
-extern BOOL uiprivFontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override);
-extern void uiprivSetupFontPanel(void);
-
-// colorbutton.m
-extern BOOL colorButtonInhibitSendAction(SEL sel, id from, id to);
-
 // scrollview.m
 struct scrollViewCreateParams {
 	NSView *DocumentView;
diff --git a/darwin/area.m b/darwin/area.m
index 5705c896..f4c2b897 100644
--- a/darwin/area.m
+++ b/darwin/area.m
@@ -57,7 +57,7 @@ struct uiArea {
 
 	c = (CGContextRef) [[NSGraphicsContext currentContext] graphicsPort];
 	// see draw.m under text for why we need the height
-	dp.Context = newContext(c, [self bounds].size.height);
+	dp.Context = uiprivDrawNewContext(c, [self bounds].size.height);
 
 	dp.AreaWidth = 0;
 	dp.AreaHeight = 0;
@@ -74,7 +74,7 @@ struct uiArea {
 	// no need to save or restore the graphics state to reset transformations; Cocoa creates a brand-new context each time
 	(*(a->ah->Draw))(a->ah, a, &dp);
 
-	freeContext(dp.Context);
+	uiprivDrawFreeContext(dp.Context);
 }
 
 - (BOOL)isFlipped
diff --git a/darwin/colorbutton.m b/darwin/colorbutton.m
index 83b61571..f2bee775 100644
--- a/darwin/colorbutton.m
+++ b/darwin/colorbutton.m
@@ -117,7 +117,7 @@ uiDarwinControlAllDefaults(uiColorButton, button)
 
 // we do not want color change events to be sent to any controls other than the color buttons
 // see main.m for more details
-BOOL colorButtonInhibitSendAction(SEL sel, id from, id to)
+BOOL uiprivColorButtonInhibitSendAction(SEL sel, id from, id to)
 {
 	if (sel != @selector(changeColor:))
 		return NO;
diff --git a/darwin/draw.m b/darwin/draw.m
index cf7d8f13..e54ecdd4 100644
--- a/darwin/draw.m
+++ b/darwin/draw.m
@@ -104,7 +104,7 @@ void uiDrawPathEnd(uiDrawPath *p)
 	p->ended = TRUE;
 }
 
-uiDrawContext *newContext(CGContextRef ctxt, CGFloat height)
+uiDrawContext *uiprivDrawNewContext(CGContextRef ctxt, CGFloat height)
 {
 	uiDrawContext *c;
 
@@ -114,7 +114,7 @@ uiDrawContext *newContext(CGContextRef ctxt, CGFloat height)
 	return c;
 }
 
-void freeContext(uiDrawContext *c)
+void uiprivDrawFreeContext(uiDrawContext *c)
 {
 	uiprivFree(c);
 }
diff --git a/darwin/main.m b/darwin/main.m
index 4c930dae..bf40e61e 100644
--- a/darwin/main.m
+++ b/darwin/main.m
@@ -25,7 +25,7 @@ static BOOL stepsIsRunning;
 // it turns out NSFontManager also sends changeFont: through this; let's inhibit that here too (see fontbutton.m)
 - (BOOL)sendAction:(SEL)sel to:(id)to from:(id)from
 {
-	if (colorButtonInhibitSendAction(sel, from, to))
+	if (uiprivColorButtonInhibitSendAction(sel, from, to))
 		return NO;
 	if (uiprivFontButtonInhibitSendAction(sel, from, to))
 		return NO;
diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h
index 1cd88dbd..a41c0135 100644
--- a/darwin/uipriv_darwin.h
+++ b/darwin/uipriv_darwin.h
@@ -110,4 +110,16 @@ extern int uiprivSendAreaEvents(NSEvent *);
 extern BOOL uiprivFromKeycode(unsigned short keycode, uiAreaKeyEvent *ke);
 extern BOOL uiprivKeycodeModifier(unsigned short keycode, uiModifiers *mod);
 
+// draw.m
+extern uiDrawContext *uiprivDrawNewContext(CGContextRef, CGFloat);
+extern void uiprivDrawFreeContext(uiDrawContext *);
+
+// fontbutton.m
+extern BOOL uiprivFontButtonInhibitSendAction(SEL sel, id from, id to);
+extern BOOL uiprivFontButtonOverrideTargetForAction(SEL sel, id from, id to, id *override);
+extern void uiprivSetupFontPanel(void);
+
+// colorbutton.m
+extern BOOL uiprivColorButtonInhibitSendAction(SEL sel, id from, id to);
+
 #import "OLD_uipriv_darwin.h"