diff --git a/CMakeLists.txt b/CMakeLists.txt
index 44940dd58d..ea216672c9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -242,6 +242,7 @@ target_link_libraries(scylla-precompiled-header PRIVATE
     absl::btree
     absl::hash
     absl::raw_hash_set
+    idl
     Seastar::seastar
     Snappy::snappy
     systemd
diff --git a/stdafx.hh b/stdafx.hh
index 8101a6a7c3..dbd5f66436 100644
--- a/stdafx.hh
+++ b/stdafx.hh
@@ -402,20 +402,36 @@
 
 // Scylla internal headers included by most translation units
 #include "bytes.hh"
+#include "cql3/query_options.hh"
+#include "cql3/query_processor.hh"
+#include "db/config.hh"
+#include "db/system_keyspace.hh"
 #include "db/timeout_clock.hh"
 #include "db_clock.hh"
 #include "dht/token.hh"
+#include "exceptions/exceptions.hh"
 #include "gc_clock.hh"
+#include "gms/feature_service.hh"
+#include "gms/gossiper.hh"
 #include "gms/inet_address.hh"
 #include "keys/keys.hh"
 #include "locator/host_id.hh"
+#include "locator/token_metadata.hh"
 #include "locator/token_metadata_fwd.hh"
 #include "locator/types.hh"
 #include "mutation/mutation_fragment.hh"
 #include "mutation/mutation_partition.hh"
 #include "schema/schema.hh"
+#include "schema/schema_builder.hh"
 #include "schema/schema_fwd.hh"
 #include "seastarx.hh"
+#include "service/client_state.hh"
+#include "service/migration_manager.hh"
+#include "service/storage_proxy.hh"
+#include "service/storage_service.hh"
+#include "service/topology_state_machine.hh"
+#include "sstables/sstables.hh"
+#include "transport/messages/result_message.hh"
 #include "types/types.hh"
 #include "utils/chunked_vector.hh"
 #include "utils/fragment_range.hh"