diff --git a/runform/Makefile b/runform/Makefile
index 6271e3c..0457b9a 100644
--- a/runform/Makefile
+++ b/runform/Makefile
@@ -69,4 +69,5 @@ $(FORMAXE): ../generate/formax.inp
 clean:
 	for D in colquery crypt membed elk regex ../generate; do ( cd $$D; make clean >/dev/null; ); done
 	rm -f *.o a.out *core.* runform runform0 curkeys curkeys.h test afiedt.buf \
-		/tmp/odbc.log ads_* $(EXAMPLE) testelk formax.frm company.h out *.exe
+		/tmp/odbc.log ads_* $(EXAMPLE) testelk formax.frm company.h out *.exe libncursesw6.dll scotty.*
+	rm -rf bin include lib
diff --git a/runform/Makefile.W32 b/runform/Makefile.W32
index 3dfa7c9..4349062 100644
--- a/runform/Makefile.W32
+++ b/runform/Makefile.W32
@@ -25,8 +25,9 @@ clean:
 	rm -f *.o runform $(OBJB)
 	for SUB in colquery elk regex; do cd $$SUB; make clean CC=gcc; cd ..; done
 
-# prepare
-# wget -O../../curses//ncurses-win32.zip https://invisible-island.net/datafiles/release/mingw32.zip
-# unzip ../../curses/ncurses-win32.zip
-# cp bin/libncursesw6.dll .
+libncursesw6.dll:
+	unzip ../bin/ncurses-win32.zip
+	cp bin/libncursesw6.dll .
+
+# wget -O../bin/ncurses-win32.zip https://invisible-island.net/datafiles/release/mingw32.zip
 # compile with msys + mingw32
diff --git a/runform/screen.cpp b/runform/screen.cpp
index 7c69def..81c350b 100644
--- a/runform/screen.cpp
+++ b/runform/screen.cpp
@@ -1,6 +1,11 @@
 /* curses screen handling interface */
 #include <cstdarg>
 #include <unistd.h>
+#ifndef USETERMIO
+#ifndef WIN32
+#define WIN32
+#endif
+#endif
 #ifndef WIN32
 #include <termios.h>
 #include <term.h>
@@ -95,7 +100,7 @@ if (colcode == -1) {
 
 int Screen::setattributs(int attrib) {
 nocurses(attrib);
-#ifndef WIN32
+#ifdef USETERMIO
 if (attrib & A_REVERSE) {
   if (enter_reverse_mode == NULL) /* terminal has no reverse mode */
     attrib |= A_STANDOUT;         /* use standout instead */