diff --git a/configure b/configure
index 42fb7df47f..cf8c91a73a 100755
--- a/configure
+++ b/configure
@@ -133,7 +133,14 @@ standard_gcc_settings()
 			haikuSharedLibStdCxx=`$HAIKU_CC -print-file-name=libstdc++.so`
 			haikuStaticLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.a`
 			haikuSharedLibSupCxx=`$HAIKU_CC -print-file-name=libsupc++.so`
-			local headers=$gccdir/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion
+
+			local headers
+			if [ -d $gccdir/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion ]; then
+				headers=$gccdir/../../../../$haikuGCCMachine/include/c++/$haikuGCCVersion
+			else
+				headers=$gccdir/../../../../include/c++/$haikuGCCVersion
+			fi
+
 			haikuCxxHeadersDir=$headers
 			for d in $haikuGCCMachine backward ext; do
 				# Note: We need the line break, otherwise the line might become