Move module implementation from brep/ to mod/

31 files changed, 177 insertions, 169 deletions

diff --git a/INSTALL-DEV b/INSTALL-DEV
index 51dad72..d9eef3b 100644
--- a/INSTALL-DEV
+++ b/INSTALL-DEV
@@ -66,7 +66,7 @@ replacing <BREP-OUT-ROOT> and <BREP-SRC-ROOT> with the actual absolute paths
 
         # Load the brep module.
         #
-        LoadModule brep_module <BREP-OUT-ROOT>/brep/mod_brep.so
+        LoadModule brep_module <BREP-OUT-ROOT>/mod/mod_brep.so
 
         # Repository root. Use / for web server root. And don't forget to also
         # update the Location and Alias directives below.
diff --git a/brep/.gitignore b/brep/.gitignore
index 852a40d..687b168 100644
--- a/brep/.gitignore
+++ b/brep/.gitignore
@@ -1,5 +1,3 @@
-options
-options.?xx
 package-odb*
 package.sql
 package-extra
diff --git a/brep/buildfile b/brep/buildfile
index 4caf93a..529916a 100644
--- a/brep/buildfile
+++ b/brep/buildfile
@@ -2,16 +2,10 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-define mod: libso
-mod{*}: bin.libprefix = mod_
-mod{*}: install = libexec
-
 define sql: file
 sql{*}: extension = sql
 sql{*}: install = data
 
-./: lib{brep} mod{brep} sql{package package-extra}
-
 # lib{brep}
 #
 import libs += libodb%lib{odb}
@@ -28,57 +22,12 @@ lib{brep}:                          \
 {hxx            }{ types          } \
 {hxx            }{ utility        } \
 {hxx            }{ version        } \
-$libs
+{hxx            }{ wrapper-traits } \
+$libs                               \
+sql{package package-extra}
 
-libso{brep}: cxx.export.poptions = -I$out_root -I$src_root
+lib{brep}: cxx.export.poptions = -I$out_root -I$src_root
 
 # Install into the brep/ subdirectory of, say, /usr/include/.
 #
 install.include = $install.include/brep
-
-# mod{brep}
-#
-import libs += libstudxml%lib{studxml}
-
-gen =         {hxx ixx     cxx}{ options                 }
-src =                                                          \
-              {hxx         cxx}{ database                    } \
-              {hxx         cxx}{ database-module             } \
-              {hxx         cxx}{ diagnostics                 } \
-              {hxx         cxx}{ mod-package-details         } \
-              {hxx         cxx}{ mod-package-search          } \
-              {hxx         cxx}{ mod-package-version-details } \
-              {hxx         cxx}{ mod-repository-details      } \
-              {hxx         cxx}{ mod-repository-root         } \
-              {hxx         cxx}{ module                      } \
-              {hxx            }{ options-types               } \
-              {hxx         cxx}{ page                        } \
-              {            cxx}{ services                    } \
-              {hxx         cxx}{ types-parsers               } \
-              {hxx            }{ wrapper-traits              } \
-       ../web/{hxx         cxx}{ mime-url-encoding           } \
-       ../web/{hxx            }{ module                      } \
-       ../web/{hxx            }{ xhtml                       } \
-       ../web/{hxx         cxx}{ xhtml-fragment              } \
-../web/apache/{hxx            }{ log                         } \
-../web/apache/{hxx ixx     cxx}{ request                     } \
-../web/apache/{hxx     txx cxx}{ service                     } \
-../web/apache/{hxx            }{ stream                      }
-
-mod{brep}: $src $gen lib{brep} $libs
-
-# Don't install any of the mod{brep} headers.
-#
-$out_base/{$gen}: install = false
-$src_base/{$src}: install = false
-
-# Set option prefix to the empty value to handle all unknown request parameters
-# uniformly with a single catch block.
-#
-cli.options += --std c++11 -I $src_root --include-with-brackets \
---include-prefix brep --guard-prefix BREP \
---cxx-prologue "#include <brep/types-parsers>" \
---cli-namespace brep::cli --generate-file-scanner --suppress-usage \
---generate-modifier --generate-description --option-prefix ""
-
-{hxx ixx cxx}{options}: cli{options}
diff --git a/buildfile b/buildfile
index 521be1f..c74b0c9 100644
--- a/buildfile
+++ b/buildfile
@@ -2,7 +2,7 @@
 # copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 # license   : MIT; see accompanying LICENSE file
 
