diff --git a/src/crypto/crypto.cc b/src/crypto/crypto.cc
index 418a597..e5ee202 100644
--- a/src/crypto/crypto.cc
+++ b/src/crypto/crypto.cc
@@ -18,6 +18,8 @@
 
 #include <string.h>
 #include <stdio.h>
+#include <errno.h>
+#include <stdlib.h>
 
 #include "crypto.h"
 #include "base64.h"
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
index e959fd5..d4d01dd 100644
--- a/src/crypto/crypto.h
+++ b/src/crypto/crypto.h
@@ -22,6 +22,7 @@
 #include "ae.h"
 #include <string>
 #include <string.h>
+#include <stdint.h>
 
 using namespace std;
 
diff --git a/src/network/network.cc b/src/network/network.cc
index 8057dc0..ea7dabb 100644
--- a/src/network/network.cc
+++ b/src/network/network.cc
@@ -22,6 +22,7 @@
 #include <arpa/inet.h>
 #include <assert.h>
 #include <endian.h>
+#include <errno.h>
 
 #include "dos_assert.h"
 #include "network.h"
diff --git a/src/network/transportsender.cc b/src/network/transportsender.cc
index 5d0da77..68ed2b2 100644
--- a/src/network/transportsender.cc
+++ b/src/network/transportsender.cc
@@ -18,6 +18,7 @@
 
 #include <algorithm>
 #include <list>
+#include <stdio.h>
 
 #include "transportsender.h"
 #include "transportfragment.h"
diff --git a/src/terminal/parser.cc b/src/terminal/parser.cc
index c32d24e..6dc38e8 100644
--- a/src/terminal/parser.cc
+++ b/src/terminal/parser.cc
@@ -19,6 +19,7 @@
 #include <assert.h>
 #include <typeinfo>
 #include <langinfo.h>
+#include <errno.h>
 
 #include "parser.h"
 
diff --git a/src/terminal/terminaldispatcher.cc b/src/terminal/terminaldispatcher.cc
index 172030d..87ebaf8 100644
--- a/src/terminal/terminaldispatcher.cc
+++ b/src/terminal/terminaldispatcher.cc
@@ -19,6 +19,8 @@
 #include <stdio.h>
 #include <assert.h>
 #include <string.h>
+#include <errno.h>
+#include <stdlib.h>
 
 #include "terminaldispatcher.h"
 #include "parseraction.h"
diff --git a/src/terminal/terminaldisplay.cc b/src/terminal/terminaldisplay.cc
index a48eddf..5f3027a 100644
--- a/src/terminal/terminaldisplay.cc
+++ b/src/terminal/terminaldisplay.cc
@@ -17,6 +17,7 @@
 */
 
 #include <assert.h>
+#include <stdio.h>
 
 #include "terminaldisplay.h"
 
diff --git a/src/terminal/terminalframebuffer.cc b/src/terminal/terminalframebuffer.cc
index 980e2f3..5f65455 100644
--- a/src/terminal/terminalframebuffer.cc
+++ b/src/terminal/terminalframebuffer.cc
@@ -17,6 +17,7 @@
 */
 
 #include <assert.h>
+#include <stdio.h>
 
 #include "terminalframebuffer.h"
 
diff --git a/src/terminal/terminalfunctions.cc b/src/terminal/terminalfunctions.cc
index 1d7c0c0..db5a368 100644
--- a/src/terminal/terminalfunctions.cc
+++ b/src/terminal/terminalfunctions.cc
@@ -18,6 +18,7 @@
 
 #include <unistd.h>
 #include <string>
+#include <stdio.h>
 
 #include "terminaldispatcher.h"
 #include "terminalframebuffer.h"