diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index a97384130..bce307283 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2015-03-24  Corinna Vinschen  <corinna@vinschen.de>
+
+	Per glibc BZ #15366:
+	* inttypes.h: Drop __STDC_FORMAT_MACROS consideration.
+	* stdint.h: Drop __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS
+	consideration.
+
 2015-03-23  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/cygwin/_types.h: Drop unused file.
diff --git a/winsup/cygwin/include/inttypes.h b/winsup/cygwin/include/inttypes.h
index eb60e79e4..5a646813b 100644
--- a/winsup/cygwin/include/inttypes.h
+++ b/winsup/cygwin/include/inttypes.h
@@ -1,6 +1,6 @@
 /* inttypes.h - fixed size integer types
 
-   Copyright 2003, 2005, 2009, 2010, 2012 Red Hat, Inc.
+   Copyright 2003, 2005, 2009, 2010, 2012, 2015 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -16,11 +16,6 @@ details. */
 #include <stddef.h>
 #include <bits/wordsize.h>
 
-/* C99 requires that in C++ the following macros should be defined only
-   if requested. */
-#if !defined (__cplusplus) || defined (__STDC_FORMAT_MACROS) \
-    || defined (__INSIDE_CYGWIN__)
-
 #if __WORDSIZE == 64
 #define __PRI64 "l"
 #define __PRIFAST "l"
@@ -247,8 +242,6 @@ details. */
 #define SCNxMAX __SCN64 "x"
 #define SCNxPTR __SCNPTR "x"
 
-#endif /* !__cplusplus || __STDC_FORMAT_MACROS || __INSIDE_CYGWIN__ */
-
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/winsup/cygwin/include/stdint.h b/winsup/cygwin/include/stdint.h
index 94b6b7673..7da9caf6f 100644
--- a/winsup/cygwin/include/stdint.h
+++ b/winsup/cygwin/include/stdint.h
@@ -1,6 +1,6 @@
 /* stdint.h - integer types
 
-   Copyright 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 Red Hat, Inc.
+   Copyright 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2012 2015 Red Hat, Inc.
 
 This file is part of Cygwin.
 
@@ -109,11 +109,6 @@ typedef long long intmax_t;
 typedef unsigned long long uintmax_t;
 #endif
 
-/* C99 requires that in C++ the following macros should be defined only
-   if requested. */
-#if !defined (__cplusplus) || defined (__STDC_LIMIT_MACROS) \
-    || defined (__INSIDE_CYGWIN__)
-
 #ifdef __x86_64__
 # define __I64(n) n ## L
 # define __U64(n) n ## UL
@@ -248,13 +243,6 @@ typedef unsigned long long uintmax_t;
 #define WINT_MAX (4294967295U)
 #endif
 
-#endif /* !__cplusplus || __STDC_LIMIT_MACROS || __INSIDE_CYGWIN__ */
-
-/* C99 requires that in C++ the following macros should be defined only
-   if requested. */
-#if !defined (__cplusplus) || defined (__STDC_CONSTANT_MACROS) \
-    || defined (__INSIDE_CYGWIN__)
-
 /* Macros for minimum-width integer constant expressions */
 
 #define INT8_C(x) x
@@ -285,6 +273,4 @@ typedef unsigned long long uintmax_t;
 #define UINTMAX_C(x) x ## ULL
 #endif
 
-#endif /* !__cplusplus || __STDC_CONSTANT_MACROS || __INSIDE_CYGWIN__ */
-
 #endif /* _STDINT_H */