diff --git a/unix/OLD_uipriv_unix.h b/unix/OLD_uipriv_unix.h
index a60e0834..5f263a28 100644
--- a/unix/OLD_uipriv_unix.h
+++ b/unix/OLD_uipriv_unix.h
@@ -1,13 +1,3 @@
-// draw.c
-extern uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style);
-extern void freeContext(uiDrawContext *);
-
-// image.c
-/*TODO remove this*/typedef struct uiImage uiImage;
-extern cairo_surface_t *imageAppropriateSurface(uiImage *i, GtkWidget *w);
-
-// cellrendererbutton.c
-extern GtkCellRenderer *newCellRendererButton(void);
 
 // future.c
 extern void loadFutures(void);
diff --git a/unix/area.c b/unix/area.c
index cba1f5e7..0a2e6d69 100644
--- a/unix/area.c
+++ b/unix/area.c
@@ -122,7 +122,7 @@ static gboolean areaWidget_draw(GtkWidget *w, cairo_t *cr)
 	uiAreaDrawParams dp;
 	double clipX0, clipY0, clipX1, clipY1;
 
-	dp.Context = newContext(cr,
+	dp.Context = uiprivNewContext(cr,
 		gtk_widget_get_style_context(a->widget));
 
 	loadAreaSize(a, &(dp.AreaWidth), &(dp.AreaHeight));
@@ -136,7 +136,7 @@ static gboolean areaWidget_draw(GtkWidget *w, cairo_t *cr)
 	// no need to save or restore the graphics state to reset transformations; GTK+ does that for us
 	(*(a->ah->Draw))(a->ah, a, &dp);
 
-	freeContext(dp.Context);
+	uiprivFreeContext(dp.Context);
 	return FALSE;
 }
 
diff --git a/unix/cellrendererbutton.c b/unix/cellrendererbutton.c
index e3bbf48b..e686b454 100644
--- a/unix/cellrendererbutton.c
+++ b/unix/cellrendererbutton.c
@@ -293,7 +293,7 @@ static void cellRendererButton_class_init(cellRendererButtonClass *class)
 		1, G_TYPE_STRING);
 }
 
-GtkCellRenderer *newCellRendererButton(void)
+GtkCellRenderer *uiprivNewCellRendererButton(void)
 {
 	return GTK_CELL_RENDERER(g_object_new(cellRendererButtonType, NULL));
 }
diff --git a/unix/draw.c b/unix/draw.c
index 15abb611..3e28fb37 100644
--- a/unix/draw.c
+++ b/unix/draw.c
@@ -2,7 +2,7 @@
 #include "uipriv_unix.h"
 #include "draw.h"
 
-uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style)
+uiDrawContext *uiprivNewContext(cairo_t *cr, GtkStyleContext *style)
 {
 	uiDrawContext *c;
 
@@ -12,7 +12,7 @@ uiDrawContext *newContext(cairo_t *cr, GtkStyleContext *style)
 	return c;
 }
 
-void freeContext(uiDrawContext *c)
+void uiprivFreeContext(uiDrawContext *c)
 {
 	// free neither cr nor style; we own neither
 	uiprivFree(c);
diff --git a/unix/image.c b/unix/image.c
index 1bdf0d64..3b5db020 100644
--- a/unix/image.c
+++ b/unix/image.c
@@ -105,7 +105,7 @@ writeMatch:
 	m->distY = abs(m->targetY - y);
 }
 
-cairo_surface_t *imageAppropriateSurface(uiImage *i, GtkWidget *w)
+cairo_surface_t *uiprivImageAppropriateSurface(uiImage *i, GtkWidget *w)
 {
 	struct matcher m;
 
diff --git a/unix/uipriv_unix.h b/unix/uipriv_unix.h
index 9fd354da..d706db19 100644
--- a/unix/uipriv_unix.h
+++ b/unix/uipriv_unix.h
@@ -43,4 +43,15 @@ extern void uiprivChildSetFlag(uiprivChild *c, int flag);
 extern GtkWidget *uiprivChildBox(uiprivChild *c);
 extern void uiprivChildSetMargined(uiprivChild *c, int margined);
 
+// draw.c
+extern uiDrawContext *uiprivNewContext(cairo_t *cr, GtkStyleContext *style);
+extern void uiprivFreeContext(uiDrawContext *);
+
+// image.c
+/*TODO remove this*/typedef struct uiImage uiImage;
+extern cairo_surface_t *uiprivImageAppropriateSurface(uiImage *i, GtkWidget *w);
+
+// cellrendererbutton.c
+extern GtkCellRenderer *uiprivNewCellRendererButton(void);
+
 #include "OLD_uipriv_unix.h"