diff --git a/externals b/externals
index 2ee6c3869..fc3fd64ee 160000
--- a/externals
+++ b/externals
@@ -1 +1 @@
-Subproject commit 2ee6c3869ed35301755b9b3e3c146db11ddffc0e
+Subproject commit fc3fd64ee73491dd0c339be5c28ae99520878a07
diff --git a/mkspecs/features/externals.pri b/mkspecs/features/externals.pri
index b45c78367..607ef1de3 100644
--- a/mkspecs/features/externals.pri
+++ b/mkspecs/features/externals.pri
@@ -23,32 +23,37 @@ isEmpty(EXTERNALSROOT) {
 
 EXTERNALS_SPEC = $$basename(QMAKESPEC)
 msvc {
-    clang_cl: EXTERNALS_SPEC = win32-msvc2015
-    win32-msvc2017: EXTERNALS_SPEC = win32-msvc2015
+    clang_cl: EXTERNALS_SPEC = win32-msvc
     win32-msvc {
         # From Qt 5.8.1 onwards, QMAKESPEC is win32-msvc without the version number
         # see https://codereview.qt-project.org/#/c/162754/
         lessThan(MSVC_VER, 14.0) | greaterThan(MSVC_VER, 15.0) {
             error(This version of Visual Studio is not supported (MSVC_VER = $$MSVC_VER))
         }
-        EXTERNALS_SPEC = win32-msvc2015
     }
 }
 
-INCLUDEPATH *= $$EXTERNALSROOT/common/include
-INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/include
+win32 {
+    INCLUDEPATH *= $$EXTERNALSROOT/common/include
+}
+else:macx {
+    INCLUDEPATH *= $$EXTERNALSROOT/common/include
+}
+else:unix: {
+    QMAKE_CXXFLAGS *= -idirafter $$EXTERNALSROOT/common/include
+}
 
 equals(WORD_SIZE,64) {
-    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/bin64
-    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/lib64
+    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/bin
+    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/lib
+    INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/64/include
 }
 equals(WORD_SIZE,32) {
-    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/bin32
-    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/lib32
+    EXTERNALS_BIN_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/bin
+    EXTERNALS_LIB_DIR = $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/lib
+    INCLUDEPATH *= $$EXTERNALSROOT/$$EXTERNALS_SPEC/32/include
 }
 
 LIBS *= -L$$EXTERNALS_LIB_DIR
 macx: LIBS *= -F$$EXTERNALS_LIB_DIR
 win32: LIBS *= -luser32
-
-INCLUDEPATH *= $$EXTERNALDIR/common/include