diff --git a/examples/tvdemo/gadgets.cpp b/examples/tvdemo/gadgets.cpp
index d919ed0f..6a9a0240 100644
--- a/examples/tvdemo/gadgets.cpp
+++ b/examples/tvdemo/gadgets.cpp
@@ -32,6 +32,7 @@
 #include "gadgets.h"
 
 #if !defined( __BORLANDC__ ) && defined( _WIN32 )
+#include <tvision/compat/windows/windows.h>
 #include <psapi.h>
 #endif
 
diff --git a/examples/tvforms/datacoll.cpp b/examples/tvforms/datacoll.cpp
index 4f399869..e48e0b22 100755
--- a/examples/tvforms/datacoll.cpp
+++ b/examples/tvforms/datacoll.cpp
@@ -27,6 +27,10 @@ __link( RStringCollection )
 #include <string.h>
 #endif  // __STRING_H
 
+#if !defined( __STDLIB_H )
+#include <stdlib.h>
+#endif  // __STDLIB_H
+
 const char * const TDataCollection::name = "TDataCollection";
 
 void TDataCollection::write( opstream& os )
diff --git a/include/pch.h b/include/pch.h
index 4b72e062..1936f0d4 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -1,6 +1,7 @@
 #define Uses_TApplication
 #define Uses_TDialog
 #include <tvision/tv.h>
+#include <tvision/compat/windows/windows.h>
 #include <unordered_map>
 #include <memory>
 #include <string>
diff --git a/include/tvision/internal/findfrst.h b/include/tvision/internal/findfrst.h
index 5c485229..daead241 100644
--- a/include/tvision/internal/findfrst.h
+++ b/include/tvision/internal/findfrst.h
@@ -11,6 +11,8 @@
 #include <unistd.h>
 #include <dirent.h>
 #include <sys/stat.h>
+#else
+#include <tvision/compat/windows/windows.h>
 #endif
 
 namespace tvision
diff --git a/include/tvision/system.h b/include/tvision/system.h
index c0392e46..ddfa0146 100644
--- a/include/tvision/system.h
+++ b/include/tvision/system.h
@@ -57,18 +57,9 @@ const int mwRight   = 0x08;
 
 /* Mouse event flags */
 
-#if !defined( __FLAT__ )
 const int meMouseMoved = 0x01;
 const int meDoubleClick = 0x02;
-#else
-#if !defined( __WINDOWS_H )
-#include <tvision/compat/windows/windows.h>
-#endif
-const int meMouseMoved = MOUSE_MOVED;       // NT values from WINDOWS.H
-const int meDoubleClick = DOUBLE_CLICK;
-#endif
-// 0x04 and 0x08 are reserved by NT (MOUSE_WHEELED, MOUSE_HWHEELED).
-const int meTripleClick = 0x10;
+const int meTripleClick = 0x04;
 
 #endif  // __EVENT_CODES
 
diff --git a/source/platform/ansidisp.cpp b/source/platform/ansidisp.cpp
index 6b813966..acaea21b 100644
--- a/source/platform/ansidisp.cpp
+++ b/source/platform/ansidisp.cpp
@@ -1,5 +1,4 @@
 #include <internal/ansidisp.h>
-#include <internal/stdioctl.h>
 #include <internal/strings.h>
 #include <stdlib.h>
 
diff --git a/source/tvision/tdircoll.cpp b/source/tvision/tdircoll.cpp
index 00204e86..a8ea03a5 100644
--- a/source/tvision/tdircoll.cpp
+++ b/source/tvision/tdircoll.cpp
@@ -30,6 +30,10 @@
 #include <dos.h>
 #endif  // __DOS_H
 
+#if defined( _WIN32 ) && defined( __FLAT__ )
+#include <tvision/compat/windows/windows.h>
+#endif
+
 #pragma warn -asc
 
 Boolean driveValid( char drive ) noexcept