-d = brep/ etc/ load/ migrate/ tests/ www/ doc/
+d = brep/ mod/ load/ migrate/ tests/ www/ doc/ etc/
 ./: $d doc{INSTALL INSTALL-DEV LICENSE NEWS README version} file{manifest}
 include $d
 
diff --git a/mod/.gitignore b/mod/.gitignore
new file mode 100644
index 0000000..ddd62b8
--- /dev/null
+++ b/mod/.gitignore
@@ -0,0 +1,2 @@
+options
+options.?xx
diff --git a/mod/buildfile b/mod/buildfile
new file mode 100644
index 0000000..574b34a
--- /dev/null
+++ b/mod/buildfile
@@ -0,0 +1,55 @@
+# file      : mod/buildfile
+# copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
+# license   : MIT; see accompanying LICENSE file
+
+define mod: libso
+mod{*}: bin.libprefix = mod_
+mod{*}: install = libexec
+
+import libs += libodb%lib{odb}
+import libs += libodb-pgsql%lib{odb-pgsql}
+import libs += libbpkg%lib{bpkg}
+import libs += libstudxml%lib{studxml}
+
+include ../brep/
+
+mod{brep}:                                                     \
+              {hxx         cxx}{ database                    } \
+              {hxx         cxx}{ database-module             } \
+              {hxx         cxx}{ diagnostics                 } \
+              {hxx         cxx}{ mod-package-details         } \
+              {hxx         cxx}{ mod-package-search          } \
+              {hxx         cxx}{ mod-package-version-details } \
+              {hxx         cxx}{ mod-repository-details      } \
+              {hxx         cxx}{ mod-repository-root         } \
+              {hxx         cxx}{ module                      } \
+	      {hxx ixx     cxx}{ options                     } \
+              {hxx            }{ options-types               } \
+              {hxx         cxx}{ page                        } \
+              {            cxx}{ services                    } \
+              {hxx         cxx}{ types-parsers               } \
+       ../web/{hxx         cxx}{ mime-url-encoding           } \
+       ../web/{hxx            }{ module                      } \
+       ../web/{hxx            }{ xhtml                       } \
+       ../web/{hxx         cxx}{ xhtml-fragment              } \
+../web/apache/{hxx            }{ log                         } \
+../web/apache/{hxx ixx     cxx}{ request                     } \
+../web/apache/{hxx     txx cxx}{ service                     } \
+../web/apache/{hxx            }{ stream                      } \
+../brep/lib{brep} $libs
+
+# Don't install any of the module's headers.
+#
+{hxx ixx txx}{*}: install = false
+../web/{hxx ixx txx}{*}: install = false
+
+# Set option prefix to the empty value to handle all unknown request parameters
+# uniformly with a single catch block.
+#
+cli.options += --std c++11 -I $src_root --include-with-brackets \
+--include-prefix mod --guard-prefix MOD \
+--cxx-prologue "#include <mod/types-parsers>" \
+--cli-namespace brep::cli --generate-file-scanner --suppress-usage \
+--generate-modifier --generate-description --option-prefix ""
+
+{hxx ixx cxx}{options}: cli{options}
diff --git a/brep/database b/mod/database
index d29d4a5..2730449 100644
--- a/brep/database
+++ b/mod/database
@@ -1,16 +1,16 @@
-// file      : brep/database -*- C++ -*-
+// file      : mod/database -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_DATABASE
-#define BREP_DATABASE
+#ifndef MOD_DATABASE
+#define MOD_DATABASE
 
 #include <odb/forward.hxx> // database
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
+#include <mod/options>
 
 namespace brep
 {
@@ -23,4 +23,4 @@ namespace brep
   shared_database (const options::db&);
 }
 
