remove some includes

arangod/Replication/InitialSyncer.cpp

@@ -36,7 +36,7 @@
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Utils/CollectionGuard.h"
-#include "MMFiles/MMFilesCollection.h"
+#include "MMFiles/MMFilesCollection.h" //TODO -- Remove -- ditches 
 #include "MMFiles/MMFilesDatafileHelper.h"
 #include "MMFiles/MMFilesIndexElement.h"
 #include "MMFiles/MMFilesPrimaryIndex.h"

arangod/StorageEngine/RocksDBEngine.cpp

@@ -37,10 +37,6 @@
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/ticks.h"
 #include "VocBase/vocbase.h"
-#include "MMFiles/MMFilesLogfileManager.h"
-
-#include "MMFiles/MMFilesPersistentIndexFeature.h"
-#include "MMFiles/MMFilesPersistentIndex.h"
 
 #include <velocypack/Collection.h>
 #include <velocypack/Iterator.h>

arangod/StorageEngine/StorageEngine.h

@@ -28,7 +28,7 @@
 #include "Basics/Common.h"
 #include "ApplicationFeatures/ApplicationFeature.h"
 #include "Indexes/IndexFactory.h"
-#include "MMFiles/MMFilesCollectorCache.h"
+#include "MMFiles/MMFilesCollectorCache.h"  //TODO -- REMOVE
 #include "VocBase/AccessMode.h"
 #include "VocBase/voc-types.h"
 #include "VocBase/vocbase.h"

arangod/Transaction/Methods.cpp

@@ -39,10 +39,9 @@
 #include "Cluster/ServerState.h"
 #include "Indexes/Index.h"
 #include "Logger/Logger.h"
-#include "MMFiles/MMFilesCollection.h"
-#include "MMFiles/MMFilesLogfileManager.h"
-#include "MMFiles/MMFilesPrimaryIndex.h"
-#include "MMFiles/MMFilesIndexElement.h"
+#include "MMFiles/MMFilesCollection.h" //TODO -- remove -- ditches
+#include "MMFiles/MMFilesLogfileManager.h" //TODO -- remove -- waitForTick 
+#include "MMFiles/MMFilesPrimaryIndex.h" //TODO -- remove -- physical->primaryIndex() can not return MMFilesIndex
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"
 #include "StorageEngine/TransactionCollection.h"

arangod/Utils/CollectionKeys.cpp

@@ -24,9 +24,8 @@
 #include "CollectionKeys.h"
 #include "Basics/StaticStrings.h"
 #include "Basics/StringRef.h"
-#include "MMFiles/MMFilesDatafileHelper.h"
-#include "MMFiles/MMFilesLogfileManager.h"
-#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE
+#include "MMFiles/MMFilesLogfileManager.h" //TODO -- REMOVE
+#include "MMFiles/MMFilesCollection.h"     //TODO -- REMOVE
 #include "StorageEngine/EngineSelectorFeature.h"
 #include "StorageEngine/StorageEngine.h"
 #include "Transaction/Helpers.h"

arangod/Utils/TransactionContext.cpp

@@ -21,15 +21,14 @@
 /// @author Jan Steemann
 ////////////////////////////////////////////////////////////////////////////////
 
-#include "TransactionContext.h"
 #include "Basics/MutexLocker.h"
 #include "Basics/StringBuffer.h"
+#include "MMFiles/MMFilesCollection.h"     //TODO -- REMOVE
+#include "MMFiles/MMFilesLogfileManager.h" //TODO -- REMOVE
 #include "RestServer/TransactionManagerFeature.h"
-#include "MMFiles/MMFilesDatafileHelper.h"
-#include "MMFiles/MMFilesLogfileManager.h"
-#include "MMFiles/MMFilesCollection.h" //TODO -- REMOVE
 #include "Transaction/Helpers.h"
 #include "Transaction/Methods.h"
+#include "TransactionContext.h"
 #include "Utils/CollectionNameResolver.h"
 #include "VocBase/Ditch.h"
 #include "VocBase/LogicalCollection.h"

arangod/VocBase/LogicalCollection.cpp

@@ -39,14 +39,6 @@
 #include "Cluster/FollowerInfo.h"
 #include "Cluster/ServerState.h"
 #include "Indexes/Index.h"
-#include "MMFiles/MMFilesDocumentOperation.h"
-#include "MMFiles/MMFilesCollection.h" //remove
-#include "MMFiles/MMFilesPrimaryIndex.h"
-#include "MMFiles/MMFilesIndexElement.h"
-#include "MMFiles/MMFilesToken.h"
-#include "MMFiles/MMFilesTransactionState.h"
-#include "MMFiles/MMFilesWalMarker.h" //crud marker -- TODO remove
-#include "MMFiles/MMFilesWalSlots.h"  //TODO -- remove
 #include "RestServer/DatabaseFeature.h"
 #include "Scheduler/Scheduler.h"
 #include "Scheduler/SchedulerFeature.h"