diff --git a/reactos/lib/crt/float/fpecode.c b/reactos/lib/crt/float/fpecode.c
index 523c02c64a9..d7c8a10909a 100644
--- a/reactos/lib/crt/float/fpecode.c
+++ b/reactos/lib/crt/float/fpecode.c
@@ -1,7 +1,3 @@
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
-
 #include <float.h>
 #include <internal/tls.h>
 
diff --git a/reactos/lib/crt/include/internal/file.h b/reactos/lib/crt/include/internal/file.h
index 040c47917e6..b451e292ad6 100644
--- a/reactos/lib/crt/include/internal/file.h
+++ b/reactos/lib/crt/include/internal/file.h
@@ -17,6 +17,9 @@
 #include <fcntl.h>
 #include <stdarg.h>
 
+#include <windef.h>
+#include <winbase.h>
+#include <winnt.h>
 
 #ifndef _IORMONCL
 #define _IORMONCL 004000  /* remove on close, for temp files */
@@ -50,9 +53,6 @@ void free_fd(int _fd);
 void sigabort_handler(int sig);
 char split_oflags(int oflags);
 
-
-#include <windows.h>
-
 unsigned create_io_inherit_block(STARTUPINFOA* si);
 void UnixTimeToFileTime(time_t unix_time, FILETIME* filetime, DWORD remainder);
 time_t FileTimeToUnixTime(const FILETIME* filetime, DWORD *remainder);
diff --git a/reactos/lib/crt/include/internal/tls.h b/reactos/lib/crt/include/internal/tls.h
index 1bb029c72ed..690aa398784 100644
--- a/reactos/lib/crt/include/internal/tls.h
+++ b/reactos/lib/crt/include/internal/tls.h
@@ -3,7 +3,12 @@
 #ifndef __CRT_INTERNAL_TLS_H
 #define __CRT_INTERNAL_TLS_H
 
-#include <windows.h>
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winnt.h>
+
 #include <msvcrt/crttypes.h>
 #include <stddef.h>
 
diff --git a/reactos/lib/crt/stdio/fopen.c b/reactos/lib/crt/stdio/fopen.c
index 1bbbd3b2751..9d9f0e1c354 100644
--- a/reactos/lib/crt/stdio/fopen.c
+++ b/reactos/lib/crt/stdio/fopen.c
@@ -25,6 +25,8 @@
  */
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 
+#include "precomp.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <string.h>
diff --git a/reactos/lib/crt/stdio/freopen.c b/reactos/lib/crt/stdio/freopen.c
index 738eb199a3c..9030e5dda39 100644
--- a/reactos/lib/crt/stdio/freopen.c
+++ b/reactos/lib/crt/stdio/freopen.c
@@ -1,5 +1,7 @@
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 
+#include "precomp.h"
+
 #include <sys/types.h>
 #include <stdio.h>
 #include <fcntl.h>
diff --git a/reactos/lib/crt/stdio/fsopen.c b/reactos/lib/crt/stdio/fsopen.c
index 571dacbc322..fc94ac6d8da 100644
--- a/reactos/lib/crt/stdio/fsopen.c
+++ b/reactos/lib/crt/stdio/fsopen.c
@@ -9,6 +9,8 @@
  */
 /* Copyright (C) 1995 DJ Delorie, see COPYING.DJ for details */
 
+#include "precomp.h"
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdio.h>
diff --git a/reactos/lib/crt/stdio/vfprintf.c b/reactos/lib/crt/stdio/vfprintf.c
index 70e6568cc69..f69515496ff 100644
--- a/reactos/lib/crt/stdio/vfprintf.c
+++ b/reactos/lib/crt/stdio/vfprintf.c
@@ -3,20 +3,11 @@
 #include <stdio.h>
 #include <malloc.h>
 #include <internal/file.h>
-
-#ifdef __USE_W32API
 #include <ntdef.h>
-#endif
-
-
 
 extern int __mb_cur_max;
-
-
-
 int __vfprintf(FILE*, const char*, va_list);
 
-
 /*
  * @implemented
  */
diff --git a/reactos/lib/crt/stdio/vfwprint.c b/reactos/lib/crt/stdio/vfwprint.c
index 262b2d18e97..92040f3c8a1 100644
--- a/reactos/lib/crt/stdio/vfwprint.c
+++ b/reactos/lib/crt/stdio/vfwprint.c
@@ -1,14 +1,13 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
 
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
+#include "precomp.h"
 
 #include <stdarg.h>
 #include <stdio.h>
 #include <malloc.h>
 #include <internal/file.h>
 
+#include <ntdef.h>
 
 int _isnanl(double x);
 int _isinfl(double x);
diff --git a/reactos/lib/crt/stdlib/errno.c b/reactos/lib/crt/stdlib/errno.c
index 7b2ba8df874..74e70689089 100644
--- a/reactos/lib/crt/stdlib/errno.c
+++ b/reactos/lib/crt/stdlib/errno.c
@@ -1,9 +1,6 @@
 /* $Id$
  *
  */
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif 
 
 #include <errno.h>
 #include <internal/tls.h>
diff --git a/reactos/lib/crt/stdlib/qsort.c b/reactos/lib/crt/stdlib/qsort.c
index 2be3badae77..e6c4f449a4c 100644
--- a/reactos/lib/crt/stdlib/qsort.c
+++ b/reactos/lib/crt/stdlib/qsort.c
@@ -1,7 +1,4 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
 
 #include <stdlib.h>
 #include <search.h>
diff --git a/reactos/lib/crt/stdlib/rand.c b/reactos/lib/crt/stdlib/rand.c
index 79a04b53448..ddcfe47d1cd 100644
--- a/reactos/lib/crt/stdlib/rand.c
+++ b/reactos/lib/crt/stdlib/rand.c
@@ -1,7 +1,4 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
 
 #include <stdlib.h>
 #include <internal/tls.h>
diff --git a/reactos/lib/crt/string/lasttok.c b/reactos/lib/crt/string/lasttok.c
index 188b10d7085..f5f8b61d7e6 100644
--- a/reactos/lib/crt/string/lasttok.c
+++ b/reactos/lib/crt/string/lasttok.c
@@ -1,7 +1,3 @@
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
-
 #include <internal/tls.h>
 #include <assert.h>
 
diff --git a/reactos/lib/crt/string/strtok.c b/reactos/lib/crt/string/strtok.c
index 4bd36f39fdc..aca32a62885 100644
--- a/reactos/lib/crt/string/strtok.c
+++ b/reactos/lib/crt/string/strtok.c
@@ -1,7 +1,4 @@
 /* Copyright (C) 1994 DJ Delorie, see COPYING.DJ for details */
-#ifdef __USE_W32API
-#undef __USE_W32API
-#endif
 
 #include <string.h>
 #include <internal/tls.h>