diff --git a/arangod/MMFiles/MMFilesTransactionState.cpp b/arangod/MMFiles/MMFilesTransactionState.cpp
index 4111a1a8cd..dbb531f796 100644
--- a/arangod/MMFiles/MMFilesTransactionState.cpp
+++ b/arangod/MMFiles/MMFilesTransactionState.cpp
@@ -52,7 +52,8 @@ static inline MMFilesLogfileManager* GetMMFilesLogfileManager() {
 /// @brief transaction type
 MMFilesTransactionState::MMFilesTransactionState(TRI_vocbase_t* vocbase)
     : TransactionState(vocbase),
-      _rocksTransaction(nullptr) {}
+      _rocksTransaction(nullptr),
+      _hasOperations(false) {}
 
 /// @brief free a transaction container
 MMFilesTransactionState::~MMFilesTransactionState() {
diff --git a/arangod/MMFiles/MMFilesTransactionState.h b/arangod/MMFiles/MMFilesTransactionState.h
index 80f5c2ef5b..336c1cb21f 100644
--- a/arangod/MMFiles/MMFilesTransactionState.h
+++ b/arangod/MMFiles/MMFilesTransactionState.h
@@ -106,6 +106,7 @@ class MMFilesTransactionState final : public TransactionState {
   
  private:
   rocksdb::Transaction* _rocksTransaction;
+  bool _hasOperations;
 };
 
 }
diff --git a/arangod/StorageEngine/TransactionState.cpp b/arangod/StorageEngine/TransactionState.cpp
index 5fecfba938..a2d01d176c 100644
--- a/arangod/StorageEngine/TransactionState.cpp
+++ b/arangod/StorageEngine/TransactionState.cpp
@@ -29,8 +29,6 @@
 #include "StorageEngine/StorageEngine.h"
 #include "StorageEngine/TransactionCollection.h"
 #include "Transaction/Methods.h"
-#include "VocBase/LogicalCollection.h"
-#include "VocBase/modes.h"
 #include "VocBase/ticks.h"
 
 using namespace arangodb;
@@ -46,7 +44,6 @@ TransactionState::TransactionState(TRI_vocbase_t* vocbase)
       _hints(),
       _nestingLevel(0), 
       _allowImplicit(true),
-      _hasOperations(false), 
       _waitForSync(false),
       _beginWritten(false), 
       _timeout(transaction::Methods::DefaultLockTimeout) {}
diff --git a/arangod/StorageEngine/TransactionState.h b/arangod/StorageEngine/TransactionState.h
index f76de32eb0..260ecf2fa7 100644
--- a/arangod/StorageEngine/TransactionState.h
+++ b/arangod/StorageEngine/TransactionState.h
@@ -146,7 +146,6 @@ class TransactionState {
   transaction::Hints _hints;            // hints;
   int _nestingLevel;
   bool _allowImplicit;
-  bool _hasOperations;
   bool _waitForSync;   // whether or not the transaction had a synchronous op
   bool _beginWritten;  // whether or not the begin marker was already written
   double _timeout;     // timeout for lock acquisition