diff --git a/src/command_scheduler.cc b/src/command_scheduler.cc
index 5a63d6c0..0566e70a 100644
--- a/src/command_scheduler.cc
+++ b/src/command_scheduler.cc
@@ -36,6 +36,8 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+
 #include "core/manager.h"
 #include "core/download.h"
 #include "core/download_list.h"
diff --git a/src/command_ui.cc b/src/command_ui.cc
index 9d393601..f8356681 100644
--- a/src/command_ui.cc
+++ b/src/command_ui.cc
@@ -36,6 +36,8 @@
 
 #include "config.h"
 
+#include <sys/types.h>
+
 #include <ctime>
 #include <rak/functional.h>
 #include <rak/functional_fun.h>
diff --git a/src/core/download_factory.cc b/src/core/download_factory.cc
index 40150916..6e13a2ca 100644
--- a/src/core/download_factory.cc
+++ b/src/core/download_factory.cc
@@ -175,7 +175,7 @@ download_factory_add_stream(torrent::Object* root, const char* key, const char*
   if (!stream.good())
     return false;
 
-  root->insert_key_swap(key, obj);
+  root->insert_key_move(key, obj);
   return true;
 }