Rename header guards in modules from BOTAN_EXT_ to BOTAN_ for consistency

26 files changed, 48 insertions, 48 deletions

diff --git a/modules/allocation/alloc_mmap/mmap_mem.h b/modules/allocation/alloc_mmap/mmap_mem.h
index ddf999014..a6f68d039 100644
--- a/modules/allocation/alloc_mmap/mmap_mem.h
+++ b/modules/allocation/alloc_mmap/mmap_mem.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_MMAP_ALLOCATOR_H__
-#define BOTAN_EXT_MMAP_ALLOCATOR_H__
+#ifndef BOTAN_MMAP_ALLOCATOR_H__
+#define BOTAN_MMAP_ALLOCATOR_H__
 
 #include <botan/mem_pool.h>
 
diff --git a/modules/asm/asm_amd64/asm_macr.h b/modules/asm/asm_amd64/asm_macr.h
index 02aafb347..3cdd42dc6 100644
--- a/modules/asm/asm_amd64/asm_macr.h
+++ b/modules/asm/asm_amd64/asm_macr.h
@@ -3,8 +3,8 @@
 * (C) 1999-2008 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_AMD64_ASM_MACROS_H__
-#define BOTAN_EXT_AMD64_ASM_MACROS_H__
+#ifndef BOTAN_AMD64_ASM_MACROS_H__
+#define BOTAN_AMD64_ASM_MACROS_H__
 
 #ifdef __ELF__
 .section .note.GNU-stack,"",%progbits
diff --git a/modules/asm/asm_ia32/asm_macr.h b/modules/asm/asm_ia32/asm_macr.h
index 392b05d5b..6d5dbb59d 100644
--- a/modules/asm/asm_ia32/asm_macr.h
+++ b/modules/asm/asm_ia32/asm_macr.h
@@ -3,8 +3,8 @@
 * (C) 1999-2008 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_IA32_ASM_MACROS_H__
-#define BOTAN_EXT_IA32_ASM_MACROS_H__
+#ifndef BOTAN_IA32_ASM_MACROS_H__
+#define BOTAN_IA32_ASM_MACROS_H__
 
 #ifdef __ELF__
 .section .note.GNU-stack,"",%progbits
diff --git a/src/adler32.cpp b/modules/checksum/adler32/adler32.cpp
index b808e3e67..b808e3e67 100644
--- a/src/adler32.cpp
+++ b/modules/checksum/adler32/adler32.cpp
diff --git a/include/adler32.h b/modules/checksum/adler32/adler32.h
index 1abce690c..1abce690c 100644
--- a/include/adler32.h
+++ b/modules/checksum/adler32/adler32.h
diff --git a/modules/compression/bzip2/bzip2.h b/modules/compression/bzip2/bzip2.h
index eb9962dec..1244924ca 100644
--- a/modules/compression/bzip2/bzip2.h
+++ b/modules/compression/bzip2/bzip2.h
@@ -4,8 +4,8 @@
 *     2001-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_BZIP2_H__
-#define BOTAN_EXT_BZIP2_H__
+#ifndef BOTAN_BZIP2_H__
+#define BOTAN_BZIP2_H__
 
 #include <botan/filter.h>
 
diff --git a/modules/compression/zlib/zlib.h b/modules/compression/zlib/zlib.h
index 42f2eed5e..c3baea4ee 100644
--- a/modules/compression/zlib/zlib.h
+++ b/modules/compression/zlib/zlib.h
@@ -4,8 +4,8 @@
 *     2001-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ZLIB_H__
-#define BOTAN_EXT_ZLIB_H__
+#ifndef BOTAN_ZLIB_H__
+#define BOTAN_ZLIB_H__
 
 #include <botan/filter.h>
 
diff --git a/modules/engine/gnump/eng_gmp.h b/modules/engine/gnump/eng_gmp.h
index 2ac2b54a8..b8b2081fa 100644
--- a/modules/engine/gnump/eng_gmp.h
+++ b/modules/engine/gnump/eng_gmp.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENGINE_GMP_H__
-#define BOTAN_EXT_ENGINE_GMP_H__
+#ifndef BOTAN_ENGINE_GMP_H__
+#define BOTAN_ENGINE_GMP_H__
 
 #include <botan/engine.h>
 
diff --git a/modules/engine/gnump/gmp_wrap.h b/modules/engine/gnump/gmp_wrap.h
index 0da54550f..09a8590c4 100644
--- a/modules/engine/gnump/gmp_wrap.h
+++ b/modules/engine/gnump/gmp_wrap.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_GMP_MPZ_WRAP_H__
-#define BOTAN_EXT_GMP_MPZ_WRAP_H__
+#ifndef BOTAN_GMP_MPZ_WRAP_H__
+#define BOTAN_GMP_MPZ_WRAP_H__
 
 #include <botan/bigint.h>
 #include <gmp.h>
