Moved srtuct declarations from _mingw.h to crtdefs.h
git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/stable/v2.x@5227 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/crt/_mingw.h.in b/mingw-w64-headers/crt/_mingw.h.in
index 6968ffa..bf71223 100644
--- a/mingw-w64-headers/crt/_mingw.h.in
+++ b/mingw-w64-headers/crt/_mingw.h.in
@@ -4,8 +4,8 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#ifndef _INC_CRTDEFS
-#define _INC_CRTDEFS
+#ifndef _INC__MINGW_H
+#define _INC__MINGW_H
#include "_mingw_mac.h"
@@ -645,58 +645,6 @@
#endif
-
-/* MSVC-isms: */
-
-struct threadlocaleinfostruct;
-struct threadmbcinfostruct;
-typedef struct threadlocaleinfostruct *pthreadlocinfo;
-typedef struct threadmbcinfostruct *pthreadmbcinfo;
-struct __lc_time_data;
-
-typedef struct localeinfo_struct {
- pthreadlocinfo locinfo;
- pthreadmbcinfo mbcinfo;
-} _locale_tstruct,*_locale_t;
-
-#ifndef _TAGLC_ID_DEFINED
-#define _TAGLC_ID_DEFINED
-typedef struct tagLC_ID {
- unsigned short wLanguage;
- unsigned short wCountry;
- unsigned short wCodePage;
-} LC_ID,*LPLC_ID;
-#endif /* _TAGLC_ID_DEFINED */
-
-#ifndef _THREADLOCALEINFO
-#define _THREADLOCALEINFO
-typedef struct threadlocaleinfostruct {
- int refcount;
- unsigned int lc_codepage;
- unsigned int lc_collate_cp;
- unsigned long lc_handle[6];
- LC_ID lc_id[6];
- struct {
- char *locale;
- wchar_t *wlocale;
- int *refcount;
- int *wrefcount;
- } lc_category[6];
- int lc_clike;
- int mb_cur_max;
- int *lconv_intl_refcount;
- int *lconv_num_refcount;
- int *lconv_mon_refcount;
- struct lconv *lconv;
- int *ctype1_refcount;
- unsigned short *ctype1;
- const unsigned short *pctype;
- const unsigned char *pclmap;
- const unsigned char *pcumap;
- struct __lc_time_data *lc_time_curr;
-} threadlocinfo;
-#endif /* _THREADLOCALEINFO */
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -720,7 +668,7 @@
#pragma pack(pop)
-#endif /* _INC_CRTDEFS */
+#endif /* _INC__MINGW_H */
#ifndef MINGW_SDK_INIT
#define MINGW_SDK_INIT
diff --git a/mingw-w64-headers/crt/assert.h b/mingw-w64-headers/crt/assert.h
index 702d089..34d48ac 100644
--- a/mingw-w64-headers/crt/assert.h
+++ b/mingw-w64-headers/crt/assert.h
@@ -12,7 +12,7 @@
#ifndef __ASSERT_H_
#define __ASSERT_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
#include <stdlib.h>
#endif
diff --git a/mingw-w64-headers/crt/complex.h b/mingw-w64-headers/crt/complex.h
index 6426ee2..99772f2 100644
--- a/mingw-w64-headers/crt/complex.h
+++ b/mingw-w64-headers/crt/complex.h
@@ -27,7 +27,7 @@
#define _COMPLEX_H_
/* All the headers include this file. */
-#include <_mingw.h>
+#include <crtdefs.h>
/* These macros are specified by C99 standard */
diff --git a/mingw-w64-headers/crt/conio.h b/mingw-w64-headers/crt/conio.h
index c108e8b..a7f9fa5 100644
--- a/mingw-w64-headers/crt/conio.h
+++ b/mingw-w64-headers/crt/conio.h
@@ -6,7 +6,7 @@
#ifndef _INC_CONIO
#define _INC_CONIO
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/crtdbg.h b/mingw-w64-headers/crt/crtdbg.h
index e864e0b..e872fab 100644
--- a/mingw-w64-headers/crt/crtdbg.h
+++ b/mingw-w64-headers/crt/crtdbg.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _INC_CRTDBG
#define _INC_CRTDBG
diff --git a/mingw-w64-headers/crt/crtdefs.h b/mingw-w64-headers/crt/crtdefs.h
index 357331f..de2eb5c 100644
--- a/mingw-w64-headers/crt/crtdefs.h
+++ b/mingw-w64-headers/crt/crtdefs.h
@@ -3,6 +3,10 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
+
+#ifndef _INC_CRTDEFS
+#define _INC_CRTDEFS
+
#include <_mingw.h>
#ifndef __ERRCODE_DEFINED_MS
@@ -18,6 +22,57 @@
#define _CRTRESTRICT
#endif
+struct threadlocaleinfostruct;
+struct threadmbcinfostruct;
+typedef struct threadlocaleinfostruct *pthreadlocinfo;
+typedef struct threadmbcinfostruct *pthreadmbcinfo;
+struct __lc_time_data;
+
+typedef struct localeinfo_struct {
+ pthreadlocinfo locinfo;
+ pthreadmbcinfo mbcinfo;
+} _locale_tstruct,*_locale_t;
+
+#ifndef _TAGLC_ID_DEFINED
+#define _TAGLC_ID_DEFINED
+typedef struct tagLC_ID {
+ unsigned short wLanguage;
+ unsigned short wCountry;
+ unsigned short wCodePage;
+} LC_ID,*LPLC_ID;
+#endif /* _TAGLC_ID_DEFINED */
+
+#ifndef _THREADLOCALEINFO
+#define _THREADLOCALEINFO
+typedef struct threadlocaleinfostruct {
+ int refcount;
+ unsigned int lc_codepage;
+ unsigned int lc_collate_cp;
+ unsigned long lc_handle[6];
+ LC_ID lc_id[6];
+ struct {
+ char *locale;
+ wchar_t *wlocale;
+ int *refcount;
+ int *wrefcount;
+ } lc_category[6];
+ int lc_clike;
+ int mb_cur_max;
+ int *lconv_intl_refcount;
+ int *lconv_num_refcount;
+ int *lconv_mon_refcount;
+ struct lconv *lconv;
+ int *ctype1_refcount;
+ unsigned short *ctype1;
+ const unsigned short *pctype;
+ const unsigned char *pclmap;
+ const unsigned char *pcumap;
+ struct __lc_time_data *lc_time_curr;
+} threadlocinfo;
+#endif /* _THREADLOCALEINFO */
+
#ifndef __crt_typefix
#define __crt_typefix(ctype)
#endif
+
+#endif /* _INC_CRTDEFS */
diff --git a/mingw-w64-headers/crt/ctype.h b/mingw-w64-headers/crt/ctype.h
index eb69877..5b0f4f8 100644
--- a/mingw-w64-headers/crt/ctype.h
+++ b/mingw-w64-headers/crt/ctype.h
@@ -6,7 +6,7 @@
#ifndef _INC_CTYPE
#define _INC_CTYPE
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/direct.h b/mingw-w64-headers/crt/direct.h
index b7632f5..e8e04be 100644
--- a/mingw-w64-headers/crt/direct.h
+++ b/mingw-w64-headers/crt/direct.h
@@ -6,7 +6,7 @@
#ifndef _INC_DIRECT
#define _INC_DIRECT
-#include <_mingw.h>
+#include <crtdefs.h>
#include <io.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/dirent.h b/mingw-w64-headers/crt/dirent.h
index bb631c2..b590510 100644
--- a/mingw-w64-headers/crt/dirent.h
+++ b/mingw-w64-headers/crt/dirent.h
@@ -10,7 +10,7 @@
#define _DIRENT_H_
/* All the headers include this file. */
-#include <_mingw.h>
+#include <crtdefs.h>
#include <io.h>
diff --git a/mingw-w64-headers/crt/dos.h b/mingw-w64-headers/crt/dos.h
index 2983aab..6aeedf1 100644
--- a/mingw-w64-headers/crt/dos.h
+++ b/mingw-w64-headers/crt/dos.h
@@ -6,7 +6,7 @@
#ifndef _INC_DOS
#define _INC_DOS
-#include <_mingw.h>
+#include <crtdefs.h>
#include <io.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/dvec.h b/mingw-w64-headers/crt/dvec.h
index 5d22e52..dd95695 100644
--- a/mingw-w64-headers/crt/dvec.h
+++ b/mingw-w64-headers/crt/dvec.h
@@ -14,7 +14,7 @@
#include <intrin.h>
#include <assert.h>
#include <fvec.h>
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/eh.h b/mingw-w64-headers/crt/eh.h
index 9604c4e..a8398b8 100644
--- a/mingw-w64-headers/crt/eh.h
+++ b/mingw-w64-headers/crt/eh.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _EH_H_
#define _EH_H_
diff --git a/mingw-w64-headers/crt/errno.h b/mingw-w64-headers/crt/errno.h
index 791395f..84110b6 100644
--- a/mingw-w64-headers/crt/errno.h
+++ b/mingw-w64-headers/crt/errno.h
@@ -6,7 +6,7 @@
#ifndef _INC_ERRNO
#define _INC_ERRNO
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/excpt.h b/mingw-w64-headers/crt/excpt.h
index 324e26f..b823019 100644
--- a/mingw-w64-headers/crt/excpt.h
+++ b/mingw-w64-headers/crt/excpt.h
@@ -6,7 +6,7 @@
#ifndef _INC_EXCPT
#define _INC_EXCPT
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/fcntl.h b/mingw-w64-headers/crt/fcntl.h
index 7b76dd4..f35d6a6 100644
--- a/mingw-w64-headers/crt/fcntl.h
+++ b/mingw-w64-headers/crt/fcntl.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#include <io.h>
diff --git a/mingw-w64-headers/crt/fenv.h b/mingw-w64-headers/crt/fenv.h
index 55340af..30a8f66 100644
--- a/mingw-w64-headers/crt/fenv.h
+++ b/mingw-w64-headers/crt/fenv.h
@@ -6,7 +6,7 @@
#ifndef _FENV_H_
#define _FENV_H_
-#include <_mingw.h>
+#include <crtdefs.h>
/* FPU status word exception flags */
#define FE_INVALID 0x01
diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h
index dfe5504..3337526 100644
--- a/mingw-w64-headers/crt/float.h
+++ b/mingw-w64-headers/crt/float.h
@@ -119,7 +119,7 @@
#define _MINGW_FLOAT_H_
/* All the headers include this file. */
-#include <_mingw.h>
+#include <crtdefs.h>
/*
* Functions and definitions for controlling the FPU.
diff --git a/mingw-w64-headers/crt/fpieee.h b/mingw-w64-headers/crt/fpieee.h
index f3bf142..02f1b49 100644
--- a/mingw-w64-headers/crt/fpieee.h
+++ b/mingw-w64-headers/crt/fpieee.h
@@ -6,7 +6,7 @@
#ifndef _INC_FPIEEE
#define _INC_FPIEEE
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/fvec.h b/mingw-w64-headers/crt/fvec.h
index 8a586ac..7120539 100644
--- a/mingw-w64-headers/crt/fvec.h
+++ b/mingw-w64-headers/crt/fvec.h
@@ -14,7 +14,7 @@
#include <intrin.h>
#include <assert.h>
#include <ivec.h>
-#include <_mingw.h>
+#include <crtdefs.h>
#if defined(_ENABLE_VEC_DEBUG)
#include <iostream>
diff --git a/mingw-w64-headers/crt/getopt.h b/mingw-w64-headers/crt/getopt.h
index 2e54525..924df0b 100644
--- a/mingw-w64-headers/crt/getopt.h
+++ b/mingw-w64-headers/crt/getopt.h
@@ -13,7 +13,7 @@
#define __GETOPT_H__
/* All the headers include this file. */
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/ieeefp.h b/mingw-w64-headers/crt/ieeefp.h
index 1b2c53c..d22a4b5 100644
--- a/mingw-w64-headers/crt/ieeefp.h
+++ b/mingw-w64-headers/crt/ieeefp.h
@@ -1,7 +1,7 @@
#ifndef _IEEEFP_H_
#define _IEEEFP_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#include <math.h>
#include <ansidecl.h>
diff --git a/mingw-w64-headers/crt/intrin.h b/mingw-w64-headers/crt/intrin.h
index e43a58a..dd3b262 100644
--- a/mingw-w64-headers/crt/intrin.h
+++ b/mingw-w64-headers/crt/intrin.h
@@ -7,7 +7,7 @@
#define __INTRIN_H_
#ifndef RC_INVOKED
-#include <_mingw.h>
+#include <crtdefs.h>
#include <setjmp.h>
#include <stddef.h>
diff --git a/mingw-w64-headers/crt/inttypes.h b/mingw-w64-headers/crt/inttypes.h
index ba6081e..e3d6cd8 100644
--- a/mingw-w64-headers/crt/inttypes.h
+++ b/mingw-w64-headers/crt/inttypes.h
@@ -8,7 +8,7 @@
#ifndef _INTTYPES_H_
#define _INTTYPES_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#include <stdint.h>
#define __need_wchar_t
#include <stddef.h>
diff --git a/mingw-w64-headers/crt/io.h b/mingw-w64-headers/crt/io.h
index f767dd6..6a9b236 100644
--- a/mingw-w64-headers/crt/io.h
+++ b/mingw-w64-headers/crt/io.h
@@ -6,7 +6,7 @@
#ifndef _IO_H_
#define _IO_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#include <string.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/ivec.h b/mingw-w64-headers/crt/ivec.h
index 98388ba..48589b5 100644
--- a/mingw-w64-headers/crt/ivec.h
+++ b/mingw-w64-headers/crt/ivec.h
@@ -14,7 +14,7 @@
#include <intrin.h>
#include <assert.h>
#include <dvec.h>
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/libgen.h b/mingw-w64-headers/crt/libgen.h
index 2e4b414..7d8d79c 100644
--- a/mingw-w64-headers/crt/libgen.h
+++ b/mingw-w64-headers/crt/libgen.h
@@ -7,7 +7,7 @@
#ifndef _LIBGEN_H_
#define _LIBGEN_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/limits.h b/mingw-w64-headers/crt/limits.h
index 22a7ae4..56c3c6b 100644
--- a/mingw-w64-headers/crt/limits.h
+++ b/mingw-w64-headers/crt/limits.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _INC_LIMITS
#define _INC_LIMITS
diff --git a/mingw-w64-headers/crt/locale.h b/mingw-w64-headers/crt/locale.h
index 3c4895e..264c50c 100644
--- a/mingw-w64-headers/crt/locale.h
+++ b/mingw-w64-headers/crt/locale.h
@@ -6,7 +6,7 @@
#ifndef _INC_LOCALE
#define _INC_LOCALE
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/malloc.h b/mingw-w64-headers/crt/malloc.h
index 7883266..212b8e6 100644
--- a/mingw-w64-headers/crt/malloc.h
+++ b/mingw-w64-headers/crt/malloc.h
@@ -6,7 +6,7 @@
#ifndef _MALLOC_H_
#define _MALLOC_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h
index 0819eb3..1ab185d 100644
--- a/mingw-w64-headers/crt/math.h
+++ b/mingw-w64-headers/crt/math.h
@@ -10,7 +10,7 @@
#pragma GCC system_header
#endif
-#include <_mingw.h>
+#include <crtdefs.h>
struct _exception;
diff --git a/mingw-w64-headers/crt/mbctype.h b/mingw-w64-headers/crt/mbctype.h
index 7da43e6..da233e2 100644
--- a/mingw-w64-headers/crt/mbctype.h
+++ b/mingw-w64-headers/crt/mbctype.h
@@ -6,7 +6,7 @@
#ifndef _INC_MBCTYPE
#define _INC_MBCTYPE
-#include <_mingw.h>
+#include <crtdefs.h>
#include <ctype.h>
#ifdef __cplusplus
diff --git a/mingw-w64-headers/crt/mbstring.h b/mingw-w64-headers/crt/mbstring.h
index bbc11bb..cc48b60 100644
--- a/mingw-w64-headers/crt/mbstring.h
+++ b/mingw-w64-headers/crt/mbstring.h
@@ -6,7 +6,7 @@
#ifndef _INC_MBSTRING
#define _INC_MBSTRING
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/memory.h b/mingw-w64-headers/crt/memory.h
index 32a1fd4..cfc716d 100644
--- a/mingw-w64-headers/crt/memory.h
+++ b/mingw-w64-headers/crt/memory.h
@@ -6,7 +6,7 @@
#ifndef _INC_MEMORY
#define _INC_MEMORY
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/new.h b/mingw-w64-headers/crt/new.h
index 0c2790d..c043d04 100644
--- a/mingw-w64-headers/crt/new.h
+++ b/mingw-w64-headers/crt/new.h
@@ -10,7 +10,7 @@
#include <new>
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma push_macro("new")
#undef new
diff --git a/mingw-w64-headers/crt/process.h b/mingw-w64-headers/crt/process.h
index 8b32fc7..141bbab 100644
--- a/mingw-w64-headers/crt/process.h
+++ b/mingw-w64-headers/crt/process.h
@@ -6,7 +6,7 @@
#ifndef _INC_PROCESS
#define _INC_PROCESS
-#include <_mingw.h>
+#include <crtdefs.h>
/* Includes a definition of _pid_t and pid_t */
#include <sys/types.h>
diff --git a/mingw-w64-headers/crt/search.h b/mingw-w64-headers/crt/search.h
index c6262d3..f6cf4c0 100644
--- a/mingw-w64-headers/crt/search.h
+++ b/mingw-w64-headers/crt/search.h
@@ -6,7 +6,7 @@
#ifndef _INC_SEARCH
#define _INC_SEARCH
-#include <_mingw.h>
+#include <crtdefs.h>
#include <stddef.h>
#ifdef __cplusplus
diff --git a/mingw-w64-headers/crt/signal.h b/mingw-w64-headers/crt/signal.h
index 7c6a009..6c9b3fc 100644
--- a/mingw-w64-headers/crt/signal.h
+++ b/mingw-w64-headers/crt/signal.h
@@ -6,7 +6,7 @@
#ifndef _INC_SIGNAL
#define _INC_SIGNAL
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/stddef.h b/mingw-w64-headers/crt/stddef.h
index 3d7c90d..ad69dea 100644
--- a/mingw-w64-headers/crt/stddef.h
+++ b/mingw-w64-headers/crt/stddef.h
@@ -4,7 +4,7 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _INC_STDDEF
#define _INC_STDDEF
diff --git a/mingw-w64-headers/crt/stdexcpt.h b/mingw-w64-headers/crt/stdexcpt.h
index b3e2858..b05c6f6 100644
--- a/mingw-w64-headers/crt/stdexcpt.h
+++ b/mingw-w64-headers/crt/stdexcpt.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _INC_STDEXCPT
#define _INC_STDEXCPT
diff --git a/mingw-w64-headers/crt/stdint.h b/mingw-w64-headers/crt/stdint.h
index c0326e4..b170225 100644
--- a/mingw-w64-headers/crt/stdint.h
+++ b/mingw-w64-headers/crt/stdint.h
@@ -25,7 +25,7 @@
#ifndef _STDINT_H
#define _STDINT_H
-#include <_mingw.h>
+#include <crtdefs.h>
#define __need_wint_t
#define __need_wchar_t
diff --git a/mingw-w64-headers/crt/stdio.h b/mingw-w64-headers/crt/stdio.h
index 487ed9c..a75de7d 100644
--- a/mingw-w64-headers/crt/stdio.h
+++ b/mingw-w64-headers/crt/stdio.h
@@ -6,7 +6,7 @@
#ifndef _INC_STDIO
#define _INC_STDIO
-#include <_mingw.h>
+#include <crtdefs.h>
#include <_mingw_print_push.h>
diff --git a/mingw-w64-headers/crt/stdlib.h b/mingw-w64-headers/crt/stdlib.h
index 6057e09..a8d8843 100644
--- a/mingw-w64-headers/crt/stdlib.h
+++ b/mingw-w64-headers/crt/stdlib.h
@@ -6,7 +6,7 @@
#ifndef _INC_STDLIB
#define _INC_STDLIB
-#include <_mingw.h>
+#include <crtdefs.h>
#include <limits.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/string.h b/mingw-w64-headers/crt/string.h
index 565c558..cada229 100644
--- a/mingw-w64-headers/crt/string.h
+++ b/mingw-w64-headers/crt/string.h
@@ -6,7 +6,7 @@
#ifndef _INC_STRING
#define _INC_STRING
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef __cplusplus
extern "C" {
diff --git a/mingw-w64-headers/crt/sys/cdefs.h b/mingw-w64-headers/crt/sys/cdefs.h
index 29a177f..adaa27c 100644
--- a/mingw-w64-headers/crt/sys/cdefs.h
+++ b/mingw-w64-headers/crt/sys/cdefs.h
@@ -4,7 +4,7 @@
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _SYS_CDEFS_H
#define _SYS_CDEFS_H
#ifdef __cplusplus
diff --git a/mingw-w64-headers/crt/sys/locking.h b/mingw-w64-headers/crt/sys/locking.h
index c1e2825..5d6f84f 100644
--- a/mingw-w64-headers/crt/sys/locking.h
+++ b/mingw-w64-headers/crt/sys/locking.h
@@ -11,7 +11,7 @@
#endif
/* All the headers include this file. */
-#include <_mingw.h>
+#include <crtdefs.h>
#define _LK_UNLCK 0
#define _LK_LOCK 1
diff --git a/mingw-w64-headers/crt/sys/stat.h b/mingw-w64-headers/crt/sys/stat.h
index 4f82062..fe510f3 100644
--- a/mingw-w64-headers/crt/sys/stat.h
+++ b/mingw-w64-headers/crt/sys/stat.h
@@ -10,7 +10,7 @@
#error Only Win32 target is supported!
#endif
-#include <_mingw.h>
+#include <crtdefs.h>
#include <io.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/sys/timeb.h b/mingw-w64-headers/crt/sys/timeb.h
index 53adf7c..82302e1 100644
--- a/mingw-w64-headers/crt/sys/timeb.h
+++ b/mingw-w64-headers/crt/sys/timeb.h
@@ -6,7 +6,7 @@
#ifndef _TIMEB_H_
#define _TIMEB_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _WIN32
#error Only Win32 target is supported!
diff --git a/mingw-w64-headers/crt/sys/types.h b/mingw-w64-headers/crt/sys/types.h
index 1993f5b..f779c3f 100644
--- a/mingw-w64-headers/crt/sys/types.h
+++ b/mingw-w64-headers/crt/sys/types.h
@@ -10,7 +10,7 @@
#error Only Win32 target is supported!
#endif
-#include <_mingw.h>
+#include <crtdefs.h>
#ifdef _USE_32BIT_TIME_T
#ifdef _WIN64
diff --git a/mingw-w64-headers/crt/sys/utime.h b/mingw-w64-headers/crt/sys/utime.h
index 9dca923..91e3f1c 100644
--- a/mingw-w64-headers/crt/sys/utime.h
+++ b/mingw-w64-headers/crt/sys/utime.h
@@ -10,7 +10,7 @@
#error Only Win32 target is supported!
#endif
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/tchar.h b/mingw-w64-headers/crt/tchar.h
index e8dc6bb..4598be3 100644
--- a/mingw-w64-headers/crt/tchar.h
+++ b/mingw-w64-headers/crt/tchar.h
@@ -3,7 +3,7 @@
* This file is part of the w64 mingw-runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _INC_TCHAR
#define _INC_TCHAR
diff --git a/mingw-w64-headers/crt/time.h b/mingw-w64-headers/crt/time.h
index e1077ed..e97f2fe 100644
--- a/mingw-w64-headers/crt/time.h
+++ b/mingw-w64-headers/crt/time.h
@@ -6,7 +6,7 @@
#ifndef _TIME_H_
#define _TIME_H_
-#include <_mingw.h>
+#include <crtdefs.h>
#ifndef _WIN32
#error Only Win32 target is supported!
diff --git a/mingw-w64-headers/crt/wchar.h b/mingw-w64-headers/crt/wchar.h
index e0cd297..c801101 100644
--- a/mingw-w64-headers/crt/wchar.h
+++ b/mingw-w64-headers/crt/wchar.h
@@ -6,7 +6,7 @@
#ifndef _INC_WCHAR
#define _INC_WCHAR
-#include <_mingw.h>
+#include <crtdefs.h>
#include <_mingw_print_push.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/wctype.h b/mingw-w64-headers/crt/wctype.h
index 40a4921..66a355b 100644
--- a/mingw-w64-headers/crt/wctype.h
+++ b/mingw-w64-headers/crt/wctype.h
@@ -10,7 +10,7 @@
#error Only Win32 target is supported!
#endif
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
diff --git a/mingw-w64-headers/crt/yvals.h b/mingw-w64-headers/crt/yvals.h
index b984719..8c6affb 100644
--- a/mingw-w64-headers/crt/yvals.h
+++ b/mingw-w64-headers/crt/yvals.h
@@ -6,7 +6,7 @@
#ifndef _YVALS
#define _YVALS
-#include <_mingw.h>
+#include <crtdefs.h>
#pragma pack(push,_CRT_PACKING)
