diff --git a/src/c_screen.cpp b/src/c_screen.cpp
index 73e23ef5..a7b4b66c 100644
--- a/src/c_screen.cpp
+++ b/src/c_screen.cpp
@@ -130,7 +130,7 @@ static int init(FILE *f, int o, int now)
     if (!screen)
         screen = do_construct(screen_djgpp2_construct(),fd);
 #endif
-#if (ACC_OS_WIN32)
+#if (ACC_OS_CYGWIN || ACC_OS_WIN32 || ACC_OS_WIN64)
     if (!screen)
         screen = do_construct(screen_win32_construct(),fd);
 #endif
diff --git a/src/s_win32.cpp b/src/s_win32.cpp
index 88344b1d..70f76703 100644
--- a/src/s_win32.cpp
+++ b/src/s_win32.cpp
@@ -445,7 +445,7 @@ static int s_kbhit(screen_t *this)
 {
 #if defined(HAVE_CONIO_H)
     UNUSED(this);
-# if defined(__BORLANDC__)
+# if defined(__BORLANDC__) || defined(__WATCOMC__)
     return kbhit();
 # else
     return _kbhit();