diff --git a/include/mapbox/geometry.hpp b/include/mapbox/geometry.hpp
new file mode 100644
index 0000000..361552e
--- /dev/null
+++ b/include/mapbox/geometry.hpp
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <mapbox/geometry/point.hpp>
+#include <mapbox/geometry/line_string.hpp>
+#include <mapbox/geometry/polygon.hpp>
+#include <mapbox/geometry/multi_point.hpp>
+#include <mapbox/geometry/multi_line_string.hpp>
+#include <mapbox/geometry/multi_polygon.hpp>
+#include <mapbox/geometry/geometry.hpp>
+#include <mapbox/geometry/feature.hpp>
diff --git a/include/mapbox/geometry/feature.hpp b/include/mapbox/geometry/feature.hpp
new file mode 100644
index 0000000..5d72bd7
--- /dev/null
+++ b/include/mapbox/geometry/feature.hpp
@@ -0,0 +1,43 @@
+#pragma once
+
+#include <mapbox/geometry/geometry.hpp>
+
+#include <mapbox/variant.hpp>
+
+#include <cstdint>
+#include <string>
+#include <vector>
+#include <unordered_map>
+
+namespace mapbox { namespace geometry {
+
+struct value;
+
+using value_base = mapbox::util::variant<bool, int64_t, uint64_t, double, std::string,
+                                         mapbox::util::recursive_wrapper<std::vector<value>>,
+                                         mapbox::util::recursive_wrapper<std::unordered_map<std::string, value>>>;
+
+struct value : value_base
+{
+    using value_base::value_base;
+};
+
+template <class T>
+struct feature
+{
+    using geometry_type = mapbox::geometry::geometry<T>; // Fully qualified to avoid GCC -fpermissive error.
+    using property_map = std::unordered_map<std::string, value>;
+
+    geometry_type geometry;
+    property_map properties {};
+};
+
+template <class T, template <typename...> class Cont = std::vector>
+struct feature_collection : Cont<feature<T>>
+{
+    using feature_type = feature<T>;
+    using container_type = Cont<feature_type>;
+    using container_type::container_type;
+};
+
+}}
diff --git a/tests/test.cpp b/tests/test.cpp
index 62ddeb9..60df829 100644
--- a/tests/test.cpp
+++ b/tests/test.cpp
@@ -1,4 +1,4 @@
-#include <mapbox/geometry/geometry.hpp>
+#include <mapbox/geometry.hpp>
 
 #include <cassert>
 
@@ -76,6 +76,17 @@ static void testGeometryCollection() {
     assert(gc1.size() == 0);
 }
 
+static void testFeature() {
+    feature<double> pf { point<double>() };
+    assert(pf.geometry.is<point<double>>());
+    assert(pf.properties.size() == 0);
+}
+
+static void testFeatureCollection() {
+    feature_collection<double> fc1;
+    assert(fc1.size() == 0);
+}
+
 int main() {
     testPoint();
     testMultiPoint();
@@ -85,5 +96,7 @@ int main() {
     testMultiPolygon();
     testGeometry();
     testGeometryCollection();
+    testFeature();
+    testFeatureCollection();
     return 0;
 }