diff --git a/arangod/VocBase/index-garbage-collector.c b/arangod/VocBase/index-garbage-collector.c
index a02f9ed28e..3cbb09bc90 100644
--- a/arangod/VocBase/index-garbage-collector.c
+++ b/arangod/VocBase/index-garbage-collector.c
@@ -38,6 +38,7 @@
 #include "VocBase/index.h"
 #include "VocBase/transaction.h"
 
+#ifdef TRI_SKIPLIST_EX
 
 
 // -----------------------------------------------------------------------------
@@ -995,6 +996,8 @@ static int ExciseNodeSwapPointersUndo(linked_list_node_t* nodeToExcise, linked_l
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
 
+#endif
+
 // Local Variables:
 // mode: outline-minor
 // outline-regexp: "/// @brief\\|/// {@inheritDoc}\\|/// @addtogroup\\|/// @page\\|// --SECTION--\\|/// @\\}"
diff --git a/lib/BasicsC/locks-posix.c b/lib/BasicsC/locks-posix.c
index e80417782c..915c97a7f1 100644
--- a/lib/BasicsC/locks-posix.c
+++ b/lib/BasicsC/locks-posix.c
@@ -553,7 +553,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond) {
 
 
 
-
+#ifdef TRI_SKIPLIST_EX
 
 // -----------------------------------------------------------------------------
 // COMPARE & SWAP operations below for MAC and GNUC
@@ -678,6 +678,8 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue) {
   #endif
 }
 
+#endif
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/lib/BasicsC/locks-win32.c b/lib/BasicsC/locks-win32.c
index 6e5ef1e311..43186597fb 100644
--- a/lib/BasicsC/locks-win32.c
+++ b/lib/BasicsC/locks-win32.c
@@ -900,6 +900,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond) {
 }
 
 
+#ifdef TRI_SKIPLIST_EX
 
 // -----------------------------------------------------------------------------
 // COMPARE & SWAP operations below for windows
@@ -966,6 +967,7 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue) {
   return ( InterlockedCompareExchangePointer(theValue, oldValue, oldValue) == oldValue );
 }
 
+#endif
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
diff --git a/lib/BasicsC/locks.h b/lib/BasicsC/locks.h
index 518414250e..c8db33dcd7 100644
--- a/lib/BasicsC/locks.h
+++ b/lib/BasicsC/locks.h
@@ -386,6 +386,7 @@ void TRI_UnlockCondition (TRI_condition_t* cond);
 /// @{
 ////////////////////////////////////////////////////////////////////////////////
 
+#ifdef TRI_SKIPLIST_EX
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief performs an atomic compare and swap operation on a 32bit integer.
@@ -451,6 +452,7 @@ bool TRI_ComparePointer(void* volatile* theValue, void* oldValue);
 ////////////////////////////////////////////////////////////////////////////////
 /// @}
 ////////////////////////////////////////////////////////////////////////////////
+#endif
 
 #ifdef __cplusplus
 }