Use "/*" instead of "/**" in starting comments at the begining of a file.

This caused Doxygen to think this was markup meant for it, which really
caused some clutter in the namespace page.

85 files changed, 96 insertions, 97 deletions

diff --git a/src/algo_factory/algo_factory.h b/src/algo_factory/algo_factory.h
index 0b630c721..e8a4914b5 100644
--- a/src/algo_factory/algo_factory.h
+++ b/src/algo_factory/algo_factory.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Algorithm Factory
 * (C) 2008 Jack Lloyd
 *
diff --git a/src/algo_factory/prov_weight.cpp b/src/algo_factory/prov_weight.cpp
index 17284d024..0ca588aa9 100644
--- a/src/algo_factory/prov_weight.cpp
+++ b/src/algo_factory/prov_weight.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Default provider weights for Algorithm_Cache
 * (C) 2008 Jack Lloyd
 *
diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp
index a24a3fdaf..887c64e70 100644
--- a/src/benchmark/benchmark.cpp
+++ b/src/benchmark/benchmark.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Runtime benchmarking
 * (C) 2008 Jack Lloyd
 *
diff --git a/src/benchmark/benchmark.h b/src/benchmark/benchmark.h
index 9c4e410f1..4f1d91b79 100644
--- a/src/benchmark/benchmark.h
+++ b/src/benchmark/benchmark.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Runtime benchmarking
 * (C) 2008 Jack Lloyd
 *
