diff --git a/mingw-w64-libraries/winpthreads/Makefile.am b/mingw-w64-libraries/winpthreads/Makefile.am
index 0bcff1a..3c14040 100644
--- a/mingw-w64-libraries/winpthreads/Makefile.am
+++ b/mingw-w64-libraries/winpthreads/Makefile.am
@@ -1,7 +1,7 @@
 
 SUBDIRS = . tests
 
-AM_CFLAGS = -Wall -DWIN32_LEAN_AND_MEAN
+AM_CFLAGS = -Wall
 ACLOCAL_AMFLAGS = -I m4
 
 lib_LTLIBRARIES = libwinpthread.la
diff --git a/mingw-w64-libraries/winpthreads/src/barrier.c b/mingw-w64-libraries/winpthreads/src/barrier.c
index 13e38a2..858dda7 100644
--- a/mingw-w64-libraries/winpthreads/src/barrier.c
+++ b/mingw-w64-libraries/winpthreads/src/barrier.c
@@ -21,11 +21,16 @@
 */
 
 #include <assert.h>
-#include <windows.h>
-#include <stdio.h>
 #include <malloc.h>
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
 #include "pthread.h"
 #include "semaphore.h"
+/* internal header files */
 #include "barrier.h"
 #include "misc.h"
 
diff --git a/mingw-w64-libraries/winpthreads/src/barrier.h b/mingw-w64-libraries/winpthreads/src/barrier.h
index 5509678..1d1e83d 100644
--- a/mingw-w64-libraries/winpthreads/src/barrier.h
+++ b/mingw-w64-libraries/winpthreads/src/barrier.h
@@ -34,8 +34,6 @@
             return EINVAL;                                              \
     } while (0)
 
-#include "semaphore.h"
-
 typedef struct barrier_t barrier_t;
 struct barrier_t
 {
diff --git a/mingw-w64-libraries/winpthreads/src/clock.c b/mingw-w64-libraries/winpthreads/src/clock.c
index 954d845..16e840f 100644
--- a/mingw-w64-libraries/winpthreads/src/clock.c
+++ b/mingw-w64-libraries/winpthreads/src/clock.c
@@ -7,12 +7,13 @@
 #include <errno.h>
 #include <stdint.h>
 #include <time.h>
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#ifndef IN_WINPTHREAD
-#define IN_WINPTHREAD 1
-#endif
-#include "pthread.h"
+
+/* public header files */
 #include "pthread_time.h"
+/* internal header files */
 #include "misc.h"
 
 #define POW10_7                 10000000
@@ -172,7 +173,7 @@
         return 0;
         }
 
