diff --git a/UnitTests/Basics/structure-size-test.cpp b/UnitTests/Basics/structure-size-test.cpp
index 200a4a4eb8..66c6855cf6 100644
--- a/UnitTests/Basics/structure-size-test.cpp
+++ b/UnitTests/Basics/structure-size-test.cpp
@@ -29,7 +29,6 @@
 
 #include "arangod/VocBase/datafile.h"
 #include "arangod/VocBase/document-collection.h"
-#include "arangod/VocBase/VocShaper.h"
 #include "arangod/Wal/Marker.h"
 
 template<typename T, typename U> size_t offsetOf (U T::*member) {
diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h
index 51603843a5..64a72178d0 100644
--- a/arangod/VocBase/document-collection.h
+++ b/arangod/VocBase/document-collection.h
@@ -25,7 +25,6 @@
 #define ARANGOD_VOC_BASE_DOCUMENT_COLLECTION_H 1
 
 #include "Basics/Common.h"
-#include "Basics/fasthash.h"
 #include "Basics/ReadWriteLock.h"
 #include "Cluster/ClusterInfo.h"
 #include "VocBase/collection.h"
@@ -39,7 +38,6 @@
 
 namespace arangodb {
 class EdgeIndex;
-class ExampleMatcher;
 class Index;
 class KeyGenerator;
 class OperationOptions;
@@ -456,28 +454,6 @@ static inline TRI_voc_cid_t TRI_EXTRACT_MARKER_TO_CID(
   return TRI_EXTRACT_MARKER_TO_CID(marker);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief extracts the revision id from a marker
-////////////////////////////////////////////////////////////////////////////////
-
-static inline TRI_voc_rid_t TRI_EXTRACT_MARKER_RID(
-    TRI_df_marker_t const* marker) {
-  // invalid marker type
-  TRI_ASSERT(false);
-
-  return 0;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief extracts the revision id from a master pointer
-////////////////////////////////////////////////////////////////////////////////
-
-static inline TRI_voc_rid_t TRI_EXTRACT_MARKER_RID(TRI_doc_mptr_t const* mptr) {
-  TRI_df_marker_t const* marker =
-      static_cast<TRI_df_marker_t const*>(mptr->getDataPtr());
-  return TRI_EXTRACT_MARKER_RID(marker);
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief extracts the pointer to the key from a marker
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/arangod/VocBase/vocbase.h b/arangod/VocBase/vocbase.h
index 331f479daf..467c42358f 100644
--- a/arangod/VocBase/vocbase.h
+++ b/arangod/VocBase/vocbase.h
@@ -314,7 +314,7 @@ struct TRI_vocbase_t {
 /// in this enum for compatibility with earlier versions
 ////////////////////////////////////////////////////////////////////////////////
 
-typedef enum {
+enum TRI_vocbase_col_status_e {
   TRI_VOC_COL_STATUS_CORRUPTED = 0,
   TRI_VOC_COL_STATUS_NEW_BORN = 1,  // DEPRECATED, and shouldn't be used anymore
   TRI_VOC_COL_STATUS_UNLOADED = 2,
@@ -322,7 +322,7 @@ typedef enum {
   TRI_VOC_COL_STATUS_UNLOADING = 4,
   TRI_VOC_COL_STATUS_DELETED = 5,
   TRI_VOC_COL_STATUS_LOADING = 6
-} TRI_vocbase_col_status_e;
+};
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief collection container