diff --git a/src/block/aes/aes.cpp b/src/block/aes/aes.cpp
index df2674f34..257dfd183 100644
--- a/src/block/aes/aes.cpp
+++ b/src/block/aes/aes.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * AES
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/block/aes/aes.h b/src/block/aes/aes.h
index 45026f732..00b3163b7 100644
--- a/src/block/aes/aes.h
+++ b/src/block/aes/aes.h
@@ -1,4 +1,4 @@
-/**
+/*
 * AES
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/block/aes_intel/aes_intel.cpp b/src/block/aes_intel/aes_intel.cpp
index 3d3683d7d..0da523156 100644
--- a/src/block/aes_intel/aes_intel.cpp
+++ b/src/block/aes_intel/aes_intel.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * AES using Intel's AES-NI instructions
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/block/aes_intel/aes_intel.h b/src/block/aes_intel/aes_intel.h
index 9a9463479..592fb7faa 100644
--- a/src/block/aes_intel/aes_intel.h
+++ b/src/block/aes_intel/aes_intel.h
@@ -1,4 +1,4 @@
-/**
+/*
 * AES using Intel's AES-NI instructions
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/block/block_cipher.h b/src/block/block_cipher.h
index 55bc6d90c..ff0a10103 100644
--- a/src/block/block_cipher.h
+++ b/src/block/block_cipher.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Block Cipher Base Class
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/block/blowfish/blowfish.h b/src/block/blowfish/blowfish.h
index 2306f0e37..f04b16484 100644
--- a/src/block/blowfish/blowfish.h
+++ b/src/block/blowfish/blowfish.h
@@ -1,4 +1,3 @@
-/*
 * Blowfish
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/block/misty1/misty1.h b/src/block/misty1/misty1.h
index 7b4d91def..d58a2aac7 100644
--- a/src/block/misty1/misty1.h
+++ b/src/block/misty1/misty1.h
@@ -1,4 +1,4 @@
-/**
+/*
 * MISTY1
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/engine/aes_isa_eng/aes_isa_engine.h b/src/engine/aes_isa_eng/aes_isa_engine.h
index 5f22e4105..8a913551a 100644
--- a/src/engine/aes_isa_eng/aes_isa_engine.h
+++ b/src/engine/aes_isa_eng/aes_isa_engine.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Engine for AES instructions
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/engine/amd64_eng/amd64_engine.cpp b/src/engine/amd64_eng/amd64_engine.cpp
index 6de1484fb..262bd5809 100644
--- a/src/engine/amd64_eng/amd64_engine.cpp
+++ b/src/engine/amd64_eng/amd64_engine.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * AMD64 Assembly Implementation Engine
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/engine/amd64_eng/amd64_engine.h b/src/engine/amd64_eng/amd64_engine.h
index dc6f3e993..358e31132 100644
--- a/src/engine/amd64_eng/amd64_engine.h
+++ b/src/engine/amd64_eng/amd64_engine.h
@@ -1,4 +1,4 @@
-/**
+/*
 * x86-64 Assembly Implementation Engines
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/engine/ia32_eng/ia32_engine.h b/src/engine/ia32_eng/ia32_engine.h
index 517b88aa8..77bdc5d74 100644
--- a/src/engine/ia32_eng/ia32_engine.h
+++ b/src/engine/ia32_eng/ia32_engine.h
@@ -1,4 +1,4 @@
-/**
+/*
 * IA-32 Assembly Implementation Engines
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/engine/simd_engine/simd_engine.cpp b/src/engine/simd_engine/simd_engine.cpp
index e889ca161..aa434d669 100644
--- a/src/engine/simd_engine/simd_engine.cpp
+++ b/src/engine/simd_engine/simd_engine.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * SIMD Engine
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/engine/simd_engine/simd_engine.h b/src/engine/simd_engine/simd_engine.h
index 722b5529b..9c117d45d 100644
--- a/src/engine/simd_engine/simd_engine.h
+++ b/src/engine/simd_engine/simd_engine.h
@@ -1,4 +1,4 @@
-/**
+/*
 * SIMD Assembly Engine
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/entropy/beos_stats/es_beos.cpp b/src/entropy/beos_stats/es_beos.cpp
index 148d38b9b..2b4a7a24f 100644
--- a/src/entropy/beos_stats/es_beos.cpp
+++ b/src/entropy/beos_stats/es_beos.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * BeOS EntropySource
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/entropy/beos_stats/es_beos.h b/src/entropy/beos_stats/es_beos.h
index be80ad340..31029a88c 100644
--- a/src/entropy/beos_stats/es_beos.h
+++ b/src/entropy/beos_stats/es_beos.h
@@ -1,4 +1,4 @@
-/**
+/*
 * BeOS EntropySource
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/entropy/egd/es_egd.h b/src/entropy/egd/es_egd.h
index 1a3618989..defe88a54 100644
--- a/src/entropy/egd/es_egd.h
+++ b/src/entropy/egd/es_egd.h
@@ -1,4 +1,4 @@
-/**
+/*
 * EGD EntropySource
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/entropy/entropy_src.h b/src/entropy/entropy_src.h
index 4d01bce7c..e5c22e2c3 100644
--- a/src/entropy/entropy_src.h
+++ b/src/entropy/entropy_src.h
@@ -1,4 +1,4 @@
-/**
+/*
 * EntropySource
 * (C) 2008-2009 Jack Lloyd
 *
diff --git a/src/entropy/unix_procs/unix_cmd.h b/src/entropy/unix_procs/unix_cmd.h
index 7decf587f..d233577d1 100644
--- a/src/entropy/unix_procs/unix_cmd.h
+++ b/src/entropy/unix_procs/unix_cmd.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Unix Command Execution
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/entropy/win32_stats/es_win32.cpp b/src/entropy/win32_stats/es_win32.cpp
index e9f564fee..b3d7d27e5 100644
--- a/src/entropy/win32_stats/es_win32.cpp
+++ b/src/entropy/win32_stats/es_win32.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Win32 EntropySource
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/entropy/win32_stats/es_win32.h b/src/entropy/win32_stats/es_win32.h
index 0aa9054e3..2e46c773d 100644
--- a/src/entropy/win32_stats/es_win32.h
+++ b/src/entropy/win32_stats/es_win32.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Win32 EntropySource
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/filters/modes/mode_pad/mode_pad.h b/src/filters/modes/mode_pad/mode_pad.h
index a486d3c1f..d6d1c5298 100644
--- a/src/filters/modes/mode_pad/mode_pad.h
+++ b/src/filters/modes/mode_pad/mode_pad.h
@@ -1,4 +1,4 @@
-/**
+/*
 * CBC Padding Methods
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/hash/comb4p/comb4p.cpp b/src/hash/comb4p/comb4p.cpp
index 6ae36b9d3..ecbdc4671 100644
--- a/src/hash/comb4p/comb4p.cpp
+++ b/src/hash/comb4p/comb4p.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Comb4P hash combiner
 * (C) 2010 Jack Lloyd
 *
diff --git a/src/hash/comb4p/comb4p.h b/src/hash/comb4p/comb4p.h
index ce66bb9c9..424512092 100644
--- a/src/hash/comb4p/comb4p.h
+++ b/src/hash/comb4p/comb4p.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Comb4P hash combiner
 * (C) 2010 Jack Lloyd
 *
diff --git a/src/hash/gost_3411/gost_3411.h b/src/hash/gost_3411/gost_3411.h
index d2bada7ab..bedda3da7 100644
--- a/src/hash/gost_3411/gost_3411.h
+++ b/src/hash/gost_3411/gost_3411.h
@@ -1,4 +1,4 @@
-/**
+/*
 * GOST 34.11
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/hash/hash.h b/src/hash/hash.h
index 1098951d8..7cdfc6712 100644
--- a/src/hash/hash.h
+++ b/src/hash/hash.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Hash Function Base Class
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/hash/md5/md5.h b/src/hash/md5/md5.h
index d1f294a87..d0706ab4b 100644
--- a/src/hash/md5/md5.h
+++ b/src/hash/md5/md5.h
@@ -1,4 +1,4 @@
-/**
+/*
 * MD5
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/hash/mdx_hash/mdx_hash.cpp b/src/hash/mdx_hash/mdx_hash.cpp
index 28402c2c5..8326f7d4b 100644
--- a/src/hash/mdx_hash/mdx_hash.cpp
+++ b/src/hash/mdx_hash/mdx_hash.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Merkle-Damgard Hash Function
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/hash/mdx_hash/mdx_hash.h b/src/hash/mdx_hash/mdx_hash.h
index 2d70deed3..9fba0b799 100644
--- a/src/hash/mdx_hash/mdx_hash.h
+++ b/src/hash/mdx_hash/mdx_hash.h
@@ -1,4 +1,4 @@
-/**
+/*
 * MDx Hash Function
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/hash/skein/skein_512.cpp b/src/hash/skein/skein_512.cpp
index 3b716e8f5..4d7717ef4 100644
--- a/src/hash/skein/skein_512.cpp
+++ b/src/hash/skein/skein_512.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * The Skein-512 hash function
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/hash/skein/skein_512.h b/src/hash/skein/skein_512.h
index 222db5d68..a633fabcb 100644
--- a/src/hash/skein/skein_512.h
+++ b/src/hash/skein/skein_512.h
@@ -1,4 +1,4 @@
-/**
+/*
 * The Skein-512 hash function
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/libstate/botan.h b/src/libstate/botan.h
index a88edb59b..42d3dc392 100644
--- a/src/libstate/botan.h
+++ b/src/libstate/botan.h
@@ -1,4 +1,4 @@
-/**
+/*
 * A vague catch all include file for Botan
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/libstate/init.cpp b/src/libstate/init.cpp
index b908de6c7..386767b04 100644
--- a/src/libstate/init.cpp
+++ b/src/libstate/init.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Default Initialization Function
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/libstate/init.h b/src/libstate/init.h
index 254f9458b..8b0ce80de 100644
--- a/src/libstate/init.h
+++ b/src/libstate/init.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Library Initialization
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/libstate/scan_name.cpp b/src/libstate/scan_name.cpp
index eccb15565..7c2e4b28d 100644
--- a/src/libstate/scan_name.cpp
+++ b/src/libstate/scan_name.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * SCAN Name Abstraction
 * (C) 2008-2009 Jack Lloyd
 *
diff --git a/src/libstate/scan_name.h b/src/libstate/scan_name.h
index 4350dca86..66eda688c 100644
--- a/src/libstate/scan_name.h
+++ b/src/libstate/scan_name.h
@@ -1,4 +1,4 @@
-/**
+/*
 * SCAN Name Abstraction
 * (C) 2008 Jack Lloyd
 *
diff --git a/src/mac/mac.cpp b/src/mac/mac.cpp
index 04b259647..a2c884ab6 100644
--- a/src/mac/mac.cpp
+++ b/src/mac/mac.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Message Authentication Code base class
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/mac/mac.h b/src/mac/mac.h
index 7c73a2900..617e86358 100644
--- a/src/mac/mac.h
+++ b/src/mac/mac.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Base class for message authentiction codes
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/pbe/pbes2/pbes2.cpp b/src/pbe/pbes2/pbes2.cpp
index 63772263f..79d4dfadf 100644
--- a/src/pbe/pbes2/pbes2.cpp
+++ b/src/pbe/pbes2/pbes2.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * PKCS #5 PBES2
 * (C) 1999-2008 Jack Lloyd
 *
diff --git a/src/ssl/c_kex.cpp b/src/ssl/c_kex.cpp
index db2198627..5194c8c3d 100644
--- a/src/ssl/c_kex.cpp
+++ b/src/ssl/c_kex.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Client Key Exchange Message
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/cert_req.cpp b/src/ssl/cert_req.cpp
index 4431a4a39..04d7867c6 100644
--- a/src/ssl/cert_req.cpp
+++ b/src/ssl/cert_req.cpp
@@ -1,5 +1,5 @@
-/**
-* Certificate Request Message 
+/*
+* Certificate Request Message
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/cert_ver.cpp b/src/ssl/cert_ver.cpp
index 74f737d7b..d1d39f74e 100644
--- a/src/ssl/cert_ver.cpp
+++ b/src/ssl/cert_ver.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Certificate Verify Message
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/finished.cpp b/src/ssl/finished.cpp
index b0f6abd25..6648a2c3e 100644
--- a/src/ssl/finished.cpp
+++ b/src/ssl/finished.cpp
@@ -1,5 +1,5 @@
-/**
-* Finished Message 
+/*
+* Finished Message
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/handshake_hash.cpp b/src/ssl/handshake_hash.cpp
index d94fa0178..2331d015e 100644
--- a/src/ssl/handshake_hash.cpp
+++ b/src/ssl/handshake_hash.cpp
@@ -1,5 +1,5 @@
-/**
-* TLS Handshake Hash 
+/*
+* TLS Handshake Hash
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/handshake_hash.h b/src/ssl/handshake_hash.h
index cfb351765..8e068f3de 100644
--- a/src/ssl/handshake_hash.h
+++ b/src/ssl/handshake_hash.h
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Handshake Hash
 * (C) 2004-2006 Jack Lloyd
 *
diff --git a/src/ssl/handshake_state.cpp b/src/ssl/handshake_state.cpp
index 314625057..373d4b57c 100644
--- a/src/ssl/handshake_state.cpp
+++ b/src/ssl/handshake_state.cpp
@@ -1,5 +1,5 @@
-/**
-* TLS Handshaking 
+/*
+* TLS Handshaking
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/hello.cpp b/src/ssl/hello.cpp
index 5b3c32278..2fb5bb567 100644
--- a/src/ssl/hello.cpp
+++ b/src/ssl/hello.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Hello Messages
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/rec_read.cpp b/src/ssl/rec_read.cpp
index f07744c2a..336191557 100644
--- a/src/ssl/rec_read.cpp
+++ b/src/ssl/rec_read.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Record Reading
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/rec_wri.cpp b/src/ssl/rec_wri.cpp
index 092ecdfe1..82b63db03 100644
--- a/src/ssl/rec_wri.cpp
+++ b/src/ssl/rec_wri.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Record Writing
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/s_kex.cpp b/src/ssl/s_kex.cpp
index 6f149cf36..bf0a25c62 100644
--- a/src/ssl/s_kex.cpp
+++ b/src/ssl/s_kex.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Server Key Exchange Message
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/socket.h b/src/ssl/socket.h
index 62ceed028..6d88bd48a 100644
--- a/src/ssl/socket.h
+++ b/src/ssl/socket.h
@@ -1,5 +1,5 @@
-/**
-* Socket Interface 
+/*
+* Socket Interface
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_alerts.h b/src/ssl/tls_alerts.h
index 894bca4af..cb7529021 100644
--- a/src/ssl/tls_alerts.h
+++ b/src/ssl/tls_alerts.h
@@ -1,5 +1,5 @@
-/**
-* Alert Message 
+/*
+* Alert Message
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_client.cpp b/src/ssl/tls_client.cpp
index 8a4275d93..3b63b2119 100644
--- a/src/ssl/tls_client.cpp
+++ b/src/ssl/tls_client.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Client
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_client.h b/src/ssl/tls_client.h
index 2439a58f0..c9ed3ca37 100644
--- a/src/ssl/tls_client.h
+++ b/src/ssl/tls_client.h
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Client
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_connection.h b/src/ssl/tls_connection.h
index ff55cceab..a6de659c4 100644
--- a/src/ssl/tls_connection.h
+++ b/src/ssl/tls_connection.h
@@ -1,5 +1,5 @@
-/**
-* TLS Connection 
+/*
+* TLS Connection
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_exceptn.h b/src/ssl/tls_exceptn.h
index 3ba852875..a9efc718a 100644
--- a/src/ssl/tls_exceptn.h
+++ b/src/ssl/tls_exceptn.h
@@ -1,5 +1,5 @@
-/**
-* Exceptions 
+/*
+* Exceptions
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_magic.h b/src/ssl/tls_magic.h
index 93b56d96d..2a0c61e18 100644
--- a/src/ssl/tls_magic.h
+++ b/src/ssl/tls_magic.h
@@ -1,4 +1,4 @@
-/**
+/*
 * SSL/TLS Protocol Constants
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_messages.h b/src/ssl/tls_messages.h
index 5c0c06c88..20aa9b930 100644
--- a/src/ssl/tls_messages.h
+++ b/src/ssl/tls_messages.h
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Messages
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_policy.cpp b/src/ssl/tls_policy.cpp
index 57fcdb5cc..03a83319c 100644
--- a/src/ssl/tls_policy.cpp
+++ b/src/ssl/tls_policy.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Policies for TLS
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_policy.h b/src/ssl/tls_policy.h
index 75d6d7663..5555f0ca6 100644
--- a/src/ssl/tls_policy.h
+++ b/src/ssl/tls_policy.h
@@ -1,5 +1,5 @@
-/**
-* Policies 
+/*
+* Policies
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_record.h b/src/ssl/tls_record.h
index 2058933d0..863e2c801 100644
--- a/src/ssl/tls_record.h
+++ b/src/ssl/tls_record.h
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Record Handling
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_server.cpp b/src/ssl/tls_server.cpp
index a4cfcf7de..2a84fa063 100644
--- a/src/ssl/tls_server.cpp
+++ b/src/ssl/tls_server.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Server
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_server.h b/src/ssl/tls_server.h
index 5cf830a64..673f16580 100644
--- a/src/ssl/tls_server.h
+++ b/src/ssl/tls_server.h
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Server
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_session_key.cpp b/src/ssl/tls_session_key.cpp
index 13575adac..594b99e19 100644
--- a/src/ssl/tls_session_key.cpp
+++ b/src/ssl/tls_session_key.cpp
@@ -1,5 +1,5 @@
-/**
-* TLS Session Key 
+/*
+* TLS Session Key
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_session_key.h b/src/ssl/tls_session_key.h
index b0eba2eb1..98c1b92ff 100644
--- a/src/ssl/tls_session_key.h
+++ b/src/ssl/tls_session_key.h
@@ -1,5 +1,5 @@
-/**
-* TLS Session Key 
+/*
+* TLS Session Key
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_state.h b/src/ssl/tls_state.h
index ddf03a822..1472271e3 100644
--- a/src/ssl/tls_state.h
+++ b/src/ssl/tls_state.h
@@ -1,5 +1,5 @@
-/**
-* TLS Handshaking 
+/*
+* TLS Handshaking
 * (C) 2004-2006 Jack Lloyd
 *
 * Released under the terms of the Botan license
diff --git a/src/ssl/tls_suites.cpp b/src/ssl/tls_suites.cpp
index ccc4ab502..a6e630717 100644
--- a/src/ssl/tls_suites.cpp
+++ b/src/ssl/tls_suites.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * TLS Cipher Suites
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/tls_suites.h b/src/ssl/tls_suites.h
index fa015c28f..612c148e6 100644
--- a/src/ssl/tls_suites.h
+++ b/src/ssl/tls_suites.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Cipher Suites
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/ssl/unix_socket/unx_sock.cpp b/src/ssl/unix_socket/unx_sock.cpp
index 9954cdc06..a7c19b70c 100644
--- a/src/ssl/unix_socket/unx_sock.cpp
+++ b/src/ssl/unix_socket/unx_sock.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Unix Socket
 * (C) 2004-2010 Jack Lloyd
 *
diff --git a/src/stream/stream_cipher.h b/src/stream/stream_cipher.h
index cb6fb3481..11b741a1a 100644
--- a/src/stream/stream_cipher.h
+++ b/src/stream/stream_cipher.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Stream Cipher
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/sym_algo/sym_algo.h b/src/sym_algo/sym_algo.h
index 929f2a6f0..20bbd649f 100644
--- a/src/sym_algo/sym_algo.h
+++ b/src/sym_algo/sym_algo.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Symmetric Algorithm Base Class
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/utils/buf_comp/buf_comp.h b/src/utils/buf_comp/buf_comp.h
index 3f1e90bad..6c1acb520 100644
--- a/src/utils/buf_comp/buf_comp.h
+++ b/src/utils/buf_comp/buf_comp.h
@@ -1,4 +1,4 @@
-/**
+/*
 * BufferedComputation
 * (C) 1999-2007 Jack Lloyd
 *
diff --git a/src/utils/cpuid.cpp b/src/utils/cpuid.cpp
index 19a2db788..4837e7ac4 100644
--- a/src/utils/cpuid.cpp
+++ b/src/utils/cpuid.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Runtime CPU detection
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/cpuid.h b/src/utils/cpuid.h
index 1de97f129..e7e15a887 100644
--- a/src/utils/cpuid.h
+++ b/src/utils/cpuid.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Runtime CPU detection
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/debug.h b/src/utils/debug.h
index 271e0047b..11de7010e 100644
--- a/src/utils/debug.h
+++ b/src/utils/debug.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Internal-use debugging functions for Botan
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/simd_32/simd_32.h b/src/utils/simd_32/simd_32.h
index 23dce0305..15be7713d 100644
--- a/src/utils/simd_32/simd_32.h
+++ b/src/utils/simd_32/simd_32.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Lightweight wrappers for SIMD operations
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/simd_32/simd_altivec.h b/src/utils/simd_32/simd_altivec.h
index 859a48a5f..44e2a4d2b 100644
--- a/src/utils/simd_32/simd_altivec.h
+++ b/src/utils/simd_32/simd_altivec.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Lightweight wrappers around AltiVec for 32-bit operations
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/simd_32/simd_scalar.h b/src/utils/simd_32/simd_scalar.h
index 5cf1a11c3..d9766f252 100644
--- a/src/utils/simd_32/simd_scalar.h
+++ b/src/utils/simd_32/simd_scalar.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Scalar emulation of SIMD 32-bit operations
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/simd_32/simd_sse.h b/src/utils/simd_32/simd_sse.h
index 0189c2e4d..ad3857fbf 100644
--- a/src/utils/simd_32/simd_sse.h
+++ b/src/utils/simd_32/simd_sse.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Lightweight wrappers for SSE2 intrinsics for 32-bit operations
 * (C) 2009 Jack Lloyd
 *
diff --git a/src/utils/time.cpp b/src/utils/time.cpp
index 0dbbd5e9c..db535f316 100644
--- a/src/utils/time.cpp
+++ b/src/utils/time.cpp
@@ -1,4 +1,4 @@
-/**
+/*
 * Time Functions
 * (C) 1999-2010 Jack Lloyd
 *
diff --git a/src/utils/time.h b/src/utils/time.h
index bc571120b..c1ab52021 100644
--- a/src/utils/time.h
+++ b/src/utils/time.h
@@ -1,4 +1,4 @@
-/**
+/*
 * Time Functions
 * (C) 1999-2009 Jack Lloyd
 *
diff --git a/src/utils/xor_buf.h b/src/utils/xor_buf.h
index 0d7d587c8..34abb48d3 100644
--- a/src/utils/xor_buf.h
+++ b/src/utils/xor_buf.h
@@ -1,4 +1,4 @@
-/**
+/*
 * XOR operations
 * (C) 1999-2008 Jack Lloyd
 *