CI updates and cleanups

src/work.cpp

@@ -30,15 +30,13 @@
 // of class PackerBase which then does the actual work.
 // And see p_com.cpp for a simple executable format.
 
+#define WANT_WINDOWS_LEAN_H 1 // _get_osfhandle, GetFileTime, SetFileTime
 #include "headers.h"
 #if USE_UTIMENSAT
 #include <sys/types.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #endif
-#if defined(_WIN32) || defined(__CYGWIN__)
-#include "util/windows_lean.h" // _get_osfhandle, GetFileTime, SetFileTime
-#endif
 #include "conf.h"
 #include "file.h"
 #include "packmast.h"