diff --git a/cql3/cql3_type.cc b/cql3/cql3_type.cc
index ec65cd93da..e2da09fd81 100644
--- a/cql3/cql3_type.cc
+++ b/cql3/cql3_type.cc
@@ -29,6 +29,7 @@
 #include "database.hh"
 #include "user_types_metadata.hh"
 #include "types/map.hh"
+#include "types/set.hh"
 
 namespace cql3 {
 
diff --git a/cql3/functions/functions.cc b/cql3/functions/functions.cc
index 8808af5b59..1e7171e7e2 100644
--- a/cql3/functions/functions.cc
+++ b/cql3/functions/functions.cc
@@ -29,6 +29,7 @@
 #include "cql3/constants.hh"
 #include "database.hh"
 #include "types/map.hh"
+#include "types/set.hh"
 #include "types/list.hh"
 
 namespace cql3 {
diff --git a/cql3/operation.cc b/cql3/operation.cc
index 660d7e2316..b58b9a9a4c 100644
--- a/cql3/operation.cc
+++ b/cql3/operation.cc
@@ -46,6 +46,7 @@
 #include "types/tuple.hh"
 #include "types/map.hh"
 #include "types/list.hh"
+#include "types/set.hh"
 
 namespace cql3 {
 
diff --git a/cql3/sets.cc b/cql3/sets.cc
index 545a1aff97..c9bf57f6bf 100644
--- a/cql3/sets.cc
+++ b/cql3/sets.cc
@@ -23,6 +23,7 @@
 #include "constants.hh"
 #include "cql3_type.hh"
 #include "types/map.hh"
+#include "types/set.hh"
 
 namespace cql3 {
 
@@ -213,6 +214,11 @@ sets::delayed_value::bind(const query_options& options) {
 }
 
 
+sets::marker::marker(int32_t bind_index, ::shared_ptr<column_specification> receiver)
+    : abstract_marker{bind_index, std::move(receiver)} {
+        assert(dynamic_cast<const set_type_impl*>(_receiver->type.get()));
+    }
+
 ::shared_ptr<terminal>
 sets::marker::bind(const query_options& options) {
     const auto& value = options.get_value_at(_bind_index);
diff --git a/cql3/sets.hh b/cql3/sets.hh
index f602ee942d..6bc40f9820 100644
--- a/cql3/sets.hh
+++ b/cql3/sets.hh
@@ -47,7 +47,6 @@
 #include "column_identifier.hh"
 #include "to_string.hh"
 #include <unordered_set>
-#include "types/set.hh"
 
 namespace cql3 {
 
@@ -101,10 +100,7 @@ public:
 
     class marker : public abstract_marker {
     public:
-        marker(int32_t bind_index, ::shared_ptr<column_specification> receiver)
-                : abstract_marker{bind_index, std::move(receiver)} {
-            assert(dynamic_cast<const set_type_impl*>(_receiver->type.get()));
-        }
+        marker(int32_t bind_index, ::shared_ptr<column_specification> receiver);
         virtual ::shared_ptr<terminal> bind(const query_options& options) override;
     };
 
diff --git a/cql3/statements/update_statement.cc b/cql3/statements/update_statement.cc
index fc889805b7..1e354ccbd3 100644
--- a/cql3/statements/update_statement.cc
+++ b/cql3/statements/update_statement.cc
@@ -48,6 +48,7 @@
 #include "cql3/operation_impl.hh"
 #include "json.hh"
 #include "types/map.hh"
+#include "types/set.hh"
 #include "types/list.hh"
 
 namespace cql3 {