diff --git a/configure.ac b/configure.ac
index d3deac832..a70d40628 100644
--- a/configure.ac
+++ b/configure.ac
@@ -393,6 +393,7 @@ AC_CHECK_HEADERS([ \
 	sys/bsdtty.h \
 	sys/cdefs.h \
 	sys/dir.h \
+	sys/file.h \
 	sys/mman.h \
 	sys/label.h \
 	sys/ndir.h \
diff --git a/ssh-xmss.c b/ssh-xmss.c
index d9dafd762..e25dbbf65 100644
--- a/ssh-xmss.c
+++ b/ssh-xmss.c
@@ -15,6 +15,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include "includes.h"
+
 #define SSHKEY_INTERNAL
 #include <sys/types.h>
 #include <limits.h>
diff --git a/sshkey-xmss.c b/sshkey-xmss.c
index 41cc1bade..f146098b3 100644
--- a/sshkey-xmss.c
+++ b/sshkey-xmss.c
@@ -23,6 +23,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "includes.h"
+
 #include <sys/types.h>
 #include <sys/uio.h>
 
@@ -31,6 +33,9 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#ifdef HAVE_SYS_FILE_H
+# include <sys/file.h>
+#endif
 
 #include "ssh2.h"
 #include "ssherr.h"
diff --git a/xmss_commons.c b/xmss_commons.c
index 51171af91..0752f29b2 100644
--- a/xmss_commons.c
+++ b/xmss_commons.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_commons.h"
 #include <stdlib.h>
 #include <stdio.h>
@@ -24,4 +26,4 @@ void hexdump(const unsigned char *a, size_t len)
   size_t i;
   for (i = 0; i < len; i++)
     printf("%02x", a[i]);
-}
\ No newline at end of file
+}
diff --git a/xmss_fast.c b/xmss_fast.c
index 7ddc92f83..6aff36a07 100644
--- a/xmss_fast.c
+++ b/xmss_fast.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_fast.h"
 #include <stdlib.h>
 #include <string.h>
diff --git a/xmss_hash.c b/xmss_hash.c
index 963b584b9..9c42c4f40 100644
--- a/xmss_hash.c
+++ b/xmss_hash.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include "xmss_hash_address.h"
 #include "xmss_commons.h"
 #include "xmss_hash.h"
diff --git a/xmss_hash_address.c b/xmss_hash_address.c
index 223c6f8ab..385868de7 100644
--- a/xmss_hash_address.c
+++ b/xmss_hash_address.c
@@ -4,6 +4,8 @@ Andreas Hülsing
 Joost Rijneveld
 Public domain.
 */
+#include "includes.h"
+
 #include <stdint.h>
 #include "xmss_hash_address.h"	/* prototypes */
 
diff --git a/xmss_wots.c b/xmss_wots.c
index fcd033405..4120acf17 100644
--- a/xmss_wots.c
+++ b/xmss_wots.c
@@ -5,6 +5,8 @@ Joost Rijneveld
 Public domain.
 */
 
+#include "includes.h"
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <limits.h>