diff --git a/_wiptable/unix_table.c b/_wiptable/unix_table.c
index ac0ccc62..825cf675 100644
--- a/_wiptable/unix_table.c
+++ b/_wiptable/unix_table.c
@@ -13,8 +13,7 @@ struct uiTable {
 };
 
 uiUnixDefineControl(
-	uiTable,								// type name
-	uiTableType							// type function
+	uiTable								// type name
 )
 
 void uiTableSetModel(uiTable *t, uiTableModel *m)
diff --git a/darwin/area.m b/darwin/area.m
index baab2f23..bd4714b2 100644
--- a/darwin/area.m
+++ b/darwin/area.m
@@ -27,7 +27,6 @@ struct uiArea {
 
 uiDarwinDefineControl(
 	uiArea,								// type name
-	uiAreaType,							// type function
 	view									// handle
 )
 
diff --git a/darwin/box.m b/darwin/box.m
index aea87dc1..3de18830 100644
--- a/darwin/box.m
+++ b/darwin/box.m
@@ -27,7 +27,6 @@ static void onDestroy(uiBox *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	view,								// handle
 	onDestroy(this);						// on destroy
 )
diff --git a/darwin/button.m b/darwin/button.m
index 31e5c408..3b8dacbc 100644
--- a/darwin/button.m
+++ b/darwin/button.m
@@ -59,7 +59,6 @@ static buttonDelegateClass *buttonDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiButton,								// type name
-	uiButtonType,							// type function
 	button,								// handle
 	[buttonDelegate unregisterButton:this];		// on destroy
 )
diff --git a/darwin/checkbox.m b/darwin/checkbox.m
index abd287bb..9ecb1804 100644
--- a/darwin/checkbox.m
+++ b/darwin/checkbox.m
@@ -61,7 +61,6 @@ static checkboxDelegateClass *checkboxDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiCheckbox,								// type name
-	uiCheckboxType,							// type function
 	button,									// handle
 	[checkboxDelegate unregisterCheckbox:this];		// on destroy
 )
diff --git a/darwin/combobox.m b/darwin/combobox.m
index 27c32c08..8e573809 100644
--- a/darwin/combobox.m
+++ b/darwin/combobox.m
@@ -102,7 +102,6 @@ static void onDestroy(uiCombobox *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiCombobox,							// type name
-	uiComboboxType,						// type function
 	handle,								// handle
 	onDestroy(this);						// on destroy
 )
diff --git a/darwin/datetimepicker.m b/darwin/datetimepicker.m
index c37951d1..944e5ee3 100644
--- a/darwin/datetimepicker.m
+++ b/darwin/datetimepicker.m
@@ -8,7 +8,6 @@ struct uiDateTimePicker {
 
 uiDarwinDefineControl(
 	uiDateTimePicker,						// type name
-	uiDateTimePickerType,					// type function
 	dp									// handle
 )
 
diff --git a/darwin/entry.m b/darwin/entry.m
index d4ac5afb..1a589b82 100644
--- a/darwin/entry.m
+++ b/darwin/entry.m
@@ -77,7 +77,6 @@ static entryDelegateClass *entryDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiEntry,								// type name
-	uiEntryType,							// type function
 	textfield,								// handle
 	[entryDelegate unregisterEntry:this];			// on destroy
 )
diff --git a/darwin/fontbutton.m b/darwin/fontbutton.m
index 8e2af4e3..d98ff413 100644
--- a/darwin/fontbutton.m
+++ b/darwin/fontbutton.m
@@ -2,6 +2,7 @@
 #import "uipriv_darwin.h"
 
 // TODO drag and drop fonts? what other interactions does NSColorWell allow that we can do for fonts?
