diff --git a/arangod/Ahuacatl/ahuacatl-access-optimiser.c b/arangod/Ahuacatl/ahuacatl-access-optimiser.c
index 7c61e544fb..f86cfd22be 100644
--- a/arangod/Ahuacatl/ahuacatl-access-optimiser.c
+++ b/arangod/Ahuacatl/ahuacatl-access-optimiser.c
@@ -340,7 +340,7 @@ static void SetNameLength (TRI_aql_field_access_t* const fieldAccess) {
     fieldAccess->_variableNameLength = strlen(fieldAccess->_fullName);
   }
   else {
-    fieldAccess->_variableNameLength = dotPosition - fieldAccess->_fullName;
+    fieldAccess->_variableNameLength = (size_t) (dotPosition - fieldAccess->_fullName);
   }
 }
 
diff --git a/arangod/Ahuacatl/ahuacatl-error.c b/arangod/Ahuacatl/ahuacatl-error.c
index 44d4a41344..f71aabd833 100644
--- a/arangod/Ahuacatl/ahuacatl-error.c
+++ b/arangod/Ahuacatl/ahuacatl-error.c
@@ -179,7 +179,7 @@ char* TRI_GetContextErrorAql (const char* const query, const size_t line, const
   // p is pointing at the position in the query the parse error occurred at
   assert(p >= query);
 
-  offset = p - query;
+  offset = (size_t) (p - query);
 
   if (strlen(query) < offset + SNIPPET_LENGTH) {
     return TRI_DuplicateString2Z(TRI_UNKNOWN_MEM_ZONE, query + offset, strlen(query) - offset);
diff --git a/arangod/GeoIndex/GeoIndex.h b/arangod/GeoIndex/GeoIndex.h
index ce0306dcdc..37d8d1b43f 100755
--- a/arangod/GeoIndex/GeoIndex.h
+++ b/arangod/GeoIndex/GeoIndex.h
@@ -95,9 +95,6 @@ typedef struct {
 typedef char GeoIndex;   /* to keep the structure private  */
 
 
-int GeoIndex_assignMethod (void*, TRI_index_method_assignment_type_e);
-
-
 ///////////////////////////////////////////////////////////////////////////////////////
 // Allows one or more call back functions to be assigned
 ///////////////////////////////////////////////////////////////////////////////////////
diff --git a/arangod/VocBase/document-collection.h b/arangod/VocBase/document-collection.h
index a6310bb683..a885db97e5 100644
--- a/arangod/VocBase/document-collection.h
+++ b/arangod/VocBase/document-collection.h
@@ -560,31 +560,6 @@ struct TRI_index_s* TRI_EnsurePriorityQueueIndexDocumentCollection (TRI_document
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
 
-// -----------------------------------------------------------------------------
-// --SECTION--                                              PRIORITY QUEUE INDEX
-// -----------------------------------------------------------------------------
-
-// -----------------------------------------------------------------------------
-// --SECTION--                                                  public functions
-// -----------------------------------------------------------------------------
-
-////////////////////////////////////////////////////////////////////////////////
-/// @addtogroup VocBase
-/// @{
-////////////////////////////////////////////////////////////////////////////////
-
-////////////////////////////////////////////////////////////////////////////////
-/// @brief ensures that a cap constraint exists
-////////////////////////////////////////////////////////////////////////////////
-
-TRI_index_t* TRI_EnsureCapConstraintDocumentCollection (TRI_document_collection_t*,
-                                                        size_t,
-                                                        bool*);
-
-////////////////////////////////////////////////////////////////////////////////
-/// @}
-////////////////////////////////////////////////////////////////////////////////
-
 // -----------------------------------------------------------------------------
 // --SECTION--                                           SELECT BY EXAMPLE QUERY
 // -----------------------------------------------------------------------------
diff --git a/arangoirb/MRClient/arangoirb.cpp b/arangoirb/MRClient/arangoirb.cpp
index a01043d0b3..9573394371 100644
--- a/arangoirb/MRClient/arangoirb.cpp
+++ b/arangoirb/MRClient/arangoirb.cpp
@@ -54,6 +54,7 @@
 #include "MRuby/mr-utils.h"
 #include "Rest/Endpoint.h"
 #include "Rest/Initialise.h"
+#include "Rest/InitialiseRest.h"
 #include "SimpleHttpClient/SimpleHttpClient.h"
 #include "SimpleHttpClient/SimpleHttpResult.h"
 
diff --git a/lib/BasicsC/strings.h b/lib/BasicsC/strings.h
index 237b69982c..5da7838d3d 100644
--- a/lib/BasicsC/strings.h
+++ b/lib/BasicsC/strings.h
@@ -304,12 +304,6 @@ char* TRI_UnescapeUtf8String (char const* in, size_t inLength, size_t* outLength
 
 char* TRI_UnescapeUtf8StringZ (TRI_memory_zone_t*, char const* in, size_t inLength, size_t* outLength);
 
-////////////////////////////////////////////////////////////////////////////////
-/// @brief unescapes unicode escape sequences
-////////////////////////////////////////////////////////////////////////////////
-
-char* TRI_UnescapeUtf8StringZ (TRI_memory_zone_t*, char const* in, size_t inLength, size_t* outLength);
-
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/ShapedJson/shaped-json.c b/lib/ShapedJson/shaped-json.c
index 57c186cd33..7f8cee0ef2 100644
--- a/lib/ShapedJson/shaped-json.c
+++ b/lib/ShapedJson/shaped-json.c
@@ -42,7 +42,6 @@
 // --SECTION--                                              forward declarations
 // -----------------------------------------------------------------------------
 
-void TRI_PrintShape (TRI_shaper_t* shaper, TRI_shape_t const* shape, int indent);
 static bool FillShapeValueJson (TRI_shaper_t* shaper, TRI_shape_value_t* dst, TRI_json_t const* json);
 static TRI_json_t* JsonShapeData (TRI_shaper_t* shaper, TRI_shape_t const* shape, char const* data, uint64_t size);
 static bool StringifyJsonShapeData (TRI_shaper_t* shaper, TRI_string_buffer_t* buffer, TRI_shape_t const* shape, char const* data, uint64_t size);