diff --git a/client/fwknop.c b/client/fwknop.c
index 84cac2e5..8659676f 100644
--- a/client/fwknop.c
+++ b/client/fwknop.c
@@ -28,7 +28,6 @@
  *
  *****************************************************************************
 */
-#include "fko.h"
 #include "fwknop.h"
 #include "config_init.h"
 #include "spa_comm.h"
diff --git a/client/fwknop_common.h b/client/fwknop_common.h
index 4367ae87..01915f1b 100644
--- a/client/fwknop_common.h
+++ b/client/fwknop_common.h
@@ -32,7 +32,6 @@
 #define FWKNOP_COMMON_H
 
 #include "common.h"
-#include "fko_limits.h"
 
 /* My Name and Version
 */
diff --git a/lib/cipher_funcs.h b/lib/cipher_funcs.h
index 151d4406..21b26802 100644
--- a/lib/cipher_funcs.h
+++ b/lib/cipher_funcs.h
@@ -31,7 +31,6 @@
 #ifndef CIPHER_FUNCS_H
 #define CIPHER_FUNCS_H 1
 
-#include "fko.h"
 #include "rijndael.h"
 #include "gpgme_funcs.h"
 
diff --git a/lib/md5.c b/lib/md5.c
index dbd4f9c3..ab1d130f 100644
--- a/lib/md5.c
+++ b/lib/md5.c
@@ -28,6 +28,7 @@
  *****************************************************************************
 */
 #include "md5.h"
+#include "fko_common.h"
 
 #if BYTEORDER == 1234
   #define byteReverse(buf, len)    /* Nothing */
diff --git a/lib/sha1.c b/lib/sha1.c
index 8edfea8a..3da18e61 100644
--- a/lib/sha1.c
+++ b/lib/sha1.c
@@ -17,6 +17,7 @@
  *****************************************************************************
 */
 #include "sha1.h"
+#include "fko_common.h"
 
 /* SHA f()-functions */
 #define f1(x,y,z)    ((x & y) | (~x & z))