+// TODO make position of templates consistent
 
 @interface fontButton : NSButton {
 	uiFontButton *libui_b;
@@ -27,7 +28,6 @@ struct uiFontButton {
 
 uiDarwinDefineControl(
 	uiFontButton,							// type name
-	uiFontButtonType,						// type function
 	button								// handle
 )
 
diff --git a/darwin/group.m b/darwin/group.m
index 5e79852d..02e74158 100644
--- a/darwin/group.m
+++ b/darwin/group.m
@@ -12,7 +12,6 @@ static void onDestroy(uiGroup *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	box,									// handle
 	onDestroy(this);						// on destroy
 )
diff --git a/darwin/label.m b/darwin/label.m
index 07ad2971..49a70628 100644
--- a/darwin/label.m
+++ b/darwin/label.m
@@ -8,7 +8,6 @@ struct uiLabel {
 
 uiDarwinDefineControl(
 	uiLabel,								// type name
-	uiLabelType,							// type function
 	textfield								// handle
 )
 
diff --git a/darwin/multilineentry.m b/darwin/multilineentry.m
index d80c143b..c591beb0 100644
--- a/darwin/multilineentry.m
+++ b/darwin/multilineentry.m
@@ -13,7 +13,6 @@ struct uiMultilineEntry {
 
 uiDarwinDefineControl(
 	uiMultilineEntry,						// type name
-	uiMultilineEntryType,					// type function
 	sv									// handle
 )
 
diff --git a/darwin/progressbar.m b/darwin/progressbar.m
index 864d2cc3..c6b5fb50 100644
--- a/darwin/progressbar.m
+++ b/darwin/progressbar.m
@@ -8,7 +8,6 @@ struct uiProgressBar {
 
 uiDarwinDefineControl(
 	uiProgressBar,							// type name
-	uiProgressBarType,						// type function
 	pi									// handle
 )
 
diff --git a/darwin/radiobuttons.m b/darwin/radiobuttons.m
index aa88c71e..56fa9a51 100644
--- a/darwin/radiobuttons.m
+++ b/darwin/radiobuttons.m
@@ -10,7 +10,6 @@ struct uiRadioButtons {
 
 uiDarwinDefineControl(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	matrix								// handle
 )
 
diff --git a/darwin/separator.m b/darwin/separator.m
index d353f5fa..766850ef 100644
--- a/darwin/separator.m
+++ b/darwin/separator.m
@@ -13,7 +13,6 @@ struct uiSeparator {
 
 uiDarwinDefineControl(
 	uiSeparator,							// type name
-	uiSeparatorType,						// type function
 	box									// handle
 )
 
diff --git a/darwin/slider.m b/darwin/slider.m
index 18906c5e..c3089473 100644
--- a/darwin/slider.m
+++ b/darwin/slider.m
@@ -79,7 +79,6 @@ static sliderDelegateClass *sliderDelegate = nil;
 
 uiDarwinDefineControlWithOnDestroy(
 	uiSlider,								// type name
-	uiSliderType,							// type function
 	slider,								// handle
 	[sliderDelegate unregisterSlider:this];		// on destroy
 )
diff --git a/darwin/spinbox.m b/darwin/spinbox.m
index 776aaf0e..bf48edd4 100644
--- a/darwin/spinbox.m
+++ b/darwin/spinbox.m
@@ -131,7 +131,6 @@ struct uiSpinbox {
 
 uiDarwinDefineControl(
 	uiSpinbox,							// type name
-	uiSpinboxType,						// type function
 	spinbox								// handle
 )
 
diff --git a/darwin/tab.m b/darwin/tab.m
index b711168a..11c1c021 100644
--- a/darwin/tab.m
+++ b/darwin/tab.m
@@ -16,7 +16,6 @@ static void onDestroy(uiTab *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	tabview,								// handle
 	onDestroy(this);						// on destroy
 )
diff --git a/darwin/window.m b/darwin/window.m
index fda55e44..4f580fdf 100644
--- a/darwin/window.m
+++ b/darwin/window.m
@@ -75,7 +75,6 @@ static void onDestroy(uiWindow *);
 
 uiDarwinDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	window,								// handle
 	onDestroy(this);						// on destroy
 )
diff --git a/unix/area.c b/unix/area.c
index 5462e211..8548dcfd 100644
--- a/unix/area.c
+++ b/unix/area.c
@@ -483,8 +483,7 @@ static void areaWidget_class_init(areaWidgetClass *class)
 // control implementation
 
 uiUnixDefineControl(
-	uiArea,								// type name
-	uiAreaType							// type function
+	uiArea								// type name
 )
 
 void uiAreaSetSize(uiArea *a, intmax_t width, intmax_t height)
diff --git a/unix/box.c b/unix/box.c
index 78dda791..dc320e93 100644
--- a/unix/box.c
+++ b/unix/box.c
@@ -18,7 +18,6 @@ static void onDestroy(uiBox *b);
 
 uiUnixDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	onDestroy(this);						// on destroy
 )
 
diff --git a/unix/button.c b/unix/button.c
index 8bcea519..198374c4 100644
--- a/unix/button.c
+++ b/unix/button.c
@@ -10,8 +10,7 @@ struct uiButton {
 };
 
 uiUnixDefineControl(
-	uiButton,								// type name
-	uiButtonType							// type function
+	uiButton								// type name
 )
 
 static void onClicked(GtkButton *button, gpointer data)
diff --git a/unix/checkbox.c b/unix/checkbox.c
index 0cb8a87a..d56a8330 100644
--- a/unix/checkbox.c
+++ b/unix/checkbox.c
@@ -13,8 +13,7 @@ struct uiCheckbox {
 };
 
 uiUnixDefineControl(
-	uiCheckbox,							// type name
-	uiCheckboxType						// type function
+	uiCheckbox							// type name
 )
 
 static void onToggled(GtkToggleButton *b, gpointer data)
diff --git a/unix/combobox.c b/unix/combobox.c
index c1fc0db1..1e787b50 100644
--- a/unix/combobox.c
+++ b/unix/combobox.c
@@ -12,8 +12,7 @@ struct uiCombobox {
 };
 
 uiUnixDefineControl(
-	uiCombobox,							// type name
-	uiComboboxType						// type function
+	uiCombobox							// type name
 )
 
 // TODO this is triggered when editing an editable combobox's text
diff --git a/unix/datetimepicker.c b/unix/datetimepicker.c
index 86f7ebdd..e965aa88 100644
--- a/unix/datetimepicker.c
+++ b/unix/datetimepicker.c
@@ -7,8 +7,7 @@ struct uiDateTimePicker {
 };
 
 uiUnixDefineControl(
-	uiDateTimePicker,						// type name
-	uiDateTimePickerType					// type function
+	uiDateTimePicker						// type name
 )
 
 // TODO
diff --git a/unix/entry.c b/unix/entry.c
index 5b4d66e8..0b8572cc 100644
--- a/unix/entry.c
+++ b/unix/entry.c
@@ -12,8 +12,7 @@ struct uiEntry {
 };
 
 uiUnixDefineControl(
-	uiEntry,								// type name
-	uiEntryType							// type function
+	uiEntry								// type name
 )
 
 static void onChanged(GtkEditable *editable, gpointer data)
diff --git a/unix/fontbutton.c b/unix/fontbutton.c
index 4d918ca7..fd2b08ff 100644
--- a/unix/fontbutton.c
+++ b/unix/fontbutton.c
@@ -12,8 +12,7 @@ struct uiFontButton {
 };
 
 uiUnixDefineControl(
-	uiFontButton,							// type name
-	uiFontButtonType						// type function
+	uiFontButton							// type name
 )
 
 // TODO NOTE no need to inhibit the signal; font-set is documented as only being sent when the user changes the font
diff --git a/unix/group.c b/unix/group.c
index d0bdd451..a13a5d58 100644
--- a/unix/group.c
+++ b/unix/group.c
@@ -18,7 +18,6 @@ static void onDestroy(uiGroup *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	onDestroy(this);						// on destroy
 )
 
diff --git a/unix/label.c b/unix/label.c
index d8b481ff..1c0e6407 100644
--- a/unix/label.c
+++ b/unix/label.c
@@ -9,8 +9,7 @@ struct uiLabel {
 };
 
 uiUnixDefineControl(
-	uiLabel,								// type name
-	uiLabelType							// type function
+	uiLabel								// type name
 )
 
 char *uiLabelText(uiLabel *l)
diff --git a/unix/multilineentry.c b/unix/multilineentry.c
index 9b18ee39..cb25f3a0 100644
--- a/unix/multilineentry.c
+++ b/unix/multilineentry.c
@@ -17,8 +17,7 @@ struct uiMultilineEntry {
 };
 
 uiUnixDefineControl(
-	uiMultilineEntry,						// type name
-	uiMultilineEntryType						// type function
+	uiMultilineEntry						// type name
 )
 
 static void onChanged(GtkTextBuffer *textbuf, gpointer data)
diff --git a/unix/progressbar.c b/unix/progressbar.c
index 8aa94538..64cf9471 100644
--- a/unix/progressbar.c
+++ b/unix/progressbar.c
@@ -8,8 +8,7 @@ struct uiProgressBar {
 };
 
 uiUnixDefineControl(
-	uiProgressBar,							// type name
-	uiProgressBarType						// type function
+	uiProgressBar							// type name
 )
 
 void uiProgressBarSetValue(uiProgressBar *p, int value)
diff --git a/unix/radiobuttons.c b/unix/radiobuttons.c
index 83019f1a..4a216870 100644
--- a/unix/radiobuttons.c
+++ b/unix/radiobuttons.c
@@ -15,7 +15,6 @@ static void onDestroy(uiRadioButtons *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	onDestroy(this);						// on destroy
 )
 
diff --git a/unix/separator.c b/unix/separator.c
index 301d198a..b432e67f 100644
--- a/unix/separator.c
+++ b/unix/separator.c
@@ -8,8 +8,7 @@ struct uiSeparator {
 };
 
 uiUnixDefineControl(
-	uiSeparator,							// type name
-	uiSeparatorType						// type function
+	uiSeparator							// type name
 )
 
 uiSeparator *uiNewHorizontalSeparator(void)
diff --git a/unix/slider.c b/unix/slider.c
index 0c91a6a1..a23589c4 100644
--- a/unix/slider.c
+++ b/unix/slider.c
@@ -12,8 +12,7 @@ struct uiSlider {
 };
 
 uiUnixDefineControl(
-	uiSlider,								// type name
-	uiSliderType							// type function
+	uiSlider								// type name
 )
 
 static void onChanged(GtkRange *range, gpointer data)
diff --git a/unix/spinbox.c b/unix/spinbox.c
index 4e8d2d84..fdf3caa4 100644
--- a/unix/spinbox.c
+++ b/unix/spinbox.c
@@ -12,8 +12,7 @@ struct uiSpinbox {
 };
 
 uiUnixDefineControl(
-	uiSpinbox,							// type name
-	uiSpinboxType							// type function
+	uiSpinbox							// type name
 )
 
 static void onChanged(GtkSpinButton *sb, gpointer data)
diff --git a/unix/tab.c b/unix/tab.c
index b356c847..3b2ac6a4 100644
--- a/unix/tab.c
+++ b/unix/tab.c
@@ -15,7 +15,6 @@ static void onDestroy(uiTab *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	onDestroy(this);						// on destroy
 )
 
diff --git a/unix/window.c b/unix/window.c
index 5f788914..1fabb9f0 100644
--- a/unix/window.c
+++ b/unix/window.c
@@ -25,7 +25,6 @@ static void onDestroy(uiWindow *);
 
 uiUnixDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	onDestroy(this);						// on destroy
 )
 
diff --git a/windows/area.cpp b/windows/area.cpp
index df2bc4c3..8fa8975a 100644
--- a/windows/area.cpp
+++ b/windows/area.cpp
@@ -3,8 +3,7 @@
 #include "area.hpp"
 
 uiWindowsDefineControl(
-	uiArea,								// type name
-	uiAreaType							// type function
+	uiArea								// type name
 )
 
 static LRESULT CALLBACK areaWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
diff --git a/windows/box.cpp b/windows/box.cpp
index cdfc06c5..341615f8 100644
--- a/windows/box.cpp
+++ b/windows/box.cpp
@@ -23,7 +23,6 @@ static void onDestroy(uiBox *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiBox,								// type name
-	uiBoxType,							// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/button.cpp b/windows/button.cpp
index 7123d2e3..1aaf6fe8 100644
--- a/windows/button.cpp
+++ b/windows/button.cpp
@@ -10,7 +10,6 @@ struct uiButton {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiButton,								// type name
-	uiButtonType,							// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/checkbox.cpp b/windows/checkbox.cpp
index 76a68547..f3371768 100644
--- a/windows/checkbox.cpp
+++ b/windows/checkbox.cpp
@@ -10,7 +10,6 @@ struct uiCheckbox {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiCheckbox,							// type name
-	uiCheckboxType,						// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/combobox.cpp b/windows/combobox.cpp
index f3612518..7c9b6efb 100644
--- a/windows/combobox.cpp
+++ b/windows/combobox.cpp
@@ -15,7 +15,6 @@ struct uiCombobox {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiCombobox,							// type name
-	uiComboboxType,						// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/datetimepicker.cpp b/windows/datetimepicker.cpp
index abb5f465..174d8400 100644
--- a/windows/datetimepicker.cpp
+++ b/windows/datetimepicker.cpp
@@ -8,7 +8,6 @@ struct uiDateTimePicker {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiDateTimePicker,						// type name
-	uiDateTimePickerType,					// type function
 	uiWindowsUnregisterReceiveWM_WININICHANGE(me->hwnd);		// on destroy
 )
 
diff --git a/windows/entry.cpp b/windows/entry.cpp
index 3d5dd3fe..93fe14e9 100644
--- a/windows/entry.cpp
+++ b/windows/entry.cpp
@@ -11,7 +11,6 @@ struct uiEntry {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiEntry,								// type name
-	uiEntryType,							// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/fontbutton.cpp b/windows/fontbutton.cpp
index 87f6bbf8..051999d7 100644
--- a/windows/fontbutton.cpp
+++ b/windows/fontbutton.cpp
@@ -14,7 +14,6 @@ static void onDestroy(uiFontButton *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiFontButton,							// type name
-	uiFontButtonType,						// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/group.cpp b/windows/group.cpp
index 4afa2d00..c0ba9ca8 100644
--- a/windows/group.cpp
+++ b/windows/group.cpp
@@ -12,7 +12,6 @@ static void onDestroy(uiGroup *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiGroup,								// type name
-	uiGroupType,							// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/label.cpp b/windows/label.cpp
index 6d3a4cd5..565d0964 100644
--- a/windows/label.cpp
+++ b/windows/label.cpp
@@ -7,8 +7,7 @@ struct uiLabel {
 };
 
 uiWindowsDefineControl(
-	uiLabel,								// type name
-	uiLabelType							// type function
+	uiLabel								// type name
 )
 
 // via http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
diff --git a/windows/multilineentry.cpp b/windows/multilineentry.cpp
index ab5fb7bb..34377a5a 100644
--- a/windows/multilineentry.cpp
+++ b/windows/multilineentry.cpp
@@ -14,7 +14,6 @@ struct uiMultilineEntry {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiMultilineEntry,						// type name
-	uiMultilineEntryType,					// type function
 	uiWindowsUnregisterWM_COMMANDHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/progressbar.cpp b/windows/progressbar.cpp
index 86f85031..4487d57f 100644
--- a/windows/progressbar.cpp
+++ b/windows/progressbar.cpp
@@ -7,8 +7,7 @@ struct uiProgressBar {
 };
 
 uiWindowsDefineControl(
-	uiProgressBar,							// type name
-	uiProgressBarType						// type function
+	uiProgressBar							// type name
 )
 
 // via http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
diff --git a/windows/radiobuttons.cpp b/windows/radiobuttons.cpp
index 3a754224..65deb6cc 100644
--- a/windows/radiobuttons.cpp
+++ b/windows/radiobuttons.cpp
@@ -18,7 +18,6 @@ static void onDestroy(uiRadioButtons *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiRadioButtons,						// type name
-	uiRadioButtonsType,						// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/separator.cpp b/windows/separator.cpp
index 153c1b8d..edb83d44 100644
--- a/windows/separator.cpp
+++ b/windows/separator.cpp
@@ -11,8 +11,7 @@ struct uiSeparator {
 };
 
 uiWindowsDefineControl(
-	uiSeparator,							// type name
-	uiSeparatorType						// type function
+	uiSeparator							// type name
 )
 
 // via https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx
diff --git a/windows/slider.cpp b/windows/slider.cpp
index b4dba963..496f2434 100644
--- a/windows/slider.cpp
+++ b/windows/slider.cpp
@@ -10,7 +10,6 @@ struct uiSlider {
 
 uiWindowsDefineControlWithOnDestroy(
 	uiSlider,								// type name
-	uiSliderType,							// type function
 	uiWindowsUnregisterWM_HSCROLLHandler(me->hwnd);	// on destroy
 )
 
diff --git a/windows/spinbox.cpp b/windows/spinbox.cpp
index 58cc2fc5..1c56bdac 100644
--- a/windows/spinbox.cpp
+++ b/windows/spinbox.cpp
@@ -15,7 +15,6 @@ static void onDestroy(uiSpinbox *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiSpinbox,							// type name
-	uiSpinboxType,						// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/tab.cpp b/windows/tab.cpp
index feeee750..653dd22d 100644
--- a/windows/tab.cpp
+++ b/windows/tab.cpp
@@ -17,7 +17,6 @@ static void onDestroy(uiTab *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiTab,								// type name
-	uiTabType,							// type function
 	onDestroy(me);						// on destroy
 )
 
diff --git a/windows/window.cpp b/windows/window.cpp
index d821524a..6e0e7879 100644
--- a/windows/window.cpp
+++ b/windows/window.cpp
@@ -19,7 +19,6 @@ static void onDestroy(uiWindow *);
 
 uiWindowsDefineControlWithOnDestroy(
 	uiWindow,							// type name
-	uiWindowType,							// type function
 	onDestroy(me);						// on destroy
 )