diff --git a/modules/engine/openssl/bn_wrap.h b/modules/engine/openssl/bn_wrap.h
index 682795660..a42967544 100644
--- a/modules/engine/openssl/bn_wrap.h
+++ b/modules/engine/openssl/bn_wrap.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_OPENSSL_BN_WRAP_H__
-#define BOTAN_EXT_OPENSSL_BN_WRAP_H__
+#ifndef BOTAN_OPENSSL_BN_WRAP_H__
+#define BOTAN_OPENSSL_BN_WRAP_H__
 
 #include <botan/bigint.h>
 #include <openssl/bn.h>
diff --git a/modules/engine/openssl/eng_ossl.h b/modules/engine/openssl/eng_ossl.h
index a1886662f..40da748db 100644
--- a/modules/engine/openssl/eng_ossl.h
+++ b/modules/engine/openssl/eng_ossl.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENGINE_OPENSSL_H__
-#define BOTAN_EXT_ENGINE_OPENSSL_H__
+#ifndef BOTAN_ENGINE_OPENSSL_H__
+#define BOTAN_ENGINE_OPENSSL_H__
 
 #include <botan/engine.h>
 #include <botan/mutex.h>
diff --git a/modules/entropy/beos_stats/es_beos.h b/modules/entropy/beos_stats/es_beos.h
index 11808d2b8..047939c8c 100644
--- a/modules/entropy/beos_stats/es_beos.h
+++ b/modules/entropy/beos_stats/es_beos.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_BEOS_H__
-#define BOTAN_EXT_ENTROPY_SRC_BEOS_H__
+#ifndef BOTAN_ENTROPY_SRC_BEOS_H__
+#define BOTAN_ENTROPY_SRC_BEOS_H__
 
 #include <botan/buf_es.h>
 
diff --git a/modules/entropy/cryptoapi_rng/es_capi.h b/modules/entropy/cryptoapi_rng/es_capi.h
index 36b4acd8d..68e42cf9c 100644
--- a/modules/entropy/cryptoapi_rng/es_capi.h
+++ b/modules/entropy/cryptoapi_rng/es_capi.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_WIN32_CAPI_H__
-#define BOTAN_EXT_ENTROPY_SRC_WIN32_CAPI_H__
+#ifndef BOTAN_ENTROPY_SRC_WIN32_CAPI_H__
+#define BOTAN_ENTROPY_SRC_WIN32_CAPI_H__
 
 #include <botan/rng.h>
 #include <vector>
diff --git a/modules/entropy/egd/es_egd.h b/modules/entropy/egd/es_egd.h
index e3ff2fec8..ce6ba9521 100644
--- a/modules/entropy/egd/es_egd.h
+++ b/modules/entropy/egd/es_egd.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_EGD_H__
-#define BOTAN_EXT_ENTROPY_SRC_EGD_H__
+#ifndef BOTAN_ENTROPY_SRC_EGD_H__
+#define BOTAN_ENTROPY_SRC_EGD_H__
 
 #include <botan/rng.h>
 #include <string>
diff --git a/modules/entropy/proc_walk/es_ftw.h b/modules/entropy/proc_walk/es_ftw.h
index 0a48cc551..a2229ff1f 100644
--- a/modules/entropy/proc_walk/es_ftw.h
+++ b/modules/entropy/proc_walk/es_ftw.h
@@ -3,8 +3,8 @@
 * (C) 1999-2008 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_FTW_H__
-#define BOTAN_EXT_ENTROPY_SRC_FTW_H__
+#ifndef BOTAN_ENTROPY_SRC_FTW_H__
+#define BOTAN_ENTROPY_SRC_FTW_H__
 
 #include <botan/buf_es.h>
 
diff --git a/modules/entropy/unix_procs/es_unix.h b/modules/entropy/unix_procs/es_unix.h
index a1e279633..d1b1d623e 100644
--- a/modules/entropy/unix_procs/es_unix.h
+++ b/modules/entropy/unix_procs/es_unix.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_UNIX_H__
-#define BOTAN_EXT_ENTROPY_SRC_UNIX_H__
+#ifndef BOTAN_ENTROPY_SRC_UNIX_H__
+#define BOTAN_ENTROPY_SRC_UNIX_H__
 
 #include <botan/buf_es.h>
 #include <botan/unix_cmd.h>
diff --git a/modules/entropy/unix_procs/unix_cmd.h b/modules/entropy/unix_procs/unix_cmd.h
index 0e187db03..090dd8fdd 100644
--- a/modules/entropy/unix_procs/unix_cmd.h
+++ b/modules/entropy/unix_procs/unix_cmd.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_UNIX_CMD_H__
-#define BOTAN_EXT_UNIX_CMD_H__
+#ifndef BOTAN_UNIX_CMD_H__
+#define BOTAN_UNIX_CMD_H__
 
 #include <botan/types.h>
 #include <botan/data_src.h>
diff --git a/modules/entropy/win32_stats/es_win32.h b/modules/entropy/win32_stats/es_win32.h
index 19b664a2f..02558b335 100644
--- a/modules/entropy/win32_stats/es_win32.h
+++ b/modules/entropy/win32_stats/es_win32.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_ENTROPY_SRC_WIN32_H__
-#define BOTAN_EXT_ENTROPY_SRC_WIN32_H__
+#ifndef BOTAN_ENTROPY_SRC_WIN32_H__
+#define BOTAN_ENTROPY_SRC_WIN32_H__
 
 #include <botan/buf_es.h>
 
