Use odb prefix for inclusion

22 files changed, 28 insertions, 41 deletions

diff --git a/odb/semantics/class-template.cxx b/odb/semantics/class-template.cxx
index 05deef8..20c8ba7 100644
--- a/odb/semantics/class-template.cxx
+++ b/odb/semantics/class-template.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/class-template.hxx>
+#include <odb/semantics/class-template.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/class-template.hxx b/odb/semantics/class-template.hxx
index a6a34a4..7d069ec 100644
--- a/odb/semantics/class-template.hxx
+++ b/odb/semantics/class-template.hxx
@@ -6,9 +6,9 @@
 #ifndef ODB_SEMANTICS_CLASS_TEMPLATE_HXX
 #define ODB_SEMANTICS_CLASS_TEMPLATE_HXX
 
-#include <semantics/elements.hxx>
-#include <semantics/class.hxx>
-#include <semantics/template.hxx>
+#include <odb/semantics/elements.hxx>
+#include <odb/semantics/class.hxx>
+#include <odb/semantics/template.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/class.cxx b/odb/semantics/class.cxx
index 7462d7c..b408d05 100644
--- a/odb/semantics/class.cxx
+++ b/odb/semantics/class.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/class.hxx>
+#include <odb/semantics/class.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/class.hxx b/odb/semantics/class.hxx
index ba1a09b..bb5dec3 100644
--- a/odb/semantics/class.hxx
+++ b/odb/semantics/class.hxx
@@ -7,7 +7,7 @@
 #define ODB_SEMANTICS_CLASS_HXX
 
 #include <vector>
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/derived.cxx b/odb/semantics/derived.cxx
index 490dac4..5f33d5a 100644
--- a/odb/semantics/derived.cxx
+++ b/odb/semantics/derived.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/derived.hxx>
+#include <odb/semantics/derived.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/derived.hxx b/odb/semantics/derived.hxx
index 00ab18a..e7c0e51 100644
--- a/odb/semantics/derived.hxx
+++ b/odb/semantics/derived.hxx
@@ -6,7 +6,7 @@
 #ifndef ODB_SEMANTICS_DERIVED_HXX
 #define ODB_SEMANTICS_DERIVED_HXX
 
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/elements.cxx b/odb/semantics/elements.cxx
index caed01e..29b1f8e 100644
--- a/odb/semantics/elements.cxx
+++ b/odb/semantics/elements.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/elements.hxx b/odb/semantics/elements.hxx
index 969f33a..cc3b0be 100644
--- a/odb/semantics/elements.hxx
+++ b/odb/semantics/elements.hxx
@@ -6,7 +6,7 @@
 #ifndef ODB_SEMANTICS_ELEMENTS_HXX
 #define ODB_SEMANTICS_ELEMENTS_HXX
 
-#include <gcc.hxx> // Keep it first.
+#include <odb/gcc.hxx> // Keep it first.
 
 #include <map>
 #include <list>
@@ -18,10 +18,8 @@
 #include <cassert>
 
 #include <cutl/fs/path.hxx>
-
 #include <cutl/container/graph.hxx>
 #include <cutl/container/pointer-iterator.hxx>
-
 #include <cutl/compiler/context.hxx>
 
 namespace semantics
@@ -590,6 +588,6 @@ namespace semantics
   };
 }
 
-#include <semantics/elements.ixx>
+#include <odb/semantics/elements.ixx>
 
 #endif // ODB_SEMANTICS_ELEMENTS_HXX