-    case CLOCK_THREAD_CPUTIME_ID: 
+    case CLOCK_THREAD_CPUTIME_ID:
         {
             if(0 == GetThreadTimes(GetCurrentThread(), &ct.ft, &et.ft, &kt.ft, &ut.ft))
                 return lc_set_errno(EINVAL);
diff --git a/mingw-w64-libraries/winpthreads/src/cond.c b/mingw-w64-libraries/winpthreads/src/cond.c
index ea49255..4013bdf 100644
--- a/mingw-w64-libraries/winpthreads/src/cond.c
+++ b/mingw-w64-libraries/winpthreads/src/cond.c
@@ -24,15 +24,21 @@
  * Posix Condition Variables for Microsoft Windows.
  * 22-9-2010 Partly based on the ACE framework implementation.
  */
-#include <windows.h>
-#include <stdio.h>
+
 #include <malloc.h>
+#include <stdio.h>
 #include <time.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
 #include "pthread.h"
 #include "pthread_time.h"
+/* internal header files */
 #include "cond.h"
-#include "thread.h"
 #include "misc.h"
+#include "thread.h"
 
 #include "pthread_compat.h"
 
diff --git a/mingw-w64-libraries/winpthreads/src/cond.h b/mingw-w64-libraries/winpthreads/src/cond.h
index 9eda223..fcf7db3 100644
--- a/mingw-w64-libraries/winpthreads/src/cond.h
+++ b/mingw-w64-libraries/winpthreads/src/cond.h
@@ -23,8 +23,6 @@
 #ifndef WIN_PTHREADS_COND_H
 #define WIN_PTHREADS_COND_H
 
-#include <windows.h>
-
 #define CHECK_COND(c)                                                   \
     do {                                                                \
         if (!(c) || !*c || (*c == PTHREAD_COND_INITIALIZER)             \
diff --git a/mingw-w64-libraries/winpthreads/src/misc.c b/mingw-w64-libraries/winpthreads/src/misc.c
index c426f59..605c8f3 100644
--- a/mingw-w64-libraries/winpthreads/src/misc.c
+++ b/mingw-w64-libraries/winpthreads/src/misc.c
@@ -20,8 +20,12 @@
    DEALINGS IN THE SOFTWARE.
 */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+/* public header files */
 #include "pthread.h"
+/* internal header files */
 #include "misc.h"
 
 void (WINAPI *_pthread_get_system_time_best_as_file_time) (LPFILETIME) = NULL;
diff --git a/mingw-w64-libraries/winpthreads/src/misc.h b/mingw-w64-libraries/winpthreads/src/misc.h
index f01f1fb..75818b4 100644
--- a/mingw-w64-libraries/winpthreads/src/misc.h
+++ b/mingw-w64-libraries/winpthreads/src/misc.h
@@ -23,6 +23,8 @@
 #ifndef WIN_PTHREADS_MISC_H
 #define WIN_PTHREADS_MISC_H
 
+#include <limits.h>
+/* public header files */
 #include "pthread_compat.h"
 
 #define PTR2INT(x)	((int)(uintptr_t)(x))
diff --git a/mingw-w64-libraries/winpthreads/src/mutex.c b/mingw-w64-libraries/winpthreads/src/mutex.c
index 866e18d..782c143 100644
--- a/mingw-w64-libraries/winpthreads/src/mutex.c
+++ b/mingw-w64-libraries/winpthreads/src/mutex.c
@@ -21,11 +21,16 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <windows.h>
-#include <stdio.h>
 #include <malloc.h>
 #include <stdbool.h>
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
 #include "pthread.h"
+/* internal header files */
 #include "misc.h"
 
 typedef enum {
@@ -200,7 +205,7 @@
 }
 
 int pthread_mutex_unlock(pthread_mutex_t *m)
-{    
+{
   /* Here m might an initialiser of an error-checking or recursive mutex, in
      which case the behaviour is well-defined, so we can't skip this check. */
   mutex_impl_t *mi = mutex_impl(m);
@@ -305,9 +310,9 @@
 {
   if (!a || !type)
     return EINVAL;
-	
+
   *type = *a & 3;
-  
+
   return 0;
 }
 
diff --git a/mingw-w64-libraries/winpthreads/src/nanosleep.c b/mingw-w64-libraries/winpthreads/src/nanosleep.c
index 5ee5ef6..5b5c5f7 100644
--- a/mingw-w64-libraries/winpthreads/src/nanosleep.c
+++ b/mingw-w64-libraries/winpthreads/src/nanosleep.c
@@ -6,9 +6,14 @@
 
 #include <errno.h>
 #include <time.h>
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+/* public header files */
 #include "pthread.h"
 #include "pthread_time.h"
+/* internal header files */
 #include "thread.h"
 
 #define POW10_3                 1000
diff --git a/mingw-w64-libraries/winpthreads/src/rwlock.c b/mingw-w64-libraries/winpthreads/src/rwlock.c
index 0bdfe41..66c0b21 100644
--- a/mingw-w64-libraries/winpthreads/src/rwlock.c
+++ b/mingw-w64-libraries/winpthreads/src/rwlock.c
@@ -21,13 +21,18 @@
 */
 
 #include <assert.h>
-#include <windows.h>
-#include <stdio.h>
 #include <malloc.h>
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
 #include "pthread.h"
-#include "thread.h"
-#include "rwlock.h"
+/* internal header files */
 #include "misc.h"
+#include "rwlock.h"
+#include "thread.h"
 
 static pthread_spinlock_t rwl_global = PTHREAD_SPINLOCK_INITIALIZER;
 
diff --git a/mingw-w64-libraries/winpthreads/src/sched.c b/mingw-w64-libraries/winpthreads/src/sched.c
index 976bcc1..a6ad845 100644
--- a/mingw-w64-libraries/winpthreads/src/sched.c
+++ b/mingw-w64-libraries/winpthreads/src/sched.c
@@ -20,12 +20,16 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <windows.h>
 #include <stdio.h>
-#include "pthread.h"
-#include "thread.h"
 
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
+#include "pthread.h"
+/* internal header files */
 #include "misc.h"
+#include "thread.h"
 
 int sched_get_priority_min(int pol)
 {
diff --git a/mingw-w64-libraries/winpthreads/src/sem.c b/mingw-w64-libraries/winpthreads/src/sem.c
index 990f10c..4172b1e 100644
--- a/mingw-w64-libraries/winpthreads/src/sem.c
+++ b/mingw-w64-libraries/winpthreads/src/sem.c
@@ -20,14 +20,19 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <windows.h>
-#include <stdio.h>
 #include <malloc.h>
+#include <stdio.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+
+/* public header files */
 #include "pthread.h"
-#include "thread.h"
-#include "misc.h"
 #include "semaphore.h"
+/* internal header files */
+#include "misc.h"
 #include "sem.h"
+#include "thread.h"
 
 int do_sema_b_wait_intern (HANDLE sema, int nointerrupt, DWORD timeout);
 
diff --git a/mingw-w64-libraries/winpthreads/src/sem.h b/mingw-w64-libraries/winpthreads/src/sem.h
index 3b3ace7..ddfc00a 100644
--- a/mingw-w64-libraries/winpthreads/src/sem.h
+++ b/mingw-w64-libraries/winpthreads/src/sem.h
@@ -23,8 +23,6 @@
 #ifndef WIN_SEM
 #define WIN_SEM
 
-#include <windows.h>
-
 #define LIFE_SEM 0xBAB1F00D
 #define DEAD_SEM 0xDEADBEEF
 
diff --git a/mingw-w64-libraries/winpthreads/src/spinlock.c b/mingw-w64-libraries/winpthreads/src/spinlock.c
index 224c5a0..850735e 100644
--- a/mingw-w64-libraries/winpthreads/src/spinlock.c
+++ b/mingw-w64-libraries/winpthreads/src/spinlock.c
@@ -21,8 +21,12 @@
    DEALINGS IN THE SOFTWARE.
 */
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+/* public header files */
 #include "pthread.h"
+/* internal header files */
 #include "misc.h"
 
 /* We use the pthread_spinlock_t itself as a lock:
@@ -56,7 +60,7 @@
     } while (*lk == 0);
   return 0;
 }
-  
+
 int
 pthread_spin_trylock (pthread_spinlock_t *lock)
 {
diff --git a/mingw-w64-libraries/winpthreads/src/thread.c b/mingw-w64-libraries/winpthreads/src/thread.c
index bee7670..8ee9be0 100644
--- a/mingw-w64-libraries/winpthreads/src/thread.c
+++ b/mingw-w64-libraries/winpthreads/src/thread.c
@@ -20,15 +20,20 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <windows.h>
-#include <strsafe.h>
-#include <stdio.h>
-#include <stdlib.h>
 #include <malloc.h>
 #include <signal.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#include <strsafe.h>
+
+/* public header files */
 #include "pthread.h"
-#include "thread.h"
+/* internal header files */
 #include "misc.h"
+#include "thread.h"
 
 static _pthread_v *__pthread_self_lite (void);
 
diff --git a/mingw-w64-libraries/winpthreads/src/thread.h b/mingw-w64-libraries/winpthreads/src/thread.h
index c38ff2b..90f9cd3 100644
--- a/mingw-w64-libraries/winpthreads/src/thread.h
+++ b/mingw-w64-libraries/winpthreads/src/thread.h
@@ -23,8 +23,8 @@
 #ifndef WIN_PTHREAD_H
 #define WIN_PTHREAD_H
 
-#include <windows.h>
 #include <setjmp.h>
+/* internal header files */
 #include "rwlock.h"
 
 #define LIFE_THREAD 0xBAB1F00D