all: assorted cleanups; introduce undocumented '--sysinfo' option

src/console/s_win32.cpp

@@ -33,23 +33,7 @@
 // direct screen access
 **************************************************************************/
 
-#if !defined(WIN32_LEAN_AND_MEAN)
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-#if (defined(_MSC_VER) && (_MSC_VER >= 1000 && _MSC_VER < 1200)) && !defined(__clang__)
-/* avoid -W4 warnings in <conio.h> */
-#pragma warning(disable : 4032)
-/* avoid -W4 warnings in <windows.h> */
-#pragma warning(disable : 4201 4214 4514)
-#endif
-#if defined(_MSC_VER) && !defined(__clang__)
-/* avoid warnings in some versions of <windows.h> */
-#pragma warning(disable : 5105)
-#endif
-#if defined(__RSXNT__)
-#define timeval win32_timeval /* struct timeval already in <sys/time.h> */
-#endif
-#include <windows.h>
+#include "../util/windows_lean.h"
 #if (HAVE_CONIO_H)
 #include <conio.h>
 #endif

src/console/screen.h

@@ -26,8 +26,6 @@
  */
 
 #pragma once
-#ifndef UPX_SCREEN_H__
-#define UPX_SCREEN_H__ 1
 
 #if (USE_SCREEN)
 
@@ -100,6 +98,4 @@ void screen_show_frames(screen_t *);
 
 #endif /* USE_SCREEN */
 
-#endif /* already included */
-
 /* vim:set ts=4 sw=4 et: */