--- a/src/core/range_map.h
+++ b/src/core/range_map.h
@@ -102,16 +102,16 @@ private:
 template<typename Key, typename T, typename C, typename A>
 inline typename RangeMap<Key,T,C,A>::iterator
 RangeMap<Key,T,C,A>::crop_overlap(const Key& _begin, const Key& _end) {
-  typename RangeMap::iterator itr = upper_bound(_begin);
+  typename RangeMap::iterator itr = this->upper_bound(_begin);
 
   while (itr != end() && key_comp()(itr->second.first, _end)) {
     // There's a subrange before the new begin: need new entry (new range end means new key).
     if (key_comp()(itr->second.first, _begin))
-      insert(itr, typename RangeMap::value_type(_begin, itr->second));
+      this->insert(itr, typename RangeMap::value_type(_begin, itr->second));
 
     // Old end is within our range: erase entry.
     if (!key_comp()(_end, itr->first)) {
-      erase(itr++);
+      this->erase(itr++);
 
     // Otherwise simply set the new begin of the old range.
     } else {
@@ -137,7 +137,7 @@ RangeMap<Key,T,C,A>::set_merge(Key _begi
     typename RangeMap::iterator prev = itr;
     if (!key_comp()((--prev)->first, _begin) && prev->second.second == value) {
       _begin = prev->second.first;
-      erase(prev);
+      this->erase(prev);
     }
   }
 
@@ -148,7 +148,7 @@ RangeMap<Key,T,C,A>::set_merge(Key _begi
   }
 
   // Otherwise, this range isn't mergeable, make new entry.
-  return insert(itr, typename RangeMap::value_type(_end, typename RangeMap::mapped_type(_begin, value)));
+  return this->insert(itr, typename RangeMap::value_type(_end, typename RangeMap::mapped_type(_begin, value)));
 }
 
 template<typename Key, typename T, typename C, typename A>
@@ -163,7 +163,7 @@ RangeMap<Key,T,C,A>::set_range(const Key
 template<typename Key, typename T, typename C, typename A>
 inline typename RangeMap<Key,T,C,A>::const_iterator
 RangeMap<Key,T,C,A>::find(const Key& key) const {
-  typename RangeMap::const_iterator itr = upper_bound(key);
+  typename RangeMap::const_iterator itr = this->upper_bound(key);
 
   if (itr != end() && key_comp()(key, itr->second.first))
     itr = end();
--- a/src/thread_base.cc
+++ b/src/thread_base.cc
@@ -45,6 +45,7 @@
 #include <signal.h>
 #include <rak/error_number.h>
 #include <torrent/exceptions.h>
+#include <unistd.h>
 
 #include "globals.h"
 #include "control.h"