Decentralize includes (#9623)

arangod/Actions/actions.cpp

@@ -28,7 +28,9 @@
 #include "Basics/ReadWriteLock.h"
 #include "Basics/StringUtils.h"
 #include "Basics/WriteLocker.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Rest/GeneralRequest.h"
 
 using namespace arangodb::basics;

arangod/Actions/actions.h

@@ -24,6 +24,9 @@
 #ifndef ARANGOD_ACTIONS_ACTIONS_H
 #define ARANGOD_ACTIONS_ACTIONS_H 1
 
+#include <functional>
+#include <memory>
+
 #include "Basics/Common.h"
 #include "Basics/Mutex.h"
 

arangod/Agency/AgencyComm.cpp

@@ -23,7 +23,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "AgencyComm.h"
+
 #include "ApplicationFeatures/ApplicationServer.h"
+#include "Basics/application-exit.h"
 #include "RestServer/ServerFeature.h"
 
 #include <thread>
@@ -41,6 +43,7 @@
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/WriteLocker.h"
+#include "Basics/system-functions.h"
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ServerState.h"
 #include "Endpoint/Endpoint.h"

arangod/Agency/AgencyComm.h

@@ -25,10 +25,11 @@
 #ifndef ARANGOD_CLUSTER_AGENCY_COMM_H
 #define ARANGOD_CLUSTER_AGENCY_COMM_H 1
 
-#include "Basics/Common.h"
-
-#include <list>
 #include <deque>
+#include <list>
+#include <memory>
+#include <string>
+#include <unordered_map>
 
 #include <boost/uuid/uuid.hpp>
 #include <boost/uuid/uuid_generators.hpp>
@@ -40,6 +41,7 @@
 #include <type_traits>
 
 #include "Basics/Mutex.h"
+#include "Basics/Result.h"
 #include "GeneralServer/GeneralDefinitions.h"
 #include "Rest/CommonDefines.h"
 #include "SimpleHttpClient/GeneralClientConnection.h"

arangod/Agency/AgencyFeature.cpp

@@ -26,6 +26,7 @@
 #include "Agency/Agent.h"
 #include "Agency/Job.h"
 #include "Agency/Supervision.h"
+#include "Basics/application-exit.h"
 #include "Cluster/ClusterFeature.h"
 #include "Logger/Logger.h"
 #include "ProgramOptions/ProgramOptions.h"

arangod/Agency/Agent.cpp

@@ -33,8 +33,9 @@
 #include "Agency/GossipCallback.h"
 #include "Basics/ConditionLocker.h"
 #include "Basics/ReadLocker.h"
-#include "Basics/WriteLocker.h"
 #include "Basics/ScopeGuard.h"
+#include "Basics/WriteLocker.h"
+#include "Basics/application-exit.h"
 #include "RestServer/QueryRegistryFeature.h"
 #include "RestServer/SystemDatabaseFeature.h"
 #include "VocBase/vocbase.h"

arangod/Agency/AgentConfiguration.cpp

@@ -25,6 +25,9 @@
 
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 using namespace arangodb::consensus;
 

arangod/Agency/Constituent.cpp

@@ -34,6 +34,7 @@
 #include "Aql/Query.h"
 #include "Aql/QueryRegistry.h"
 #include "Basics/ConditionLocker.h"
+#include "Basics/application-exit.h"
 #include "Cluster/ClusterComm.h"
 #include "Logger/Logger.h"
 #include "Random/RandomGenerator.h"

arangod/Agency/GossipCallback.cpp

@@ -24,6 +24,7 @@
 #include "GossipCallback.h"
 
 #include "Agency/Agent.h"
+#include "Basics/application-exit.h"
 
 using namespace arangodb::consensus;
 using namespace arangodb::velocypack;

arangod/Agency/Inception.cpp

@@ -26,6 +26,7 @@
 #include "Agency/Agent.h"
 #include "Agency/GossipCallback.h"
 #include "Basics/ConditionLocker.h"
+#include "Basics/application-exit.h"
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ServerState.h"
 

arangod/Agency/Job.cpp

@@ -21,11 +21,23 @@
 /// @author Kaveh Vahedipour
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Job.h"
-#include "Basics/StringUtils.h"
-#include "Random/RandomGenerator.h"
-
+#include <chrono>
+#include <cstdint>
+#include <iterator>
 #include <numeric>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+
+#include "Job.h"
+
+#include "Agency/Node.h"
+#include "Agency/Supervision.h"
+#include "Agency/TimeString.h"
+#include "Basics/Exceptions.h"
+#include "Basics/StringUtils.h"
+#include "Basics/voc-errors.h"
+#include "Random/RandomGenerator.h"
 
 static std::string const DBServer = "DBServer";
 

arangod/Agency/Job.h

@@ -24,20 +24,29 @@
 #ifndef ARANGOD_CONSENSUS_JOB_H
 #define ARANGOD_CONSENSUS_JOB_H 1
 
-#include "AgentInterface.h"
-#include "Node.h"
-#include "Supervision.h"
-
-#include "Basics/Result.h"
+#include <stddef.h>
+#include <algorithm>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
 
+#include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>
 #include <velocypack/Slice.h>
 #include <velocypack/velocypack-aliases.h>
 
-#include <string>
+#include "Agency/AgencyCommon.h"
+#include "Agency/AgentInterface.h"
+#include "Basics/Result.h"
+#include "Basics/debugging.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 namespace arangodb {
 namespace consensus {
+class Node;
 
 enum JOB_STATUS { TODO, PENDING, FINISHED, FAILED, NOTFOUND };
 const std::vector<std::string> pos({"/Target/ToDo/", "/Target/Pending/",
@@ -110,7 +119,7 @@ struct Job {
 
   virtual JOB_STATUS status() = 0;
 
-  virtual bool create(std::shared_ptr<VPackBuilder> b) = 0;
+  virtual bool create(std::shared_ptr<velocypack::Builder> b) = 0;
 
   // Returns if job was actually started (i.e. false if directly failed!)
   virtual bool start(bool& aborts) = 0;
@@ -124,8 +133,10 @@ struct Job {
   ///        excluding "exclude" vector
   static std::string randomIdleAvailableServer(Node const& snap,
                                                    std::vector<std::string> const& exclude);
-  static std::string randomIdleAvailableServer(Node const& snap, VPackSlice const& exclude);
-  static size_t countGoodOrBadServersInList(Node const& snap, VPackSlice const& serverList);
+  static std::string randomIdleAvailableServer(Node const& snap,
+                                               velocypack::Slice const& exclude);
+  static size_t countGoodOrBadServersInList(Node const& snap,
+                                            velocypack::Slice const& serverList);
   static size_t countGoodOrBadServersInList(Node const& snap, std::vector<std::string> const& serverList);
   static bool isInServerList(Node const& snap, std::string const& prefix, std::string const& server, bool isArray);
 
@@ -151,43 +162,50 @@ struct Job {
 
   static std::string agencyPrefix;  // will be initialized in AgencyFeature
 
-  std::shared_ptr<Builder> _jb;
+  std::shared_ptr<velocypack::Builder> _jb;
 
   static void doForAllShards(
       Node const& snapshot, std::string& database, std::vector<shard_t>& shards,
-      std::function<void(Slice plan, Slice current, std::string& planPath, std::string& curPath)> worker);
+      std::function<void(velocypack::Slice plan, velocypack::Slice current, std::string& planPath, std::string& curPath)> worker);
 
   // The following methods adds an operation to a transaction object or
   // a condition to a precondition object. In all cases, the builder trx
   // or pre must be in the state that an object has been opened, this
   // method adds some attribute/value pairs and leaves the object open:
-  static void addIncreasePlanVersion(Builder& trx);
-  static void addRemoveJobFromSomewhere(Builder& trx, std::string const& where,
+  static void addIncreasePlanVersion(velocypack::Builder& trx);
+  static void addRemoveJobFromSomewhere(velocypack::Builder& trx, std::string const& where,
                                         std::string const& jobId);
-  static void addPutJobIntoSomewhere(Builder& trx, std::string const& where,
-                                     Slice job, std::string const& reason = "");
-  static void addPreconditionCollectionStillThere(Builder& pre, std::string const& database,
+  static void addPutJobIntoSomewhere(velocypack::Builder& trx,
+                                     std::string const& where, velocypack::Slice job,
+                                     std::string const& reason = "");
+  static void addPreconditionCollectionStillThere(velocypack::Builder& pre,
+                                                  std::string const& database,
                                                   std::string const& collection);
-  static void addBlockServer(Builder& trx, std::string const& server,
+  static void addBlockServer(velocypack::Builder& trx, std::string const& server,
                              std::string const& jobId);
-  static void addBlockShard(Builder& trx, std::string const& shard, std::string const& jobId);
-  static void addReleaseServer(Builder& trx, std::string const& server);
-  static void addReleaseShard(Builder& trx, std::string const& shard);
-  static void addPreconditionServerNotBlocked(Builder& pre, std::string const& server);
-  static void addPreconditionServerHealth(Builder& pre, std::string const& server,
+  static void addBlockShard(velocypack::Builder& trx, std::string const& shard,
+                            std::string const& jobId);
+  static void addReleaseServer(velocypack::Builder& trx, std::string const& server);
+  static void addReleaseShard(velocypack::Builder& trx, std::string const& shard);
+  static void addPreconditionServerNotBlocked(velocypack::Builder& pre,
+                                              std::string const& server);
+  static void addPreconditionServerHealth(velocypack::Builder& pre, std::string const& server,
                                           std::string const& health);
-  static void addPreconditionShardNotBlocked(Builder& pre, std::string const& shard);
-  static void addPreconditionUnchanged(Builder& pre, std::string const& key, Slice value);
-  static void addPreconditionJobStillInPending(Builder& pre, std::string const& jobId);
+  static void addPreconditionShardNotBlocked(velocypack::Builder& pre,
+                                             std::string const& shard);
+  static void addPreconditionUnchanged(velocypack::Builder& pre, std::string const& key,
+                                       velocypack::Slice value);
+  static void addPreconditionJobStillInPending(velocypack::Builder& pre,
+                                               std::string const& jobId);
   static std::string checkServerHealth(Node const& snapshot, std::string const& server);
 };
 
 inline arangodb::consensus::write_ret_t singleWriteTransaction(AgentInterface* _agent,
-                                                               Builder const& transaction,
+                                                               velocypack::Builder const& transaction,
                                                                bool waitForCommit = true) {
-  query_t envelope = std::make_shared<Builder>();
+  query_t envelope = std::make_shared<velocypack::Builder>();
 
-  Slice trx = transaction.slice();
+  velocypack::Slice trx = transaction.slice();
   try {
     {
       VPackArrayBuilder listOfTrxs(envelope.get());
@@ -221,9 +239,9 @@ inline arangodb::consensus::write_ret_t singleWriteTransaction(AgentInterface* _
 }
 
 inline arangodb::consensus::trans_ret_t generalTransaction(AgentInterface* _agent,
-                                                           Builder const& transaction) {
-  query_t envelope = std::make_shared<Builder>();
-  Slice trx = transaction.slice();
+                                                           velocypack::Builder const& transaction) {
+  query_t envelope = std::make_shared<velocypack::Builder>();
+  velocypack::Slice trx = transaction.slice();
 
   try {
     {
@@ -269,10 +287,10 @@ inline arangodb::consensus::trans_ret_t generalTransaction(AgentInterface* _agen
 }
 
 inline arangodb::consensus::trans_ret_t transient(AgentInterface* _agent,
-                                                  Builder const& transaction) {
-  query_t envelope = std::make_shared<Builder>();
+                                                  velocypack::Builder const& transaction) {
+  query_t envelope = std::make_shared<velocypack::Builder>();
 
-  Slice trx = transaction.slice();
+  velocypack::Slice trx = transaction.slice();
   try {
     {
       VPackArrayBuilder listOfTrxs(envelope.get());

arangod/Agency/Node.cpp

@@ -25,6 +25,9 @@
 #include "Store.h"
 
 #include "Basics/StringUtils.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 #include <velocypack/Compare.h>
 #include <velocypack/Iterator.h>

arangod/Agency/State.cpp

@@ -38,6 +38,7 @@
 #include "Basics/MutexLocker.h"
 #include "Basics/StaticStrings.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Basics/application-exit.h"
 #include "Cluster/ServerState.h"
 #include "RestServer/QueryRegistryFeature.h"
 #include "Transaction/StandaloneContext.h"

arangod/Agency/TimeString.h

@@ -26,6 +26,8 @@
 #include "Basics/Common.h"
 #include <chrono>
 
+#include "Basics/system-functions.h"
+
 inline std::string timepointToString(std::chrono::system_clock::time_point const& t) {
   time_t tt = std::chrono::system_clock::to_time_t(t);
   struct tm tb;

arangod/Aql/AqlItemMatrix.h

@@ -27,6 +27,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/types.h"
 #include "Basics/Common.h"
+#include "Basics/system-compiler.h"
 
 #include <math.h>
 

arangod/Aql/AqlTransaction.h

@@ -35,6 +35,10 @@
 #include <map>
 
 namespace arangodb {
+namespace velocypack {
+class Builder;
+}
+
 namespace aql {
 
 class AqlTransaction : public transaction::Methods {

arangod/Aql/Arithmetic.h

@@ -24,6 +24,10 @@
 #ifndef ARANGOD_AQL_ARITHMETIC_H
 #define ARANGOD_AQL_ARITHMETIC_H 1
 
+#include <algorithm>
+#include <limits>
+#include <string>
+
 #include "Basics/Common.h"
 
 namespace arangodb {

arangod/Aql/AstNode.cpp

@@ -31,6 +31,7 @@
 #include "Aql/types.h"
 #include "Basics/FloatingPoint.h"
 #include "Basics/StringBuffer.h"
+#include "Basics/StringUtils.h"
 #include "Basics/Utf8Helper.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/fasthash.h"

arangod/Aql/AstNode.h

@@ -24,22 +24,33 @@
 #ifndef ARANGOD_AQL_AST_NODE_H
 #define ARANGOD_AQL_AST_NODE_H 1
 
-#include "Basics/AttributeNameParser.h"
-#include "Basics/Common.h"
+#include <string.h>
+#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <iosfwd>
+#include <memory>
+#include <string>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
 #include "Basics/Exceptions.h"
 #include "Basics/ScopeGuard.h"
+#include "Basics/debugging.h"
+#include "Basics/operating-system.h"
+#include "Basics/voc-errors.h"
 
 #include <velocypack/Slice.h>
 #include <velocypack/StringRef.h>
 
-#include <iosfwd>
-
 namespace arangodb {
 namespace velocypack {
 class Builder;
-class Slice;
 }  // namespace velocypack
 namespace basics {
+struct AttributeName;
 class StringBuffer;
 }
 

arangod/Aql/BindParameters.cpp

@@ -23,6 +23,7 @@
 
 #include "Aql/BindParameters.h"
 #include "Basics/Exceptions.h"
+#include "Basics/debugging.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>

arangod/Aql/Collections.h

@@ -24,11 +24,12 @@
 #ifndef ARANGOD_AQL_COLLECTIONS_H
 #define ARANGOD_AQL_COLLECTIONS_H 1
 
+#include <map>
+#include <vector>
+
 #include "Basics/Common.h"
 #include "VocBase/AccessMode.h"
 
-#include <map>
-
 struct TRI_vocbase_t;
 
 namespace arangodb {

arangod/Aql/CostEstimate.h

@@ -25,6 +25,7 @@
 #define ARANGOD_AQL_COST_ESTIMATE_H 1
 
 #include "Basics/Common.h"
+#include "Basics/debugging.h"
 
 namespace arangodb {
 namespace aql {

arangod/Aql/ExecutionBlock.h

@@ -26,11 +26,12 @@
 
 #include "Aql/AqlItemBlock.h"
 #include "Aql/BlockCollector.h"
-#include "Aql/ExecutionNode.h"
 #include "Aql/ExecutionEngine.h"
+#include "Aql/ExecutionNode.h"
 #include "Aql/ExecutionState.h"
 #include "Aql/ExecutionStats.h"
 #include "Aql/Variable.h"
+#include "Basics/system-functions.h"
 #include "QueryOptions.h"
 
 #include <deque>

arangod/Aql/ExecutionNode.cpp

@@ -55,6 +55,7 @@
 #include "Aql/SubqueryExecutor.h"
 #include "Aql/TraversalNode.h"
 #include "Aql/WalkerWorker.h"
+#include "Basics/system-compiler.h"
 #include "Cluster/ServerState.h"
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"

arangod/Aql/ExecutorInfos.cpp

@@ -22,6 +22,8 @@
 
 #include "ExecutorInfos.h"
 
+#include "Basics/debugging.h"
+
 using namespace arangodb::aql;
 
 ExecutorInfos::ExecutorInfos(

arangod/Aql/ExecutorInfos.h

@@ -26,11 +26,12 @@
 #ifndef ARANGOD_AQL_EXECUTOR_INFOS_H
 #define ARANGOD_AQL_EXECUTOR_INFOS_H 1
 
+#include <memory>
+#include <unordered_set>
+
 #include "Aql/types.h"
 #include "Basics/Common.h"
 
-#include <unordered_set>
-
 namespace arangodb {
 namespace aql {
 

arangod/Aql/Function.cpp

@@ -23,6 +23,9 @@
 
 #include "Aql/Function.h"
 #include "Basics/Exceptions.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 using namespace arangodb::aql;
 

arangod/Aql/Functions.cpp

@@ -43,6 +43,7 @@
 #include "Basics/conversions.h"
 #include "Basics/fpconv.h"
 #include "Basics/hashes.h"
+#include "Basics/system-functions.h"
 #include "Basics/tri-strings.h"
 #include "Geo/GeoJson.h"
 #include "Geo/GeoParams.h"

arangod/Aql/IndexNode.cpp

@@ -31,6 +31,7 @@
 #include "Aql/IndexExecutor.h"
 #include "Aql/Query.h"
 #include "Basics/AttributeNameParser.h"
+#include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Indexes/Index.h"
 #include "StorageEngine/EngineSelectorFeature.h"

arangod/Aql/OptimizerRulesReplaceFunctions.cpp

@@ -35,6 +35,7 @@
 #include "Basics/SmallVector.h"
 #include "Basics/StaticStrings.h"
 #include "Basics/StringBuffer.h"
+#include "Basics/StringUtils.h"
 #include "Indexes/Index.h"
 #include "OptimizerRules.h"
 #include "VocBase/Methods/Collections.h"

arangod/Aql/OutputAqlItemRow.h

@@ -29,6 +29,7 @@
 #include "Aql/InputAqlItemRow.h"
 #include "Aql/types.h"
 #include "Basics/Common.h"
+#include "Basics/system-compiler.h"
 
 namespace arangodb {
 namespace aql {

arangod/Aql/PlanCache.h

@@ -24,6 +24,8 @@
 #ifndef ARANGOD_AQL_PLAN_CACHE_H
 #define ARANGOD_AQL_PLAN_CACHE_H 1
 
+#include <unordered_map>
+
 #include "Basics/Common.h"
 #include "Basics/ReadWriteLock.h"
 

arangod/Aql/Quantifier.h

@@ -24,6 +24,9 @@
 #ifndef ARANGOD_AQL_QUANTIFIER_H
 #define ARANGOD_AQL_QUANTIFIER_H 1
 
+#include <cstdint>
+#include <string>
+
 #include "Basics/Common.h"
 
 namespace arangodb {

arangod/Aql/Query.cpp

@@ -36,12 +36,15 @@
 #include "Aql/QueryProfile.h"
 #include "Aql/QueryRegistry.h"
 #include "Basics/Exceptions.h"
+#include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/fasthash.h"
 #include "Cluster/ServerState.h"
 #include "Graph/Graph.h"
 #include "Graph/GraphManager.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/AqlFeature.h"
 #include "RestServer/QueryRegistryFeature.h"
 #include "StorageEngine/TransactionCollection.h"

arangod/Aql/QueryCache.cpp

@@ -29,6 +29,7 @@
 #include "Basics/WriteLocker.h"
 #include "Basics/conversions.h"
 #include "Basics/fasthash.h"
+#include "Basics/system-functions.h"
 #include "VocBase/LogicalDataSource.h"
 #include "VocBase/vocbase.h"
 

arangod/Aql/QueryCache.h

@@ -24,14 +24,16 @@
 #ifndef ARANGOD_AQL_QUERY_CACHE_H
 #define ARANGOD_AQL_QUERY_CACHE_H 1
 
+#include <memory>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
+
 #include "Aql/QueryString.h"
 #include "Basics/Common.h"
 #include "Basics/Mutex.h"
 #include "Basics/ReadWriteLock.h"
 
-#include <unordered_set>
-#include <memory>
-
 struct TRI_vocbase_t;
 
 namespace arangodb {

arangod/Aql/QueryExecutionState.cpp

@@ -23,6 +23,10 @@
 
 #include "QueryExecutionState.h"
 
+#include <string>
+
+#include "Basics/debugging.h"
+
 using namespace arangodb::aql;
 
 /// @brief names of query phases / states

arangod/Aql/QueryExecutionState.h

@@ -27,6 +27,7 @@
 #include "Basics/Common.h"
 
 #include <iosfwd>
+#include <string>
 
 namespace arangodb {
 namespace aql {

arangod/Aql/QueryList.cpp

@@ -28,7 +28,10 @@
 #include "Basics/Exceptions.h"
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
+#include "Basics/system-functions.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/QueryRegistryFeature.h"
 #include "VocBase/vocbase.h"
 

arangod/Aql/QueryList.h

@@ -24,13 +24,14 @@
 #ifndef ARANGOD_AQL_QUERY_LIST_H
 #define ARANGOD_AQL_QUERY_LIST_H 1
 
+#include <cmath>
+#include <list>
+
 #include "Aql/QueryExecutionState.h"
 #include "Basics/Common.h"
 #include "Basics/ReadWriteLock.h"
 #include "VocBase/voc-types.h"
 
-#include <list>
-
 struct TRI_vocbase_t;
 
 namespace arangodb {

arangod/Aql/QueryProfile.cpp

@@ -26,6 +26,7 @@
 #include "Aql/Query.h"
 #include "Aql/QueryList.h"
 #include "Basics/EnumIterator.h"
+#include "Basics/system-functions.h"
 #include "VocBase/vocbase.h"
 
 #include <velocypack/Builder.h>

arangod/Aql/QueryRegistry.cpp

@@ -28,6 +28,7 @@
 #include "Aql/Query.h"
 #include "Basics/ReadLocker.h"
 #include "Basics/WriteLocker.h"
+#include "Basics/system-functions.h"
 #include "Cluster/ServerState.h"
 #include "Logger/Logger.h"
 #include "Transaction/Methods.h"

arangod/Aql/QueryResources.h

@@ -24,6 +24,9 @@
 #ifndef ARANGOD_AQL_QUERY_RESOURCES_H
 #define ARANGOD_AQL_QUERY_RESOURCES_H 1
 
+#include <string>
+#include <vector>
+
 #include "Aql/ShortStringStorage.h"
 #include "Basics/Common.h"
 

arangod/Aql/QueryResult.h

@@ -24,7 +24,10 @@
 #ifndef ARANGOD_AQL_QUERY_RESULT_H
 #define ARANGOD_AQL_QUERY_RESULT_H 1
 
+#include <memory>
 #include <unordered_set>
+#include <vector>
+
 #include "Basics/Common.h"
 #include "Basics/Result.h"
 

arangod/Aql/QueryString.cpp

@@ -22,6 +22,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "QueryString.h"
+
+#include "Basics/debugging.h"
 #include "Basics/fasthash.h"
 
 using namespace arangodb::aql;

arangod/Aql/Range.h

@@ -24,6 +24,9 @@
 #ifndef ARANGOD_AQL_RANGE_H
 #define ARANGOD_AQL_RANGE_H 1
 
+#include <cstdint>
+#include <cstdlib>
+
 #include "Basics/Common.h"
 
 namespace arangodb {

arangod/Aql/ResourceUsage.h

@@ -26,6 +26,8 @@
 
 #include "Basics/Common.h"
 #include "Basics/Exceptions.h"
+#include "Basics/debugging.h"
+#include "Basics/system-compiler.h"
 
 #include <algorithm>
 

arangod/Aql/Scopes.cpp

@@ -23,6 +23,7 @@
 
 #include "Aql/Scopes.h"
 #include "Basics/Exceptions.h"
+#include "Basics/StringUtils.h"
 
 using namespace arangodb::aql;
 

arangod/Aql/Scopes.h

@@ -24,8 +24,12 @@
 #ifndef ARANGOD_AQL_SCOPES_H
 #define ARANGOD_AQL_SCOPES_H 1
 
+#include <memory>
+#include <vector>
+
 #include "Aql/Variable.h"
 #include "Basics/Common.h"
+#include "Basics/debugging.h"
 
 namespace arangodb {
 namespace aql {

arangod/Aql/SharedQueryState.cpp

@@ -21,6 +21,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "SharedQueryState.h"
+
 #include "Scheduler/Scheduler.h"
 #include "Scheduler/SchedulerFeature.h"
 

arangod/Aql/SharedQueryState.h

@@ -24,7 +24,10 @@
 #define ARANGOD_AQL_SHARED_QUERY_STATE_H 1
 
 #include <condition_variable>
+#include <functional>
+
 #include "Basics/Common.h"
+#include "Basics/system-compiler.h"
 
 namespace arangodb {
 namespace aql {

arangod/Aql/ShortStringStorage.cpp

@@ -24,6 +24,7 @@
 #include "ShortStringStorage.h"
 #include "Aql/ResourceUsage.h"
 #include "Basics/Exceptions.h"
+#include "Basics/debugging.h"
 #include "Basics/tri-strings.h"
 
 #include <cstring>

arangod/Aql/ShortStringStorage.h

@@ -24,6 +24,8 @@
 #ifndef ARANGOD_AQL_SHORT_STRING_STORAGE_H
 #define ARANGOD_AQL_SHORT_STRING_STORAGE_H 1
 
+#include <vector>
+
 #include "Basics/Common.h"
 
 namespace arangodb {

arangod/Aql/ShortestPathExecutor.cpp

@@ -21,11 +21,13 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "ShortestPathExecutor.h"
+
 #include "Aql/AqlValue.h"
 #include "Aql/OutputAqlItemRow.h"
 #include "Aql/Query.h"
 #include "Aql/SingleRowFetcher.h"
 #include "Aql/Stats.h"
+#include "Basics/system-compiler.h"
 #include "Graph/ShortestPathFinder.h"
 #include "Graph/ShortestPathOptions.h"
 #include "Graph/ShortestPathResult.h"

arangod/Aql/SortCondition.h

@@ -28,6 +28,7 @@
 #include "Basics/AttributeNameParser.h"
 #include "Basics/Common.h"
 #include "Basics/HashSet.h"
+#include "Basics/debugging.h"
 
 namespace arangodb {
 

arangod/Aql/TraversalExecutor.cpp

@@ -25,6 +25,7 @@
 #include "Aql/PruneExpressionEvaluator.h"
 #include "Aql/Query.h"
 #include "Aql/SingleRowFetcher.h"
+#include "Basics/system-compiler.h"
 #include "Graph/Traverser.h"
 #include "Graph/TraverserCache.h"
 #include "Graph/TraverserOptions.h"

arangod/Aql/V8Executor.cpp

@@ -28,6 +28,9 @@
 #include "Aql/Variable.h"
 #include "Basics/Exceptions.h"
 #include "Basics/StringBuffer.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "V8/v8-conv.h"
 #include "V8/v8-globals.h"
 #include "V8/v8-utils.h"

arangod/Aql/Variable.h

@@ -24,6 +24,8 @@
 #ifndef ARANGOD_AQL_VARIABLE_H
 #define ARANGOD_AQL_VARIABLE_H 1
 
+#include <string>
+
 #include "Aql/types.h"
 #include "Basics/Common.h"
 

arangod/Aql/VariableGenerator.cpp

@@ -23,6 +23,7 @@
 
 #include "Aql/VariableGenerator.h"
 #include "Basics/Exceptions.h"
+#include "Basics/debugging.h"
 
 #include <velocypack/Builder.h>
 #include <velocypack/Iterator.h>

arangod/Aql/grammar.h

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.5.  */
+/* A Bison parser, made by GNU Bison 3.3.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 #ifndef YY_AQL_AQL_GRAMMAR_HPP_INCLUDED
 # define YY_AQL_AQL_GRAMMAR_HPP_INCLUDED
 /* Debug traces.  */
@@ -126,7 +130,7 @@ extern int Aqldebug;
 
 union YYSTYPE
 {
-#line 35 "Aql/grammar.y" /* yacc.c:1910  */
+#line 36 "Aql/grammar.y" /* yacc.c:1921  */
 
   arangodb::aql::AstNode*  node;
   struct {
@@ -136,7 +140,7 @@ union YYSTYPE
   bool                     boolval;
   int64_t                  intval;
 
-#line 140 "Aql/grammar.hpp" /* yacc.c:1910  */
+#line 144 "Aql/grammar.hpp" /* yacc.c:1921  */
 };
 
 typedef union YYSTYPE YYSTYPE;

arangod/Aql/grammar.hpp

@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.5.  */
+/* A Bison parser, made by GNU Bison 3.3.2.  */
 
 /* Bison interface for Yacc-like parsers in C
 
-   Copyright (C) 1984, 1989-1990, 2000-2015, 2018 Free Software Foundation, Inc.
+   Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+   Inc.
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +31,9 @@
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+/* Undocumented macros, especially those whose name start with YY_,
+   are private implementation details.  Do not rely on them.  */
+
 #ifndef YY_AQL_AQL_GRAMMAR_HPP_INCLUDED
 # define YY_AQL_AQL_GRAMMAR_HPP_INCLUDED
 /* Debug traces.  */
@@ -126,7 +130,7 @@ extern int Aqldebug;
 
 union YYSTYPE
 {
-#line 35 "Aql/grammar.y" /* yacc.c:1910  */
+#line 36 "Aql/grammar.y" /* yacc.c:1921  */
 
   arangodb::aql::AstNode*  node;
   struct {
@@ -136,7 +140,7 @@ union YYSTYPE
   bool                     boolval;
   int64_t                  intval;
 
-#line 140 "Aql/grammar.hpp" /* yacc.c:1910  */
+#line 144 "Aql/grammar.hpp" /* yacc.c:1921  */
 };
 
 typedef union YYSTYPE YYSTYPE;

arangod/Aql/grammar.y

@@ -27,6 +27,7 @@
 #include "Aql/Quantifier.h"
 #include "Aql/Query.h"
 #include "Aql/types.h"
+#include "Basics/StringUtils.h"
 #include "Basics/tri-strings.h"
 #include "Transaction/Context.h"
 #include "VocBase/AccessMode.h"

arangod/Aql/tokens.ll

@@ -23,8 +23,13 @@
 
 %{
 #include "Basics/Common.h"
-#include "Basics/conversions.h"
 #include "Basics/NumberUtils.h"
+#include "Basics/conversions.h"
+#include "Basics/operating-system.h"
+
+#if _WIN32
+#include "Basics/win-utils.h"
+#endif
 
 // introduce the namespace here, otherwise following references to
 // the namespace in auto-generated headers might fail

arangod/Aql/types.h

@@ -24,6 +24,9 @@
 #ifndef ARANGOD_AQL_TYPES_H
 #define ARANGOD_AQL_TYPES_H 1
 
+#include <unordered_map>
+#include <vector>
+
 #include "Basics/Common.h"
 #include "Basics/HashSet.h"
 

arangod/Auth/Handler.h

@@ -24,8 +24,9 @@
 #ifndef ARANGOD_AUTHENTICATION_HANDLER_H
 #define ARANGOD_AUTHENTICATION_HANDLER_H 1
 
-#include "Basics/Result.h"
 #include "Auth/Common.h"
+#include "Basics/Result.h"
+#include "Basics/voc-errors.h"
 
 #include <velocypack/Slice.h>
 #include <set>

arangod/Auth/TokenCache.cpp

@@ -33,7 +33,9 @@
 #include "Basics/tri-strings.h"
 #include "Cluster/ServerState.h"
 #include "GeneralServer/AuthenticationFeature.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Ssl/SslInterface.h"
 
 #include <velocypack/Builder.h>

arangod/Auth/TokenCache.h

@@ -29,6 +29,8 @@
 #include "Basics/Mutex.h"
 #include "Basics/ReadWriteLock.h"
 #include "Basics/Result.h"
+#include "Basics/debugging.h"
+#include "Basics/system-functions.h"
 #include "Rest/CommonDefines.h"
 
 #include <velocypack/Builder.h>

arangod/Auth/User.cpp

@@ -24,15 +24,18 @@
 
 #include "Auth/User.h"
 #include "Basics/ReadLocker.h"
+#include "Basics/ScopeGuard.h"
 #include "Basics/StaticStrings.h"
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/WriteLocker.h"
+#include "Basics/system-functions.h"
 #include "Basics/tri-strings.h"
-#include "Basics/ScopeGuard.h"
 #include "Cluster/ServerState.h"
 #include "GeneralServer/GeneralServerFeature.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Random/UniformCharacter.h"
 #include "RestServer/DatabaseFeature.h"
 #include "Ssl/SslInterface.h"

arangod/Auth/UserManager.cpp

@@ -35,7 +35,9 @@
 #include "Cluster/ServerState.h"
 #include "GeneralServer/AuthenticationFeature.h"
 #include "GeneralServer/GeneralServerFeature.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/BootstrapFeature.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/InitDatabaseFeature.h"

arangod/Cache/BucketState.cpp

@@ -24,6 +24,7 @@
 #include "Cache/BucketState.h"
 #include "Basics/Common.h"
 #include "Basics/cpu-relax.h"
+#include "Basics/debugging.h"
 
 #include <stdint.h>
 #include <atomic>

arangod/Cache/BucketState.h

@@ -24,10 +24,11 @@
 #ifndef ARANGODB_CACHE_BUCKET_STATE_H
 #define ARANGODB_CACHE_BUCKET_STATE_H
 
-#include "Basics/Common.h"
-
 #include <atomic>
 #include <cstdint>
+#include <functional>
+
+#include "Basics/Common.h"
 
 namespace arangodb {
 namespace cache {

arangod/Cache/CacheManagerFeature.cpp

@@ -30,11 +30,14 @@
 
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Basics/ArangoGlobalContext.h"
+#include "Basics/application-exit.h"
 #include "Basics/process-utils.h"
 #include "Cache/CacheManagerFeatureThreads.h"
 #include "Cache/Manager.h"
 #include "Cluster/ServerState.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
 #include "Scheduler/Scheduler.h"

arangod/Cache/CacheManagerFeatureThreads.cpp

@@ -21,16 +21,16 @@
 /// @author Daniel H. Larkin
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "Cache/CacheManagerFeatureThreads.h"
-#include "Basics/Common.h"
+#include <stdint.h>
+
 #include "Basics/ConditionLocker.h"
 #include "Basics/ConditionVariable.h"
 #include "Basics/Thread.h"
+#include "Basics/voc-errors.h"
+#include "Cache/CacheManagerFeatureThreads.h"
 #include "Cache/Manager.h"
 #include "Cache/Rebalancer.h"
 
-#include <stdint.h>
-
 using namespace arangodb;
 
 CacheRebalancerThread::CacheRebalancerThread(cache::Manager* manager, uint64_t interval)

arangod/Cache/CachedValue.cpp

@@ -26,6 +26,8 @@
 #include <stdint.h>
 #include <cstring>
 
+#include "Basics/debugging.h"
+
 using namespace arangodb::cache;
 
 const size_t CachedValue::_headerAllocSize = sizeof(CachedValue) + CachedValue::_padding;

arangod/Cache/Common.h

@@ -24,9 +24,10 @@
 #ifndef ARANGODB_CACHE_COMMON_H
 #define ARANGODB_CACHE_COMMON_H
 
-#include "Basics/Common.h"
+#include <cstdint>
+#include <cstdlib>
 
-#include <stdint.h>
+#include "Basics/Common.h"
 
 namespace arangodb {
 namespace cache {

arangod/Cache/Finding.cpp

@@ -22,6 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/Finding.h"
+
+#include "Basics/debugging.h"
+#include "Basics/voc-errors.h"
 #include "Cache/CachedValue.h"
 
 using namespace arangodb;

arangod/Cache/Manager.cpp

@@ -21,9 +21,21 @@
 /// @author Daniel H. Larkin
 ////////////////////////////////////////////////////////////////////////////////
 
+#include <stdint.h>
+#include <algorithm>
+#include <atomic>
+#include <chrono>
+#include <cmath>
+#include <memory>
+#include <set>
+#include <stack>
+#include <utility>
+
 #include "Cache/Manager.h"
+
 #include "Basics/Common.h"
 #include "Basics/SharedPRNG.h"
+#include "Basics/voc-errors.h"
 #include "Cache/Cache.h"
 #include "Cache/CachedValue.h"
 #include "Cache/Common.h"
@@ -34,16 +46,9 @@
 #include "Cache/Table.h"
 #include "Cache/Transaction.h"
 #include "Cache/TransactionalCache.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
-
-#include <stdint.h>
-#include <algorithm>
-#include <atomic>
-#include <chrono>
-#include <memory>
-#include <set>
-#include <stack>
-#include <utility>
+#include "Logger/LoggerStream.h"
 
 using namespace arangodb::cache;
 

arangod/Cache/PlainBucket.cpp

@@ -22,7 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/PlainBucket.h"
+
 #include "Basics/Common.h"
+#include "Basics/debugging.h"
 #include "Cache/CachedValue.h"
 
 #include <stdint.h>

arangod/Cache/PlainCache.cpp

@@ -22,7 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/PlainCache.h"
+
 #include "Basics/Common.h"
+#include "Basics/voc-errors.h"
 #include "Cache/Cache.h"
 #include "Cache/CachedValue.h"
 #include "Cache/Common.h"

arangod/Cache/Rebalancer.cpp

@@ -22,7 +22,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/Rebalancer.h"
-#include "Basics/Common.h"
+
+#include "Basics/voc-errors.h"
 #include "Cache/Manager.h"
 
 using namespace arangodb::cache;

arangod/Cache/Table.cpp

@@ -26,6 +26,7 @@
 #include "Cache/Common.h"
 
 #include <stdint.h>
+#include <algorithm>
 #include <memory>
 #include <stdexcept>
 

arangod/Cache/TransactionalBucket.cpp

@@ -22,7 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/TransactionalBucket.h"
+
 #include "Basics/Common.h"
+#include "Basics/debugging.h"
 #include "Cache/CachedValue.h"
 
 #include <stdint.h>

arangod/Cache/TransactionalCache.cpp

@@ -22,7 +22,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "Cache/TransactionalCache.h"
+
 #include "Basics/Common.h"
+#include "Basics/voc-errors.h"
 #include "Cache/Cache.h"
 #include "Cache/CachedValue.h"
 #include "Cache/Common.h"

arangod/Cluster/ActionBase.cpp

@@ -28,6 +28,9 @@
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Cluster/ClusterFeature.h"
 #include "Cluster/MaintenanceFeature.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 using namespace arangodb;
 using namespace arangodb::application_features;

arangod/Cluster/AgencyCallback.cpp

@@ -33,7 +33,9 @@
 #include "Basics/MutexLocker.h"
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 using namespace arangodb;
 using namespace arangodb::application_features;

arangod/Cluster/AgencyCallbackRegistry.cpp

@@ -33,7 +33,9 @@
 #include "Basics/WriteLocker.h"
 #include "Cluster/ServerState.h"
 #include "Endpoint/Endpoint.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Random/RandomGenerator.h"
 
 using namespace arangodb;

arangod/Cluster/ClusterComm.cpp

@@ -28,6 +28,7 @@
 #include "Basics/ConditionLocker.h"
 #include "Basics/HybridLogicalClock.h"
 #include "Basics/StringUtils.h"
+#include "Basics/application-exit.h"
 #include "Cluster/ClusterInfo.h"
 #include "Cluster/ServerState.h"
 #include "GeneralServer/AuthenticationFeature.h"

arangod/Cluster/ClusterComm.h

@@ -33,6 +33,7 @@
 #include "Basics/ConditionVariable.h"
 #include "Basics/ReadWriteLock.h"
 #include "Basics/Thread.h"
+#include "Basics/error.h"
 #include "Cluster/ClusterInfo.h"
 #include "Logger/LogTopic.h"
 #include "Rest/GeneralRequest.h"

arangod/Cluster/ClusterFeature.cpp

@@ -25,6 +25,7 @@
 
 #include "Basics/FileUtils.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Basics/application-exit.h"
 #include "Basics/files.h"
 #include "Cluster/ClusterComm.h"
 #include "Cluster/ClusterInfo.h"

arangod/Cluster/ClusterInfo.cpp

@@ -33,6 +33,7 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/WriteLocker.h"
 #include "Basics/hashes.h"
+#include "Basics/system-functions.h"
 #include "Cluster/ClusterCollectionCreationInfo.h"
 #include "Cluster/ClusterHelpers.h"
 #include "Cluster/ServerState.h"

arangod/Cluster/ClusterMethods.cpp

@@ -31,6 +31,7 @@
 #include "Basics/StringUtils.h"
 #include "Basics/VelocyPackHelper.h"
 #include "Basics/conversions.h"
+#include "Basics/system-functions.h"
 #include "Basics/tri-strings.h"
 #include "Cluster/ClusterCollectionCreationInfo.h"
 #include "Cluster/ClusterComm.h"

arangod/Cluster/ClusterRepairDistributeShardsLike.cpp

@@ -22,7 +22,10 @@
 
 #include "ClusterRepairDistributeShardsLike.h"
 
-#include <lib/Basics/StringUtils.h>
+#include <Basics/StringUtils.h>
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 
 #include <boost/range/combine.hpp>
 

arangod/Cluster/CreateCollection.cpp

@@ -29,6 +29,9 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Cluster/ClusterFeature.h"
 #include "Cluster/FollowerInfo.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Utils/DatabaseGuard.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/Methods/Collections.h"

arangod/Cluster/CreateDatabase.cpp

@@ -28,6 +28,9 @@
 
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/DatabaseFeature.h"
 #include "Utils/DatabaseGuard.h"
 #include "VocBase/Methods/Databases.h"

arangod/Cluster/DBServerAgencySync.cpp

@@ -33,7 +33,9 @@
 #include "Cluster/MaintenanceFeature.h"
 #include "Cluster/MaintenanceStrings.h"
 #include "Cluster/ServerState.h"
+#include "Logger/LogMacros.h"
 #include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/DatabaseFeature.h"
 #include "RestServer/SystemDatabaseFeature.h"
 #include "VocBase/LogicalCollection.h"

arangod/Cluster/DropCollection.cpp

@@ -28,6 +28,9 @@
 #include "Basics/VelocyPackHelper.h"
 #include "Cluster/ClusterFeature.h"
 #include "Cluster/MaintenanceFeature.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "Utils/DatabaseGuard.h"
 #include "VocBase/Methods/Collections.h"
 #include "VocBase/Methods/Databases.h"

arangod/Cluster/DropDatabase.cpp

@@ -26,6 +26,9 @@
 
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Basics/VelocyPackHelper.h"
+#include "Logger/LogMacros.h"
+#include "Logger/Logger.h"
+#include "Logger/LoggerStream.h"
 #include "RestServer/DatabaseFeature.h"
 #include "Utils/DatabaseGuard.h"
 #include "VocBase/Methods/Databases.h"