diff --git a/libs/console/piscreen.cpp b/libs/console/piscreen.cpp
index 7f6fbc23..951d182b 100644
--- a/libs/console/piscreen.cpp
+++ b/libs/console/piscreen.cpp
@@ -20,17 +20,19 @@
 
 #include "piincludes_p.h"
 #include "piliterals_time.h"
+// clang-format off
 #ifndef WINDOWS
 #  include <fcntl.h>
 #  include <sys/ioctl.h>
 #  include <termios.h>
 #else
-#  include <wincon.h>
 #  include <wingdi.h>
+#  include <wincon.h>
 #  ifndef COMMON_LVB_UNDERSCORE
 #	define COMMON_LVB_UNDERSCORE 0x8000
 #  endif
 #endif
+// clang-format on
 
 
 using namespace PIScreenTypes;
diff --git a/libs/console/piterminal.cpp b/libs/console/piterminal.cpp
index 236d6565..fbf1b718 100644
--- a/libs/console/piterminal.cpp
+++ b/libs/console/piterminal.cpp
@@ -23,7 +23,6 @@
 #include "pisharedmemory.h"
 #ifndef MICRO_PIP
 #  ifdef WINDOWS
-#	include <wincon.h>
 #	include <windows.h>
 #	include <wingdi.h>
 #	include <winuser.h>
diff --git a/libs/main/console/pikbdlistener.cpp b/libs/main/console/pikbdlistener.cpp
index 9f3e4362..de81d229 100644
--- a/libs/main/console/pikbdlistener.cpp
+++ b/libs/main/console/pikbdlistener.cpp
@@ -21,12 +21,14 @@
 #include "piincludes_p.h"
 #include "piliterals.h"
 #include "piwaitevent_p.h"
+// clang-format off
 #ifndef WINDOWS
 #  include <termios.h>
 #else
-#  include <wincon.h>
 #  include <wingdi.h>
+#  include <wincon.h>
 #endif
+// clang-format on
 
 /** \class PIKbdListener
  * \brief Keyboard console input listener
diff --git a/libs/main/core/pibase.h b/libs/main/core/pibase.h
index cf3ed3ee..d2642bce 100644
--- a/libs/main/core/pibase.h
+++ b/libs/main/core/pibase.h
@@ -46,6 +46,7 @@
 #include <atomic>
 #include <cassert>
 #include <cstddef>
+#include <cstdio>
 #include <functional>
 #include <initializer_list>
 #include <limits>
diff --git a/libs/main/core/picout.cpp b/libs/main/core/picout.cpp
index d766cbca..c4127681 100644
--- a/libs/main/core/picout.cpp
+++ b/libs/main/core/picout.cpp
@@ -28,7 +28,6 @@
 #  include <locale>
 #endif
 #ifdef WINDOWS
-#  include <wincon.h>
 #  include <windows.h>
 #  include <wingdi.h>
 #  define COMMON_LVB_UNDERSCORE 0x8000
diff --git a/utils/piterminal/main.cpp b/utils/piterminal/main.cpp
index 40c509ed..4574f9a7 100644
--- a/utils/piterminal/main.cpp
+++ b/utils/piterminal/main.cpp
@@ -31,8 +31,10 @@ int main(int argc, char * argv[]) {
 #  include "piscreentypes.h"
 #  include "pisharedmemory.h"
 
-#  include <wincon.h>
+// clang-format off
 #  include <wingdi.h>
+#  include <wincon.h>
+// clang-format on
 
 
 PIVector<PIVector<PIScreenTypes::Cell>> cells;