-#endif // BREP_DATABASE
+#endif // MOD_DATABASE
diff --git a/brep/database-module b/mod/database-module
index 64d5aaf..0933794 100644
--- a/brep/database-module
+++ b/mod/database-module
@@ -1,17 +1,17 @@
-// file      : brep/database-module -*- C++ -*-
+// file      : mod/database-module -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_DATABASE_MODULE
-#define BREP_DATABASE_MODULE
+#ifndef MOD_DATABASE_MODULE
+#define MOD_DATABASE_MODULE
 
 #include <odb/forward.hxx> // database
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/module>
-#include <brep/options>
+#include <mod/module>
+#include <mod/options>
 
 namespace brep
 {
@@ -52,4 +52,4 @@ namespace brep
   };
 }
 
-#endif // BREP_DATABASE_MODULE
+#endif // MOD_DATABASE_MODULE
diff --git a/brep/database-module.cxx b/mod/database-module.cxx
index 630fd89..a794672 100644
--- a/brep/database-module.cxx
+++ b/mod/database-module.cxx
@@ -1,13 +1,13 @@
-// file      : brep/database-module.cxx -*- C++ -*-
+// file      : mod/database-module.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/database-module>
+#include <mod/database-module>
 
 #include <odb/exceptions.hxx>
 
-#include <brep/options>
-#include <brep/database>
+#include <mod/options>
+#include <mod/database>
 
 namespace brep
 {
diff --git a/brep/database.cxx b/mod/database.cxx
index 4b56c37..0f0b703 100644
--- a/brep/database.cxx
+++ b/mod/database.cxx
@@ -1,8 +1,8 @@
-// file      : brep/database.cxx -*- C++ -*-
+// file      : mod/database.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/database>
+#include <mod/database>
 
 #include <map>
 
diff --git a/brep/diagnostics b/mod/diagnostics
index b5b1b36..38286d4 100644
--- a/brep/diagnostics
+++ b/mod/diagnostics
@@ -1,9 +1,9 @@
-// file      : brep/diagnostics -*- C++ -*-
+// file      : mod/diagnostics -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_DIAGNOSTICS
-#define BREP_DIAGNOSTICS
+#ifndef MOD_DIAGNOSTICS
+#define MOD_DIAGNOSTICS
 
 #include <sstream>
 
@@ -303,4 +303,4 @@ namespace brep
   using fail_mark = diag_mark<fail_mark_base<E>>;
 }
 
-#endif // BREP_DIAGNOSTICS
+#endif // MOD_DIAGNOSTICS
diff --git a/brep/diagnostics.cxx b/mod/diagnostics.cxx
index b0d122f..6512517 100644
--- a/brep/diagnostics.cxx
+++ b/mod/diagnostics.cxx
@@ -1,8 +1,8 @@
-// file      : brep/diagnostics.cxx -*- C++ -*-
+// file      : mod/diagnostics.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/diagnostics>
+#include <mod/diagnostics>
 
 using namespace std;
 
