diff --git a/src/broxygen/Configuration.cc b/src/broxygen/Configuration.cc
index bb346935a9..92f070c5de 100644
--- a/src/broxygen/Configuration.cc
+++ b/src/broxygen/Configuration.cc
@@ -7,6 +7,7 @@
 #include <fstream>
 #include <vector>
 #include <algorithm>
+#include <errno.h>
 
 using namespace broxygen;
 using namespace std;
diff --git a/src/broxygen/Manager.cc b/src/broxygen/Manager.cc
index b923efe61f..64c7bf1ef7 100644
--- a/src/broxygen/Manager.cc
+++ b/src/broxygen/Manager.cc
@@ -167,8 +167,7 @@ IdentifierInfo* Manager::CreateIdentifierInfo(ID* id, ScriptInfo* script)
 	rval->AddComments(comment_buffer);
 	comment_buffer.clear();
 
-	comment_buffer_map_t::const_iterator it =
-	        comment_buffer_map.find(id->Name());
+	comment_buffer_map_t::iterator it = comment_buffer_map.find(id->Name());
 
 	if ( it != comment_buffer_map.end() )
 		{
diff --git a/src/broxygen/Manager.h b/src/broxygen/Manager.h
index bb67cf35cf..8d606357f2 100644
--- a/src/broxygen/Manager.h
+++ b/src/broxygen/Manager.h
@@ -17,6 +17,7 @@
 #include <map>
 #include <ctime>
 #include <sys/stat.h>
+#include <errno.h>
 
 namespace broxygen {
 
diff --git a/src/broxygen/PackageInfo.cc b/src/broxygen/PackageInfo.cc
index c01182dfeb..88bf167ef6 100644
--- a/src/broxygen/PackageInfo.cc
+++ b/src/broxygen/PackageInfo.cc
@@ -4,6 +4,7 @@
 #include "Reporter.h"
 
 #include <fstream>
+#include <errno.h>
 
 using namespace std;
 using namespace broxygen;
diff --git a/src/broxygen/utils.cc b/src/broxygen/utils.cc
index 5d0b3be91b..4d33670f28 100644
--- a/src/broxygen/utils.cc
+++ b/src/broxygen/utils.cc
@@ -3,6 +3,7 @@
 #include "Reporter.h"
 
 #include <sys/stat.h>
+#include <errno.h>
 
 using namespace broxygen;
 using namespace std;