From b9425dd4ecd112f0f455b6a6950039d77305a465 Mon Sep 17 00:00:00 2001
From: zmiao <miao.zhao@mapbox.com>
Date: Wed, 19 Feb 2020 12:06:42 +0200
Subject: [core] Remove unnecessary includes, fix comments

This reverts commit b5c386ad7708ca9fe14f219b0ffc94cf6ce8fc88.
---
 src/mbgl/style/expression/within.cpp | 3 +--
 src/mbgl/util/geometry_within.cpp    | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/mbgl/style/expression/within.cpp b/src/mbgl/style/expression/within.cpp
index 0447dfe228..7dc55eda7f 100644
--- a/src/mbgl/style/expression/within.cpp
+++ b/src/mbgl/style/expression/within.cpp
@@ -2,7 +2,7 @@
 
 #include <mapbox/geojson.hpp>
 #include <mapbox/geometry.hpp>
-#include <mbgl/style/conversion_impl.hpp>
+#include <mbgl/style/conversion/json.hpp>
 #include <mbgl/tile/geometry_tile_data.hpp>
 
 #include <mbgl/util/geometry_within.hpp>
@@ -10,7 +10,6 @@
 #include <mbgl/util/string.hpp>
 
 #include <rapidjson/document.h>
-#include <mbgl/style/conversion/json.hpp>
 
 namespace mbgl {
 namespace {
diff --git a/src/mbgl/util/geometry_within.cpp b/src/mbgl/util/geometry_within.cpp
index bb62047077..344e15b5d7 100644
--- a/src/mbgl/util/geometry_within.cpp
+++ b/src/mbgl/util/geometry_within.cpp
@@ -1,5 +1,4 @@
 #include <mbgl/util/geometry_within.hpp>
-#include <mbgl/util/logging.hpp>
 
 namespace mbgl {
 
-- 
cgit v1.2.1