diff --git a/include/tins/pdu_iterator.h b/include/tins/pdu_iterator.h
index abc5685..c91bab2 100644
--- a/include/tins/pdu_iterator.h
+++ b/include/tins/pdu_iterator.h
@@ -162,12 +162,12 @@ public:
     /**
      * Dereference and get the stored PDU
      */
-    value_type operator*();
+    PDU& operator*();
 
     /**
      * Dereference and get the stored PDU
      */
-    const value_type operator*() const;
+    const PDU& operator*() const;
 private:
     pointer pdu_;
 };
diff --git a/src/pdu_iterator.cpp b/src/pdu_iterator.cpp
index 12c154d..357c6ff 100644
--- a/src/pdu_iterator.cpp
+++ b/src/pdu_iterator.cpp
@@ -51,7 +51,7 @@ PDUIterator::value_type PDUIterator::operator*() {
     return *pdu_;
 }
 
-const PDUIterator::value_type PDUIterator::operator*() const {
+const PDU& PDUIterator::operator*() const {
     return *pdu_;
 }
 
diff --git a/src/utils/routing_utils.cpp b/src/utils/routing_utils.cpp
index c2d3229..cf9cb32 100644
--- a/src/utils/routing_utils.cpp
+++ b/src/utils/routing_utils.cpp
@@ -55,6 +55,7 @@
 #endif
 #include <set>
 #include <fstream>
+#include <stdexcept>
 #include "network_interface.h"
 
 using std::vector;
@@ -62,6 +63,7 @@ using std::string;
 using std::set;
 using std::ifstream;
 using std::istream;
+using std::runtime_error;
 
 namespace Tins {
 namespace Utils {