diff --git a/src/hashes/sha2/sha224.c b/src/hashes/sha2/sha224.c
index c0bfdcb..2240aaf 100644
--- a/src/hashes/sha2/sha224.c
+++ b/src/hashes/sha2/sha224.c
@@ -13,6 +13,10 @@
    LTC_SHA-224 new NIST standard based off of LTC_SHA-256 truncated to 224 bits (Tom St Denis)
 */
 
+#include "tomcrypt.h"
+
+#if defined(LTC_SHA224) && defined(LTC_SHA256)
+
 const struct ltc_hash_descriptor sha224_desc =
 {
     "sha224",
@@ -119,6 +123,8 @@ int  sha224_test(void)
  #endif
 }
 
+#endif /* defined(LTC_SHA224) && defined(LTC_SHA256) */
+
 
 /* $Source$ */
 /* $Revision$ */
diff --git a/src/hashes/sha2/sha256.c b/src/hashes/sha2/sha256.c
index ad1386a..251ee6d 100644
--- a/src/hashes/sha2/sha256.c
+++ b/src/hashes/sha2/sha256.c
@@ -327,10 +327,6 @@ int  sha256_test(void)
  #endif
 }
 
-#ifdef LTC_SHA224
-#include "sha224.c"
-#endif
-
 #endif
 
 
diff --git a/src/hashes/sha2/sha384.c b/src/hashes/sha2/sha384.c
index 3e3ce57..483784b 100644
--- a/src/hashes/sha2/sha384.c
+++ b/src/hashes/sha2/sha384.c
@@ -13,6 +13,10 @@
    LTC_SHA384 hash included in sha512.c, Tom St Denis
 */
 
+#include "tomcrypt.h"
+
+#if defined(LTC_SHA384) && defined(LTC_SHA512)
+
 const struct ltc_hash_descriptor sha384_desc =
 {
     "sha384",
@@ -125,10 +129,7 @@ int  sha384_test(void)
  #endif
 }
 
-
-
-
-
+#endif /* defined(LTC_SHA384) && defined(LTC_SHA512) */
 
 /* $Source$ */
 /* $Revision$ */
diff --git a/src/hashes/sha2/sha512.c b/src/hashes/sha2/sha512.c
index 4b7e761..2d68416 100644
--- a/src/hashes/sha2/sha512.c
+++ b/src/hashes/sha2/sha512.c
@@ -305,10 +305,6 @@ int  sha512_test(void)
   #endif
 }
 
-#ifdef LTC_SHA384
-   #include "sha384.c"
-#endif
-
 #endif