From dfaf2706701860e3f219325d684814d81c1be6e0 Mon Sep 17 00:00:00 2001
From: "Hochsteger, Matthias" <mhochsteger@cerbsim.com>
Date: Mon, 12 Feb 2024 11:57:54 +0100
Subject: [PATCH] Remove windows.h include where possible.

---
 libsrc/include/incopengl.hpp | 4 ++++
 libsrc/include/inctcl.hpp    | 5 +++++
 libsrc/include/mystdlib.h    | 2 +-
 libsrc/meshing/meshing.hpp   | 7 -------
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libsrc/include/incopengl.hpp b/libsrc/include/incopengl.hpp
index 7b07cf6f..35b1c48b 100644
--- a/libsrc/include/incopengl.hpp
+++ b/libsrc/include/incopengl.hpp
@@ -5,6 +5,10 @@
 #include <mystdlib.h>
 #include <mydefs.hpp>
 
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
 
 #  ifdef __APPLE__
 #define GL_SILENCE_DEPRECATION
diff --git a/libsrc/include/inctcl.hpp b/libsrc/include/inctcl.hpp
index 8191a44a..4a15a885 100644
--- a/libsrc/include/inctcl.hpp
+++ b/libsrc/include/inctcl.hpp
@@ -1,3 +1,8 @@
+#ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#endif
+
 #include <tcl.h>
 #include <tk.h>
 
diff --git a/libsrc/include/mystdlib.h b/libsrc/include/mystdlib.h
index 5b495edd..08f4af3e 100644
--- a/libsrc/include/mystdlib.h
+++ b/libsrc/include/mystdlib.h
@@ -59,7 +59,7 @@ namespace metis { extern "C" {
 // #   include <afxmt.h>
 #  endif // MSVC_EXPRESS
 # endif
-# include <windows.h>
+// # include <windows.h>
 # undef WIN32_LEAN_AND_MEAN
 // # include <winnt.h>
 #else // Not using MC VC++
diff --git a/libsrc/meshing/meshing.hpp b/libsrc/meshing/meshing.hpp
index 12129cbb..779453b8 100644
--- a/libsrc/meshing/meshing.hpp
+++ b/libsrc/meshing/meshing.hpp
@@ -9,13 +9,6 @@
 #include "../include/opti.hpp"
 
 
-/*** Windows headers ***/
-#ifdef _MSC_VER
-# define WIN32_LEAN_AND_MEAN
-# include <windows.h>
-# undef WIN32_LEAN_AND_MEAN
-#endif
-
 namespace netgen
 {
   // extern int printmessage_importance;