diff --git a/redo/stubs/entry.c b/redo/stubs/entry.c
index 15284161..c4c3cb85 100644
--- a/redo/stubs/entry.c
+++ b/redo/stubs/entry.c
@@ -55,7 +55,6 @@ static int entryReadOnly(uiEntry *ee)
 static void entrySetReadOnly(uiEntry *ee, int readonly)
 {
 	struct entry *e = (struct entry *) ee;
-	WPARAM ro;
 
 	PUT_CODE_HERE;
 }
diff --git a/redo/stubs/spinbox.c b/redo/stubs/spinbox.c
index 2263c9bd..cb931243 100644
--- a/redo/stubs/spinbox.c
+++ b/redo/stubs/spinbox.c
@@ -3,6 +3,9 @@
 
 struct spinbox {
 	uiSpinbox s;
+	OSTYPE OSHANDLE;
+	void (*onChanged)(uiSpinbox *, void *);
+	void *onChangedData;
 };
 
 uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox)
diff --git a/redo/unix/button.c b/redo/unix/button.c
index c00fb09b..63456307 100644
--- a/redo/unix/button.c
+++ b/redo/unix/button.c
@@ -50,7 +50,7 @@ uiButton *uiNewButton(const char *text)
 {
 	struct button *b;
 
-	b = (struct button *) MAKE_CONTROL_INSTANCE(uiTypeButton());
+	b = (struct button *) uiNewControl(uiTypeButton());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/checkbox.c b/redo/unix/checkbox.c
index edd86230..d4f9a5d4 100644
--- a/redo/unix/checkbox.c
+++ b/redo/unix/checkbox.c
@@ -64,7 +64,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
 {
 	struct checkbox *c;
 
-	c = (struct checkbox *) MAKE_CONTROL_INSTANCE(uiTypeCheckbox());
+	c = (struct checkbox *) uiNewControl(uiTypeCheckbox());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/combobox.c b/redo/unix/combobox.c
index f2a7defc..f08a6bec 100644
--- a/redo/unix/combobox.c
+++ b/redo/unix/combobox.c
@@ -26,7 +26,7 @@ static uiCombobox *finishNewCombobox(GtkWidget (*newfunc)(void))
 {
 	struct combobox *c;
 
-	c = (struct combobox *) MAKE_CONTROL_INSTANCE(uiTypeCombobox());
+	c = (struct combobox *) uiNewControl(uiTypeCombobox());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/datetimepicker.c b/redo/unix/datetimepicker.c
index 3fe04855..96fb7dc7 100644
--- a/redo/unix/datetimepicker.c
+++ b/redo/unix/datetimepicker.c
@@ -15,11 +15,19 @@ static uintptr_t datetimepickerHandle(uiControl *c)
 	return (uintptr_t) (d->widget);
 }
 
+// TODO
+typedef int OSTHING;
+enum {
+	OSARGDATETIME,
+	OSARGDATEONLY,
+	OSARGTIMEONLY,
+};
+
 uiDateTimePicker *finishNewDateTimePicker(OSTHING OSARG)
 {
 	struct datetimepicker *d;
 
-	d = (struct datetimepicker *) MAKE_CONTROL_INSTANCE(uiTypeDateTimePicker());
+	d = (struct datetimepicker *) uiNewControl(uiTypeDateTimePicker());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/entry.c b/redo/unix/entry.c
index 482a9f0c..d7a7d4ba 100644
--- a/redo/unix/entry.c
+++ b/redo/unix/entry.c
@@ -55,7 +55,6 @@ static int entryReadOnly(uiEntry *ee)
 static void entrySetReadOnly(uiEntry *ee, int readonly)
 {
 	struct entry *e = (struct entry *) ee;
-	WPARAM ro;
 
 	PUT_CODE_HERE;
 }
@@ -64,7 +63,7 @@ uiEntry *uiNewEntry(void)
 {
 	struct entry *e;
 
-	e = (struct entry *) MAKE_CONTROL_INSTANCE(uiTypeEntry());
+	e = (struct entry *) uiNewControl(uiTypeEntry());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/group.c b/redo/unix/group.c
index f88c9ad7..439e9440 100644
--- a/redo/unix/group.c
+++ b/redo/unix/group.c
@@ -73,7 +73,7 @@ uiGroup *uiNewGroup(const char *text)
 {
 	struct group *g;
 
-	g = (struct group *) MAKE_CONTROL_INSTANCE(uiTypeGroup());
+	g = (struct group *) uiNewControl(uiTypeGroup());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/label.c b/redo/unix/label.c
index 7be6ec70..79c3acfc 100644
--- a/redo/unix/label.c
+++ b/redo/unix/label.c
@@ -35,7 +35,7 @@ uiLabel *uiNewLabel(const char *text)
 {
 	struct label *l;
 
-	l = (struct label *) MAKE_CONTROL_INSTANCE(uiTypeLabel());
+	l = (struct label *) uiNewControl(uiTypeLabel());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/progressbar.c b/redo/unix/progressbar.c
index c4942bd3..42a444ee 100644
--- a/redo/unix/progressbar.c
+++ b/redo/unix/progressbar.c
@@ -28,7 +28,7 @@ uiProgressBar *uiNewProgressBar(void)
 {
 	struct progressbar *p;
 
-	p = (struct progressbar *) MAKE_CONTROL_INSTANCE(uiTypeProgressBar());
+	p = (struct progressbar *) uiNewControl(uiTypeProgressBar());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/radiobuttons.c b/redo/unix/radiobuttons.c
index e1ecba8e..edbc5c2a 100644
--- a/redo/unix/radiobuttons.c
+++ b/redo/unix/radiobuttons.c
@@ -24,7 +24,7 @@ uiRadioButtons *uiNewRadioButtons(void)
 {
 	struct radiobuttons *r;
 
-	r = (struct radiobuttons *) MAKE_CONTROL_INSTANCE(uiTypeRadioButtons());
+	r = (struct radiobuttons *) uiNewControl(uiTypeRadioButtons());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/separator.c b/redo/unix/separator.c
index 9e64bd6e..6d3535ac 100644
--- a/redo/unix/separator.c
+++ b/redo/unix/separator.c
@@ -19,7 +19,7 @@ uiSeparator *uiNewHorizontalSeparator(void)
 {
 	struct separator *s;
 
-	s = (struct separator *) MAKE_CONTROL_INSTANCE(uiTypeSeparator());
+	s = (struct separator *) uiNewControl(uiTypeSeparator());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/slider.c b/redo/unix/slider.c
index 958812ff..75dbf5f9 100644
--- a/redo/unix/slider.c
+++ b/redo/unix/slider.c
@@ -48,7 +48,7 @@ uiSlider *uiNewSlider(intmax_t min, intmax_t max)
 {
 	struct slider *s;
 
-	s = (struct slider *) MAKE_CONTROL_INSTANCE(uiTypeSlider());
+	s = (struct slider *) uiNewControl(uiTypeSlider());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/spinbox.c b/redo/unix/spinbox.c
index c1e666d5..cbd120d6 100644
--- a/redo/unix/spinbox.c
+++ b/redo/unix/spinbox.c
@@ -3,6 +3,8 @@
 
 struct spinbox {
 	uiSpinbox s;
+	void (*onChanged)(uiSpinbox *, void *);
+	void *onChangedData;
 };
 
 uiDefineControlType(uiSpinbox, uiTypeSpinbox, struct spinbox)
@@ -48,7 +50,7 @@ uiSpinbox *uiNewSpinbox(intmax_t min, intmax_t max)
 	if (min >= max)
 		complain("error: min >= max in uiNewSpinbox()");
 
-	s = (struct spinbox *) MAKE_CONTROL_INSTANCE(uiTypeSpinbox());
+	s = (struct spinbox *) uiNewControl(uiTypeSpinbox());
 
 	PUT_CODE_HERE;
 
diff --git a/redo/unix/tab.c b/redo/unix/tab.c
index f7adbd0f..615718c6 100644
--- a/redo/unix/tab.c
+++ b/redo/unix/tab.c
@@ -61,7 +61,7 @@ uiTab *uiNewTab(void)
 {
 	struct tab *t;
 
-	t = (struct tab *) MAKE_CONTROL_INSTANCE(uiTypeTab());
+	t = (struct tab *) uiNewControl(uiTypeTab());
 
 	PUT_CODE_HERE;