diff --git a/arangod/Aql/BindParameters.cpp b/arangod/Aql/BindParameters.cpp
index 1c26b7c84a..4da6d3ef4a 100644
--- a/arangod/Aql/BindParameters.cpp
+++ b/arangod/Aql/BindParameters.cpp
@@ -94,7 +94,7 @@ void BindParameters::stripCollectionNames(VPackSlice const& keys,
         // key begins with collection name + '/', now strip it in place for
         // further comparisons
         result.add(VPackValue(
-            std::string(p + 1, static_cast<size_t>(l - static_cast<ptrdiff_t>(p - s) - 1))));
+         std::string(p + 1, static_cast<size_t>(l - static_cast<std::ptrdiff_t>(p - s) - 1))));
         continue;
       }
     }
diff --git a/arangod/MMFiles/MMFilesDatafile.h b/arangod/MMFiles/MMFilesDatafile.h
index b27c4d57a9..a2407ed000 100644
--- a/arangod/MMFiles/MMFilesDatafile.h
+++ b/arangod/MMFiles/MMFilesDatafile.h
@@ -23,6 +23,7 @@
 
 #ifndef ARANGOD_MMFILES_MMFILES_DATAFILE_H
 #define ARANGOD_MMFILES_MMFILES_DATAFILE_H 1
+#include <cstddef>
 
 #include "Basics/Common.h"
 #include "VocBase/vocbase.h"
@@ -546,4 +547,4 @@ arangodb::Result TRI_IterateDatafile(MMFilesDatafile*,
 bool TRI_IterateDatafile(MMFilesDatafile*,
                          std::function<bool(MMFilesMarker const*, MMFilesDatafile*)> const& cb);
 
-#endif
\ No newline at end of file
+#endif