diff --git a/drivers/common/include/pch.h b/drivers/common/include/pch.h
index e0b28f26a..27c75e609 100644
--- a/drivers/common/include/pch.h
+++ b/drivers/common/include/pch.h
@@ -20,7 +20,9 @@
 #  include <qt_windows.h>
 #endif
 
+#include <mutex>
 #include <shared_mutex>
+#include <thread>
 
 #ifdef __linux__
 #  include <dlfcn.h>
diff --git a/drivers/mysql/include/pch.h b/drivers/mysql/include/pch.h
index 521c3d013..24f41dafa 100644
--- a/drivers/mysql/include/pch.h
+++ b/drivers/mysql/include/pch.h
@@ -6,8 +6,6 @@
 /* Add C++ includes here */
 #include <QDateTime>
 
-#include <optional>
-
 #include <orm/macros/commonnamespace.hpp>
 #include <orm/macros/likely.hpp>
 #include <orm/macros/stringify.hpp>
diff --git a/include/pch.h b/include/pch.h
index b6ab493af..2ca6bf080 100644
--- a/include/pch.h
+++ b/include/pch.h
@@ -28,9 +28,10 @@
 #endif
 
 #include <fstream>
-#include <optional>
 #include <set>
 #include <stack>
+#include <typeindex>
+#include <typeinfo>
 #include <unordered_set>
 
 #ifdef __GNUG__