diff --git a/new/unix/GNUmakeinc.mk b/new/unix/GNUmakeinc.mk
index 7d67be92..06e3f4df 100644
--- a/new/unix/GNUmakeinc.mk
+++ b/new/unix/GNUmakeinc.mk
@@ -3,7 +3,11 @@
 osCFILES = \
 	unix/alloc.c \
 	unix/bin.c \
+	unix/button.c \
+	unix/checkbox.c \
 	unix/container.c \
+	unix/entry.c \
+	unix/label.c \
 	unix/main.c \
 	unix/menu.c \
 	unix/newcontrol.c \
diff --git a/unix/button.c b/new/unix/button.c
similarity index 96%
rename from unix/button.c
rename to new/unix/button.c
index ae1832f1..faae2f68 100644
--- a/unix/button.c
+++ b/new/unix/button.c
@@ -61,7 +61,7 @@ uiButton *uiNewButton(const char *text)
 		"label", text,
 		NULL);
 
-	b->widget = WIDGET(b);
+	b->widget = GTK_WIDGET(uiControlHandle(uiControl(b)));
 	b->button = GTK_BUTTON(b->widget);
 
 	g_signal_connect(b->widget, "clicked", G_CALLBACK(onClicked), b);
diff --git a/unix/checkbox.c b/new/unix/checkbox.c
similarity index 97%
rename from unix/checkbox.c
rename to new/unix/checkbox.c
index 77e2f8bd..e002c784 100644
--- a/unix/checkbox.c
+++ b/new/unix/checkbox.c
@@ -85,7 +85,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
 		"label", text,
 		NULL);
 
-	c->widget = WIDGET(c);
+	c->widget = GTK_WIDGET(uiControlHandle(uiControl(c)));
 	c->button = GTK_BUTTON(c->widget);
 	c->toggleButton = GTK_TOGGLE_BUTTON(c->widget);
 	c->checkButton = GTK_CHECK_BUTTON(c->widget);
diff --git a/unix/entry.c b/new/unix/entry.c
similarity index 93%
rename from unix/entry.c
rename to new/unix/entry.c
index 8521681c..2106d497 100644
--- a/unix/entry.c
+++ b/new/unix/entry.c
@@ -38,7 +38,7 @@ uiEntry *uiNewEntry(void)
 		FALSE, FALSE, onDestroy, e,
 		NULL);
 
-	e->widget = WIDGET(e);
+	e->widget = GTK_WIDGET(uiControlHandle(uiControl(e)));
 	e->entry = GTK_ENTRY(e->widget);
 
 	uiEntry(e)->Text = entryText;
diff --git a/unix/label.c b/new/unix/label.c
similarity index 94%
rename from unix/label.c
rename to new/unix/label.c
index cf47ec79..50115f8a 100644
--- a/unix/label.c
+++ b/new/unix/label.c
@@ -42,7 +42,7 @@ uiLabel *uiNewLabel(const char *text)
 		// TODO yalign 0?
 		NULL);
 
-	l->widget = WIDGET(l);
+	l->widget = GTK_WIDGET(uiControlHandle(uiControl(l)));
 	l->label = GTK_LABEL(l->widget);
 
 	uiLabel(l)->Text = labelText;