111 files changed, 33 insertions, 21 deletions

diff --git a/configure.pl b/configure.pl
index 4dc01b108..4158cde07 100755
--- a/configure.pl
+++ b/configure.pl
@@ -183,7 +183,7 @@ sub croak {
 }
 
 sub warning {
-    warn with_diagnostic('warning', @_);
+    print with_diagnostic('warning', @_);
 }
 
 sub autoconfig {
@@ -204,7 +204,7 @@ sub trace {
 
     $func =~ s/main:://;
 
-    warn with_diagnostic('trace', "at $func:$line - ", @_);
+    print with_diagnostic('trace', "at $func:$line - ", @_);
 }
 
 ##################################################
@@ -1066,6 +1066,8 @@ sub load_modules {
 sub load_module {
     my ($config, $modname) = @_;
 
+    trace("load_module($modname)");
+
     my %module = %{$MODULES{$modname}};
 
     my $works_on = sub {
@@ -1094,12 +1096,15 @@ sub load_module {
     croak("Module '$modname' does not work with $cc")
         unless(&$works_on($cc, $module{'cc'}));
 
+    trace($modname);
+    trace($module{"moddirs"});
+
     my $handle_files = sub {
         my($lst, $func) = @_;
         return unless defined($lst);
 
         foreach (sort @$lst) {
-            &$func($modname, $config, $_);
+            &$func($module{"moddirs"}, $config, $_);
         }
     };
 
@@ -1127,11 +1132,9 @@ sub file_type {
 }
 
 sub add_file {
-    my ($modname, $config, $file) = @_;
-
-    check_for_file($config, $file, $modname, $modname);
+    my ($mod_dir, $config, $file) = @_;
 
-    my $mod_dir = File::Spec->catdir($$config{'mods-dir'}, $modname);
+    check_for_file($config, $file, $mod_dir, $mod_dir);
 
     my $do_add_file = sub {
         my ($type) = @_;
@@ -1146,15 +1149,15 @@ sub add_file {
 }
 
 sub ignore_file {
-    my ($modname, $config, $file) = @_;
-    check_for_file($config, $file, undef, $modname);
+    my ($mod_dir, $config, $file) = @_;
+    check_for_file($config, $file, undef, $mod_dir);
 
     my $do_ignore_file = sub {
         my ($type, $ok_if_from) = @_;
 
         if(defined ($$config{$type}{$file})) {
 
-            croak("$modname - File $file modified from ",
+            croak("$mod_dir - File $file modified from ",
                   $$config{$type}{$file})
                 if($$config{$type}{$file} ne $ok_if_from);
 
@@ -1166,13 +1169,14 @@ sub ignore_file {
 }
 
 sub check_for_file {
-   my ($config, $file, $added_from, $modname) = @_;
+   my ($config, $file, $added_from, $mod_dir) = @_;
+
+   #trace("check_for_file($file, $added_from, $mod_dir)");
 
    my $full_path = sub {
-       my ($file,$modname) = @_;
+       my ($file,$mod_dir) = @_;
 
-       return File::Spec->catfile($$config{'mods-dir'}, $modname, $file)
-           if(defined($modname));
+       return File::Spec->catfile($mod_dir, $file) if(defined($mod_dir));
 
        my @typeinfo = file_type($config, $file);
        return File::Spec->catfile($typeinfo[1], $file);
@@ -1180,7 +1184,7 @@ sub check_for_file {
 
    $file = &$full_path($file, $added_from);
 
-   croak("Module $modname requires that file $file exist. This error\n      ",
+   croak("Module $mod_dir requires that file $file exist. This error\n      ",
          'should never occur; please contact the maintainers with details.')
        unless(-e $file);
 }
@@ -1324,11 +1328,17 @@ sub read_module_files {
     my $mod_dir = $$config{'mods-dir'};
 
     my %allinfo;
-    foreach my $dir (dir_list($mod_dir)) {
-        my $modfile = File::Spec->catfile($mod_dir, $dir, 'modinfo.txt');
-
+    foreach my $modfile (glob("modules/*/*/modinfo.txt")) {
         trace("reading $modfile");
-        %{$allinfo{$dir}} = get_module_info($dir, $modfile);
+
+        my ($volume,$dirs,$file) = File::Spec->splitpath($modfile);
+
+        my @dirs = File::Spec->splitdir($dirs);
+        my $moddir = $dirs[$#dirs-1];
+
+        trace("module $moddir in $dirs $modfile");
+
+        %{$allinfo{$moddir}} = get_module_info($dirs, $moddir, $modfile);
     }
 
     return %allinfo;
@@ -1339,11 +1349,13 @@ sub read_module_files {
 ##################################################
 
 sub get_module_info {
-   my ($name, $file) = @_;
-   my $reader = make_reader($file);
+   my ($dirs, $name, $modfile) = @_;
+   my $reader = make_reader($modfile);
 
    my %info;
    $info{'name'} = $name;
+   $info{'modinfo'} = $modfile;
+   $info{'moddirs'} = $dirs;
    $info{'load_on'} = 'request'; # default unless specified
    $info{'libs'} = {};
 
diff --git a/modules/alloc_mmap/mmap_mem.cpp b/modules/allocation/alloc_mmap/mmap_mem.cpp
index e9ea17a53..e9ea17a53 100644
--- a/modules/alloc_mmap/mmap_mem.cpp
+++ b/modules/allocation/alloc_mmap/mmap_mem.cpp
diff --git a/modules/alloc_mmap/mmap_mem.h b/modules/allocation/alloc_mmap/mmap_mem.h
index ddf999014..ddf999014 100644
--- a/modules/alloc_mmap/mmap_mem.h
+++ b/modules/allocation/alloc_mmap/mmap_mem.h
diff --git a/modules/alloc_mmap/modinfo.txt b/modules/allocation/alloc_mmap/modinfo.txt
index 8cc2b206e..8cc2b206e 100644
--- a/modules/alloc_mmap/modinfo.txt
+++ b/modules/allocation/alloc_mmap/modinfo.txt
diff --git a/modules/ml_unix/mlock.cpp b/modules/allocation/ml_unix/mlock.cpp
index 98214a215..98214a215 100644
--- a/modules/ml_unix/mlock.cpp
+++ b/modules/allocation/ml_unix/mlock.cpp
diff --git a/modules/ml_unix/modinfo.txt b/modules/allocation/ml_unix/modinfo.txt
index 201a30ead..201a30ead 100644
--- a/modules/ml_unix/modinfo.txt
+++ b/modules/allocation/ml_unix/modinfo.txt
diff --git a/modules/ml_win32/mlock.cpp b/modules/allocation/ml_win32/mlock.cpp
index 8c5919934..8c5919934 100644
--- a/modules/ml_win32/mlock.cpp
+++ b/modules/allocation/ml_win32/mlock.cpp
diff --git a/modules/ml_win32/modinfo.txt b/modules/allocation/ml_win32/modinfo.txt
index 92936e1de..92936e1de 100644
--- a/modules/ml_win32/modinfo.txt
+++ b/modules/allocation/ml_win32/modinfo.txt
diff --git a/modules/asm_amd64/asm_macr.h b/modules/asm/asm_amd64/asm_macr.h
index 02aafb347..02aafb347 100644
--- a/modules/asm_amd64/asm_macr.h
+++ b/modules/asm/asm_amd64/asm_macr.h
diff --git a/modules/asm_amd64/modinfo.txt b/modules/asm/asm_amd64/modinfo.txt
index 30aa5a413..30aa5a413 100644
--- a/modules/asm_amd64/modinfo.txt
+++ b/modules/asm/asm_amd64/modinfo.txt
diff --git a/modules/asm_amd64/mp_monty.S b/modules/asm/asm_amd64/mp_monty.S
index 3dd4040bc..3dd4040bc 100644
--- a/modules/asm_amd64/mp_monty.S
+++ b/modules/asm/asm_amd64/mp_monty.S
diff --git a/modules/asm_amd64/mp_mulop_amd64.S b/modules/asm/asm_amd64/mp_mulop_amd64.S
index e5bba23fb..e5bba23fb 100644
--- a/modules/asm_amd64/mp_mulop_amd64.S
+++ b/modules/asm/asm_amd64/mp_mulop_amd64.S
diff --git a/modules/asm_amd64/sha160.cpp b/modules/asm/asm_amd64/sha160.cpp
index cfac02f45..cfac02f45 100644
--- a/modules/asm_amd64/sha160.cpp
+++ b/modules/asm/asm_amd64/sha160.cpp
diff --git a/modules/asm_amd64/sha1_asm.S b/modules/asm/asm_amd64/sha1_asm.S
index ecf4a18ce..ecf4a18ce 100644
--- a/modules/asm_amd64/sha1_asm.S
+++ b/modules/asm/asm_amd64/sha1_asm.S
diff --git a/modules/asm_ia32/asm_macr.h b/modules/asm/asm_ia32/asm_macr.h
index 392b05d5b..392b05d5b 100644
--- a/modules/asm_ia32/asm_macr.h
+++ b/modules/asm/asm_ia32/asm_macr.h
diff --git a/modules/asm_ia32/md4.cpp b/modules/asm/asm_ia32/md4.cpp
index e3dc79012..e3dc79012 100644
--- a/modules/asm_ia32/md4.cpp
+++ b/modules/asm/asm_ia32/md4.cpp
diff --git a/modules/asm_ia32/md4core.S b/modules/asm/asm_ia32/md4core.S
index 662e9924a..662e9924a 100644
--- a/modules/asm_ia32/md4core.S
+++ b/modules/asm/asm_ia32/md4core.S
diff --git a/modules/asm_ia32/md5.cpp b/modules/asm/asm_ia32/md5.cpp
index cfe48e7e9..cfe48e7e9 100644
--- a/modules/asm_ia32/md5.cpp
+++ b/modules/asm/asm_ia32/md5.cpp
diff --git a/modules/asm_ia32/md5core.S b/modules/asm/asm_ia32/md5core.S
index 8ebe469f3..8ebe469f3 100644
--- a/modules/asm_ia32/md5core.S
+++ b/modules/asm/asm_ia32/md5core.S
diff --git a/modules/asm_ia32/modinfo.txt b/modules/asm/asm_ia32/modinfo.txt
index 12c8cd96d..12c8cd96d 100644
--- a/modules/asm_ia32/modinfo.txt
+++ b/modules/asm/asm_ia32/modinfo.txt
diff --git a/modules/asm_ia32/mp_mulop.S b/modules/asm/asm_ia32/mp_mulop.S
index a5f0d3b27..a5f0d3b27 100644
--- a/modules/asm_ia32/mp_mulop.S
+++ b/modules/asm/asm_ia32/mp_mulop.S
diff --git a/modules/asm_ia32/serp_asm.S b/modules/asm/asm_ia32/serp_asm.S
index c8915382d..c8915382d 100644
--- a/modules/asm_ia32/serp_asm.S
+++ b/modules/asm/asm_ia32/serp_asm.S
diff --git a/modules/asm_ia32/serpent.cpp b/modules/asm/asm_ia32/serpent.cpp
index aacb72b0f..aacb72b0f 100644
--- a/modules/asm_ia32/serpent.cpp
+++ b/modules/asm/asm_ia32/serpent.cpp
diff --git a/modules/asm_ia32/sha160.cpp b/modules/asm/asm_ia32/sha160.cpp
index 7725541d5..7725541d5 100644
--- a/modules/asm_ia32/sha160.cpp
+++ b/modules/asm/asm_ia32/sha160.cpp
diff --git a/modules/asm_ia32/sha1_asm.S b/modules/asm/asm_ia32/sha1_asm.S
index 85bc9dc2c..85bc9dc2c 100644
--- a/modules/asm_ia32/sha1_asm.S
+++ b/modules/asm/asm_ia32/sha1_asm.S
diff --git a/modules/mp_amd64/bswap.h b/modules/asm/mp_amd64/bswap.h
index 3c77b460c..3c77b460c 100644
--- a/modules/mp_amd64/bswap.h
+++ b/modules/asm/mp_amd64/bswap.h
diff --git a/modules/mp_amd64/modinfo.txt b/modules/asm/mp_amd64/modinfo.txt
index a042a3976..a042a3976 100644
--- a/modules/mp_amd64/modinfo.txt
+++ b/modules/asm/mp_amd64/modinfo.txt
diff --git a/modules/mp_amd64/mp_asm.h b/modules/asm/mp_amd64/mp_asm.h
index eca7bae6c..eca7bae6c 100644
--- a/modules/mp_amd64/mp_asm.h
+++ b/modules/asm/mp_amd64/mp_asm.h
diff --git a/modules/mp_amd64/mp_asmi.h b/modules/asm/mp_amd64/mp_asmi.h
index 16632a38d..16632a38d 100644
--- a/modules/mp_amd64/mp_asmi.h
+++ b/modules/asm/mp_amd64/mp_asmi.h
diff --git a/modules/mp_amd64/mp_mulop.cpp b/modules/asm/mp_amd64/mp_mulop.cpp
index d1aa51489..d1aa51489 100644
--- a/modules/mp_amd64/mp_mulop.cpp
+++ b/modules/asm/mp_amd64/mp_mulop.cpp
diff --git a/modules/mp_asm64/modinfo.txt b/modules/asm/mp_asm64/modinfo.txt
index a9e5d53da..a9e5d53da 100644
--- a/modules/mp_asm64/modinfo.txt
+++ b/modules/asm/mp_asm64/modinfo.txt
diff --git a/modules/mp_asm64/mp_asm.h b/modules/asm/mp_asm64/mp_asm.h
index e455b3616..e455b3616 100644
--- a/modules/mp_asm64/mp_asm.h
+++ b/modules/asm/mp_asm64/mp_asm.h
diff --git a/modules/mp_ia32/modinfo.txt b/modules/asm/mp_ia32/modinfo.txt
index cf4959250..cf4959250 100644
--- a/modules/mp_ia32/modinfo.txt
+++ b/modules/asm/mp_ia32/modinfo.txt
diff --git a/modules/mp_ia32/mp_asm.h b/modules/asm/mp_ia32/mp_asm.h
index b45140321..b45140321 100644
--- a/modules/mp_ia32/mp_asm.h
+++ b/modules/asm/mp_ia32/mp_asm.h
diff --git a/modules/mp_ia32/mp_asmi.h b/modules/asm/mp_ia32/mp_asmi.h
index 9de0c11e3..9de0c11e3 100644
--- a/modules/mp_ia32/mp_asmi.h
+++ b/modules/asm/mp_ia32/mp_asmi.h
diff --git a/modules/mp_ia32_msvc/modinfo.txt b/modules/asm/mp_ia32_msvc/modinfo.txt
index 36d9d0290..36d9d0290 100644
--- a/modules/mp_ia32_msvc/modinfo.txt
+++ b/modules/asm/mp_ia32_msvc/modinfo.txt
diff --git a/modules/mp_ia32_msvc/mp_asmi.h b/modules/asm/mp_ia32_msvc/mp_asmi.h
index 5eaa46eb4..5eaa46eb4 100644
--- a/modules/mp_ia32_msvc/mp_asmi.h
+++ b/modules/asm/mp_ia32_msvc/mp_asmi.h
diff --git a/modules/sha1_sse2/modinfo.txt b/modules/asm/sha1_sse2/modinfo.txt
index e1805260c..e1805260c 100644
--- a/modules/sha1_sse2/modinfo.txt
+++ b/modules/asm/sha1_sse2/modinfo.txt
diff --git a/modules/sha1_sse2/sha160.cpp b/modules/asm/sha1_sse2/sha160.cpp
index dfb5fdfe5..dfb5fdfe5 100644
--- a/modules/sha1_sse2/sha160.cpp
+++ b/modules/asm/sha1_sse2/sha160.cpp
diff --git a/modules/sha1_sse2/sha160.h b/modules/asm/sha1_sse2/sha160.h
index c6f8482cf..c6f8482cf 100644
--- a/modules/sha1_sse2/sha160.h
+++ b/modules/asm/sha1_sse2/sha160.h
diff --git a/modules/sha1_sse2/sha1core.cpp b/modules/asm/sha1_sse2/sha1core.cpp
index 23dbfc5e2..23dbfc5e2 100644
--- a/modules/sha1_sse2/sha1core.cpp
+++ b/modules/asm/sha1_sse2/sha1core.cpp
diff --git a/modules/comp_bzip2/bzip2.cpp b/modules/compression/bzip2/bzip2.cpp
index 712dacd7d..712dacd7d 100644
--- a/modules/comp_bzip2/bzip2.cpp
+++ b/modules/compression/bzip2/bzip2.cpp
diff --git a/modules/comp_bzip2/bzip2.h b/modules/compression/bzip2/bzip2.h
index eb9962dec..eb9962dec 100644
--- a/modules/comp_bzip2/bzip2.h
+++ b/modules/compression/bzip2/bzip2.h
diff --git a/modules/comp_bzip2/modinfo.txt b/modules/compression/bzip2/modinfo.txt
index efedc097f..efedc097f 100644
--- a/modules/comp_bzip2/modinfo.txt
+++ b/modules/compression/bzip2/modinfo.txt
diff --git a/modules/comp_zlib/modinfo.txt b/modules/compression/zlib/modinfo.txt
index c1f1f998c..c1f1f998c 100644
--- a/modules/comp_zlib/modinfo.txt
+++ b/modules/compression/zlib/modinfo.txt
diff --git a/modules/comp_zlib/zlib.cpp b/modules/compression/zlib/zlib.cpp
index 36a9640e3..36a9640e3 100644
--- a/modules/comp_zlib/zlib.cpp
+++ b/modules/compression/zlib/zlib.cpp
diff --git a/modules/comp_zlib/zlib.h b/modules/compression/zlib/zlib.h
index 42f2eed5e..42f2eed5e 100644
--- a/modules/comp_zlib/zlib.h
+++ b/modules/compression/zlib/zlib.h
diff --git a/modules/eng_gmp/eng_gmp.cpp b/modules/engine/gnump/eng_gmp.cpp
index a0e18e059..a0e18e059 100644
--- a/modules/eng_gmp/eng_gmp.cpp
+++ b/modules/engine/gnump/eng_gmp.cpp
diff --git a/modules/eng_gmp/eng_gmp.h b/modules/engine/gnump/eng_gmp.h
index 2ac2b54a8..2ac2b54a8 100644
--- a/modules/eng_gmp/eng_gmp.h
+++ b/modules/engine/gnump/eng_gmp.h
diff --git a/modules/eng_gmp/gmp_mem.cpp b/modules/engine/gnump/gmp_mem.cpp
index ea8ef4d3b..ea8ef4d3b 100644
--- a/modules/eng_gmp/gmp_mem.cpp
+++ b/modules/engine/gnump/gmp_mem.cpp
diff --git a/modules/eng_gmp/gmp_powm.cpp b/modules/engine/gnump/gmp_powm.cpp
index a5e3d1c0d..a5e3d1c0d 100644
--- a/modules/eng_gmp/gmp_powm.cpp
+++ b/modules/engine/gnump/gmp_powm.cpp
diff --git a/modules/eng_gmp/gmp_wrap.cpp b/modules/engine/gnump/gmp_wrap.cpp
index 4c73c2562..4c73c2562 100644
--- a/modules/eng_gmp/gmp_wrap.cpp
+++ b/modules/engine/gnump/gmp_wrap.cpp
diff --git a/modules/eng_gmp/gmp_wrap.h b/modules/engine/gnump/gmp_wrap.h
index 0da54550f..0da54550f 100644
--- a/modules/eng_gmp/gmp_wrap.h
+++ b/modules/engine/gnump/gmp_wrap.h
diff --git a/modules/eng_gmp/modinfo.txt b/modules/engine/gnump/modinfo.txt
index e65e411fd..e65e411fd 100644
--- a/modules/eng_gmp/modinfo.txt
+++ b/modules/engine/gnump/modinfo.txt
diff --git a/modules/eng_ossl/bn_powm.cpp b/modules/engine/openssl/bn_powm.cpp
index f54411240..f54411240 100644
--- a/modules/eng_ossl/bn_powm.cpp
+++ b/modules/engine/openssl/bn_powm.cpp
diff --git a/modules/eng_ossl/bn_wrap.cpp b/modules/engine/openssl/bn_wrap.cpp
index 4f7ea0078..4f7ea0078 100644
--- a/modules/eng_ossl/bn_wrap.cpp
+++ b/modules/engine/openssl/bn_wrap.cpp
diff --git a/modules/eng_ossl/bn_wrap.h b/modules/engine/openssl/bn_wrap.h
index 682795660..682795660 100644
--- a/modules/eng_ossl/bn_wrap.h
+++ b/modules/engine/openssl/bn_wrap.h
diff --git a/modules/eng_ossl/eng_ossl.cpp b/modules/engine/openssl/eng_ossl.cpp
index 9421495c2..9421495c2 100644
--- a/modules/eng_ossl/eng_ossl.cpp
+++ b/modules/engine/openssl/eng_ossl.cpp
diff --git a/modules/eng_ossl/eng_ossl.h b/modules/engine/openssl/eng_ossl.h
index a1886662f..a1886662f 100644
--- a/modules/eng_ossl/eng_ossl.h
+++ b/modules/engine/openssl/eng_ossl.h
diff --git a/modules/eng_ossl/modinfo.txt b/modules/engine/openssl/modinfo.txt
index 7892e8e90..7892e8e90 100644
--- a/modules/eng_ossl/modinfo.txt
+++ b/modules/engine/openssl/modinfo.txt
diff --git a/modules/eng_ossl/ossl_bc.cpp b/modules/engine/openssl/ossl_bc.cpp
index 407bb3cde..407bb3cde 100644
--- a/modules/eng_ossl/ossl_bc.cpp
+++ b/modules/engine/openssl/ossl_bc.cpp
diff --git a/modules/eng_ossl/ossl_md.cpp b/modules/engine/openssl/ossl_md.cpp
index 8e24c7213..8e24c7213 100644
--- a/modules/eng_ossl/ossl_md.cpp
+++ b/modules/engine/openssl/ossl_md.cpp
diff --git a/modules/eng_ossl/ossl_rc4.cpp b/modules/engine/openssl/ossl_rc4.cpp
index eb8e9ded8..eb8e9ded8 100644
--- a/modules/eng_ossl/ossl_rc4.cpp
+++ b/modules/engine/openssl/ossl_rc4.cpp
diff --git a/modules/es_beos/es_beos.cpp b/modules/entropy/beos_stats/es_beos.cpp
index 80d5605d0..80d5605d0 100644
--- a/modules/es_beos/es_beos.cpp
+++ b/modules/entropy/beos_stats/es_beos.cpp
diff --git a/modules/es_beos/es_beos.h b/modules/entropy/beos_stats/es_beos.h
index 11808d2b8..11808d2b8 100644
--- a/modules/es_beos/es_beos.h
+++ b/modules/entropy/beos_stats/es_beos.h
diff --git a/modules/es_beos/modinfo.txt b/modules/entropy/beos_stats/modinfo.txt
index a7e62cfb3..a7e62cfb3 100644
--- a/modules/es_beos/modinfo.txt
+++ b/modules/entropy/beos_stats/modinfo.txt
diff --git a/modules/es_capi/es_capi.cpp b/modules/entropy/cryptoapi_rng/es_capi.cpp
index 7d1e0e753..7d1e0e753 100644
--- a/modules/es_capi/es_capi.cpp
+++ b/modules/entropy/cryptoapi_rng/es_capi.cpp
diff --git a/modules/es_capi/es_capi.h b/modules/entropy/cryptoapi_rng/es_capi.h
index 36b4acd8d..36b4acd8d 100644
--- a/modules/es_capi/es_capi.h
+++ b/modules/entropy/cryptoapi_rng/es_capi.h
diff --git a/modules/es_capi/modinfo.txt b/modules/entropy/cryptoapi_rng/modinfo.txt
index 40104664b..40104664b 100644
--- a/modules/es_capi/modinfo.txt
+++ b/modules/entropy/cryptoapi_rng/modinfo.txt
diff --git a/modules/es_dev/es_dev.cpp b/modules/entropy/dev_random/es_dev.cpp
index 310620716..310620716 100644
--- a/modules/es_dev/es_dev.cpp
+++ b/modules/entropy/dev_random/es_dev.cpp
diff --git a/modules/es_dev/es_dev.h b/modules/entropy/dev_random/es_dev.h
index 21d28b9bb..21d28b9bb 100644
--- a/modules/es_dev/es_dev.h
+++ b/modules/entropy/dev_random/es_dev.h
diff --git a/modules/es_dev/modinfo.txt b/modules/entropy/dev_random/modinfo.txt
index 6622886af..6622886af 100644
--- a/modules/es_dev/modinfo.txt
+++ b/modules/entropy/dev_random/modinfo.txt
diff --git a/modules/es_egd/es_egd.cpp b/modules/entropy/egd/es_egd.cpp
index da4aaf847..da4aaf847 100644
--- a/modules/es_egd/es_egd.cpp
+++ b/modules/entropy/egd/es_egd.cpp
diff --git a/modules/es_egd/es_egd.h b/modules/entropy/egd/es_egd.h
index e3ff2fec8..e3ff2fec8 100644
--- a/modules/es_egd/es_egd.h
+++ b/modules/entropy/egd/es_egd.h
diff --git a/modules/es_egd/modinfo.txt b/modules/entropy/egd/modinfo.txt
index 6b34f395c..6b34f395c 100644
--- a/modules/es_egd/modinfo.txt
+++ b/modules/entropy/egd/modinfo.txt
diff --git a/modules/es_ftw/es_ftw.cpp b/modules/entropy/proc_walk/es_ftw.cpp
index ec11378f8..ec11378f8 100644
--- a/modules/es_ftw/es_ftw.cpp
+++ b/modules/entropy/proc_walk/es_ftw.cpp
diff --git a/modules/es_ftw/es_ftw.h b/modules/entropy/proc_walk/es_ftw.h
index 0a48cc551..0a48cc551 100644
--- a/modules/es_ftw/es_ftw.h
+++ b/modules/entropy/proc_walk/es_ftw.h
diff --git a/modules/es_ftw/modinfo.txt b/modules/entropy/proc_walk/modinfo.txt
index d932523fd..d932523fd 100644
--- a/modules/es_ftw/modinfo.txt
+++ b/modules/entropy/proc_walk/modinfo.txt
diff --git a/modules/es_unix/es_unix.cpp b/modules/entropy/unix_procs/es_unix.cpp
index c503c20ae..c503c20ae 100644
--- a/modules/es_unix/es_unix.cpp
+++ b/modules/entropy/unix_procs/es_unix.cpp
diff --git a/modules/es_unix/es_unix.h b/modules/entropy/unix_procs/es_unix.h
index a1e279633..a1e279633 100644
--- a/modules/es_unix/es_unix.h
+++ b/modules/entropy/unix_procs/es_unix.h
diff --git a/modules/es_unix/modinfo.txt b/modules/entropy/unix_procs/modinfo.txt
index f16e21289..f16e21289 100644
--- a/modules/es_unix/modinfo.txt
+++ b/modules/entropy/unix_procs/modinfo.txt
diff --git a/modules/es_unix/unix_cmd.cpp b/modules/entropy/unix_procs/unix_cmd.cpp
index 32829b91b..32829b91b 100644
--- a/modules/es_unix/unix_cmd.cpp
+++ b/modules/entropy/unix_procs/unix_cmd.cpp
diff --git a/modules/es_unix/unix_cmd.h b/modules/entropy/unix_procs/unix_cmd.h
index 0e187db03..0e187db03 100644
--- a/modules/es_unix/unix_cmd.h
+++ b/modules/entropy/unix_procs/unix_cmd.h
diff --git a/modules/es_unix/unix_src.cpp b/modules/entropy/unix_procs/unix_src.cpp
index 9d44dbf4f..9d44dbf4f 100644
--- a/modules/es_unix/unix_src.cpp
+++ b/modules/entropy/unix_procs/unix_src.cpp
diff --git a/modules/es_win32/es_win32.cpp b/modules/entropy/win32_stats/es_win32.cpp
index febed59c0..febed59c0 100644
--- a/modules/es_win32/es_win32.cpp
+++ b/modules/entropy/win32_stats/es_win32.cpp
diff --git a/modules/es_win32/es_win32.h b/modules/entropy/win32_stats/es_win32.h
index 19b664a2f..19b664a2f 100644
--- a/modules/es_win32/es_win32.h
+++ b/modules/entropy/win32_stats/es_win32.h
diff --git a/modules/es_win32/modinfo.txt b/modules/entropy/win32_stats/modinfo.txt
index 931760979..931760979 100644
--- a/modules/es_win32/modinfo.txt
+++ b/modules/entropy/win32_stats/modinfo.txt
diff --git a/modules/fd_unix/fd_unix.cpp b/modules/io/fd_unix/fd_unix.cpp
index ac88ac391..ac88ac391 100644
--- a/modules/fd_unix/fd_unix.cpp
+++ b/modules/io/fd_unix/fd_unix.cpp
diff --git a/modules/fd_unix/fd_unix.h b/modules/io/fd_unix/fd_unix.h
index 4767306da..4767306da 100644
--- a/modules/fd_unix/fd_unix.h
+++ b/modules/io/fd_unix/fd_unix.h
diff --git a/modules/fd_unix/modinfo.txt b/modules/io/fd_unix/modinfo.txt
index e1f30ea28..e1f30ea28 100644
--- a/modules/fd_unix/modinfo.txt
+++ b/modules/io/fd_unix/modinfo.txt
diff --git a/modules/mux_pthr/modinfo.txt b/modules/mutex/pthreads/modinfo.txt
index 88de70de0..88de70de0 100644
--- a/modules/mux_pthr/modinfo.txt
+++ b/modules/mutex/pthreads/modinfo.txt
diff --git a/modules/mux_pthr/mux_pthr.cpp b/modules/mutex/pthreads/mux_pthr.cpp
index d003fa298..d003fa298 100644
--- a/modules/mux_pthr/mux_pthr.cpp
+++ b/modules/mutex/pthreads/mux_pthr.cpp
diff --git a/modules/mux_pthr/mux_pthr.h b/modules/mutex/pthreads/mux_pthr.h
index 1b83dbead..1b83dbead 100644
--- a/modules/mux_pthr/mux_pthr.h
+++ b/modules/mutex/pthreads/mux_pthr.h
diff --git a/modules/mux_qt/modinfo.txt b/modules/mutex/qt_mutex/modinfo.txt
index a21108c79..a21108c79 100644
--- a/modules/mux_qt/modinfo.txt
+++ b/modules/mutex/qt_mutex/modinfo.txt
diff --git a/modules/mux_qt/mux_qt.cpp b/modules/mutex/qt_mutex/mux_qt.cpp
index 421b771c7..421b771c7 100644
--- a/modules/mux_qt/mux_qt.cpp
+++ b/modules/mutex/qt_mutex/mux_qt.cpp
diff --git a/modules/mux_qt/mux_qt.h b/modules/mutex/qt_mutex/mux_qt.h
index 110e147ec..110e147ec 100644
--- a/modules/mux_qt/mux_qt.h
+++ b/modules/mutex/qt_mutex/mux_qt.h
diff --git a/modules/mux_win32/modinfo.txt b/modules/mutex/win32_crit_section/modinfo.txt
index d235ff73c..d235ff73c 100644
--- a/modules/mux_win32/modinfo.txt
+++ b/modules/mutex/win32_crit_section/modinfo.txt
diff --git a/modules/mux_win32/mux_win32.cpp b/modules/mutex/win32_crit_section/mux_win32.cpp
index 622a707fa..622a707fa 100644
--- a/modules/mux_win32/mux_win32.cpp
+++ b/modules/mutex/win32_crit_section/mux_win32.cpp
diff --git a/modules/mux_win32/mux_win32.h b/modules/mutex/win32_crit_section/mux_win32.h
index 37eadae0d..37eadae0d 100644
--- a/modules/mux_win32/mux_win32.h
+++ b/modules/mutex/win32_crit_section/mux_win32.h
diff --git a/modules/tm_hard/modinfo.txt b/modules/timer/cpu_counter/modinfo.txt
index d5583c0d7..d5583c0d7 100644
--- a/modules/tm_hard/modinfo.txt
+++ b/modules/timer/cpu_counter/modinfo.txt
diff --git a/modules/tm_hard/tm_hard.cpp b/modules/timer/cpu_counter/tm_hard.cpp
index 2f7516930..2f7516930 100644
--- a/modules/tm_hard/tm_hard.cpp
+++ b/modules/timer/cpu_counter/tm_hard.cpp
diff --git a/modules/tm_hard/tm_hard.h b/modules/timer/cpu_counter/tm_hard.h
index d02010eda..d02010eda 100644
--- a/modules/tm_hard/tm_hard.h
+++ b/modules/timer/cpu_counter/tm_hard.h
diff --git a/modules/tm_unix/modinfo.txt b/modules/timer/gettimeofday/modinfo.txt
index 495914589..495914589 100644
--- a/modules/tm_unix/modinfo.txt
+++ b/modules/timer/gettimeofday/modinfo.txt
diff --git a/modules/tm_unix/tm_unix.cpp b/modules/timer/gettimeofday/tm_unix.cpp
index 654297753..654297753 100644
--- a/modules/tm_unix/tm_unix.cpp
+++ b/modules/timer/gettimeofday/tm_unix.cpp
diff --git a/modules/tm_unix/tm_unix.h b/modules/timer/gettimeofday/tm_unix.h
index 4b5b3e9dd..4b5b3e9dd 100644
--- a/modules/tm_unix/tm_unix.h
+++ b/modules/timer/gettimeofday/tm_unix.h
diff --git a/modules/tm_posix/modinfo.txt b/modules/timer/posix_rt/modinfo.txt
index e9298a81c..e9298a81c 100644
--- a/modules/tm_posix/modinfo.txt
+++ b/modules/timer/posix_rt/modinfo.txt
diff --git a/modules/tm_posix/tm_posix.cpp b/modules/timer/posix_rt/tm_posix.cpp
index 601b2b43d..601b2b43d 100644
--- a/modules/tm_posix/tm_posix.cpp
+++ b/modules/timer/posix_rt/tm_posix.cpp
diff --git a/modules/tm_posix/tm_posix.h b/modules/timer/posix_rt/tm_posix.h
index 60fa8f844..60fa8f844 100644
--- a/modules/tm_posix/tm_posix.h
+++ b/modules/timer/posix_rt/tm_posix.h
diff --git a/modules/tm_win32/modinfo.txt b/modules/timer/win32_query_perf_ctr/modinfo.txt
index 74c4a59ea..74c4a59ea 100644
--- a/modules/tm_win32/modinfo.txt
+++ b/modules/timer/win32_query_perf_ctr/modinfo.txt
diff --git a/modules/tm_win32/tm_win32.cpp b/modules/timer/win32_query_perf_ctr/tm_win32.cpp
index 58f7b0f55..58f7b0f55 100644
--- a/modules/tm_win32/tm_win32.cpp
+++ b/modules/timer/win32_query_perf_ctr/tm_win32.cpp
diff --git a/modules/tm_win32/tm_win32.h b/modules/timer/win32_query_perf_ctr/tm_win32.h
index 5a699021c..5a699021c 100644
--- a/modules/tm_win32/tm_win32.h
+++ b/modules/timer/win32_query_perf_ctr/tm_win32.h