diff --git a/brep/mod-package-details b/mod/mod-package-details
index 4dc6b18..b324bfb 100644
--- a/brep/mod-package-details
+++ b/mod/mod-package-details
@@ -1,15 +1,15 @@
-// file      : brep/mod-package-details -*- C++ -*-
+// file      : mod/mod-package-details -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MOD_PACKAGE_DETAILS
-#define BREP_MOD_PACKAGE_DETAILS
+#ifndef MOD_MOD_PACKAGE_DETAILS
+#define MOD_MOD_PACKAGE_DETAILS
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
-#include <brep/database-module>
+#include <mod/options>
+#include <mod/database-module>
 
 namespace brep
 {
@@ -39,4 +39,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MOD_PACKAGE_DETAILS
+#endif // MOD_MOD_PACKAGE_DETAILS
diff --git a/brep/mod-package-details.cxx b/mod/mod-package-details.cxx
index 10bd72c..2ff93c9 100644
--- a/brep/mod-package-details.cxx
+++ b/mod/mod-package-details.cxx
@@ -1,8 +1,8 @@
-// file      : brep/mod-package-details.cxx -*- C++ -*-
+// file      : mod/mod-package-details.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/mod-package-details>
+#include <mod/mod-package-details>
 
 #include <xml/serializer>
 
@@ -15,11 +15,12 @@
 #include <web/xhtml-fragment>
 #include <web/mime-url-encoding>
 
-#include <brep/page>
-#include <brep/options>
 #include <brep/package>
 #include <brep/package-odb>
 
+#include <mod/page>
+#include <mod/options>
+
 using namespace odb::core;
 using namespace brep::cli;
 
diff --git a/brep/mod-package-search b/mod/mod-package-search
index bb762cd..e463e2a 100644
--- a/brep/mod-package-search
+++ b/mod/mod-package-search
@@ -1,15 +1,15 @@
-// file      : brep/mod-package-search -*- C++ -*-
+// file      : mod/mod-package-search -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MOD_PACKAGE_SEARCH
-#define BREP_MOD_PACKAGE_SEARCH
+#ifndef MOD_MOD_PACKAGE_SEARCH
+#define MOD_MOD_PACKAGE_SEARCH
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
-#include <brep/database-module>
+#include <mod/options>
+#include <mod/database-module>
 
 namespace brep
 {
@@ -39,4 +39,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MOD_PACKAGE_SEARCH
+#endif // MOD_MOD_PACKAGE_SEARCH
diff --git a/brep/mod-package-search.cxx b/mod/mod-package-search.cxx
index 9769783..5654427 100644
--- a/brep/mod-package-search.cxx
+++ b/mod/mod-package-search.cxx
@@ -1,8 +1,8 @@
-// file      : brep/mod-package-search.cxx -*- C++ -*-
+// file      : mod/mod-package-search.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/mod-package-search>
+#include <mod/mod-package-search>
 
 #include <xml/serializer>
 
@@ -17,12 +17,12 @@
 #include <web/mime-url-encoding>
 
 #include <brep/version>
-
-#include <brep/page>
-#include <brep/options>
 #include <brep/package>
 #include <brep/package-odb>
 
+#include <mod/page>
+#include <mod/options>
+
 using namespace odb::core;
 using namespace brep::cli;
 
diff --git a/brep/mod-package-version-details b/mod/mod-package-version-details
index a463511..0fba2bf 100644
--- a/brep/mod-package-version-details
+++ b/mod/mod-package-version-details
@@ -1,15 +1,15 @@
-// file      : brep/mod-package-version-details -*- C++ -*-
+// file      : mod/mod-package-version-details -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MOD_PACKAGE_VERSION_DETAILS
-#define BREP_MOD_PACKAGE_VERSION_DETAILS
+#ifndef MOD_MOD_PACKAGE_VERSION_DETAILS
+#define MOD_MOD_PACKAGE_VERSION_DETAILS
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
-#include <brep/database-module>
+#include <mod/options>
+#include <mod/database-module>
 
 namespace brep
 {
@@ -42,4 +42,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MOD_PACKAGE_VERSION_DETAILS
+#endif // MOD_MOD_PACKAGE_VERSION_DETAILS
diff --git a/brep/mod-package-version-details.cxx b/mod/mod-package-version-details.cxx
index 21da41f..149c8f9 100644
--- a/brep/mod-package-version-details.cxx
+++ b/mod/mod-package-version-details.cxx
@@ -1,8 +1,8 @@
-// file      : brep/mod-package-version-details.cxx -*- C++ -*-
+// file      : mod/mod-package-version-details.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/mod-package-version-details>
+#include <mod/mod-package-version-details>
 
 #include <xml/serializer>
 
@@ -15,11 +15,12 @@
 #include <web/xhtml-fragment>
 #include <web/mime-url-encoding>
 
-#include <brep/page>
-#include <brep/options>
 #include <brep/package>
 #include <brep/package-odb>
 
+#include <mod/page>
+#include <mod/options>
+
 using namespace std;
 using namespace odb::core;
 using namespace brep::cli;
diff --git a/brep/mod-repository-details b/mod/mod-repository-details
index 49ad629..2532613 100644
--- a/brep/mod-repository-details
+++ b/mod/mod-repository-details
@@ -1,15 +1,15 @@
-// file      : brep/mod-repository-details -*- C++ -*-
+// file      : mod/mod-repository-details -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MOD_REPOSITORY_DETAILS
-#define BREP_MOD_REPOSITORY_DETAILS
+#ifndef MOD_MOD_REPOSITORY_DETAILS
+#define MOD_MOD_REPOSITORY_DETAILS
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
-#include <brep/database-module>
+#include <mod/options>
+#include <mod/database-module>
 
 namespace brep
 {
@@ -39,4 +39,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MOD_REPOSITORY_DETAILS
+#endif // MOD_MOD_REPOSITORY_DETAILS
diff --git a/brep/mod-repository-details.cxx b/mod/mod-repository-details.cxx
index b0e2b95..91f0d1b 100644
--- a/brep/mod-repository-details.cxx
+++ b/mod/mod-repository-details.cxx
@@ -1,8 +1,8 @@
-// file      : brep/mod-repository-details.cxx -*- C++ -*-
+// file      : mod/mod-repository-details.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/mod-repository-details>
+#include <mod/mod-repository-details>
 
 #include <time.h> // tzset()
 
@@ -21,11 +21,12 @@
 #include <web/xhtml-fragment>
 #include <web/mime-url-encoding>
 
-#include <brep/page>
-#include <brep/options>
 #include <brep/package>
 #include <brep/package-odb>
 
+#include <mod/page>
+#include <mod/options>
+
 using namespace std;
 using namespace odb::core;
 using namespace brep::cli;
diff --git a/brep/mod-repository-root b/mod/mod-repository-root
index f2c2ba0..db13b58 100644
--- a/brep/mod-repository-root
+++ b/mod/mod-repository-root
@@ -1,15 +1,15 @@
-// file      : brep/mod-repository-root -*- C++ -*-
+// file      : mod/mod-repository-root -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MOD_REPOSITORY_ROOT
-#define BREP_MOD_REPOSITORY_ROOT
+#ifndef MOD_MOD_REPOSITORY_ROOT
+#define MOD_MOD_REPOSITORY_ROOT
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/module>
-#include <brep/options>
+#include <mod/module>
+#include <mod/options>
 
 namespace brep
 {
@@ -57,4 +57,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MOD_REPOSITORY_ROOT
+#endif // MOD_MOD_REPOSITORY_ROOT
diff --git a/brep/mod-repository-root.cxx b/mod/mod-repository-root.cxx
index 7d0adc9..295117e 100644
--- a/brep/mod-repository-root.cxx
+++ b/mod/mod-repository-root.cxx
@@ -1,8 +1,8 @@
-// file      : brep/mod-repository-root.cxx -*- C++ -*-
+// file      : mod/mod-repository-root.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/mod-repository-root>
+#include <mod/mod-repository-root>
 
 #include <sstream>
 
@@ -10,12 +10,12 @@
 
 #include <brep/version>
 
-#include <brep/module>
-#include <brep/options>
-#include <brep/mod-package-search>
-#include <brep/mod-package-details>
-#include <brep/mod-repository-details>
-#include <brep/mod-package-version-details>
+#include <mod/module>
+#include <mod/options>
+#include <mod/mod-package-search>
+#include <mod/mod-package-details>
+#include <mod/mod-repository-details>
+#include <mod/mod-package-version-details>
 
 using namespace std;
 using namespace brep::cli;
diff --git a/brep/module b/mod/module
index 7e5763a..b704a53 100644
--- a/brep/module
+++ b/mod/module
@@ -1,17 +1,17 @@
-// file      : brep/module -*- C++ -*-
+// file      : mod/module -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_MODULE
-#define BREP_MODULE
+#ifndef MOD_MODULE
+#define MOD_MODULE
 
 #include <web/module>
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options>
-#include <brep/diagnostics>
+#include <mod/options>
+#include <mod/diagnostics>
 
 namespace brep
 {
@@ -198,4 +198,4 @@ namespace brep
   };
 }
 
-#endif // BREP_MODULE
+#endif // MOD_MODULE
diff --git a/brep/module.cxx b/mod/module.cxx
index 68969eb..5e3a4b1 100644
--- a/brep/module.cxx
+++ b/mod/module.cxx
@@ -1,8 +1,8 @@
-// file      : brep/module.cxx -*- C++ -*-
+// file      : mod/module.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/module>
+#include <mod/module>
 
 #include <httpd.h>
 #include <http_log.h>
@@ -14,7 +14,7 @@
 #include <web/module>
 #include <web/apache/log>
 
-#include <brep/options>
+#include <mod/options>
 
 using namespace std;
 using namespace placeholders; // For std::bind's _1, etc.
diff --git a/brep/options-types b/mod/options-types
index 922637b..e696139 100644
--- a/brep/options-types
+++ b/mod/options-types
@@ -1,9 +1,9 @@
-// file      : brep/options-types -*- C++ -*-
+// file      : mod/options-types -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_OPTIONS_TYPES
-#define BREP_OPTIONS_TYPES
+#ifndef MOD_OPTIONS_TYPES
+#define MOD_OPTIONS_TYPES
 
 #include <brep/types>
 #include <brep/utility>
@@ -29,4 +29,4 @@ namespace brep
 
 }
 
-#endif // BREP_OPTIONS_TYPES
+#endif // MOD_OPTIONS_TYPES
diff --git a/brep/options.cli b/mod/options.cli
index d63a561..ba8b37b 100644
--- a/brep/options.cli
+++ b/mod/options.cli
@@ -1,4 +1,4 @@
-// file      : brep/options.cli -*- C++ -*-
+// file      : mod/options.cli -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
@@ -6,7 +6,7 @@ include <web/xhtml-fragment>;
 
 include <brep/types>;
 
-include <brep/options-types>;
+include <mod/options-types>;
 
 namespace brep
 {
diff --git a/brep/page b/mod/page
index 512c11a..b326d6c 100644
--- a/brep/page
+++ b/mod/page
@@ -1,9 +1,9 @@
-// file      : brep/page -*- C++ -*-
+// file      : mod/page -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BREP_PAGE
-#define BREP_PAGE
+#ifndef MOD_PAGE
+#define MOD_PAGE
 
 #include <xml/forward>
 
@@ -13,7 +13,8 @@
 #include <brep/utility>
 
 #include <brep/package>
-#include <brep/options-types> // page_menu
+
+#include <mod/options-types> // page_menu
 
 namespace brep
 {
@@ -399,4 +400,4 @@ namespace brep
   html_id (const string&);
 }
 
-#endif // BREP_PAGE
+#endif // MOD_PAGE
diff --git a/brep/page.cxx b/mod/page.cxx
index 689ee20..7fc2e90 100644
--- a/brep/page.cxx
+++ b/mod/page.cxx
@@ -1,8 +1,8 @@
-// file      : brep/page.cxx -*- C++ -*-
+// file      : mod/page.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/page>
+#include <mod/page>
 
 #include <set>
 #include <ios>       // hex, uppercase, right
diff --git a/brep/services.cxx b/mod/services.cxx
index 94c7fc6..b0c5834 100644
--- a/brep/services.cxx
+++ b/mod/services.cxx
@@ -1,4 +1,4 @@
-// file      : brep/services.cxx -*- C++ -*-
+// file      : mod/services.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
@@ -9,7 +9,7 @@
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/mod-repository-root>
+#include <mod/mod-repository-root>
 
 static brep::repository_root mod;
 web::apache::service AP_MODULE_DECLARE_DATA brep_module ("brep", mod);
diff --git a/brep/types-parsers b/mod/types-parsers
index 78b7088..cbea1bd 100644
--- a/brep/types-parsers
+++ b/mod/types-parsers
@@ -1,19 +1,19 @@
-// file      : brep/types-parsers -*- C++ -*-
+// file      : mod/types-parsers -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 // CLI parsers, included into the generated source files.
 //
 
-#ifndef BREP_TYPES_PARSERS
-#define BREP_TYPES_PARSERS
+#ifndef MOD_TYPES_PARSERS
+#define MOD_TYPES_PARSERS
 
 #include <web/xhtml-fragment>
 
 #include <brep/types>
 #include <brep/utility>
 
-#include <brep/options-types>
+#include <mod/options-types>
 
 namespace brep
 {
@@ -54,4 +54,4 @@ namespace brep
   }
 }
 
-#endif // BREP_TYPES_PARSERS
+#endif // MOD_TYPES_PARSERS
diff --git a/brep/types-parsers.cxx b/mod/types-parsers.cxx
index 67f4812..279ab58 100644
--- a/brep/types-parsers.cxx
+++ b/mod/types-parsers.cxx
@@ -1,10 +1,10 @@
-// file      : brep/types-parsers.cxx -*- C++ -*-
+// file      : mod/types-parsers.cxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2016 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <brep/types-parsers>
+#include <mod/types-parsers>
 
-#include <brep/options>
+#include <mod/options>
 
 using namespace std;
 using namespace web::xhtml;