diff --git a/cli-tcpfwd.c b/cli-tcpfwd.c
index 1a1850d..662a407 100644
--- a/cli-tcpfwd.c
+++ b/cli-tcpfwd.c
@@ -23,7 +23,6 @@
  * SOFTWARE. */
 
 #include "includes.h"
-#include "options.h"
 #include "dbutil.h"
 #include "tcpfwd.h"
 #include "channel.h"
diff --git a/dbhelpers.h b/dbhelpers.h
index d47707e..551bcb4 100644
--- a/dbhelpers.h
+++ b/dbhelpers.h
@@ -3,7 +3,7 @@
 
 /* This header defines some things that are also used by libtomcrypt/math. 
    We avoid including normal include.h since that can result in conflicting 
-   definitinos - only include config.h */
+   definitions - only include config.h */
 #include "config.h"
 
 #ifdef __GNUC__
diff --git a/ecc.c b/ecc.c
index f949dd1..c4881d9 100644
--- a/ecc.c
+++ b/ecc.c
@@ -1,5 +1,4 @@
 #include "includes.h"
-#include "options.h"
 #include "ecc.h"
 #include "dbutil.h"
 #include "bignum.h"
diff --git a/ecc.h b/ecc.h
index bb3bb75..f4508f8 100644
--- a/ecc.h
+++ b/ecc.h
@@ -2,7 +2,6 @@
 #define DROPBEAR_DROPBEAR_ECC_H
 
 #include "includes.h"
-#include "options.h"
 
 #include "buffer.h"
 
diff --git a/ecdsa.c b/ecdsa.c
index d7615e0..56e5355 100644
--- a/ecdsa.c
+++ b/ecdsa.c
@@ -1,4 +1,3 @@
-#include "options.h"
 #include "includes.h"
 #include "dbutil.h"
 #include "crypto_desc.h"
diff --git a/includes.h b/includes.h
index 766f58f..dd47107 100644
--- a/includes.h
+++ b/includes.h
@@ -26,7 +26,6 @@
 #define DROPBEAR_INCLUDES_H_
 
 
-#include "config.h"
 #include "options.h"
 #include "debug.h"
 
diff --git a/list.c b/list.c
index 1730711..eeba7c3 100644
--- a/list.c
+++ b/list.c
@@ -1,4 +1,4 @@
-#include "options.h"
+#include "includes.h"
 #include "dbutil.h"
 #include "list.h"
 
diff --git a/ltc_prng.c b/ltc_prng.c
index 1188ac8..4f2e9e1 100644
--- a/ltc_prng.c
+++ b/ltc_prng.c
@@ -11,7 +11,6 @@
  *
  * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com
  */
-#include "options.h"
 #include "includes.h"
 #include "dbrandom.h"
 #include "ltc_prng.h"
diff --git a/ltc_prng.h b/ltc_prng.h
index 5e00759..6bc8273 100644
--- a/ltc_prng.h
+++ b/ltc_prng.h
@@ -1,7 +1,6 @@
 #ifndef DROPBEAR_LTC_PRNG_H_DROPBEAR
 #define DROPBEAR_LTC_PRNG_H_DROPBEAR
 
-#include "options.h"
 #include "includes.h"
 
 #if DROPBEAR_LTC_PRNG
diff --git a/options.h b/options.h
index c1782d2..2fe67c3 100644
--- a/options.h
+++ b/options.h
@@ -8,6 +8,9 @@ Local compile-time configuration should be defined in localoptions.h
 See default_options.h.in for a description of the available options.
 */
 
+/* Some configuration options or checks depend on system config */
+#include "config.h"
+
 #ifdef LOCALOPTIONS_H_EXISTS
 #include "localoptions.h"
 #endif
diff --git a/session.h b/session.h
index 01db2ca..ced8ff4 100644
--- a/session.h
+++ b/session.h
@@ -26,7 +26,6 @@
 #define DROPBEAR_SESSION_H_
 
 #include "includes.h"
-#include "options.h"
 #include "buffer.h"
 #include "signkey.h"
 #include "kex.h"