diff --git a/src/FqBaseBackend.h b/src/FqBaseBackend.h
index a5bec4a0c9fd75da9b67ea691f7f788debde969d..9324f7c74bfe2404efa1dac693ca35b3636e3d78 100644
--- a/src/FqBaseBackend.h
+++ b/src/FqBaseBackend.h
@@ -8,6 +8,8 @@
 #ifndef FQBASEBACKEND_H_
 #define FQBASEBACKEND_H_
 
+#include <cstdio>
+
 #include "FqConstants.h"
 #include "srp.h"
 
diff --git a/src/srp.h b/src/srp.h
index b4b2b22d2743ad1a52305fe64d7f73af0a141990..740c4a77c5246c7579cd6a365ba0bd2ed5592f66 100644
--- a/src/srp.h
+++ b/src/srp.h
@@ -8,6 +8,8 @@
 #ifndef SRP_H_
 #define SRP_H_
 
+#include <climits>
+
 #include <vector>
 #include <map>
 
diff --git a/src/unit_test_read_utils.cpp b/src/unit_test_read_utils.cpp
index 33dc150a60eb9304e450a92e2bd4e5f2c49deed3..95a451aaa33b38a278500503f72654820deb6277 100644
--- a/src/unit_test_read_utils.cpp
+++ b/src/unit_test_read_utils.cpp
@@ -7,7 +7,9 @@
  *      Keep using assert for the moment, don't want to add a dependency on boost (or any other test framework) just for the tests.
  */
 #include <iostream>
-#include <assert.h>
+
+#include <cassert>
+#include <cstring>
 
 #include "read_utils.h"
 #include "rock_types.h"