diff --git a/bg_operators.cpp b/bg_operators.cpp
index 64a4527d2..a0e037ff0 100644
--- a/bg_operators.cpp
+++ b/bg_operators.cpp
@@ -171,75 +171,3 @@ multi_polygon_type_fp operator+(const multi_polygon_type_fp& lhs, const ring_typ
   multi_polygon_type_fp rhs_mp{polygon_type_fp{rhs}};
   return lhs + rhs_mp;
 }
-
-// It's not great to insert definitions into the bg namespace but they
-// are useful for sorting and maps.
-
-namespace boost { namespace geometry { namespace model { namespace d2 {
-
-template <typename T>
-bool operator<(
-    const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y) {
-  return std::tie(x.x(), x.y()) < std::tie(y.x(), y.y());
-}
-
-template bool operator<(const point_type_fp&, const point_type_fp&);
-template bool operator<(const ::point_type&, const ::point_type&);
-
-template <typename T>
-boost::geometry::model::d2::point_xy<T> operator-(
-    const boost::geometry::model::d2::point_xy<T>& lhs,
-    const boost::geometry::model::d2::point_xy<T>& rhs) {
-  return {lhs.x()-rhs.x(), lhs.y()-rhs.y()};
-}
-
-template point_type_fp operator-(const point_type_fp&, const point_type_fp&);
-
-template <typename T>
-boost::geometry::model::d2::point_xy<T> operator+(
-    const boost::geometry::model::d2::point_xy<T>& lhs,
-    const boost::geometry::model::d2::point_xy<T>& rhs) {
-  return {lhs.x()+rhs.x(), lhs.y()+rhs.y()};
-}
-
-template point_type_fp operator+(const point_type_fp&, const point_type_fp&);
-
-template <typename T, typename S>
-boost::geometry::model::d2::point_xy<T> operator/(
-    const boost::geometry::model::d2::point_xy<T>& lhs,
-    const S& rhs) {
-  return {lhs.x()/static_cast<T>(rhs), lhs.y()/static_cast<T>(rhs)};
-}
-
-template point_type_fp operator/(const point_type_fp&, const double&);
-template point_type_fp operator/(const point_type_fp&, const int&);
-
-template <typename T, typename S>
-boost::geometry::model::d2::point_xy<T> operator*(
-    const boost::geometry::model::d2::point_xy<T>& lhs,
-    const S& rhs) {
-  return {lhs.x()*static_cast<T>(rhs), lhs.y()*static_cast<T>(rhs)};
-}
-
-template point_type_fp operator*(const point_type_fp&, const double&);
-
-template <typename T>
-bool operator==(
-    const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y) {
-  return std::tie(x.x(), x.y()) == std::tie(y.x(), y.y());
-}
-
-template bool operator==<double>(const point_type_fp&, const point_type_fp&);
-
-template <typename T>
-bool operator!=(
-    const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y) {
-  return std::tie(x.x(), x.y()) != std::tie(y.x(), y.y());
-}
-
-template bool operator!=<double>(const point_type_fp&, const point_type_fp&);
-
-}}}} // namespace boost::geometry::model::d2
diff --git a/bg_operators.hpp b/bg_operators.hpp
index bd2ecc280..2ca469d1f 100644
--- a/bg_operators.hpp
+++ b/bg_operators.hpp
@@ -53,52 +53,66 @@ bg::model::multi_polygon<polygon_type_t> operator+(const bg::model::multi_polygo
 namespace boost { namespace geometry { namespace model { namespace d2 {
 
 template <typename T>
-bool operator<(
+extern inline bool operator<(
     const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y);
+    const boost::geometry::model::d2::point_xy<T>& y) {
+  return std::tie(x.x(), x.y()) < std::tie(y.x(), y.y());
+}
 
 template <typename T>
-boost::geometry::model::d2::point_xy<T> operator-(
+extern inline boost::geometry::model::d2::point_xy<T> operator-(
     const boost::geometry::model::d2::point_xy<T>& lhs,
-    const boost::geometry::model::d2::point_xy<T>& rhs);
+    const boost::geometry::model::d2::point_xy<T>& rhs) {
+  return {lhs.x()-rhs.x(), lhs.y()-rhs.y()};
+}
 
 template <typename T>
-boost::geometry::model::d2::point_xy<T> operator+(
+extern inline boost::geometry::model::d2::point_xy<T> operator+(
     const boost::geometry::model::d2::point_xy<T>& lhs,
-    const boost::geometry::model::d2::point_xy<T>& rhs);
+    const boost::geometry::model::d2::point_xy<T>& rhs) {
+  return {lhs.x()+rhs.x(), lhs.y()+rhs.y()};
+}
 
 template <typename T, typename S>
-boost::geometry::model::d2::point_xy<T> operator/(
+extern inline boost::geometry::model::d2::point_xy<T> operator/(
     const boost::geometry::model::d2::point_xy<T>& lhs,
-    const S& rhs);
+    const S& rhs) {
+  return {lhs.x()/static_cast<T>(rhs), lhs.y()/static_cast<T>(rhs)};
+}
 
 template <typename T, typename S>
-boost::geometry::model::d2::point_xy<T> operator*(
+extern inline boost::geometry::model::d2::point_xy<T> operator*(
     const boost::geometry::model::d2::point_xy<T>& lhs,
-    const S& rhs);
-
-static inline point_type_fp floor(const point_type_fp& a) {
-  return point_type_fp(std::floor(a.x()), std::floor(a.y()));
+    const S& rhs) {
+  return {lhs.x()*static_cast<T>(rhs), lhs.y()*static_cast<T>(rhs)};
 }
 
 template <typename T>
-bool operator==(
+extern inline bool operator==(
     const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y);
+    const boost::geometry::model::d2::point_xy<T>& y) {
+  return std::tie(x.x(), x.y()) == std::tie(y.x(), y.y());
+}
 
 template <typename T>
-bool operator!=(
+extern inline bool operator!=(
     const boost::geometry::model::d2::point_xy<T>& x,
-    const boost::geometry::model::d2::point_xy<T>& y);
+    const boost::geometry::model::d2::point_xy<T>& y) {
+  return std::tie(x.x(), x.y()) != std::tie(y.x(), y.y());
+}
+
+extern inline point_type_fp floor(const point_type_fp& a) {
+  return point_type_fp(std::floor(a.x()), std::floor(a.y()));
+}
 
 template <typename T>
-static std::ostream& operator<<(std::ostream& out, const bg::model::d2::point_xy<T>& t) {
+extern inline std::ostream& operator<<(std::ostream& out, const bg::model::d2::point_xy<T>& t) {
   out << bg::wkt(t);
   return out;
 }
 
 template <typename T>
-static std::ostream& operator<<(std::ostream& out, const bg::model::linestring<T>& t) {
+extern inline std::ostream& operator<<(std::ostream& out, const bg::model::linestring<T>& t) {
   out << bg::wkt(t);
   return out;
 }