diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index f1baa26838..f57578a814 100644
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,9 @@
+2004-12-14  Angus Leeming  <leeming@lyx.org>
+
+	* Makefile.am (INCLUDES):
+	* moc/Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
+	to overcome bug in the MinGW port of g++ 3.4.2.
+
 2004-12-07  Angus Leeming  <leeming@lyx.org>
 
 	* *.[Ch]: remove all traces of #pragma interface/implementation
diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am
index 0c86f8327e..45b5192e98 100644
--- a/src/frontends/qt2/Makefile.am
+++ b/src/frontends/qt2/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = Makefile.dialogs
 
 noinst_LTLIBRARIES = libqt2.la
 
-INCLUDES = -I$(top_srcdir)/src/ -I$(top_srcdir)/src/frontends/ \
+INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/images \
 	$(FRONTEND_INCLUDES) $(BOOST_INCLUDES) \
 	-I$(top_srcdir)/src/frontends/controllers
diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am
index 3d25b454ce..f475869b81 100644
--- a/src/frontends/qt2/moc/Makefile.am
+++ b/src/frontends/qt2/moc/Makefile.am
@@ -5,8 +5,8 @@ DISTCLEANFILES += *.C
 
 noinst_LTLIBRARIES = libqt2moc.la
 
-INCLUDES = -I$(top_srcdir)/src/ \
-	-I$(top_srcdir)/src/frontends/ \
+INCLUDES = -I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/frontends \
 	-I$(top_srcdir)/src/frontends/controllers \
 	-I$(top_builddir)/src/frontends/qt2 \
 	$(FRONTEND_INCLUDES) \
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index d845272be8..0dcc7cf607 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Angus Leeming  <leeming@lyx.org>
+
+	* Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
+	to overcome bug in the MinGW port of g++ 3.4.2.
+
 2004-12-07  Angus Leeming  <leeming@lyx.org>
 
 	* *.[Ch]: remove all traces of #pragma interface/implementation
diff --git a/src/insets/Makefile.am b/src/insets/Makefile.am
index eacdb18fc9..5513d7f28d 100644
--- a/src/insets/Makefile.am
+++ b/src/insets/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libinsets.la
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 EXTRA_DIST = \
 	insetlist.C \
diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index dd1365f4d5..de26776e80 100644
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Angus Leeming  <leeming@lyx.org>
+
+	* Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
+	to overcome bug in the MinGW port of g++ 3.4.2.
+
 2004-12-07  Angus Leeming  <leeming@lyx.org>
 
 	* *.[Ch]: remove all traces of #pragma interface/implementation
diff --git a/src/mathed/Makefile.am b/src/mathed/Makefile.am
index 3d71ea8538..630e1dbb3f 100644
--- a/src/mathed/Makefile.am
+++ b/src/mathed/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libmathed.la
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 libmathed_la_SOURCES = \
 	dimension.C \
diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 78835089a7..859c055e0c 100644
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-14  Angus Leeming  <leeming@lyx.org>
+
+	* Makefile.am (INCLUDES): Remove trailing slash from -Ifoo/
+	to overcome bug in the MinGW port of g++ 3.4.2.
+
 2004-12-07  Angus Leeming  <leeming@lyx.org>
 
 	* *.[Ch]: remove all traces of #pragma interface/implementation
diff --git a/src/support/Makefile.am b/src/support/Makefile.am
index 6323abc821..405886440f 100644
--- a/src/support/Makefile.am
+++ b/src/support/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/config/common.am
 
 noinst_LTLIBRARIES = libsupport.la
 
-INCLUDES = -I$(srcdir)/../ $(BOOST_INCLUDES)
+INCLUDES = -I$(srcdir)/.. $(BOOST_INCLUDES)
 
 EXTRA_DIST = lyxstring.C lyxstring.h \
 	     os_unix.C os_win32.C os_os2.C