diff --git a/ci/clang-tidy.sh b/ci/clang-tidy.sh
index 886417d0950a74e8256ae1bfa48f975d5fb39004..bf45a2eb46252b15df6fd7474720622429c86cc1 100755
--- a/ci/clang-tidy.sh
+++ b/ci/clang-tidy.sh
@@ -10,6 +10,10 @@
 echo -e "\033[0;34mRunning clang-tidy...\033[0m"
 
 cd "$(dirname "$0")"
+GCCVERSION=`g++ -dumpversion`
+
 clang-tidy `find ../src/ -type f -regextype posix-egrep -regex '.*\.(cpp|hpp|c|h)'` \
-    -extra-arg=-fcolor-diagnostics  -- -std=c++17 -I../inc \
-    -I/usr/include/c++/7/ -I/usr/include/x86_64-linux-gnu/c++/7 -I../lib/etl/include
+    -extra-arg=-fcolor-diagnostics -- -std=c++17 -I../inc -I../lib/etl/include \
+    -I/usr/include/c++/$GCCVERSION -I/usr/include/x86_64-linux-gnu/c++/$GCCVERSION \
+    -I/usr/include/c++/$GCCVERSION/$MACHTYPE
+