diff --git a/odb/semantics/enum.cxx b/odb/semantics/enum.cxx
index ab19c70..ea23d1e 100644
--- a/odb/semantics/enum.cxx
+++ b/odb/semantics/enum.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/enum.hxx>
+#include <odb/semantics/enum.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/enum.hxx b/odb/semantics/enum.hxx
index 6f3dfae..b03a56c 100644
--- a/odb/semantics/enum.hxx
+++ b/odb/semantics/enum.hxx
@@ -7,7 +7,7 @@
 #define ODB_SEMANTICS_ENUM_HXX
 
 #include <vector>
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/fundamental.cxx b/odb/semantics/fundamental.cxx
index 0edca0c..10074a5 100644
--- a/odb/semantics/fundamental.cxx
+++ b/odb/semantics/fundamental.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/fundamental.hxx>
+#include <odb/semantics/fundamental.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/fundamental.hxx b/odb/semantics/fundamental.hxx
index eea49a8..5cee2ac 100644
--- a/odb/semantics/fundamental.hxx
+++ b/odb/semantics/fundamental.hxx
@@ -6,7 +6,7 @@
 #ifndef ODB_SEMANTICS_FUNDAMENTAL_HXX
 #define ODB_SEMANTICS_FUNDAMENTAL_HXX
 
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/namespace.cxx b/odb/semantics/namespace.cxx
index 72e977f..797b53d 100644
--- a/odb/semantics/namespace.cxx
+++ b/odb/semantics/namespace.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/namespace.hxx>
+#include <odb/semantics/namespace.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/namespace.hxx b/odb/semantics/namespace.hxx
index b6a673c..936a8c7 100644
--- a/odb/semantics/namespace.hxx
+++ b/odb/semantics/namespace.hxx
@@ -6,7 +6,7 @@
 #ifndef ODB_SEMANTICS_NAMESPACE_HXX
 #define ODB_SEMANTICS_NAMESPACE_HXX
 
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/template.cxx b/odb/semantics/template.cxx
index 4882aa3..4a3df79 100644
--- a/odb/semantics/template.cxx
+++ b/odb/semantics/template.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/template.hxx>
+#include <odb/semantics/template.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/template.hxx b/odb/semantics/template.hxx
index 1357dbf..b610cfb 100644
--- a/odb/semantics/template.hxx
+++ b/odb/semantics/template.hxx
@@ -7,7 +7,7 @@
 #define ODB_SEMANTICS_TEMPLATE_HXX
 
 #include <vector>
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/union-template.cxx b/odb/semantics/union-template.cxx
index a83748f..6aa192b 100644
--- a/odb/semantics/union-template.cxx
+++ b/odb/semantics/union-template.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/union-template.hxx>
+#include <odb/semantics/union-template.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/union-template.hxx b/odb/semantics/union-template.hxx
index 8e74e6e..4b0df27 100644
--- a/odb/semantics/union-template.hxx
+++ b/odb/semantics/union-template.hxx
@@ -6,9 +6,9 @@
 #ifndef ODB_SEMANTICS_UNION_TEMPLATE_HXX
 #define ODB_SEMANTICS_UNION_TEMPLATE_HXX
 
-#include <semantics/elements.hxx>
-#include <semantics/union.hxx>
-#include <semantics/template.hxx>
+#include <odb/semantics/elements.hxx>
+#include <odb/semantics/union.hxx>
+#include <odb/semantics/template.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/union.cxx b/odb/semantics/union.cxx
index a4e62a1..ae2f46e 100644
--- a/odb/semantics/union.cxx
+++ b/odb/semantics/union.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/union.hxx>
+#include <odb/semantics/union.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/union.hxx b/odb/semantics/union.hxx
index e4b93a9..2f441ca 100644
--- a/odb/semantics/union.hxx
+++ b/odb/semantics/union.hxx
@@ -6,7 +6,7 @@
 #ifndef ODB_SEMANTICS_UNION_HXX
 #define ODB_SEMANTICS_UNION_HXX
 
-#include <semantics/elements.hxx>
+#include <odb/semantics/elements.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/unit.cxx b/odb/semantics/unit.cxx
index 073b7fd..260b1c6 100644
--- a/odb/semantics/unit.cxx
+++ b/odb/semantics/unit.cxx
@@ -4,8 +4,7 @@
 // license   : GNU GPL v2; see accompanying LICENSE file
 
 #include <cutl/compiler/type-info.hxx>
-
-#include <semantics/unit.hxx>
+#include <odb/semantics/unit.hxx>
 
 namespace semantics
 {
diff --git a/odb/semantics/unit.hxx b/odb/semantics/unit.hxx
index 05eec7f..4a7b5f4 100644
--- a/odb/semantics/unit.hxx
+++ b/odb/semantics/unit.hxx
@@ -8,8 +8,8 @@
 
 #include <map>
 
-#include <semantics/elements.hxx>
-#include <semantics/namespace.hxx>
+#include <odb/semantics/elements.hxx>
+#include <odb/semantics/namespace.hxx>
 
 namespace semantics
 {