diff --git a/new/windows/GNUmakeinc.mk b/new/windows/GNUmakeinc.mk
index 5d9e457d..2b680b4c 100644
--- a/new/windows/GNUmakeinc.mk
+++ b/new/windows/GNUmakeinc.mk
@@ -3,10 +3,14 @@
 osCFILES = \
 	windows/alloc.c \
 	windows/bin.c \
+	windows/button.c \
+	windows/checkbox.c \
 	windows/comctl32.c \
 	windows/container.c \
 	windows/debug.c \
+	windows/entry.c \
 	windows/init.c \
+	windows/label.c \
 	windows/main.c \
 	windows/menu.c \
 	windows/newcontrol.c \
diff --git a/windows/button.c b/new/windows/button.c
similarity index 98%
rename from windows/button.c
rename to new/windows/button.c
index 0f0b2d93..7219ca60 100644
--- a/windows/button.c
+++ b/new/windows/button.c
@@ -100,7 +100,7 @@ uiButton *uiNewButton(const char *text)
 	uiWindowsNewControl(uiControl(b), &p);
 	uiFree(wtext);
 
-	b->hwnd = HWND(b);
+	b->hwnd = (HWND) uiControlHandle(uiControl(b));
 
 	b->onClicked = defaultOnClicked;
 
diff --git a/windows/checkbox.c b/new/windows/checkbox.c
similarity index 98%
rename from windows/checkbox.c
rename to new/windows/checkbox.c
index 5d39622a..b5bd6c56 100644
--- a/windows/checkbox.c
+++ b/new/windows/checkbox.c
@@ -115,7 +115,7 @@ uiCheckbox *uiNewCheckbox(const char *text)
 	uiWindowsNewControl(uiControl(c), &p);
 	uiFree(wtext);
 
-	c->hwnd = HWND(c);
+	c->hwnd = (HWND) uiControlHandle(uiControl(c));
 
 	c->onToggled = defaultOnToggled;
 
diff --git a/windows/entry.c b/new/windows/entry.c
similarity index 97%
rename from windows/entry.c
rename to new/windows/entry.c
index 2aa066a2..62ab8cf3 100644
--- a/windows/entry.c
+++ b/new/windows/entry.c
@@ -62,7 +62,7 @@ uiEntry *uiNewEntry(void)
 	p.onDestroyData = e;
 	uiWindowsNewControl(uiControl(e), &p);
 
-	e->hwnd = HWND(e);
+	e->hwnd = (HWND) uiControlHandle(uiControl(e));
 
 	uiControl(e)->PreferredSize = preferredSize;
 
diff --git a/windows/label.c b/new/windows/label.c
similarity index 97%
rename from windows/label.c
rename to new/windows/label.c
index 916d0ca8..95256fef 100644
--- a/windows/label.c
+++ b/new/windows/label.c
@@ -68,7 +68,7 @@ uiLabel *uiNewLabel(const char *text)
 	uiWindowsNewControl(uiControl(l), &p);
 	uiFree(wtext);
 
-	l->hwnd = HWND(l);
+	l->hwnd = (HWND) uiControlHandle(uiControl(l));
 
 	uiControl(l)->PreferredSize = preferredSize;