diff --git a/include/libssh/blf.h b/include/libssh/blf.h
index 71928a7d..b43367de 100644
--- a/include/libssh/blf.h
+++ b/include/libssh/blf.h
@@ -31,6 +31,8 @@
 #ifndef _BLF_H_
 #define _BLF_H_
 
+#include <stdint.h>
+
 //#include "includes.h"
 
 #if !defined(HAVE_BCRYPT_PBKDF) && !defined(HAVE_BLH_H)
diff --git a/include/libssh/chacha.h b/include/libssh/chacha.h
index ab3fe492..388dd467 100644
--- a/include/libssh/chacha.h
+++ b/include/libssh/chacha.h
@@ -9,6 +9,8 @@ Public domain.
 #ifndef CHACHA_H
 #define CHACHA_H
 
+#include <stdint.h>
+
 struct chacha_ctx {
     uint32_t input[16];
 };
diff --git a/include/libssh/chacha20-poly1305-common.h b/include/libssh/chacha20-poly1305-common.h
index b2f0231b..2f1e3791 100644
--- a/include/libssh/chacha20-poly1305-common.h
+++ b/include/libssh/chacha20-poly1305-common.h
@@ -29,6 +29,8 @@
 #ifndef CHACHA20_POLY1305_H
 #define CHACHA20_POLY1305_H
 
+#include <stdint.h>
+
 #define CHACHA20_BLOCKSIZE 64
 #define CHACHA20_KEYLEN 32
 
diff --git a/include/libssh/poly1305.h b/include/libssh/poly1305.h
index a22fea87..92b44f09 100644
--- a/include/libssh/poly1305.h
+++ b/include/libssh/poly1305.h
@@ -5,6 +5,10 @@
 
 #ifndef POLY1305_H
 #define POLY1305_H
+
+#include <stddef.h>
+#include <stdint.h>
+
 #include "libssh/chacha20-poly1305-common.h"
 
 #ifdef __cplusplus
diff --git a/include/libssh/sc25519.h b/include/libssh/sc25519.h
index 43b09a05..a626c9e6 100644
--- a/include/libssh/sc25519.h
+++ b/include/libssh/sc25519.h
@@ -9,6 +9,8 @@
 #ifndef SC25519_H
 #define SC25519_H
 
+#include <stdint.h>
+
 #define sc25519                  crypto_sign_ed25519_ref_sc25519
 #define shortsc25519             crypto_sign_ed25519_ref_shortsc25519
 #define sc25519_from32bytes      crypto_sign_ed25519_ref_sc25519_from32bytes
diff --git a/include/libssh/scp.h b/include/libssh/scp.h
index 089fcfc9..5d87fe5f 100644
--- a/include/libssh/scp.h
+++ b/include/libssh/scp.h
@@ -21,6 +21,9 @@
 #ifndef _SCP_H
 #define _SCP_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 enum ssh_scp_states {
   SSH_SCP_NEW,          //Data structure just created
   SSH_SCP_WRITE_INITED, //Gave our intention to write