From 6a07476c41e17a885314f07aef13350221bc14fe Mon Sep 17 00:00:00 2001
From: Jan <jsteemann@users.noreply.github.com>
Date: Fri, 7 Jun 2019 10:08:03 +0200
Subject: [PATCH] don't include the Logger in header files if it's not
 necessary (#9216)

---
 arangod/Aql/AqlItemMatrix.h       | 1 -
 arangod/Aql/ClusterNodes.h        | 1 -
 arangod/Cluster/ClusterComm.h     | 2 +-
 arangod/Cluster/CriticalThread.h  | 1 -
 arangod/Cluster/HeartbeatThread.h | 1 -
 arangod/Scheduler/Scheduler.h     | 1 -
 arangod/Utils/VersionTracker.h    | 1 -
 arangod/VocBase/LogicalView.h     | 4 ++--
 8 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/arangod/Aql/AqlItemMatrix.h b/arangod/Aql/AqlItemMatrix.h
index 434a337ff1..dedfabf325 100644
--- a/arangod/Aql/AqlItemMatrix.h
+++ b/arangod/Aql/AqlItemMatrix.h
@@ -23,7 +23,6 @@
 #ifndef ARANGOD_AQL_AQL_ITEM_MATRIX_H
 #define ARANGOD_AQL_AQL_ITEM_MATRIX_H 1
 
-#include <lib/Logger/Logger.h>
 #include "Aql/AqlItemBlock.h"
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/types.h"
diff --git a/arangod/Aql/ClusterNodes.h b/arangod/Aql/ClusterNodes.h
index 9729dc3bb3..71877522ec 100644
--- a/arangod/Aql/ClusterNodes.h
+++ b/arangod/Aql/ClusterNodes.h
@@ -32,7 +32,6 @@
 #include "Aql/types.h"
 #include "Basics/Common.h"
 #include "Basics/StringUtils.h"
-#include "Logger/Logger.h"
 #include "VocBase/voc-types.h"
 #include "VocBase/vocbase.h"
 
diff --git a/arangod/Cluster/ClusterComm.h b/arangod/Cluster/ClusterComm.h
index 407b09b348..2bfb103f76 100644
--- a/arangod/Cluster/ClusterComm.h
+++ b/arangod/Cluster/ClusterComm.h
@@ -34,7 +34,7 @@
 #include "Basics/ReadWriteLock.h"
 #include "Basics/Thread.h"
 #include "Cluster/ClusterInfo.h"
-#include "Logger/Logger.h"
+#include "Logger/LogTopic.h"
 #include "Rest/GeneralRequest.h"
 #include "Rest/GeneralResponse.h"
 #include "Rest/HttpRequest.h"
diff --git a/arangod/Cluster/CriticalThread.h b/arangod/Cluster/CriticalThread.h
index 76943e799d..aa147fb910 100644
--- a/arangod/Cluster/CriticalThread.h
+++ b/arangod/Cluster/CriticalThread.h
@@ -24,7 +24,6 @@
 #define ARANGOD_CLUSTER_CRITICAL_THREAD_H 1
 
 #include "Basics/Thread.h"
-#include "Logger/Logger.h"
 
 namespace arangodb {
 
diff --git a/arangod/Cluster/HeartbeatThread.h b/arangod/Cluster/HeartbeatThread.h
index 83b9def1b0..0773b6aaac 100644
--- a/arangod/Cluster/HeartbeatThread.h
+++ b/arangod/Cluster/HeartbeatThread.h
@@ -31,7 +31,6 @@
 #include "Basics/Mutex.h"
 #include "Cluster/CriticalThread.h"
 #include "Cluster/DBServerAgencySync.h"
-#include "Logger/Logger.h"
 
 #include <velocypack/Slice.h>
 #include <chrono>
diff --git a/arangod/Scheduler/Scheduler.h b/arangod/Scheduler/Scheduler.h
index 004805a899..6b0c908449 100644
--- a/arangod/Scheduler/Scheduler.h
+++ b/arangod/Scheduler/Scheduler.h
@@ -30,7 +30,6 @@
 #include <queue>
 
 #include "GeneralServer/RequestLane.h"
-#include "Logger/Logger.h"
 
 namespace arangodb {
 
diff --git a/arangod/Utils/VersionTracker.h b/arangod/Utils/VersionTracker.h
index cbb5e87648..f80569ba97 100644
--- a/arangod/Utils/VersionTracker.h
+++ b/arangod/Utils/VersionTracker.h
@@ -25,7 +25,6 @@
 #define ARANGOD_UTILS_VERSION_TRACKER_H 1
 
 #include "Basics/Common.h"
-#include "Logger/Logger.h"
 
 namespace arangodb {
 
diff --git a/arangod/VocBase/LogicalView.h b/arangod/VocBase/LogicalView.h
index 59c5565197..f8de8d2e6b 100644
--- a/arangod/VocBase/LogicalView.h
+++ b/arangod/VocBase/LogicalView.h
@@ -30,8 +30,8 @@
 #include "Basics/Result.h"
 #include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
-#include "LogicalDataSource.h"
 #include "Meta/utility.h"
+#include "VocBase/LogicalDataSource.h"
 #include "VocBase/voc-types.h"
 
 #include <velocypack/Buffer.h>
@@ -235,4 +235,4 @@ struct LogicalViewHelperStorageEngine {
 
 }  // namespace arangodb
 
-#endif
\ No newline at end of file
+#endif