diff --git a/stdafx.hh b/stdafx.hh
index 639a699fd4..9ad49eb888 100644
--- a/stdafx.hh
+++ b/stdafx.hh
@@ -422,5 +422,21 @@
 #include "gc_clock.hh"
 #include "locator/token_metadata_fwd.hh"
 #include "locator/types.hh"
+#include "locator/token_metadata.hh"
+#include "gms/gossiper.hh"
+#include "db/system_keyspace.hh"
+#include "service/topology_state_machine.hh"
+#include "cql3/query_options.hh"
+#include "service/client_state.hh"
+#include "cql3/query_processor.hh"
+#include "db/config.hh"
+#include "service/storage_proxy.hh"
+#include "schema/schema_builder.hh"
+#include "exceptions/exceptions.hh"
+#include "gms/feature_service.hh"
+#include "service/migration_manager.hh"
+#include "sstables/sstables.hh"
+#include "service/storage_service.hh"
+#include "transport/messages/result_message.hh"
 
 #endif