diff --git a/src/input/manager.cc b/src/input/manager.cc
index 3b7b8a7d..e2ecb2a1 100644
--- a/src/input/manager.cc
+++ b/src/input/manager.cc
@@ -54,6 +54,9 @@ Manager::erase(Bindings* b) {
     throw std::logic_error("Manager::erase(...) could not find binding");
 
   Base::erase(itr);
+
+  if (std::find(begin(), end(), b) != end())
+    throw std::logic_error("Manager::erase(...) found duplicate bindings");
 }
 
 void
diff --git a/src/signal_handler.h b/src/signal_handler.h
index 619057e4..6fa2650e 100644
--- a/src/signal_handler.h
+++ b/src/signal_handler.h
@@ -37,7 +37,7 @@
 #ifndef RTORRENT_SIGNAL_HANDLER_H
 #define RTORRENT_SIGNAL_HANDLER_H
 
-#include <signal.h>
+#include <sys/signal.h>
 #include <sigc++/slot.h>
 
 class SignalHandler {