diff --git a/modules/io/fd_unix/fd_unix.h b/modules/io/fd_unix/fd_unix.h
index 4767306da..cbe93dfe0 100644
--- a/modules/io/fd_unix/fd_unix.h
+++ b/modules/io/fd_unix/fd_unix.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_PIPE_UNIXFD_H__
-#define BOTAN_EXT_PIPE_UNIXFD_H__
+#ifndef BOTAN_PIPE_UNIXFD_H__
+#define BOTAN_PIPE_UNIXFD_H__
 
 #include <botan/pipe.h>
 
diff --git a/modules/mutex/pthreads/mux_pthr.h b/modules/mutex/pthreads/mux_pthr.h
index 1b83dbead..efdabfed4 100644
--- a/modules/mutex/pthreads/mux_pthr.h
+++ b/modules/mutex/pthreads/mux_pthr.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_MUTEX_PTHREAD_H__
-#define BOTAN_EXT_MUTEX_PTHREAD_H__
+#ifndef BOTAN_MUTEX_PTHREAD_H__
+#define BOTAN_MUTEX_PTHREAD_H__
 
 #include <botan/mutex.h>
 
diff --git a/modules/mutex/qt_mutex/mux_qt.h b/modules/mutex/qt_mutex/mux_qt.h
index 110e147ec..fffdc78ae 100644
--- a/modules/mutex/qt_mutex/mux_qt.h
+++ b/modules/mutex/qt_mutex/mux_qt.h
@@ -4,8 +4,8 @@
 *     2004-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_MUTEX_QT_H__
-#define BOTAN_EXT_MUTEX_QT_H__
+#ifndef BOTAN_MUTEX_QT_H__
+#define BOTAN_MUTEX_QT_H__
 
 #include <botan/mutex.h>
 
diff --git a/modules/mutex/win32_crit_section/mux_win32.h b/modules/mutex/win32_crit_section/mux_win32.h
index 37eadae0d..20b245967 100644
--- a/modules/mutex/win32_crit_section/mux_win32.h
+++ b/modules/mutex/win32_crit_section/mux_win32.h
@@ -4,8 +4,8 @@
 *     2006-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_MUTEX_WIN32_H__
-#define BOTAN_EXT_MUTEX_WIN32_H__
+#ifndef BOTAN_MUTEX_WIN32_H__
+#define BOTAN_MUTEX_WIN32_H__
 
 #include <botan/mutex.h>
 
diff --git a/modules/timer/cpu_counter/tm_hard.h b/modules/timer/cpu_counter/tm_hard.h
index d02010eda..678513f81 100644
--- a/modules/timer/cpu_counter/tm_hard.h
+++ b/modules/timer/cpu_counter/tm_hard.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_TIMER_HARDWARE_H__
-#define BOTAN_EXT_TIMER_HARDWARE_H__
+#ifndef BOTAN_TIMER_HARDWARE_H__
+#define BOTAN_TIMER_HARDWARE_H__
 
 #include <botan/timers.h>
 
diff --git a/modules/timer/gettimeofday/tm_unix.h b/modules/timer/gettimeofday/tm_unix.h
index 4b5b3e9dd..fd24a1563 100644
--- a/modules/timer/gettimeofday/tm_unix.h
+++ b/modules/timer/gettimeofday/tm_unix.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_TIMER_UNIX_H__
-#define BOTAN_EXT_TIMER_UNIX_H__
+#ifndef BOTAN_TIMER_UNIX_H__
+#define BOTAN_TIMER_UNIX_H__
 
 #include <botan/timers.h>
 
diff --git a/modules/timer/posix_rt/tm_posix.h b/modules/timer/posix_rt/tm_posix.h
index 60fa8f844..fc3ccdc74 100644
--- a/modules/timer/posix_rt/tm_posix.h
+++ b/modules/timer/posix_rt/tm_posix.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_TIMER_POSIX_H__
-#define BOTAN_EXT_TIMER_POSIX_H__
+#ifndef BOTAN_TIMER_POSIX_H__
+#define BOTAN_TIMER_POSIX_H__
 
 #include <botan/timers.h>
 
diff --git a/modules/timer/win32_query_perf_ctr/tm_win32.h b/modules/timer/win32_query_perf_ctr/tm_win32.h
index 5a699021c..67b045e78 100644
--- a/modules/timer/win32_query_perf_ctr/tm_win32.h
+++ b/modules/timer/win32_query_perf_ctr/tm_win32.h
@@ -3,8 +3,8 @@
 * (C) 1999-2007 Jack Lloyd                       *
 *************************************************/
 
-#ifndef BOTAN_EXT_TIMER_WIN32_H__
-#define BOTAN_EXT_TIMER_WIN32_H__
+#ifndef BOTAN_TIMER_WIN32_H__
+#define BOTAN_TIMER_WIN32_H__
 
 #include <botan/timers.h>