diff --git a/src/hashes/whirl/whirltab.c b/src/hashes/whirl/whirltab.c
index bb4b77a..3e6f747 100644
--- a/src/hashes/whirl/whirltab.c
+++ b/src/hashes/whirl/whirltab.c
@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 /**
    @file whirltab.c
    LTC_WHIRLPOOL tables, Tom St Denis
diff --git a/src/math/rand_bn.c b/src/math/rand_bn.c
index e7bddd9..5bc85ee 100755
--- a/src/math/rand_bn.c
+++ b/src/math/rand_bn.c
@@ -5,7 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
  */
 #include "tomcrypt.h"
 
diff --git a/src/misc/compare_testvector.c b/src/misc/compare_testvector.c
index 64e4e63..24639a0 100644
--- a/src/misc/compare_testvector.c
+++ b/src/misc/compare_testvector.c
@@ -5,7 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
  */
 
 #include "tomcrypt.h"
diff --git a/src/misc/hkdf/hkdf.c b/src/misc/hkdf/hkdf.c
index c4d69d1..fd31c7d 100644
--- a/src/misc/hkdf/hkdf.c
+++ b/src/misc/hkdf/hkdf.c
@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/src/misc/pk_get_oid.c b/src/misc/pk_get_oid.c
index 7d3a186..e25bccb 100644
--- a/src/misc/pk_get_oid.c
+++ b/src/misc/pk_get_oid.c
@@ -1,11 +1,10 @@
-/* LibTomCrypt, modular cryptographic library
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
  *
  * LibTomCrypt is a library that provides various cryptographic
  * algorithms in a highly modular and flexible manner.
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
  */
 #include "tomcrypt.h"
 
diff --git a/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c b/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c
index 61d6f1f..561dba2 100644
--- a/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c
+++ b/src/pk/asn1/der/sequence/der_decode_subject_public_key_info.c
@@ -5,7 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
  */
 #include "tomcrypt.h"
 /**
diff --git a/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c b/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
index 0578d53..a129acd 100644
--- a/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
+++ b/src/pk/asn1/der/sequence/der_encode_subject_public_key_info.c
@@ -5,7 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
  */
 #include "tomcrypt.h"
 
diff --git a/src/pk/asn1/der/set/der_encode_set.c b/src/pk/asn1/der/set/der_encode_set.c
index 75de234..e0e8022 100644
--- a/src/pk/asn1/der/set/der_encode_set.c
+++ b/src/pk/asn1/der/set/der_encode_set.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
-  * Tom St Denis, tomstdenis@gmail.com, http://libtom.org
  */
 #include "tomcrypt.h"
 
diff --git a/src/pk/rsa/rsa_exptmod.c b/src/pk/rsa/rsa_exptmod.c
index 781c206..2b3b4a8 100644
--- a/src/pk/rsa/rsa_exptmod.c
+++ b/src/pk/rsa/rsa_exptmod.c
@@ -5,14 +5,13 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * Added RSA blinding --nmav
  */
 #include "tomcrypt.h"
 
 /**
   @file rsa_exptmod.c
   RSA PKCS exptmod, Tom St Denis
+  Added RSA blinding --nmav
 */
 
 #ifdef LTC_MRSA
diff --git a/src/pk/rsa/rsa_get_size.c b/src/pk/rsa/rsa_get_size.c
index dfc82b0..1ed74a7 100644
--- a/src/pk/rsa/rsa_get_size.c
+++ b/src/pk/rsa/rsa_get_size.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * http://libtom.org
  */
 #include "tomcrypt.h"
 
diff --git a/src/pk/rsa/rsa_sign_saltlen_get.c b/src/pk/rsa/rsa_sign_saltlen_get.c
index 9f5cadb..0558775 100644
--- a/src/pk/rsa/rsa_sign_saltlen_get.c
+++ b/src/pk/rsa/rsa_sign_saltlen_get.c
@@ -5,8 +5,6 @@
  *
  * The library is free for all purposes without any express
  * guarantee it works.
- *
- * http://libtom.org
  */
 #include "tomcrypt.h"
 
diff --git a/src/stream/sober128/sober128tab.c b/src/stream/sober128/sober128tab.c
index 74e4f88..6d45049 100644
--- a/src/stream/sober128/sober128tab.c
+++ b/src/stream/sober128/sober128tab.c
@@ -1,3 +1,12 @@
+/* LibTomCrypt, modular cryptographic library -- Tom St Denis
+ *
+ * LibTomCrypt is a library that provides various cryptographic
+ * algorithms in a highly modular and flexible manner.
+ *
+ * The library is free for all purposes without any express
+ * guarantee it works.
+ */
+
 /**
    @file sober128tab.c
    SOBER-128 Tables