diff --git a/arangod/ClusterEngine/ClusterRestExportHandler.cpp b/arangod/ClusterEngine/ClusterRestExportHandler.cpp
index f1fa56c869fe..c52d5d03676f 100644
--- a/arangod/ClusterEngine/ClusterRestExportHandler.cpp
+++ b/arangod/ClusterEngine/ClusterRestExportHandler.cpp
@@ -22,7 +22,6 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include "ClusterRestExportHandler.h"
-#include "Basics/Exceptions.h"
 
 using namespace arangodb;
 using namespace arangodb::rest;
diff --git a/arangod/ClusterEngine/ClusterRestExportHandler.h b/arangod/ClusterEngine/ClusterRestExportHandler.h
index 1e34981efd4a..273118e31724 100644
--- a/arangod/ClusterEngine/ClusterRestExportHandler.h
+++ b/arangod/ClusterEngine/ClusterRestExportHandler.h
@@ -25,9 +25,7 @@
 #define ARANGOD_CLUSTER_CLUSTER_REST_EXPORT_HANDLER_H 1
 
 #include "Basics/Common.h"
-#include "Basics/Mutex.h"
 #include "RestHandler/RestVocbaseBaseHandler.h"
-#include "Utils/CollectionExport.h"
 
 namespace arangodb {
 class ClusterRestExportHandler : public RestVocbaseBaseHandler {
diff --git a/arangod/RestServer/FlushFeature.cpp b/arangod/RestServer/FlushFeature.cpp
index dd20080244ea..63dfdb50d995 100644
--- a/arangod/RestServer/FlushFeature.cpp
+++ b/arangod/RestServer/FlushFeature.cpp
@@ -21,28 +21,24 @@
 /// @author Andrey Abramov
 ////////////////////////////////////////////////////////////////////////////////
 
-#include <rocksdb/utilities/transaction_db.h>
-
 #include "FlushFeature.h"
 
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Aql/QueryCache.h"
 #include "Basics/ReadLocker.h"
-#include "Basics/RocksDBUtils.h"
 #include "Basics/WriteLocker.h"
 #include "Basics/application-exit.h"
 #include "Basics/encoding.h"
 #include "Cluster/ServerState.h"
 #include "FeaturePhases/BasicFeaturePhaseServer.h"
 #include "Logger/Logger.h"
+#include "Logger/LogMacros.h"
 #include "ProgramOptions/ProgramOptions.h"
 #include "ProgramOptions/Section.h"
 #include "RestServer/DatabaseFeature.h"
-#include "RocksDBEngine/RocksDBEngine.h"
-#include "RocksDBEngine/RocksDBFormat.h"
-#include "RocksDBEngine/RocksDBLogValue.h"
-#include "RocksDBEngine/RocksDBRecoveryHelper.h"
 #include "StorageEngine/EngineSelectorFeature.h"
+#include "StorageEngine/StorageEngineFeature.h"
+#include "StorageEngine/StorageEngine.h"
 #include "Utils/FlushThread.h"
 
 using namespace arangodb::application_features;