diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fe786073a02fc05188d816adb23b5fc9068d8fb7..c8d6cce99d558541f4e73a22a811caf83bed1810 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-21  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* gcc-interface/Makefile.in (INCLUDES_FOR_SUBDIR): Add $(fsrcdir) by
+	means of -iquote unconditionally.
+
 2011-11-21  Robert Dewar  <dewar@adacore.com>
 
 	* sem_ch3.adb, sem_util.adb, sem_res.adb, sem_attr.adb: Minor
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index ebb7ddb949f52518b697fe2fd6074eee71b0652f..4248a74f4fb13785e06a454dbaa46f9410dead0c 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -273,15 +273,9 @@ INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/config \
 
 ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
 
-INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \
-	-I$(fsrcdir)/../include
-
-ifeq ($(strip $(filter-out cygwin32% mingw32% pe,$(osys))),)
-  # On Windows native the tconfig.h files used by C runtime files needs to have
-  # the gcc source dir in its include dir list
-  INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. -iquote $(fsrcdir)/ada \
-        -I$(fsrcdir)/../include -I$(fsrcdir)
-endif
+INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
+		      -iquote $(fsrcdir)/ada -iquote $(fsrcdir) \
+		      -I$(fsrcdir)/../include
 
 ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada