368 files changed, 7 insertions, 9 deletions

diff --git a/configure.pl b/configure.pl
index e94b6e68c..a20125391 100755
--- a/configure.pl
+++ b/configure.pl
@@ -46,7 +46,6 @@ sub main {
 
     $$config{'base-dir'} = $base_dir;
     $$config{'config-dir'} = File::Spec->catdir($base_dir, 'misc', 'config');
-    $$config{'mods-dir'} = File::Spec->catdir($base_dir, 'modules');
     $$config{'src-dir'} = File::Spec->catdir($base_dir, 'src');
     $$config{'include-dir'} = File::Spec->catdir($base_dir, 'include');
     $$config{'checks-dir'} = File::Spec->catdir($base_dir, 'checks');
@@ -54,7 +53,7 @@ sub main {
 
     $$config{'command-line'} = $0 . ' ' . join(' ', @ARGV);
     $$config{'timestamp'} = gmtime;
-    $$config{'user'} = getlogin || getpwuid($<) || "";
+    $$config{'user'} = getlogin || getpwuid($<) || '';
     $$config{'hostname'} = hostname;
 
     %CPU = read_info_files($config, 'arch', \&get_arch_info);
@@ -869,7 +868,7 @@ sub dir_list {
     my ($dir) = @_;
     opendir(DIR, $dir) or croak("Couldn't read directory '$dir' ($!)");
 
-    my @listing = grep { !/#/ and
+    my @listing = grep { !/#/ and -f File::Spec->catfile($dir, $_) and
                          $_ ne File::Spec->curdir() and
                          $_ ne File::Spec->updir() } readdir DIR;
 
@@ -1009,7 +1008,8 @@ sub load_modules {
         push @mod_names, $mod;
 
     }
-    $$config{'mod-list'} = join("\n", @mod_names);
+
+    $$config{'mod-list'} = join('\n', @mod_names);
 
     my $gen_defines = sub {
         my $defines = '';
@@ -1134,14 +1134,14 @@ sub load_module {
         unless(&$works_on($cc, $module{'cc'}));
 
     trace($modname);
-    trace($module{"moddirs"});
+    trace($module{'moddirs'});
 
     my $handle_files = sub {
         my($lst, $func) = @_;
         return unless defined($lst);
 
         foreach (sort @$lst) {
-            &$func($module{"moddirs"}, $config, $_);
+            &$func($module{'moddirs'}, $config, $_);
         }
     };
 
@@ -1362,8 +1362,6 @@ sub read_info_files {
 sub read_module_files {
     my ($config) = @_;
 
-    my $mod_dir = $$config{'mods-dir'};
-
     my %allinfo;
 
     my @modinfos;
@@ -1376,7 +1374,7 @@ sub read_module_files {
             }
           }
         },
-        $mod_dir);
+        $$config{'src-dir'});
 
     foreach my $modfile (@modinfos) {
         trace("reading $modfile");
diff --git a/modules/allocation/alloc_mmap/mmap_mem.cpp b/src/allocation/alloc_mmap/mmap_mem.cpp
index e9ea17a53..e9ea17a53 100644
--- a/modules/allocation/alloc_mmap/mmap_mem.cpp
+++ b/src/allocation/alloc_mmap/mmap_mem.cpp
diff --git a/modules/allocation/alloc_mmap/mmap_mem.h b/src/allocation/alloc_mmap/mmap_mem.h
index a6f68d039..a6f68d039 100644
--- a/modules/allocation/alloc_mmap/mmap_mem.h
+++ b/src/allocation/alloc_mmap/mmap_mem.h
diff --git a/modules/allocation/alloc_mmap/modinfo.txt b/src/allocation/alloc_mmap/modinfo.txt
index 8cc2b206e..8cc2b206e 100644
--- a/modules/allocation/alloc_mmap/modinfo.txt
+++ b/src/allocation/alloc_mmap/modinfo.txt
diff --git a/modules/allocation/ml_unix/mlock.cpp b/src/allocation/ml_unix/mlock.cpp
index 98214a215..98214a215 100644
--- a/modules/allocation/ml_unix/mlock.cpp
+++ b/src/allocation/ml_unix/mlock.cpp
diff --git a/modules/allocation/ml_unix/modinfo.txt b/src/allocation/ml_unix/modinfo.txt
index 201a30ead..201a30ead 100644
--- a/modules/allocation/ml_unix/modinfo.txt
+++ b/src/allocation/ml_unix/modinfo.txt
diff --git a/modules/allocation/ml_win32/mlock.cpp b/src/allocation/ml_win32/mlock.cpp
index 8c5919934..8c5919934 100644
--- a/modules/allocation/ml_win32/mlock.cpp
+++ b/src/allocation/ml_win32/mlock.cpp
diff --git a/modules/allocation/ml_win32/modinfo.txt b/src/allocation/ml_win32/modinfo.txt
index 92936e1de..92936e1de 100644
--- a/modules/allocation/ml_win32/modinfo.txt
+++ b/src/allocation/ml_win32/modinfo.txt
diff --git a/modules/asm/asm_amd64/asm_macr.h b/src/asm/asm_amd64/asm_macr.h
index 3cdd42dc6..3cdd42dc6 100644
--- a/modules/asm/asm_amd64/asm_macr.h
+++ b/src/asm/asm_amd64/asm_macr.h
diff --git a/modules/asm/asm_amd64/modinfo.txt b/src/asm/asm_amd64/modinfo.txt
index 30aa5a413..30aa5a413 100644
--- a/modules/asm/asm_amd64/modinfo.txt
+++ b/src/asm/asm_amd64/modinfo.txt
diff --git a/modules/asm/asm_amd64/mp_monty.S b/src/asm/asm_amd64/mp_monty.S
index 3dd4040bc..3dd4040bc 100644
--- a/modules/asm/asm_amd64/mp_monty.S
+++ b/src/asm/asm_amd64/mp_monty.S
diff --git a/modules/asm/asm_amd64/mp_mulop_amd64.S b/src/asm/asm_amd64/mp_mulop_amd64.S
index e5bba23fb..e5bba23fb 100644
--- a/modules/asm/asm_amd64/mp_mulop_amd64.S
+++ b/src/asm/asm_amd64/mp_mulop_amd64.S
diff --git a/modules/asm/asm_amd64/sha160.cpp b/src/asm/asm_amd64/sha160.cpp
index cfac02f45..cfac02f45 100644
--- a/modules/asm/asm_amd64/sha160.cpp
+++ b/src/asm/asm_amd64/sha160.cpp
diff --git a/modules/asm/asm_amd64/sha1_asm.S b/src/asm/asm_amd64/sha1_asm.S
index ecf4a18ce..ecf4a18ce 100644
--- a/modules/asm/asm_amd64/sha1_asm.S
+++ b/src/asm/asm_amd64/sha1_asm.S
diff --git a/modules/asm/asm_ia32/asm_macr.h b/src/asm/asm_ia32/asm_macr.h
index 6d5dbb59d..6d5dbb59d 100644
--- a/modules/asm/asm_ia32/asm_macr.h
+++ b/src/asm/asm_ia32/asm_macr.h
diff --git a/modules/asm/asm_ia32/md4.cpp b/src/asm/asm_ia32/md4.cpp
index e3dc79012..e3dc79012 100644
--- a/modules/asm/asm_ia32/md4.cpp
+++ b/src/asm/asm_ia32/md4.cpp
diff --git a/modules/asm/asm_ia32/md4core.S b/src/asm/asm_ia32/md4core.S
index 662e9924a..662e9924a 100644
--- a/modules/asm/asm_ia32/md4core.S
+++ b/src/asm/asm_ia32/md4core.S
diff --git a/modules/asm/asm_ia32/md5.cpp b/src/asm/asm_ia32/md5.cpp
index cfe48e7e9..cfe48e7e9 100644
--- a/modules/asm/asm_ia32/md5.cpp
+++ b/src/asm/asm_ia32/md5.cpp
diff --git a/modules/asm/asm_ia32/md5core.S b/src/asm/asm_ia32/md5core.S
index 8ebe469f3..8ebe469f3 100644
--- a/modules/asm/asm_ia32/md5core.S
+++ b/src/asm/asm_ia32/md5core.S
diff --git a/modules/asm/asm_ia32/modinfo.txt b/src/asm/asm_ia32/modinfo.txt
index 12c8cd96d..12c8cd96d 100644
--- a/modules/asm/asm_ia32/modinfo.txt
+++ b/src/asm/asm_ia32/modinfo.txt
diff --git a/modules/asm/asm_ia32/mp_mulop.S b/src/asm/asm_ia32/mp_mulop.S
index a5f0d3b27..a5f0d3b27 100644
--- a/modules/asm/asm_ia32/mp_mulop.S
+++ b/src/asm/asm_ia32/mp_mulop.S
diff --git a/modules/asm/asm_ia32/serp_asm.S b/src/asm/asm_ia32/serp_asm.S
index c8915382d..c8915382d 100644
--- a/modules/asm/asm_ia32/serp_asm.S
+++ b/src/asm/asm_ia32/serp_asm.S
diff --git a/modules/asm/asm_ia32/serpent.cpp b/src/asm/asm_ia32/serpent.cpp
index aacb72b0f..aacb72b0f 100644
--- a/modules/asm/asm_ia32/serpent.cpp
+++ b/src/asm/asm_ia32/serpent.cpp
diff --git a/modules/asm/asm_ia32/sha160.cpp b/src/asm/asm_ia32/sha160.cpp
index 7725541d5..7725541d5 100644
--- a/modules/asm/asm_ia32/sha160.cpp
+++ b/src/asm/asm_ia32/sha160.cpp
diff --git a/modules/asm/asm_ia32/sha1_asm.S b/src/asm/asm_ia32/sha1_asm.S
index 85bc9dc2c..85bc9dc2c 100644
--- a/modules/asm/asm_ia32/sha1_asm.S
+++ b/src/asm/asm_ia32/sha1_asm.S
diff --git a/modules/asm/mp_amd64/bswap.h b/src/asm/mp_amd64/bswap.h
index 3c77b460c..3c77b460c 100644
--- a/modules/asm/mp_amd64/bswap.h
+++ b/src/asm/mp_amd64/bswap.h
diff --git a/modules/asm/mp_amd64/modinfo.txt b/src/asm/mp_amd64/modinfo.txt
index a042a3976..a042a3976 100644
--- a/modules/asm/mp_amd64/modinfo.txt
+++ b/src/asm/mp_amd64/modinfo.txt
diff --git a/modules/asm/mp_amd64/mp_asm.h b/src/asm/mp_amd64/mp_asm.h
index eca7bae6c..eca7bae6c 100644
--- a/modules/asm/mp_amd64/mp_asm.h
+++ b/src/asm/mp_amd64/mp_asm.h
diff --git a/modules/asm/mp_amd64/mp_asmi.h b/src/asm/mp_amd64/mp_asmi.h
index 16632a38d..16632a38d 100644
--- a/modules/asm/mp_amd64/mp_asmi.h
+++ b/src/asm/mp_amd64/mp_asmi.h
diff --git a/modules/asm/mp_amd64/mp_mulop.cpp b/src/asm/mp_amd64/mp_mulop.cpp
index d1aa51489..d1aa51489 100644
--- a/modules/asm/mp_amd64/mp_mulop.cpp
+++ b/src/asm/mp_amd64/mp_mulop.cpp
diff --git a/modules/asm/mp_asm64/modinfo.txt b/src/asm/mp_asm64/modinfo.txt
index a9e5d53da..a9e5d53da 100644
--- a/modules/asm/mp_asm64/modinfo.txt
+++ b/src/asm/mp_asm64/modinfo.txt
diff --git a/modules/asm/mp_asm64/mp_asm.h b/src/asm/mp_asm64/mp_asm.h
index e455b3616..e455b3616 100644
--- a/modules/asm/mp_asm64/mp_asm.h
+++ b/src/asm/mp_asm64/mp_asm.h
diff --git a/modules/asm/mp_ia32/modinfo.txt b/src/asm/mp_ia32/modinfo.txt
index cf4959250..cf4959250 100644
--- a/modules/asm/mp_ia32/modinfo.txt
+++ b/src/asm/mp_ia32/modinfo.txt
diff --git a/modules/asm/mp_ia32/mp_asm.h b/src/asm/mp_ia32/mp_asm.h
index b45140321..b45140321 100644
--- a/modules/asm/mp_ia32/mp_asm.h
+++ b/src/asm/mp_ia32/mp_asm.h
diff --git a/modules/asm/mp_ia32/mp_asmi.h b/src/asm/mp_ia32/mp_asmi.h
index 9de0c11e3..9de0c11e3 100644
--- a/modules/asm/mp_ia32/mp_asmi.h
+++ b/src/asm/mp_ia32/mp_asmi.h
diff --git a/modules/asm/mp_ia32_msvc/modinfo.txt b/src/asm/mp_ia32_msvc/modinfo.txt
index 36d9d0290..36d9d0290 100644
--- a/modules/asm/mp_ia32_msvc/modinfo.txt
+++ b/src/asm/mp_ia32_msvc/modinfo.txt
diff --git a/modules/asm/mp_ia32_msvc/mp_asmi.h b/src/asm/mp_ia32_msvc/mp_asmi.h
index 5eaa46eb4..5eaa46eb4 100644
--- a/modules/asm/mp_ia32_msvc/mp_asmi.h
+++ b/src/asm/mp_ia32_msvc/mp_asmi.h
diff --git a/modules/asm/sha1_sse2/modinfo.txt b/src/asm/sha1_sse2/modinfo.txt
index e1805260c..e1805260c 100644
--- a/modules/asm/sha1_sse2/modinfo.txt
+++ b/src/asm/sha1_sse2/modinfo.txt
diff --git a/modules/asm/sha1_sse2/sha160.cpp b/src/asm/sha1_sse2/sha160.cpp
index dfb5fdfe5..dfb5fdfe5 100644
--- a/modules/asm/sha1_sse2/sha160.cpp
+++ b/src/asm/sha1_sse2/sha160.cpp
diff --git a/modules/asm/sha1_sse2/sha160.h b/src/asm/sha1_sse2/sha160.h
index c6f8482cf..c6f8482cf 100644
--- a/modules/asm/sha1_sse2/sha160.h
+++ b/src/asm/sha1_sse2/sha160.h
diff --git a/modules/asm/sha1_sse2/sha1core.cpp b/src/asm/sha1_sse2/sha1core.cpp
index 23dbfc5e2..23dbfc5e2 100644
--- a/modules/asm/sha1_sse2/sha1core.cpp
+++ b/src/asm/sha1_sse2/sha1core.cpp
diff --git a/modules/checksum/adler32/adler32.cpp b/src/checksum/adler32/adler32.cpp
index b808e3e67..b808e3e67 100644
--- a/modules/checksum/adler32/adler32.cpp
+++ b/src/checksum/adler32/adler32.cpp
diff --git a/modules/checksum/adler32/adler32.h b/src/checksum/adler32/adler32.h
index 1abce690c..1abce690c 100644
--- a/modules/checksum/adler32/adler32.h
+++ b/src/checksum/adler32/adler32.h
diff --git a/modules/checksum/adler32/modinfo.txt b/src/checksum/adler32/modinfo.txt
index fb0f3c9cb..fb0f3c9cb 100644
--- a/modules/checksum/adler32/modinfo.txt
+++ b/src/checksum/adler32/modinfo.txt
diff --git a/modules/checksum/crc24/crc24.cpp b/src/checksum/crc24/crc24.cpp
index eda2c19f2..eda2c19f2 100644
--- a/modules/checksum/crc24/crc24.cpp
+++ b/src/checksum/crc24/crc24.cpp
diff --git a/modules/checksum/crc24/crc24.h b/src/checksum/crc24/crc24.h
index 919f860ce..919f860ce 100644
--- a/modules/checksum/crc24/crc24.h
+++ b/src/checksum/crc24/crc24.h
diff --git a/modules/checksum/crc24/modinfo.txt b/src/checksum/crc24/modinfo.txt
index b61cabbc8..b61cabbc8 100644
--- a/modules/checksum/crc24/modinfo.txt
+++ b/src/checksum/crc24/modinfo.txt
diff --git a/modules/checksum/crc32/crc32.cpp b/src/checksum/crc32/crc32.cpp
index 21af2f13b..21af2f13b 100644
--- a/modules/checksum/crc32/crc32.cpp
+++ b/src/checksum/crc32/crc32.cpp
diff --git a/modules/checksum/crc32/crc32.h b/src/checksum/crc32/crc32.h
index 51939c6e1..51939c6e1 100644
--- a/modules/checksum/crc32/crc32.h
+++ b/src/checksum/crc32/crc32.h
diff --git a/modules/checksum/crc32/modinfo.txt b/src/checksum/crc32/modinfo.txt
index 17ccca0a3..17ccca0a3 100644
--- a/modules/checksum/crc32/modinfo.txt
+++ b/src/checksum/crc32/modinfo.txt
diff --git a/modules/cipher/aes/aes.cpp b/src/cipher/aes/aes.cpp
index 24f1f6213..24f1f6213 100644
--- a/modules/cipher/aes/aes.cpp
+++ b/src/cipher/aes/aes.cpp
diff --git a/modules/cipher/aes/aes.h b/src/cipher/aes/aes.h
index 5b43735ad..5b43735ad 100644
--- a/modules/cipher/aes/aes.h
+++ b/src/cipher/aes/aes.h
diff --git a/modules/cipher/aes/aes_tab.cpp b/src/cipher/aes/aes_tab.cpp
index 3665bb746..3665bb746 100644
--- a/modules/cipher/aes/aes_tab.cpp
+++ b/src/cipher/aes/aes_tab.cpp
diff --git a/modules/cipher/aes/modinfo.txt b/src/cipher/aes/modinfo.txt
index 2803ccc4e..2803ccc4e 100644
--- a/modules/cipher/aes/modinfo.txt
+++ b/src/cipher/aes/modinfo.txt
diff --git a/modules/cipher/arc4/arc4.cpp b/src/cipher/arc4/arc4.cpp
index 238567cdc..238567cdc 100644
--- a/modules/cipher/arc4/arc4.cpp
+++ b/src/cipher/arc4/arc4.cpp
diff --git a/modules/cipher/arc4/arc4.h b/src/cipher/arc4/arc4.h
index c99691484..c99691484 100644
--- a/modules/cipher/arc4/arc4.h
+++ b/src/cipher/arc4/arc4.h
diff --git a/modules/cipher/arc4/modinfo.txt b/src/cipher/arc4/modinfo.txt
index 00f40a9ed..00f40a9ed 100644
--- a/modules/cipher/arc4/modinfo.txt
+++ b/src/cipher/arc4/modinfo.txt
diff --git a/modules/cipher/blowfish/blfs_tab.cpp b/src/cipher/blowfish/blfs_tab.cpp
index f8fa07ee5..f8fa07ee5 100644
--- a/modules/cipher/blowfish/blfs_tab.cpp
+++ b/src/cipher/blowfish/blfs_tab.cpp
diff --git a/modules/cipher/blowfish/blowfish.cpp b/src/cipher/blowfish/blowfish.cpp
index ffca9241f..ffca9241f 100644
--- a/modules/cipher/blowfish/blowfish.cpp
+++ b/src/cipher/blowfish/blowfish.cpp
diff --git a/modules/cipher/blowfish/blowfish.h b/src/cipher/blowfish/blowfish.h
index 79875ba90..79875ba90 100644
--- a/modules/cipher/blowfish/blowfish.h
+++ b/src/cipher/blowfish/blowfish.h
diff --git a/modules/cipher/blowfish/modinfo.txt b/src/cipher/blowfish/modinfo.txt
index 0a9d2adc2..0a9d2adc2 100644
--- a/modules/cipher/blowfish/modinfo.txt
+++ b/src/cipher/blowfish/modinfo.txt
diff --git a/modules/cipher/cast/cast128.cpp b/src/cipher/cast/cast128.cpp
index 14e5c9e9d..14e5c9e9d 100644
--- a/modules/cipher/cast/cast128.cpp
+++ b/src/cipher/cast/cast128.cpp
diff --git a/modules/cipher/cast/cast128.h b/src/cipher/cast/cast128.h
index 0a7c53864..0a7c53864 100644
--- a/modules/cipher/cast/cast128.h
+++ b/src/cipher/cast/cast128.h
diff --git a/modules/cipher/cast/cast256.cpp b/src/cipher/cast/cast256.cpp
index 24d3e0078..24d3e0078 100644
--- a/modules/cipher/cast/cast256.cpp
+++ b/src/cipher/cast/cast256.cpp
diff --git a/modules/cipher/cast/cast256.h b/src/cipher/cast/cast256.h
index d4b7c6b18..d4b7c6b18 100644
--- a/modules/cipher/cast/cast256.h
+++ b/src/cipher/cast/cast256.h
diff --git a/modules/cipher/cast/cast_tab.cpp b/src/cipher/cast/cast_tab.cpp
index 3edab713f..3edab713f 100644
--- a/modules/cipher/cast/cast_tab.cpp
+++ b/src/cipher/cast/cast_tab.cpp
diff --git a/modules/cipher/cast/modinfo.txt b/src/cipher/cast/modinfo.txt
index 73d3f900f..73d3f900f 100644
--- a/modules/cipher/cast/modinfo.txt
+++ b/src/cipher/cast/modinfo.txt
diff --git a/modules/cipher/des/des.cpp b/src/cipher/des/des.cpp
index d09752854..d09752854 100644
--- a/modules/cipher/des/des.cpp
+++ b/src/cipher/des/des.cpp
diff --git a/modules/cipher/des/des.h b/src/cipher/des/des.h
index 3e53a6166..3e53a6166 100644
--- a/modules/cipher/des/des.h
+++ b/src/cipher/des/des.h
diff --git a/modules/cipher/des/des_tab.cpp b/src/cipher/des/des_tab.cpp
index 9788cd8c0..9788cd8c0 100644
--- a/modules/cipher/des/des_tab.cpp
+++ b/src/cipher/des/des_tab.cpp
diff --git a/modules/cipher/des/modinfo.txt b/src/cipher/des/modinfo.txt
index 43ea9a0bc..43ea9a0bc 100644
--- a/modules/cipher/des/modinfo.txt
+++ b/src/cipher/des/modinfo.txt
diff --git a/modules/cipher/gost/gost.cpp b/src/cipher/gost/gost.cpp
index dc2b397e7..dc2b397e7 100644
--- a/modules/cipher/gost/gost.cpp
+++ b/src/cipher/gost/gost.cpp
diff --git a/modules/cipher/gost/gost.h b/src/cipher/gost/gost.h
index d78e3245f..d78e3245f 100644
--- a/modules/cipher/gost/gost.h
+++ b/src/cipher/gost/gost.h
diff --git a/modules/cipher/gost/gost_tab.cpp b/src/cipher/gost/gost_tab.cpp
index 3ef1a0caf..3ef1a0caf 100644
--- a/modules/cipher/gost/gost_tab.cpp
+++ b/src/cipher/gost/gost_tab.cpp
diff --git a/modules/cipher/gost/modinfo.txt b/src/cipher/gost/modinfo.txt
index f2b997c08..f2b997c08 100644
--- a/modules/cipher/gost/modinfo.txt
+++ b/src/cipher/gost/modinfo.txt
diff --git a/modules/cipher/idea/idea.cpp b/src/cipher/idea/idea.cpp
index a2b076015..a2b076015 100644
--- a/modules/cipher/idea/idea.cpp
+++ b/src/cipher/idea/idea.cpp
diff --git a/modules/cipher/idea/idea.h b/src/cipher/idea/idea.h
index 4c5e82aca..4c5e82aca 100644
--- a/modules/cipher/idea/idea.h
+++ b/src/cipher/idea/idea.h
diff --git a/modules/cipher/idea/modinfo.txt b/src/cipher/idea/modinfo.txt
index 2da3ffb43..2da3ffb43 100644
--- a/modules/cipher/idea/modinfo.txt
+++ b/src/cipher/idea/modinfo.txt
diff --git a/modules/cipher/kasumi/kas_tab.cpp b/src/cipher/kasumi/kas_tab.cpp
index 74a7bc06e..74a7bc06e 100644
--- a/modules/cipher/kasumi/kas_tab.cpp
+++ b/src/cipher/kasumi/kas_tab.cpp
diff --git a/modules/cipher/kasumi/kasumi.cpp b/src/cipher/kasumi/kasumi.cpp
index 4e2cba27b..4e2cba27b 100644
--- a/modules/cipher/kasumi/kasumi.cpp
+++ b/src/cipher/kasumi/kasumi.cpp
diff --git a/modules/cipher/kasumi/kasumi.h b/src/cipher/kasumi/kasumi.h
index 58888d909..58888d909 100644
--- a/modules/cipher/kasumi/kasumi.h
+++ b/src/cipher/kasumi/kasumi.h
diff --git a/modules/cipher/kasumi/modinfo.txt b/src/cipher/kasumi/modinfo.txt
index 3ca5de20a..3ca5de20a 100644
--- a/modules/cipher/kasumi/modinfo.txt
+++ b/src/cipher/kasumi/modinfo.txt
diff --git a/modules/cipher/lion/lion.cpp b/src/cipher/lion/lion.cpp
index 009e98408..009e98408 100644
--- a/modules/cipher/lion/lion.cpp
+++ b/src/cipher/lion/lion.cpp
diff --git a/modules/cipher/lion/lion.h b/src/cipher/lion/lion.h
index 70018838a..70018838a 100644
--- a/modules/cipher/lion/lion.h
+++ b/src/cipher/lion/lion.h
diff --git a/modules/cipher/lion/modinfo.txt b/src/cipher/lion/modinfo.txt
index 558d71d0c..558d71d0c 100644
--- a/modules/cipher/lion/modinfo.txt
+++ b/src/cipher/lion/modinfo.txt
diff --git a/modules/cipher/lubyrack/lubyrack.cpp b/src/cipher/lubyrack/lubyrack.cpp
index c9e6fc531..c9e6fc531 100644
--- a/modules/cipher/lubyrack/lubyrack.cpp
+++ b/src/cipher/lubyrack/lubyrack.cpp
diff --git a/modules/cipher/lubyrack/lubyrack.h b/src/cipher/lubyrack/lubyrack.h
index 2c4813cb6..2c4813cb6 100644
--- a/modules/cipher/lubyrack/lubyrack.h
+++ b/src/cipher/lubyrack/lubyrack.h
diff --git a/modules/cipher/lubyrack/modinfo.txt b/src/cipher/lubyrack/modinfo.txt
index d83df2409..d83df2409 100644
--- a/modules/cipher/lubyrack/modinfo.txt
+++ b/src/cipher/lubyrack/modinfo.txt
diff --git a/modules/cipher/mars/mars.cpp b/src/cipher/mars/mars.cpp
index cc671fc06..cc671fc06 100644
--- a/modules/cipher/mars/mars.cpp
+++ b/src/cipher/mars/mars.cpp
diff --git a/modules/cipher/mars/mars.h b/src/cipher/mars/mars.h
index 6e1bc9f34..6e1bc9f34 100644
--- a/modules/cipher/mars/mars.h
+++ b/src/cipher/mars/mars.h
diff --git a/modules/cipher/mars/mars_tab.cpp b/src/cipher/mars/mars_tab.cpp
index 07381e9cb..07381e9cb 100644
--- a/modules/cipher/mars/mars_tab.cpp
+++ b/src/cipher/mars/mars_tab.cpp
diff --git a/modules/cipher/mars/modinfo.txt b/src/cipher/mars/modinfo.txt
index b0ad8af9c..b0ad8af9c 100644
--- a/modules/cipher/mars/modinfo.txt
+++ b/src/cipher/mars/modinfo.txt
diff --git a/modules/cipher/misty1/mist_tab.cpp b/src/cipher/misty1/mist_tab.cpp
index b72742fb3..b72742fb3 100644
--- a/modules/cipher/misty1/mist_tab.cpp
+++ b/src/cipher/misty1/mist_tab.cpp
diff --git a/modules/cipher/misty1/misty1.cpp b/src/cipher/misty1/misty1.cpp
index 523d11c84..523d11c84 100644
--- a/modules/cipher/misty1/misty1.cpp
+++ b/src/cipher/misty1/misty1.cpp
diff --git a/modules/cipher/misty1/misty1.h b/src/cipher/misty1/misty1.h
index 9e506d536..9e506d536 100644
--- a/modules/cipher/misty1/misty1.h
+++ b/src/cipher/misty1/misty1.h
diff --git a/modules/cipher/misty1/modinfo.txt b/src/cipher/misty1/modinfo.txt
index 36600e5fe..36600e5fe 100644
--- a/modules/cipher/misty1/modinfo.txt
+++ b/src/cipher/misty1/modinfo.txt
diff --git a/modules/cipher/noekeon/modinfo.txt b/src/cipher/noekeon/modinfo.txt
index 8025c2073..8025c2073 100644
--- a/modules/cipher/noekeon/modinfo.txt
+++ b/src/cipher/noekeon/modinfo.txt
diff --git a/modules/cipher/noekeon/noekeon.cpp b/src/cipher/noekeon/noekeon.cpp
index 437972fe5..437972fe5 100644
--- a/modules/cipher/noekeon/noekeon.cpp
+++ b/src/cipher/noekeon/noekeon.cpp
diff --git a/modules/cipher/noekeon/noekeon.h b/src/cipher/noekeon/noekeon.h
index 660ab487a..660ab487a 100644
--- a/modules/cipher/noekeon/noekeon.h
+++ b/src/cipher/noekeon/noekeon.h
diff --git a/modules/cipher/rc2/modinfo.txt b/src/cipher/rc2/modinfo.txt
index 099141de7..099141de7 100644
--- a/modules/cipher/rc2/modinfo.txt
+++ b/src/cipher/rc2/modinfo.txt
diff --git a/modules/cipher/rc2/rc2.cpp b/src/cipher/rc2/rc2.cpp
index 6d764e5c4..6d764e5c4 100644
--- a/modules/cipher/rc2/rc2.cpp
+++ b/src/cipher/rc2/rc2.cpp
diff --git a/modules/cipher/rc2/rc2.h b/src/cipher/rc2/rc2.h
index 8f46821a4..8f46821a4 100644
--- a/modules/cipher/rc2/rc2.h
+++ b/src/cipher/rc2/rc2.h
diff --git a/modules/cipher/rc5/modinfo.txt b/src/cipher/rc5/modinfo.txt
index 4a150c3b0..4a150c3b0 100644
--- a/modules/cipher/rc5/modinfo.txt
+++ b/src/cipher/rc5/modinfo.txt
diff --git a/modules/cipher/rc5/rc5.cpp b/src/cipher/rc5/rc5.cpp
index 0c0229b6c..0c0229b6c 100644
--- a/modules/cipher/rc5/rc5.cpp
+++ b/src/cipher/rc5/rc5.cpp
diff --git a/modules/cipher/rc5/rc5.h b/src/cipher/rc5/rc5.h
index 0827048dc..0827048dc 100644
--- a/modules/cipher/rc5/rc5.h
+++ b/src/cipher/rc5/rc5.h
diff --git a/modules/cipher/rc6/modinfo.txt b/src/cipher/rc6/modinfo.txt
index 1457e78c1..1457e78c1 100644
--- a/modules/cipher/rc6/modinfo.txt
+++ b/src/cipher/rc6/modinfo.txt
diff --git a/modules/cipher/rc6/rc6.cpp b/src/cipher/rc6/rc6.cpp
index 67d765222..67d765222 100644
--- a/modules/cipher/rc6/rc6.cpp
+++ b/src/cipher/rc6/rc6.cpp
diff --git a/modules/cipher/rc6/rc6.h b/src/cipher/rc6/rc6.h
index d629b0995..d629b0995 100644
--- a/modules/cipher/rc6/rc6.h
+++ b/src/cipher/rc6/rc6.h
diff --git a/modules/cipher/safer/modinfo.txt b/src/cipher/safer/modinfo.txt
index 973cbff19..973cbff19 100644
--- a/modules/cipher/safer/modinfo.txt
+++ b/src/cipher/safer/modinfo.txt
diff --git a/modules/cipher/safer/safe_tab.cpp b/src/cipher/safer/safe_tab.cpp
index 06de7fa49..06de7fa49 100644
--- a/modules/cipher/safer/safe_tab.cpp
+++ b/src/cipher/safer/safe_tab.cpp
diff --git a/modules/cipher/safer/safer_sk.cpp b/src/cipher/safer/safer_sk.cpp
index 639130714..639130714 100644
--- a/modules/cipher/safer/safer_sk.cpp
+++ b/src/cipher/safer/safer_sk.cpp
diff --git a/modules/cipher/safer/safer_sk.h b/src/cipher/safer/safer_sk.h
index 1bc65e2f7..1bc65e2f7 100644
--- a/modules/cipher/safer/safer_sk.h
+++ b/src/cipher/safer/safer_sk.h
diff --git a/modules/cipher/salsa20/modinfo.txt b/src/cipher/salsa20/modinfo.txt
index de1683643..de1683643 100644
--- a/modules/cipher/salsa20/modinfo.txt
+++ b/src/cipher/salsa20/modinfo.txt
diff --git a/modules/cipher/salsa20/salsa20.cpp b/src/cipher/salsa20/salsa20.cpp
index d11ba8799..d11ba8799 100644
--- a/modules/cipher/salsa20/salsa20.cpp
+++ b/src/cipher/salsa20/salsa20.cpp
diff --git a/modules/cipher/salsa20/salsa20.h b/src/cipher/salsa20/salsa20.h
index e107d8569..e107d8569 100644
--- a/modules/cipher/salsa20/salsa20.h
+++ b/src/cipher/salsa20/salsa20.h
diff --git a/modules/cipher/seed/modinfo.txt b/src/cipher/seed/modinfo.txt
index d04979335..d04979335 100644
--- a/modules/cipher/seed/modinfo.txt
+++ b/src/cipher/seed/modinfo.txt
diff --git a/modules/cipher/seed/seed.cpp b/src/cipher/seed/seed.cpp
index ecb6a86fa..ecb6a86fa 100644
--- a/modules/cipher/seed/seed.cpp
+++ b/src/cipher/seed/seed.cpp
diff --git a/modules/cipher/seed/seed.h b/src/cipher/seed/seed.h
index 95ddbe1d5..95ddbe1d5 100644
--- a/modules/cipher/seed/seed.h
+++ b/src/cipher/seed/seed.h
diff --git a/modules/cipher/seed/seed_tab.cpp b/src/cipher/seed/seed_tab.cpp
index 5880f0489..5880f0489 100644
--- a/modules/cipher/seed/seed_tab.cpp
+++ b/src/cipher/seed/seed_tab.cpp
diff --git a/modules/cipher/serpent/modinfo.txt b/src/cipher/serpent/modinfo.txt
index baaccbf01..baaccbf01 100644
--- a/modules/cipher/serpent/modinfo.txt
+++ b/src/cipher/serpent/modinfo.txt
diff --git a/modules/cipher/serpent/serpent.cpp b/src/cipher/serpent/serpent.cpp
index 997daa8b1..997daa8b1 100644
--- a/modules/cipher/serpent/serpent.cpp
+++ b/src/cipher/serpent/serpent.cpp
diff --git a/modules/cipher/serpent/serpent.h b/src/cipher/serpent/serpent.h
index 685470e4c..685470e4c 100644
--- a/modules/cipher/serpent/serpent.h
+++ b/src/cipher/serpent/serpent.h
diff --git a/modules/cipher/skipjack/modinfo.txt b/src/cipher/skipjack/modinfo.txt
index 4b38d6d28..4b38d6d28 100644
--- a/modules/cipher/skipjack/modinfo.txt
+++ b/src/cipher/skipjack/modinfo.txt
diff --git a/modules/cipher/skipjack/skipjack.cpp b/src/cipher/skipjack/skipjack.cpp
index 3cad75436..3cad75436 100644
--- a/modules/cipher/skipjack/skipjack.cpp
+++ b/src/cipher/skipjack/skipjack.cpp
diff --git a/modules/cipher/skipjack/skipjack.h b/src/cipher/skipjack/skipjack.h
index 240148f19..240148f19 100644
--- a/modules/cipher/skipjack/skipjack.h
+++ b/src/cipher/skipjack/skipjack.h
diff --git a/modules/cipher/square/modinfo.txt b/src/cipher/square/modinfo.txt
index a20697923..a20697923 100644
--- a/modules/cipher/square/modinfo.txt
+++ b/src/cipher/square/modinfo.txt
diff --git a/modules/cipher/square/sqr_tab.cpp b/src/cipher/square/sqr_tab.cpp
index 248ace4cd..248ace4cd 100644
--- a/modules/cipher/square/sqr_tab.cpp
+++ b/src/cipher/square/sqr_tab.cpp
diff --git a/modules/cipher/square/square.cpp b/src/cipher/square/square.cpp
index f2b15499b..f2b15499b 100644
--- a/modules/cipher/square/square.cpp
+++ b/src/cipher/square/square.cpp
diff --git a/modules/cipher/square/square.h b/src/cipher/square/square.h
index efbc6e730..efbc6e730 100644
--- a/modules/cipher/square/square.h
+++ b/src/cipher/square/square.h
diff --git a/modules/cipher/tea/modinfo.txt b/src/cipher/tea/modinfo.txt
index 6a0e76b15..6a0e76b15 100644
--- a/modules/cipher/tea/modinfo.txt
+++ b/src/cipher/tea/modinfo.txt
diff --git a/modules/cipher/tea/tea.cpp b/src/cipher/tea/tea.cpp
index c5bd1b1fa..c5bd1b1fa 100644
--- a/modules/cipher/tea/tea.cpp
+++ b/src/cipher/tea/tea.cpp
diff --git a/modules/cipher/tea/tea.h b/src/cipher/tea/tea.h
index 2fc9fe838..2fc9fe838 100644
--- a/modules/cipher/tea/tea.h
+++ b/src/cipher/tea/tea.h
diff --git a/modules/cipher/turing/modinfo.txt b/src/cipher/turing/modinfo.txt
index 95ae2cf48..95ae2cf48 100644
--- a/modules/cipher/turing/modinfo.txt
+++ b/src/cipher/turing/modinfo.txt
diff --git a/modules/cipher/turing/tur_tab.cpp b/src/cipher/turing/tur_tab.cpp
index 08793f59d..08793f59d 100644
--- a/modules/cipher/turing/tur_tab.cpp
+++ b/src/cipher/turing/tur_tab.cpp
diff --git a/modules/cipher/turing/turing.cpp b/src/cipher/turing/turing.cpp
index 017b5cf1d..017b5cf1d 100644
--- a/modules/cipher/turing/turing.cpp
+++ b/src/cipher/turing/turing.cpp
diff --git a/modules/cipher/turing/turing.h b/src/cipher/turing/turing.h
index 14b2e6fd6..14b2e6fd6 100644
--- a/modules/cipher/turing/turing.h
+++ b/src/cipher/turing/turing.h
diff --git a/modules/cipher/twofish/modinfo.txt b/src/cipher/twofish/modinfo.txt
index 35639d858..35639d858 100644
--- a/modules/cipher/twofish/modinfo.txt
+++ b/src/cipher/twofish/modinfo.txt
diff --git a/modules/cipher/twofish/two_tab.cpp b/src/cipher/twofish/two_tab.cpp
index 7d349312b..7d349312b 100644
--- a/modules/cipher/twofish/two_tab.cpp
+++ b/src/cipher/twofish/two_tab.cpp
diff --git a/modules/cipher/twofish/twofish.cpp b/src/cipher/twofish/twofish.cpp
index b2357e347..b2357e347 100644
--- a/modules/cipher/twofish/twofish.cpp
+++ b/src/cipher/twofish/twofish.cpp
diff --git a/modules/cipher/twofish/twofish.h b/src/cipher/twofish/twofish.h
index 8519a9aa8..8519a9aa8 100644
--- a/modules/cipher/twofish/twofish.h
+++ b/src/cipher/twofish/twofish.h
diff --git a/modules/cipher/wid_wake/modinfo.txt b/src/cipher/wid_wake/modinfo.txt
index 299ebfdd7..299ebfdd7 100644
--- a/modules/cipher/wid_wake/modinfo.txt
+++ b/src/cipher/wid_wake/modinfo.txt
diff --git a/modules/cipher/wid_wake/wid_wake.cpp b/src/cipher/wid_wake/wid_wake.cpp
index d7ebdece0..d7ebdece0 100644
--- a/modules/cipher/wid_wake/wid_wake.cpp
+++ b/src/cipher/wid_wake/wid_wake.cpp
diff --git a/modules/cipher/wid_wake/wid_wake.h b/src/cipher/wid_wake/wid_wake.h
index 09171a8f5..09171a8f5 100644
--- a/modules/cipher/wid_wake/wid_wake.h
+++ b/src/cipher/wid_wake/wid_wake.h
diff --git a/modules/cipher/xtea/modinfo.txt b/src/cipher/xtea/modinfo.txt
index 0120a3bce..0120a3bce 100644
--- a/modules/cipher/xtea/modinfo.txt
+++ b/src/cipher/xtea/modinfo.txt
diff --git a/modules/cipher/xtea/xtea.cpp b/src/cipher/xtea/xtea.cpp
index db5c7effc..db5c7effc 100644
--- a/modules/cipher/xtea/xtea.cpp
+++ b/src/cipher/xtea/xtea.cpp
diff --git a/modules/cipher/xtea/xtea.h b/src/cipher/xtea/xtea.h
index 193c13bb9..193c13bb9 100644
--- a/modules/cipher/xtea/xtea.h
+++ b/src/cipher/xtea/xtea.h
diff --git a/modules/compression/bzip2/bzip2.cpp b/src/compression/bzip2/bzip2.cpp
index 712dacd7d..712dacd7d 100644
--- a/modules/compression/bzip2/bzip2.cpp
+++ b/src/compression/bzip2/bzip2.cpp
diff --git a/modules/compression/bzip2/bzip2.h b/src/compression/bzip2/bzip2.h
index 1244924ca..1244924ca 100644
--- a/modules/compression/bzip2/bzip2.h
+++ b/src/compression/bzip2/bzip2.h
diff --git a/modules/compression/bzip2/modinfo.txt b/src/compression/bzip2/modinfo.txt
index efedc097f..efedc097f 100644
--- a/modules/compression/bzip2/modinfo.txt
+++ b/src/compression/bzip2/modinfo.txt
diff --git a/modules/compression/zlib/modinfo.txt b/src/compression/zlib/modinfo.txt
index c1f1f998c..c1f1f998c 100644
--- a/modules/compression/zlib/modinfo.txt
+++ b/src/compression/zlib/modinfo.txt
diff --git a/modules/compression/zlib/zlib.cpp b/src/compression/zlib/zlib.cpp
index 36a9640e3..36a9640e3 100644
--- a/modules/compression/zlib/zlib.cpp
+++ b/src/compression/zlib/zlib.cpp
diff --git a/modules/compression/zlib/zlib.h b/src/compression/zlib/zlib.h
index c3baea4ee..c3baea4ee 100644
--- a/modules/compression/zlib/zlib.h
+++ b/src/compression/zlib/zlib.h
diff --git a/modules/engine/gnump/eng_gmp.cpp b/src/engine/gnump/eng_gmp.cpp
index a0e18e059..a0e18e059 100644
--- a/modules/engine/gnump/eng_gmp.cpp
+++ b/src/engine/gnump/eng_gmp.cpp
diff --git a/modules/engine/gnump/eng_gmp.h b/src/engine/gnump/eng_gmp.h
index b8b2081fa..b8b2081fa 100644
--- a/modules/engine/gnump/eng_gmp.h
+++ b/src/engine/gnump/eng_gmp.h
diff --git a/modules/engine/gnump/gmp_mem.cpp b/src/engine/gnump/gmp_mem.cpp
index ea8ef4d3b..ea8ef4d3b 100644
--- a/modules/engine/gnump/gmp_mem.cpp
+++ b/src/engine/gnump/gmp_mem.cpp
diff --git a/modules/engine/gnump/gmp_powm.cpp b/src/engine/gnump/gmp_powm.cpp
index a5e3d1c0d..a5e3d1c0d 100644
--- a/modules/engine/gnump/gmp_powm.cpp
+++ b/src/engine/gnump/gmp_powm.cpp
diff --git a/modules/engine/gnump/gmp_wrap.cpp b/src/engine/gnump/gmp_wrap.cpp
index 4c73c2562..4c73c2562 100644
--- a/modules/engine/gnump/gmp_wrap.cpp
+++ b/src/engine/gnump/gmp_wrap.cpp
diff --git a/modules/engine/gnump/gmp_wrap.h b/src/engine/gnump/gmp_wrap.h
index 09a8590c4..09a8590c4 100644
--- a/modules/engine/gnump/gmp_wrap.h
+++ b/src/engine/gnump/gmp_wrap.h
diff --git a/modules/engine/gnump/modinfo.txt b/src/engine/gnump/modinfo.txt
index e65e411fd..e65e411fd 100644
--- a/modules/engine/gnump/modinfo.txt
+++ b/src/engine/gnump/modinfo.txt
diff --git a/modules/engine/openssl/bn_powm.cpp b/src/engine/openssl/bn_powm.cpp
index f54411240..f54411240 100644
--- a/modules/engine/openssl/bn_powm.cpp
+++ b/src/engine/openssl/bn_powm.cpp
diff --git a/modules/engine/openssl/bn_wrap.cpp b/src/engine/openssl/bn_wrap.cpp
index 4f7ea0078..4f7ea0078 100644
--- a/modules/engine/openssl/bn_wrap.cpp
+++ b/src/engine/openssl/bn_wrap.cpp
diff --git a/modules/engine/openssl/bn_wrap.h b/src/engine/openssl/bn_wrap.h
index a42967544..a42967544 100644
--- a/modules/engine/openssl/bn_wrap.h
+++ b/src/engine/openssl/bn_wrap.h
diff --git a/modules/engine/openssl/eng_ossl.cpp b/src/engine/openssl/eng_ossl.cpp
index 9421495c2..9421495c2 100644
--- a/modules/engine/openssl/eng_ossl.cpp
+++ b/src/engine/openssl/eng_ossl.cpp
diff --git a/modules/engine/openssl/eng_ossl.h b/src/engine/openssl/eng_ossl.h
index 40da748db..40da748db 100644
--- a/modules/engine/openssl/eng_ossl.h
+++ b/src/engine/openssl/eng_ossl.h
diff --git a/modules/engine/openssl/modinfo.txt b/src/engine/openssl/modinfo.txt
index 7892e8e90..7892e8e90 100644
--- a/modules/engine/openssl/modinfo.txt
+++ b/src/engine/openssl/modinfo.txt
diff --git a/modules/engine/openssl/ossl_bc.cpp b/src/engine/openssl/ossl_bc.cpp
index 407bb3cde..407bb3cde 100644
--- a/modules/engine/openssl/ossl_bc.cpp
+++ b/src/engine/openssl/ossl_bc.cpp
diff --git a/modules/engine/openssl/ossl_md.cpp b/src/engine/openssl/ossl_md.cpp
index 8e24c7213..8e24c7213 100644
--- a/modules/engine/openssl/ossl_md.cpp
+++ b/src/engine/openssl/ossl_md.cpp
diff --git a/modules/engine/openssl/ossl_rc4.cpp b/src/engine/openssl/ossl_rc4.cpp
index eb8e9ded8..eb8e9ded8 100644
--- a/modules/engine/openssl/ossl_rc4.cpp
+++ b/src/engine/openssl/ossl_rc4.cpp
diff --git a/modules/entropy/beos_stats/es_beos.cpp b/src/entropy/beos_stats/es_beos.cpp
index 80d5605d0..80d5605d0 100644
--- a/modules/entropy/beos_stats/es_beos.cpp
+++ b/src/entropy/beos_stats/es_beos.cpp
diff --git a/modules/entropy/beos_stats/es_beos.h b/src/entropy/beos_stats/es_beos.h
index 047939c8c..047939c8c 100644
--- a/modules/entropy/beos_stats/es_beos.h
+++ b/src/entropy/beos_stats/es_beos.h
diff --git a/modules/entropy/beos_stats/modinfo.txt b/src/entropy/beos_stats/modinfo.txt
index a7e62cfb3..a7e62cfb3 100644
--- a/modules/entropy/beos_stats/modinfo.txt
+++ b/src/entropy/beos_stats/modinfo.txt
diff --git a/modules/entropy/cryptoapi_rng/es_capi.cpp b/src/entropy/cryptoapi_rng/es_capi.cpp
index 7d1e0e753..7d1e0e753 100644
--- a/modules/entropy/cryptoapi_rng/es_capi.cpp
+++ b/src/entropy/cryptoapi_rng/es_capi.cpp
diff --git a/modules/entropy/cryptoapi_rng/es_capi.h b/src/entropy/cryptoapi_rng/es_capi.h
index 68e42cf9c..68e42cf9c 100644
--- a/modules/entropy/cryptoapi_rng/es_capi.h
+++ b/src/entropy/cryptoapi_rng/es_capi.h
diff --git a/modules/entropy/cryptoapi_rng/modinfo.txt b/src/entropy/cryptoapi_rng/modinfo.txt
index 40104664b..40104664b 100644
--- a/modules/entropy/cryptoapi_rng/modinfo.txt
+++ b/src/entropy/cryptoapi_rng/modinfo.txt
diff --git a/modules/entropy/dev_random/es_dev.cpp b/src/entropy/dev_random/es_dev.cpp
index 310620716..310620716 100644
--- a/modules/entropy/dev_random/es_dev.cpp
+++ b/src/entropy/dev_random/es_dev.cpp
diff --git a/modules/entropy/dev_random/es_dev.h b/src/entropy/dev_random/es_dev.h
index 21d28b9bb..21d28b9bb 100644
--- a/modules/entropy/dev_random/es_dev.h
+++ b/src/entropy/dev_random/es_dev.h
diff --git a/modules/entropy/dev_random/modinfo.txt b/src/entropy/dev_random/modinfo.txt
index 6622886af..6622886af 100644
--- a/modules/entropy/dev_random/modinfo.txt
+++ b/src/entropy/dev_random/modinfo.txt
diff --git a/modules/entropy/egd/es_egd.cpp b/src/entropy/egd/es_egd.cpp
index da4aaf847..da4aaf847 100644
--- a/modules/entropy/egd/es_egd.cpp
+++ b/src/entropy/egd/es_egd.cpp
diff --git a/modules/entropy/egd/es_egd.h b/src/entropy/egd/es_egd.h
index ce6ba9521..ce6ba9521 100644
--- a/modules/entropy/egd/es_egd.h
+++ b/src/entropy/egd/es_egd.h
diff --git a/modules/entropy/egd/modinfo.txt b/src/entropy/egd/modinfo.txt
index 6b34f395c..6b34f395c 100644
--- a/modules/entropy/egd/modinfo.txt
+++ b/src/entropy/egd/modinfo.txt
diff --git a/modules/entropy/proc_walk/es_ftw.cpp b/src/entropy/proc_walk/es_ftw.cpp
index ec11378f8..ec11378f8 100644
--- a/modules/entropy/proc_walk/es_ftw.cpp
+++ b/src/entropy/proc_walk/es_ftw.cpp
diff --git a/modules/entropy/proc_walk/es_ftw.h b/src/entropy/proc_walk/es_ftw.h
index a2229ff1f..a2229ff1f 100644
--- a/modules/entropy/proc_walk/es_ftw.h
+++ b/src/entropy/proc_walk/es_ftw.h
diff --git a/modules/entropy/proc_walk/modinfo.txt b/src/entropy/proc_walk/modinfo.txt
index d932523fd..d932523fd 100644
--- a/modules/entropy/proc_walk/modinfo.txt
+++ b/src/entropy/proc_walk/modinfo.txt
diff --git a/modules/entropy/unix_procs/es_unix.cpp b/src/entropy/unix_procs/es_unix.cpp
index c503c20ae..c503c20ae 100644
--- a/modules/entropy/unix_procs/es_unix.cpp
+++ b/src/entropy/unix_procs/es_unix.cpp
diff --git a/modules/entropy/unix_procs/es_unix.h b/src/entropy/unix_procs/es_unix.h
index d1b1d623e..d1b1d623e 100644
--- a/modules/entropy/unix_procs/es_unix.h
+++ b/src/entropy/unix_procs/es_unix.h
diff --git a/modules/entropy/unix_procs/modinfo.txt b/src/entropy/unix_procs/modinfo.txt
index f16e21289..f16e21289 100644
--- a/modules/entropy/unix_procs/modinfo.txt
+++ b/src/entropy/unix_procs/modinfo.txt
diff --git a/modules/entropy/unix_procs/unix_cmd.cpp b/src/entropy/unix_procs/unix_cmd.cpp
index 32829b91b..32829b91b 100644
--- a/modules/entropy/unix_procs/unix_cmd.cpp
+++ b/src/entropy/unix_procs/unix_cmd.cpp
diff --git a/modules/entropy/unix_procs/unix_cmd.h b/src/entropy/unix_procs/unix_cmd.h
index 090dd8fdd..090dd8fdd 100644
--- a/modules/entropy/unix_procs/unix_cmd.h
+++ b/src/entropy/unix_procs/unix_cmd.h
diff --git a/modules/entropy/unix_procs/unix_src.cpp b/src/entropy/unix_procs/unix_src.cpp
index 9d44dbf4f..9d44dbf4f 100644
--- a/modules/entropy/unix_procs/unix_src.cpp
+++ b/src/entropy/unix_procs/unix_src.cpp
diff --git a/modules/entropy/win32_stats/es_win32.cpp b/src/entropy/win32_stats/es_win32.cpp
index febed59c0..febed59c0 100644
--- a/modules/entropy/win32_stats/es_win32.cpp
+++ b/src/entropy/win32_stats/es_win32.cpp
diff --git a/modules/entropy/win32_stats/es_win32.h b/src/entropy/win32_stats/es_win32.h
index 02558b335..02558b335 100644
--- a/modules/entropy/win32_stats/es_win32.h
+++ b/src/entropy/win32_stats/es_win32.h
diff --git a/modules/entropy/win32_stats/modinfo.txt b/src/entropy/win32_stats/modinfo.txt
index 931760979..931760979 100644
--- a/modules/entropy/win32_stats/modinfo.txt
+++ b/src/entropy/win32_stats/modinfo.txt
diff --git a/modules/hash/fork256/fork256.cpp b/src/hash/fork256/fork256.cpp
index 5ac779cab..5ac779cab 100644
--- a/modules/hash/fork256/fork256.cpp
+++ b/src/hash/fork256/fork256.cpp
diff --git a/modules/hash/fork256/fork256.h b/src/hash/fork256/fork256.h
index 8ad9c1f8d..8ad9c1f8d 100644
--- a/modules/hash/fork256/fork256.h
+++ b/src/hash/fork256/fork256.h
diff --git a/modules/hash/fork256/modinfo.txt b/src/hash/fork256/modinfo.txt
index 677834b63..677834b63 100644
--- a/modules/hash/fork256/modinfo.txt
+++ b/src/hash/fork256/modinfo.txt
diff --git a/modules/hash/has160/has160.cpp b/src/hash/has160/has160.cpp
index 422e4916a..422e4916a 100644
--- a/modules/hash/has160/has160.cpp
+++ b/src/hash/has160/has160.cpp
diff --git a/modules/hash/has160/has160.h b/src/hash/has160/has160.h
index 9e35bfdca..9e35bfdca 100644
--- a/modules/hash/has160/has160.h
+++ b/src/hash/has160/has160.h
diff --git a/modules/hash/has160/modinfo.txt b/src/hash/has160/modinfo.txt
index 7574ba293..7574ba293 100644
--- a/modules/hash/has160/modinfo.txt
+++ b/src/hash/has160/modinfo.txt
diff --git a/modules/hash/md2/md2.cpp b/src/hash/md2/md2.cpp
index c609eda10..c609eda10 100644
--- a/modules/hash/md2/md2.cpp
+++ b/src/hash/md2/md2.cpp
diff --git a/modules/hash/md2/md2.h b/src/hash/md2/md2.h
index 2c53d1cf0..2c53d1cf0 100644
--- a/modules/hash/md2/md2.h
+++ b/src/hash/md2/md2.h
diff --git a/modules/hash/md2/modinfo.txt b/src/hash/md2/modinfo.txt
index ff33e1eb3..ff33e1eb3 100644
--- a/modules/hash/md2/modinfo.txt
+++ b/src/hash/md2/modinfo.txt
diff --git a/modules/hash/md4/md4.cpp b/src/hash/md4/md4.cpp
index e2a18f424..e2a18f424 100644
--- a/modules/hash/md4/md4.cpp
+++ b/src/hash/md4/md4.cpp
diff --git a/modules/hash/md4/md4.h b/src/hash/md4/md4.h
index 4bb5e3903..4bb5e3903 100644
--- a/modules/hash/md4/md4.h
+++ b/src/hash/md4/md4.h
diff --git a/modules/hash/md4/modinfo.txt b/src/hash/md4/modinfo.txt
index 6d32dbd90..6d32dbd90 100644
--- a/modules/hash/md4/modinfo.txt
+++ b/src/hash/md4/modinfo.txt
diff --git a/modules/hash/md5/md5.cpp b/src/hash/md5/md5.cpp
index 2fd75f0fb..2fd75f0fb 100644
--- a/modules/hash/md5/md5.cpp
+++ b/src/hash/md5/md5.cpp
diff --git a/modules/hash/md5/md5.h b/src/hash/md5/md5.h
index 9634c526d..9634c526d 100644
--- a/modules/hash/md5/md5.h
+++ b/src/hash/md5/md5.h
diff --git a/modules/hash/md5/modinfo.txt b/src/hash/md5/modinfo.txt
index fb17add4a..fb17add4a 100644
--- a/modules/hash/md5/modinfo.txt
+++ b/src/hash/md5/modinfo.txt
diff --git a/modules/hash/rmd128/modinfo.txt b/src/hash/rmd128/modinfo.txt
index 9be80268b..9be80268b 100644
--- a/modules/hash/rmd128/modinfo.txt
+++ b/src/hash/rmd128/modinfo.txt
diff --git a/modules/hash/rmd128/rmd128.cpp b/src/hash/rmd128/rmd128.cpp
index 4c33350b6..4c33350b6 100644
--- a/modules/hash/rmd128/rmd128.cpp
+++ b/src/hash/rmd128/rmd128.cpp
diff --git a/modules/hash/rmd128/rmd128.h b/src/hash/rmd128/rmd128.h
index 2cb98e516..2cb98e516 100644
--- a/modules/hash/rmd128/rmd128.h
+++ b/src/hash/rmd128/rmd128.h
diff --git a/modules/hash/rmd160/modinfo.txt b/src/hash/rmd160/modinfo.txt
index 11183b03e..11183b03e 100644
--- a/modules/hash/rmd160/modinfo.txt
+++ b/src/hash/rmd160/modinfo.txt
diff --git a/modules/hash/rmd160/rmd160.cpp b/src/hash/rmd160/rmd160.cpp
index 20c0ad4f1..20c0ad4f1 100644
--- a/modules/hash/rmd160/rmd160.cpp
+++ b/src/hash/rmd160/rmd160.cpp
diff --git a/modules/hash/rmd160/rmd160.h b/src/hash/rmd160/rmd160.h
index 0544f21cc..0544f21cc 100644
--- a/modules/hash/rmd160/rmd160.h
+++ b/src/hash/rmd160/rmd160.h
diff --git a/modules/hash/sha1/modinfo.txt b/src/hash/sha1/modinfo.txt
index 38cea256c..38cea256c 100644
--- a/modules/hash/sha1/modinfo.txt
+++ b/src/hash/sha1/modinfo.txt
diff --git a/modules/hash/sha1/sha160.cpp b/src/hash/sha1/sha160.cpp
index baafec1db..baafec1db 100644
--- a/modules/hash/sha1/sha160.cpp
+++ b/src/hash/sha1/sha160.cpp
diff --git a/modules/hash/sha1/sha160.h b/src/hash/sha1/sha160.h
index 022ab9514..022ab9514 100644
--- a/modules/hash/sha1/sha160.h
+++ b/src/hash/sha1/sha160.h
diff --git a/modules/hash/sha2/modinfo.txt b/src/hash/sha2/modinfo.txt
index c7dc29fac..c7dc29fac 100644
--- a/modules/hash/sha2/modinfo.txt
+++ b/src/hash/sha2/modinfo.txt
diff --git a/modules/hash/sha2/sha256.cpp b/src/hash/sha2/sha256.cpp
index 6031d177f..6031d177f 100644
--- a/modules/hash/sha2/sha256.cpp
+++ b/src/hash/sha2/sha256.cpp
diff --git a/modules/hash/sha2/sha256.h b/src/hash/sha2/sha256.h
index cdbe02822..cdbe02822 100644
--- a/modules/hash/sha2/sha256.h
+++ b/src/hash/sha2/sha256.h
diff --git a/modules/hash/sha2/sha_64.cpp b/src/hash/sha2/sha_64.cpp
index 7f4a28fec..7f4a28fec 100644
--- a/modules/hash/sha2/sha_64.cpp
+++ b/src/hash/sha2/sha_64.cpp
diff --git a/modules/hash/sha2/sha_64.h b/src/hash/sha2/sha_64.h
index e590d088d..e590d088d 100644
--- a/modules/hash/sha2/sha_64.h
+++ b/src/hash/sha2/sha_64.h
diff --git a/modules/hash/tiger/modinfo.txt b/src/hash/tiger/modinfo.txt
index e117d6701..e117d6701 100644
--- a/modules/hash/tiger/modinfo.txt
+++ b/src/hash/tiger/modinfo.txt
diff --git a/modules/hash/tiger/tig_tab.cpp b/src/hash/tiger/tig_tab.cpp
index 6d476f4b3..6d476f4b3 100644
--- a/modules/hash/tiger/tig_tab.cpp
+++ b/src/hash/tiger/tig_tab.cpp
diff --git a/modules/hash/tiger/tiger.cpp b/src/hash/tiger/tiger.cpp
index 78bba0521..78bba0521 100644
--- a/modules/hash/tiger/tiger.cpp
+++ b/src/hash/tiger/tiger.cpp
diff --git a/modules/hash/tiger/tiger.h b/src/hash/tiger/tiger.h
index 4c95fa784..4c95fa784 100644
--- a/modules/hash/tiger/tiger.h
+++ b/src/hash/tiger/tiger.h
diff --git a/modules/hash/whirlpool/modinfo.txt b/src/hash/whirlpool/modinfo.txt
index 9d069efee..9d069efee 100644
--- a/modules/hash/whirlpool/modinfo.txt
+++ b/src/hash/whirlpool/modinfo.txt
diff --git a/modules/hash/whirlpool/whrl_tab.cpp b/src/hash/whirlpool/whrl_tab.cpp
index bd616ca27..bd616ca27 100644
--- a/modules/hash/whirlpool/whrl_tab.cpp
+++ b/src/hash/whirlpool/whrl_tab.cpp
diff --git a/modules/hash/whirlpool/whrlpool.cpp b/src/hash/whirlpool/whrlpool.cpp
index 9319a8b2a..9319a8b2a 100644
--- a/modules/hash/whirlpool/whrlpool.cpp
+++ b/src/hash/whirlpool/whrlpool.cpp
diff --git a/modules/hash/whirlpool/whrlpool.h b/src/hash/whirlpool/whrlpool.h
index 22f747520..22f747520 100644
--- a/modules/hash/whirlpool/whrlpool.h
+++ b/src/hash/whirlpool/whrlpool.h
diff --git a/modules/io/fd_unix/fd_unix.cpp b/src/io/fd_unix/fd_unix.cpp
index ac88ac391..ac88ac391 100644
--- a/modules/io/fd_unix/fd_unix.cpp
+++ b/src/io/fd_unix/fd_unix.cpp
diff --git a/modules/io/fd_unix/fd_unix.h b/src/io/fd_unix/fd_unix.h
index cbe93dfe0..cbe93dfe0 100644
--- a/modules/io/fd_unix/fd_unix.h
+++ b/src/io/fd_unix/fd_unix.h
diff --git a/modules/io/fd_unix/modinfo.txt b/src/io/fd_unix/modinfo.txt
index e1f30ea28..e1f30ea28 100644
--- a/modules/io/fd_unix/modinfo.txt
+++ b/src/io/fd_unix/modinfo.txt
diff --git a/modules/kdf/kdf1/kdf1.cpp b/src/kdf/kdf1/kdf1.cpp
index aac32db80..aac32db80 100644
--- a/modules/kdf/kdf1/kdf1.cpp
+++ b/src/kdf/kdf1/kdf1.cpp
diff --git a/modules/kdf/kdf1/kdf1.h b/src/kdf/kdf1/kdf1.h
index ebc1979fc..ebc1979fc 100644
--- a/modules/kdf/kdf1/kdf1.h
+++ b/src/kdf/kdf1/kdf1.h
diff --git a/modules/kdf/kdf1/modinfo.txt b/src/kdf/kdf1/modinfo.txt
index 802df67d0..802df67d0 100644
--- a/modules/kdf/kdf1/modinfo.txt
+++ b/src/kdf/kdf1/modinfo.txt
diff --git a/modules/kdf/kdf2/kdf2.cpp b/src/kdf/kdf2/kdf2.cpp
index fa975ccb9..fa975ccb9 100644
--- a/modules/kdf/kdf2/kdf2.cpp
+++ b/src/kdf/kdf2/kdf2.cpp
diff --git a/modules/kdf/kdf2/kdf2.h b/src/kdf/kdf2/kdf2.h
index 003f0fc45..003f0fc45 100644
--- a/modules/kdf/kdf2/kdf2.h
+++ b/src/kdf/kdf2/kdf2.h
diff --git a/modules/kdf/kdf2/modinfo.txt b/src/kdf/kdf2/modinfo.txt
index 7fceffb18..7fceffb18 100644
--- a/modules/kdf/kdf2/modinfo.txt
+++ b/src/kdf/kdf2/modinfo.txt
diff --git a/modules/kdf/pbkdf1/modinfo.txt b/src/kdf/pbkdf1/modinfo.txt
index 3c1ae802c..3c1ae802c 100644
--- a/modules/kdf/pbkdf1/modinfo.txt
+++ b/src/kdf/pbkdf1/modinfo.txt
diff --git a/modules/kdf/pbkdf1/pbkdf1.cpp b/src/kdf/pbkdf1/pbkdf1.cpp
index 70cff9eee..70cff9eee 100644
--- a/modules/kdf/pbkdf1/pbkdf1.cpp
+++ b/src/kdf/pbkdf1/pbkdf1.cpp
diff --git a/modules/kdf/pbkdf1/pbkdf1.h b/src/kdf/pbkdf1/pbkdf1.h
index 3608bb470..3608bb470 100644
--- a/modules/kdf/pbkdf1/pbkdf1.h
+++ b/src/kdf/pbkdf1/pbkdf1.h
diff --git a/modules/kdf/pbkdf2/modinfo.txt b/src/kdf/pbkdf2/modinfo.txt
index e51a331c6..e51a331c6 100644
--- a/modules/kdf/pbkdf2/modinfo.txt
+++ b/src/kdf/pbkdf2/modinfo.txt
diff --git a/modules/kdf/pbkdf2/pbkdf2.cpp b/src/kdf/pbkdf2/pbkdf2.cpp
index 09d51d2a6..09d51d2a6 100644
--- a/modules/kdf/pbkdf2/pbkdf2.cpp
+++ b/src/kdf/pbkdf2/pbkdf2.cpp
diff --git a/modules/kdf/pbkdf2/pbkdf2.h b/src/kdf/pbkdf2/pbkdf2.h
index dc6e41b9e..dc6e41b9e 100644
--- a/modules/kdf/pbkdf2/pbkdf2.h
+++ b/src/kdf/pbkdf2/pbkdf2.h
diff --git a/modules/kdf/pgps2k/modinfo.txt b/src/kdf/pgps2k/modinfo.txt
index a3d5a146f..a3d5a146f 100644
--- a/modules/kdf/pgps2k/modinfo.txt
+++ b/src/kdf/pgps2k/modinfo.txt
diff --git a/modules/kdf/pgps2k/pgp_s2k.cpp b/src/kdf/pgps2k/pgp_s2k.cpp
index 66a243e45..66a243e45 100644
--- a/modules/kdf/pgps2k/pgp_s2k.cpp
+++ b/src/kdf/pgps2k/pgp_s2k.cpp
diff --git a/modules/kdf/pgps2k/pgp_s2k.h b/src/kdf/pgps2k/pgp_s2k.h
index cd263a735..cd263a735 100644
--- a/modules/kdf/pgps2k/pgp_s2k.h
+++ b/src/kdf/pgps2k/pgp_s2k.h
diff --git a/modules/kdf/sslv3/modinfo.txt b/src/kdf/sslv3/modinfo.txt
index c41b59b12..c41b59b12 100644
--- a/modules/kdf/sslv3/modinfo.txt
+++ b/src/kdf/sslv3/modinfo.txt
diff --git a/modules/kdf/sslv3/prf_ssl3.cpp b/src/kdf/sslv3/prf_ssl3.cpp
index b241bf60f..b241bf60f 100644
--- a/modules/kdf/sslv3/prf_ssl3.cpp
+++ b/src/kdf/sslv3/prf_ssl3.cpp
diff --git a/modules/kdf/sslv3/prf_ssl3.h b/src/kdf/sslv3/prf_ssl3.h
index 951ccfe92..951ccfe92 100644
--- a/modules/kdf/sslv3/prf_ssl3.h
+++ b/src/kdf/sslv3/prf_ssl3.h
diff --git a/modules/kdf/tlsv1/modinfo.txt b/src/kdf/tlsv1/modinfo.txt
index 9f05f8729..9f05f8729 100644
--- a/modules/kdf/tlsv1/modinfo.txt
+++ b/src/kdf/tlsv1/modinfo.txt
diff --git a/modules/kdf/tlsv1/prf_tls.cpp b/src/kdf/tlsv1/prf_tls.cpp
index e035ac85e..e035ac85e 100644
--- a/modules/kdf/tlsv1/prf_tls.cpp
+++ b/src/kdf/tlsv1/prf_tls.cpp
diff --git a/modules/kdf/tlsv1/prf_tls.h b/src/kdf/tlsv1/prf_tls.h
index ebd0815ca..ebd0815ca 100644
--- a/modules/kdf/tlsv1/prf_tls.h
+++ b/src/kdf/tlsv1/prf_tls.h
diff --git a/modules/kdf/x942/modinfo.txt b/src/kdf/x942/modinfo.txt
index 32057fe94..32057fe94 100644
--- a/modules/kdf/x942/modinfo.txt
+++ b/src/kdf/x942/modinfo.txt
diff --git a/modules/kdf/x942/prf_x942.cpp b/src/kdf/x942/prf_x942.cpp
index 3a7298771..3a7298771 100644
--- a/modules/kdf/x942/prf_x942.cpp
+++ b/src/kdf/x942/prf_x942.cpp
diff --git a/modules/kdf/x942/prf_x942.h b/src/kdf/x942/prf_x942.h
index 9b78d1f86..9b78d1f86 100644
--- a/modules/kdf/x942/prf_x942.h
+++ b/src/kdf/x942/prf_x942.h
diff --git a/modules/mac/cbc_mac/cbc_mac.cpp b/src/mac/cbc_mac/cbc_mac.cpp
index d5275b0ed..d5275b0ed 100644
--- a/modules/mac/cbc_mac/cbc_mac.cpp
+++ b/src/mac/cbc_mac/cbc_mac.cpp
diff --git a/modules/mac/cbc_mac/cbc_mac.h b/src/mac/cbc_mac/cbc_mac.h
index a5646d07a..a5646d07a 100644
--- a/modules/mac/cbc_mac/cbc_mac.h
+++ b/src/mac/cbc_mac/cbc_mac.h
diff --git a/modules/mac/cbc_mac/modinfo.txt b/src/mac/cbc_mac/modinfo.txt
index 3a7a6e781..3a7a6e781 100644
--- a/modules/mac/cbc_mac/modinfo.txt
+++ b/src/mac/cbc_mac/modinfo.txt
diff --git a/modules/mac/cmac/cmac.cpp b/src/mac/cmac/cmac.cpp
index 5a99f93b1..5a99f93b1 100644
--- a/modules/mac/cmac/cmac.cpp
+++ b/src/mac/cmac/cmac.cpp
diff --git a/modules/mac/cmac/cmac.h b/src/mac/cmac/cmac.h
index c7f107258..c7f107258 100644
--- a/modules/mac/cmac/cmac.h
+++ b/src/mac/cmac/cmac.h
diff --git a/modules/mac/cmac/modinfo.txt b/src/mac/cmac/modinfo.txt
index 5188af0c0..5188af0c0 100644
--- a/modules/mac/cmac/modinfo.txt
+++ b/src/mac/cmac/modinfo.txt
diff --git a/modules/mac/hmac/hmac.cpp b/src/mac/hmac/hmac.cpp
index b8c76e8f6..b8c76e8f6 100644
--- a/modules/mac/hmac/hmac.cpp
+++ b/src/mac/hmac/hmac.cpp
diff --git a/modules/mac/hmac/hmac.h b/src/mac/hmac/hmac.h
index 62529cf13..62529cf13 100644
--- a/modules/mac/hmac/hmac.h
+++ b/src/mac/hmac/hmac.h
diff --git a/modules/mac/hmac/modinfo.txt b/src/mac/hmac/modinfo.txt
index 534d2e036..534d2e036 100644
--- a/modules/mac/hmac/modinfo.txt
+++ b/src/mac/hmac/modinfo.txt
diff --git a/modules/mac/ssl3mac/modinfo.txt b/src/mac/ssl3mac/modinfo.txt
index d7a86e571..d7a86e571 100644
--- a/modules/mac/ssl3mac/modinfo.txt
+++ b/src/mac/ssl3mac/modinfo.txt
diff --git a/modules/mac/ssl3mac/ssl3_mac.cpp b/src/mac/ssl3mac/ssl3_mac.cpp
index ceb04bf44..ceb04bf44 100644
--- a/modules/mac/ssl3mac/ssl3_mac.cpp
+++ b/src/mac/ssl3mac/ssl3_mac.cpp
diff --git a/modules/mac/ssl3mac/ssl3_mac.h b/src/mac/ssl3mac/ssl3_mac.h
index 8ab08c97d..8ab08c97d 100644
--- a/modules/mac/ssl3mac/ssl3_mac.h
+++ b/src/mac/ssl3mac/ssl3_mac.h
diff --git a/modules/mac/x919_mac/modinfo.txt b/src/mac/x919_mac/modinfo.txt
index 24c78b1c6..24c78b1c6 100644
--- a/modules/mac/x919_mac/modinfo.txt
+++ b/src/mac/x919_mac/modinfo.txt
diff --git a/modules/mac/x919_mac/x919_mac.cpp b/src/mac/x919_mac/x919_mac.cpp
index 92ec7b7b8..92ec7b7b8 100644
--- a/modules/mac/x919_mac/x919_mac.cpp
+++ b/src/mac/x919_mac/x919_mac.cpp
diff --git a/modules/mac/x919_mac/x919_mac.h b/src/mac/x919_mac/x919_mac.h
index bedb2cf58..bedb2cf58 100644
--- a/modules/mac/x919_mac/x919_mac.h
+++ b/src/mac/x919_mac/x919_mac.h
diff --git a/modules/modes/cbc/cbc.cpp b/src/modes/cbc/cbc.cpp
index 9ad598bed..9ad598bed 100644
--- a/modules/modes/cbc/cbc.cpp
+++ b/src/modes/cbc/cbc.cpp
diff --git a/modules/modes/cbc/cbc.h b/src/modes/cbc/cbc.h
index a0a30f90f..a0a30f90f 100644
--- a/modules/modes/cbc/cbc.h
+++ b/src/modes/cbc/cbc.h
diff --git a/modules/modes/cbc/modinfo.txt b/src/modes/cbc/modinfo.txt
index 4ebc7730a..4ebc7730a 100644
--- a/modules/modes/cbc/modinfo.txt
+++ b/src/modes/cbc/modinfo.txt
diff --git a/modules/modes/cfb/cfb.cpp b/src/modes/cfb/cfb.cpp
index dbfbff6ae..dbfbff6ae 100644
--- a/modules/modes/cfb/cfb.cpp
+++ b/src/modes/cfb/cfb.cpp
diff --git a/modules/modes/cfb/cfb.h b/src/modes/cfb/cfb.h
index e8133bcf4..e8133bcf4 100644
--- a/modules/modes/cfb/cfb.h
+++ b/src/modes/cfb/cfb.h
diff --git a/modules/modes/cfb/modinfo.txt b/src/modes/cfb/modinfo.txt
index edce3a7e3..edce3a7e3 100644
--- a/modules/modes/cfb/modinfo.txt
+++ b/src/modes/cfb/modinfo.txt
diff --git a/modules/modes/ctr/ctr.cpp b/src/modes/ctr/ctr.cpp
index 8b8c5f35f..8b8c5f35f 100644
--- a/modules/modes/ctr/ctr.cpp
+++ b/src/modes/ctr/ctr.cpp
diff --git a/modules/modes/ctr/ctr.h b/src/modes/ctr/ctr.h
index c3217a5d1..c3217a5d1 100644
--- a/modules/modes/ctr/ctr.h
+++ b/src/modes/ctr/ctr.h
diff --git a/modules/modes/ctr/modinfo.txt b/src/modes/ctr/modinfo.txt
index 912b80f51..912b80f51 100644
--- a/modules/modes/ctr/modinfo.txt
+++ b/src/modes/ctr/modinfo.txt
diff --git a/modules/modes/cts/cts.cpp b/src/modes/cts/cts.cpp
index 8af775713..8af775713 100644
--- a/modules/modes/cts/cts.cpp
+++ b/src/modes/cts/cts.cpp
diff --git a/modules/modes/cts/cts.h b/src/modes/cts/cts.h
index 6a07c4eb2..6a07c4eb2 100644
--- a/modules/modes/cts/cts.h
+++ b/src/modes/cts/cts.h
diff --git a/modules/modes/cts/modinfo.txt b/src/modes/cts/modinfo.txt
index 9f36221b4..9f36221b4 100644
--- a/modules/modes/cts/modinfo.txt
+++ b/src/modes/cts/modinfo.txt
diff --git a/modules/modes/eax/eax.cpp b/src/modes/eax/eax.cpp
index f246a9dea..f246a9dea 100644
--- a/modules/modes/eax/eax.cpp
+++ b/src/modes/eax/eax.cpp
diff --git a/modules/modes/eax/eax.h b/src/modes/eax/eax.h
index 676e5334e..676e5334e 100644
--- a/modules/modes/eax/eax.h
+++ b/src/modes/eax/eax.h
diff --git a/modules/modes/eax/eax_dec.cpp b/src/modes/eax/eax_dec.cpp
index 70cdd9863..70cdd9863 100644
--- a/modules/modes/eax/eax_dec.cpp
+++ b/src/modes/eax/eax_dec.cpp
diff --git a/modules/modes/eax/modinfo.txt b/src/modes/eax/modinfo.txt
index 7d5f7e98c..7d5f7e98c 100644
--- a/modules/modes/eax/modinfo.txt
+++ b/src/modes/eax/modinfo.txt
diff --git a/modules/modes/ecb/ecb.cpp b/src/modes/ecb/ecb.cpp
index 8effac1d5..8effac1d5 100644
--- a/modules/modes/ecb/ecb.cpp
+++ b/src/modes/ecb/ecb.cpp
diff --git a/modules/modes/ecb/ecb.h b/src/modes/ecb/ecb.h
index b730a4fd4..b730a4fd4 100644
--- a/modules/modes/ecb/ecb.h
+++ b/src/modes/ecb/ecb.h
diff --git a/modules/modes/ecb/modinfo.txt b/src/modes/ecb/modinfo.txt
index fb0c8b7c6..fb0c8b7c6 100644
--- a/modules/modes/ecb/modinfo.txt
+++ b/src/modes/ecb/modinfo.txt
diff --git a/modules/modes/ofb/modinfo.txt b/src/modes/ofb/modinfo.txt
index 38a15d0b6..38a15d0b6 100644
--- a/modules/modes/ofb/modinfo.txt
+++ b/src/modes/ofb/modinfo.txt
diff --git a/modules/modes/ofb/ofb.cpp b/src/modes/ofb/ofb.cpp
index db254d329..db254d329 100644
--- a/modules/modes/ofb/ofb.cpp
+++ b/src/modes/ofb/ofb.cpp
diff --git a/modules/modes/ofb/ofb.h b/src/modes/ofb/ofb.h
index 3bf6f9883..3bf6f9883 100644
--- a/modules/modes/ofb/ofb.h
+++ b/src/modes/ofb/ofb.h
diff --git a/modules/mutex/pthreads/modinfo.txt b/src/mutex/pthreads/modinfo.txt
index 88de70de0..88de70de0 100644
--- a/modules/mutex/pthreads/modinfo.txt
+++ b/src/mutex/pthreads/modinfo.txt
diff --git a/modules/mutex/pthreads/mux_pthr.cpp b/src/mutex/pthreads/mux_pthr.cpp
index d003fa298..d003fa298 100644
--- a/modules/mutex/pthreads/mux_pthr.cpp
+++ b/src/mutex/pthreads/mux_pthr.cpp
diff --git a/modules/mutex/pthreads/mux_pthr.h b/src/mutex/pthreads/mux_pthr.h
index efdabfed4..efdabfed4 100644
--- a/modules/mutex/pthreads/mux_pthr.h
+++ b/src/mutex/pthreads/mux_pthr.h
diff --git a/modules/mutex/qt_mutex/modinfo.txt b/src/mutex/qt_mutex/modinfo.txt
index a21108c79..a21108c79 100644
--- a/modules/mutex/qt_mutex/modinfo.txt
+++ b/src/mutex/qt_mutex/modinfo.txt
diff --git a/modules/mutex/qt_mutex/mux_qt.cpp b/src/mutex/qt_mutex/mux_qt.cpp
index 421b771c7..421b771c7 100644
--- a/modules/mutex/qt_mutex/mux_qt.cpp
+++ b/src/mutex/qt_mutex/mux_qt.cpp
diff --git a/modules/mutex/qt_mutex/mux_qt.h b/src/mutex/qt_mutex/mux_qt.h
index fffdc78ae..fffdc78ae 100644
--- a/modules/mutex/qt_mutex/mux_qt.h
+++ b/src/mutex/qt_mutex/mux_qt.h
diff --git a/modules/mutex/win32_crit_section/modinfo.txt b/src/mutex/win32_crit_section/modinfo.txt
index d235ff73c..d235ff73c 100644
--- a/modules/mutex/win32_crit_section/modinfo.txt
+++ b/src/mutex/win32_crit_section/modinfo.txt
diff --git a/modules/mutex/win32_crit_section/mux_win32.cpp b/src/mutex/win32_crit_section/mux_win32.cpp
index 622a707fa..622a707fa 100644
--- a/modules/mutex/win32_crit_section/mux_win32.cpp
+++ b/src/mutex/win32_crit_section/mux_win32.cpp
diff --git a/modules/mutex/win32_crit_section/mux_win32.h b/src/mutex/win32_crit_section/mux_win32.h
index 20b245967..20b245967 100644
--- a/modules/mutex/win32_crit_section/mux_win32.h
+++ b/src/mutex/win32_crit_section/mux_win32.h
diff --git a/modules/pk/dlies/dlies.cpp b/src/pk/dlies/dlies.cpp
index 2a2f33925..2a2f33925 100644
--- a/modules/pk/dlies/dlies.cpp
+++ b/src/pk/dlies/dlies.cpp
diff --git a/modules/pk/dlies/dlies.h b/src/pk/dlies/dlies.h
index ef0f4d493..ef0f4d493 100644
--- a/modules/pk/dlies/dlies.h
+++ b/src/pk/dlies/dlies.h
diff --git a/modules/pk/dlies/modinfo.txt b/src/pk/dlies/modinfo.txt
index 995dbe8a2..995dbe8a2 100644
--- a/modules/pk/dlies/modinfo.txt
+++ b/src/pk/dlies/modinfo.txt
diff --git a/modules/pk_pad/eme1/eme1.cpp b/src/pk_pad/eme1/eme1.cpp
index 2ca10c166..2ca10c166 100644
--- a/modules/pk_pad/eme1/eme1.cpp
+++ b/src/pk_pad/eme1/eme1.cpp
diff --git a/modules/pk_pad/eme1/eme1.h b/src/pk_pad/eme1/eme1.h
index 2a0ac92c4..2a0ac92c4 100644
--- a/modules/pk_pad/eme1/eme1.h
+++ b/src/pk_pad/eme1/eme1.h
diff --git a/modules/pk_pad/eme1/modinfo.txt b/src/pk_pad/eme1/modinfo.txt
index 5383d59b6..5383d59b6 100644
--- a/modules/pk_pad/eme1/modinfo.txt
+++ b/src/pk_pad/eme1/modinfo.txt
diff --git a/modules/pk_pad/eme_pkcs/eme_pkcs.cpp b/src/pk_pad/eme_pkcs/eme_pkcs.cpp
index 494f238b4..494f238b4 100644
--- a/modules/pk_pad/eme_pkcs/eme_pkcs.cpp
+++ b/src/pk_pad/eme_pkcs/eme_pkcs.cpp
diff --git a/modules/pk_pad/eme_pkcs/eme_pkcs.h b/src/pk_pad/eme_pkcs/eme_pkcs.h
index 9ec500c54..9ec500c54 100644
--- a/modules/pk_pad/eme_pkcs/eme_pkcs.h
+++ b/src/pk_pad/eme_pkcs/eme_pkcs.h
diff --git a/modules/pk_pad/eme_pkcs/modinfo.txt b/src/pk_pad/eme_pkcs/modinfo.txt
index 88d9caf17..88d9caf17 100644
--- a/modules/pk_pad/eme_pkcs/modinfo.txt
+++ b/src/pk_pad/eme_pkcs/modinfo.txt
diff --git a/modules/pk_pad/emsa1/emsa1.cpp b/src/pk_pad/emsa1/emsa1.cpp
index 15d53f6e5..15d53f6e5 100644
--- a/modules/pk_pad/emsa1/emsa1.cpp
+++ b/src/pk_pad/emsa1/emsa1.cpp
diff --git a/modules/pk_pad/emsa1/emsa1.h b/src/pk_pad/emsa1/emsa1.h
index f8d7ac043..f8d7ac043 100644
--- a/modules/pk_pad/emsa1/emsa1.h
+++ b/src/pk_pad/emsa1/emsa1.h
diff --git a/modules/pk_pad/emsa1/modinfo.txt b/src/pk_pad/emsa1/modinfo.txt
index 4040dd580..4040dd580 100644
--- a/modules/pk_pad/emsa1/modinfo.txt
+++ b/src/pk_pad/emsa1/modinfo.txt
diff --git a/modules/pk_pad/emsa2/emsa2.cpp b/src/pk_pad/emsa2/emsa2.cpp
index 24292d390..24292d390 100644
--- a/modules/pk_pad/emsa2/emsa2.cpp
+++ b/src/pk_pad/emsa2/emsa2.cpp
diff --git a/modules/pk_pad/emsa2/emsa2.h b/src/pk_pad/emsa2/emsa2.h
index 5db9593f8..5db9593f8 100644
--- a/modules/pk_pad/emsa2/emsa2.h
+++ b/src/pk_pad/emsa2/emsa2.h
diff --git a/modules/pk_pad/emsa2/modinfo.txt b/src/pk_pad/emsa2/modinfo.txt
index 8d14da548..8d14da548 100644
--- a/modules/pk_pad/emsa2/modinfo.txt
+++ b/src/pk_pad/emsa2/modinfo.txt
diff --git a/modules/pk_pad/emsa3/emsa3.cpp b/src/pk_pad/emsa3/emsa3.cpp
index 60880d1aa..60880d1aa 100644
--- a/modules/pk_pad/emsa3/emsa3.cpp
+++ b/src/pk_pad/emsa3/emsa3.cpp
diff --git a/modules/pk_pad/emsa3/emsa3.h b/src/pk_pad/emsa3/emsa3.h
index fa8521216..fa8521216 100644
--- a/modules/pk_pad/emsa3/emsa3.h
+++ b/src/pk_pad/emsa3/emsa3.h
diff --git a/modules/pk_pad/emsa3/modinfo.txt b/src/pk_pad/emsa3/modinfo.txt
index 926f9a4e8..926f9a4e8 100644
--- a/modules/pk_pad/emsa3/modinfo.txt
+++ b/src/pk_pad/emsa3/modinfo.txt
diff --git a/modules/pk_pad/emsa4/emsa4.cpp b/src/pk_pad/emsa4/emsa4.cpp
index 9821c1f13..9821c1f13 100644
--- a/modules/pk_pad/emsa4/emsa4.cpp
+++ b/src/pk_pad/emsa4/emsa4.cpp
diff --git a/modules/pk_pad/emsa4/emsa4.h b/src/pk_pad/emsa4/emsa4.h
index f4d4a4b6d..f4d4a4b6d 100644
--- a/modules/pk_pad/emsa4/emsa4.h
+++ b/src/pk_pad/emsa4/emsa4.h
diff --git a/modules/pk_pad/emsa4/modinfo.txt b/src/pk_pad/emsa4/modinfo.txt
index 39a34c619..39a34c619 100644
--- a/modules/pk_pad/emsa4/modinfo.txt
+++ b/src/pk_pad/emsa4/modinfo.txt
diff --git a/modules/pk_pad/emsa_raw/emsa_raw.cpp b/src/pk_pad/emsa_raw/emsa_raw.cpp
index c10bb4890..c10bb4890 100644
--- a/modules/pk_pad/emsa_raw/emsa_raw.cpp
+++ b/src/pk_pad/emsa_raw/emsa_raw.cpp
diff --git a/modules/pk_pad/emsa_raw/emsa_raw.h b/src/pk_pad/emsa_raw/emsa_raw.h
index a9e21d0e0..a9e21d0e0 100644
--- a/modules/pk_pad/emsa_raw/emsa_raw.h
+++ b/src/pk_pad/emsa_raw/emsa_raw.h
diff --git a/modules/pk_pad/emsa_raw/modinfo.txt b/src/pk_pad/emsa_raw/modinfo.txt
index 2a88d10fa..2a88d10fa 100644
--- a/modules/pk_pad/emsa_raw/modinfo.txt
+++ b/src/pk_pad/emsa_raw/modinfo.txt
diff --git a/modules/rng/randpool/modinfo.txt b/src/rng/randpool/modinfo.txt
index 1b2f79b56..1b2f79b56 100644
--- a/modules/rng/randpool/modinfo.txt
+++ b/src/rng/randpool/modinfo.txt
diff --git a/modules/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index 69ef3b9e7..69ef3b9e7 100644
--- a/modules/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
diff --git a/modules/rng/randpool/randpool.h b/src/rng/randpool/randpool.h
index b68dec765..b68dec765 100644
--- a/modules/rng/randpool/randpool.h
+++ b/src/rng/randpool/randpool.h
diff --git a/modules/rng/x931_rng/modinfo.txt b/src/rng/x931_rng/modinfo.txt
index 79e436822..79e436822 100644
--- a/modules/rng/x931_rng/modinfo.txt
+++ b/src/rng/x931_rng/modinfo.txt
diff --git a/modules/rng/x931_rng/x931_rng.cpp b/src/rng/x931_rng/x931_rng.cpp
index f4b0f71a9..f4b0f71a9 100644
--- a/modules/rng/x931_rng/x931_rng.cpp
+++ b/src/rng/x931_rng/x931_rng.cpp
diff --git a/modules/rng/x931_rng/x931_rng.h b/src/rng/x931_rng/x931_rng.h
index 7914b605d..7914b605d 100644
--- a/modules/rng/x931_rng/x931_rng.h
+++ b/src/rng/x931_rng/x931_rng.h
diff --git a/modules/timer/cpu_counter/modinfo.txt b/src/timer/cpu_counter/modinfo.txt
index d5583c0d7..d5583c0d7 100644
--- a/modules/timer/cpu_counter/modinfo.txt
+++ b/src/timer/cpu_counter/modinfo.txt
diff --git a/modules/timer/cpu_counter/tm_hard.cpp b/src/timer/cpu_counter/tm_hard.cpp
index 2f7516930..2f7516930 100644
--- a/modules/timer/cpu_counter/tm_hard.cpp
+++ b/src/timer/cpu_counter/tm_hard.cpp
diff --git a/modules/timer/cpu_counter/tm_hard.h b/src/timer/cpu_counter/tm_hard.h
index 678513f81..678513f81 100644
--- a/modules/timer/cpu_counter/tm_hard.h
+++ b/src/timer/cpu_counter/tm_hard.h
diff --git a/modules/timer/gettimeofday/modinfo.txt b/src/timer/gettimeofday/modinfo.txt
index 495914589..495914589 100644
--- a/modules/timer/gettimeofday/modinfo.txt
+++ b/src/timer/gettimeofday/modinfo.txt
diff --git a/modules/timer/gettimeofday/tm_unix.cpp b/src/timer/gettimeofday/tm_unix.cpp
index 654297753..654297753 100644
--- a/modules/timer/gettimeofday/tm_unix.cpp
+++ b/src/timer/gettimeofday/tm_unix.cpp
diff --git a/modules/timer/gettimeofday/tm_unix.h b/src/timer/gettimeofday/tm_unix.h
index fd24a1563..fd24a1563 100644
--- a/modules/timer/gettimeofday/tm_unix.h
+++ b/src/timer/gettimeofday/tm_unix.h
diff --git a/modules/timer/posix_rt/modinfo.txt b/src/timer/posix_rt/modinfo.txt
index e9298a81c..e9298a81c 100644
--- a/modules/timer/posix_rt/modinfo.txt
+++ b/src/timer/posix_rt/modinfo.txt
diff --git a/modules/timer/posix_rt/tm_posix.cpp b/src/timer/posix_rt/tm_posix.cpp
index 601b2b43d..601b2b43d 100644
--- a/modules/timer/posix_rt/tm_posix.cpp
+++ b/src/timer/posix_rt/tm_posix.cpp
diff --git a/modules/timer/posix_rt/tm_posix.h b/src/timer/posix_rt/tm_posix.h
index fc3ccdc74..fc3ccdc74 100644
--- a/modules/timer/posix_rt/tm_posix.h
+++ b/src/timer/posix_rt/tm_posix.h
diff --git a/modules/timer/win32_query_perf_ctr/modinfo.txt b/src/timer/win32_query_perf_ctr/modinfo.txt
index 74c4a59ea..74c4a59ea 100644
--- a/modules/timer/win32_query_perf_ctr/modinfo.txt
+++ b/src/timer/win32_query_perf_ctr/modinfo.txt
diff --git a/modules/timer/win32_query_perf_ctr/tm_win32.cpp b/src/timer/win32_query_perf_ctr/tm_win32.cpp
index 58f7b0f55..58f7b0f55 100644
--- a/modules/timer/win32_query_perf_ctr/tm_win32.cpp
+++ b/src/timer/win32_query_perf_ctr/tm_win32.cpp
diff --git a/modules/timer/win32_query_perf_ctr/tm_win32.h b/src/timer/win32_query_perf_ctr/tm_win32.h
index 67b045e78..67b045e78 100644
--- a/modules/timer/win32_query_perf_ctr/tm_win32.h
+++ b/src/timer/win32_query_perf_ctr/tm_win32.h
diff --git a/modules/x509/certstor.cpp b/src/x509/certstor.cpp
index 2b51590ad..2b51590ad 100644
--- a/modules/x509/certstor.cpp
+++ b/src/x509/certstor.cpp
diff --git a/modules/x509/certstor.h b/src/x509/certstor.h
index ca0480496..ca0480496 100644
--- a/modules/x509/certstor.h
+++ b/src/x509/certstor.h
diff --git a/modules/x509/crl_ent.cpp b/src/x509/crl_ent.cpp
index 4a85b99c2..4a85b99c2 100644
--- a/modules/x509/crl_ent.cpp
+++ b/src/x509/crl_ent.cpp
diff --git a/modules/x509/crl_ent.h b/src/x509/crl_ent.h
index 05a9338b3..05a9338b3 100644
--- a/modules/x509/crl_ent.h
+++ b/src/x509/crl_ent.h
diff --git a/modules/x509/modinfo.txt b/src/x509/modinfo.txt
index 162d3931b..162d3931b 100644
--- a/modules/x509/modinfo.txt
+++ b/src/x509/modinfo.txt
diff --git a/modules/x509/pkcs10.cpp b/src/x509/pkcs10.cpp
index bd21cca7d..bd21cca7d 100644
--- a/modules/x509/pkcs10.cpp
+++ b/src/x509/pkcs10.cpp
diff --git a/modules/x509/pkcs10.h b/src/x509/pkcs10.h
index f688688ee..f688688ee 100644
--- a/modules/x509/pkcs10.h
+++ b/src/x509/pkcs10.h
diff --git a/modules/x509/x509_ca.cpp b/src/x509/x509_ca.cpp
index d455e4988..d455e4988 100644
--- a/modules/x509/x509_ca.cpp
+++ b/src/x509/x509_ca.cpp
diff --git a/modules/x509/x509_ca.h b/src/x509/x509_ca.h
index 969e62558..969e62558 100644
--- a/modules/x509/x509_ca.h
+++ b/src/x509/x509_ca.h
diff --git a/modules/x509/x509_crl.cpp b/src/x509/x509_crl.cpp
index 306c78bd1..306c78bd1 100644
--- a/modules/x509/x509_crl.cpp
+++ b/src/x509/x509_crl.cpp
diff --git a/modules/x509/x509_crl.h b/src/x509/x509_crl.h
index f7623b940..f7623b940 100644
--- a/modules/x509/x509_crl.h
+++ b/src/x509/x509_crl.h
diff --git a/modules/x509/x509_ext.cpp b/src/x509/x509_ext.cpp
index 3595a0492..3595a0492 100644
--- a/modules/x509/x509_ext.cpp
+++ b/src/x509/x509_ext.cpp
diff --git a/modules/x509/x509_ext.h b/src/x509/x509_ext.h
index 5b302df0d..5b302df0d 100644
--- a/modules/x509/x509_ext.h
+++ b/src/x509/x509_ext.h
diff --git a/modules/x509/x509_obj.cpp b/src/x509/x509_obj.cpp
index e78790949..e78790949 100644
--- a/modules/x509/x509_obj.cpp
+++ b/src/x509/x509_obj.cpp
diff --git a/modules/x509/x509_obj.h b/src/x509/x509_obj.h
index 8808fd686..8808fd686 100644
--- a/modules/x509/x509_obj.h
+++ b/src/x509/x509_obj.h
diff --git a/modules/x509/x509cert.cpp b/src/x509/x509cert.cpp
index b24e6a036..b24e6a036 100644
--- a/modules/x509/x509cert.cpp
+++ b/src/x509/x509cert.cpp
diff --git a/modules/x509/x509cert.h b/src/x509/x509cert.h
index c8dc2c435..c8dc2c435 100644
--- a/modules/x509/x509cert.h
+++ b/src/x509/x509cert.h
diff --git a/modules/x509/x509find.cpp b/src/x509/x509find.cpp
index 83d02449d..83d02449d 100644
--- a/modules/x509/x509find.cpp
+++ b/src/x509/x509find.cpp
diff --git a/modules/x509/x509find.h b/src/x509/x509find.h
index 65781199f..65781199f 100644
--- a/modules/x509/x509find.h
+++ b/src/x509/x509find.h
diff --git a/modules/x509/x509opt.cpp b/src/x509/x509opt.cpp
index 716884ed5..716884ed5 100644
--- a/modules/x509/x509opt.cpp
+++ b/src/x509/x509opt.cpp
diff --git a/modules/x509/x509self.cpp b/src/x509/x509self.cpp
index 6c3baae9b..6c3baae9b 100644
--- a/modules/x509/x509self.cpp
+++ b/src/x509/x509self.cpp
diff --git a/modules/x509/x509self.h b/src/x509/x509self.h
index 2f83a12be..2f83a12be 100644
--- a/modules/x509/x509self.h
+++ b/src/x509/x509self.h
diff --git a/modules/x509/x509stor.cpp b/src/x509/x509stor.cpp
index f050b33b1..f050b33b1 100644
--- a/modules/x509/x509stor.cpp
+++ b/src/x509/x509stor.cpp
diff --git a/modules/x509/x509stor.h b/src/x509/x509stor.h
index 3f3f38ea0..3f3f38ea0 100644
--- a/modules/x509/x509stor.h
+++ b/src/x509/x509stor.h