zorba-coders team mailing list archive

[Ghislain Fourny <ghislain.fourny@xxxxxxxxxx>]

Ghislain Fourny has proposed merging lp:~gislenius/zorba/same-directory-store-includes into lp:zorba.

Requested reviews:
  Matthias Brantner (matthias-brantner)

For more details, see:
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279

Made store includes occur in same directory, i.e. replaced

#include "store/naive/include-file"

with

#include "include-file"

for all files in the /src/store/naive directory.
-- 
https://code.launchpad.net/~gislenius/zorba/same-directory-store-includes/+merge/91279
Your team Zorba Coders is subscribed to branch lp:zorba.

=== modified file 'src/store/naive/atomic_items.cpp'
--- src/store/naive/atomic_items.cpp	2012-01-26 19:56:14 +0000
+++ src/store/naive/atomic_items.cpp	2012-02-02 14:45:36 +0000
@@ -32,14 +32,14 @@
 #include "store/api/store.h"
 #include "store/api/item_factory.h"
 #include "store/api/collection.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/item_iterator.h"
-#include "store/naive/node_items.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/ordpath.h"
+#include "qname_pool.h"
+#include "simple_store.h"
+#include "simple_item_factory.h"
+#include "store_defs.h"
+#include "item_iterator.h"
+#include "node_items.h"
+#include "atomic_items.h"
+#include "ordpath.h"
 
 #include "util/ascii_util.h"
 #include "util/string_util.h"

=== modified file 'src/store/naive/collection_set.cpp'
--- src/store/naive/collection_set.cpp	2011-10-03 09:18:49 +0000
+++ src/store/naive/collection_set.cpp	2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
  */
 #include "stdafx.h"
 
-#include "store/naive/collection_set.h"
+#include "collection_set.h"
 #include "store/api/iterator.h"
-#include "store/naive/name_iterator.h"
+#include "name_iterator.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/dataguide.cpp'
--- src/store/naive/dataguide.cpp	2011-07-12 20:15:01 +0000
+++ src/store/naive/dataguide.cpp	2012-02-02 14:45:36 +0000
@@ -16,7 +16,7 @@
 #include "stdafx.h"
 
 #include "zorbautils/fatal.h"
-#include "store/naive/dataguide.h"
+#include "dataguide.h"
 
 
 namespace zorba 

=== modified file 'src/store/naive/inmemorystore.cpp'
--- src/store/naive/inmemorystore.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/inmemorystore.cpp	2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
  */
 #include "stdafx.h"
 
-#include "store/naive/store_manager_impl.h"
+#include "store_manager_impl.h"
 
-#include "store/naive/simple_store.h"
+#include "simple_store.h"
 
 namespace zorba 
 { 

=== modified file 'src/store/naive/inmemorystorec.cpp'
--- src/store/naive/inmemorystorec.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/inmemorystorec.cpp	2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
 
 #include <zorba/store_manager_c.h>
 #include <zorba/store_manager.h>
-#include "store/naive/simple_store.h"
+#include "simple_store.h"
 
 void* 
 create_store()

=== modified file 'src/store/naive/item.cpp'
--- src/store/naive/item.cpp	2012-01-26 19:56:14 +0000
+++ src/store/naive/item.cpp	2012-02-02 14:45:36 +0000
@@ -23,9 +23,9 @@
 
 #include "store/api/item.h"
 #include "store/api/iterator.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/node_items.h"
+#include "store_defs.h"
+#include "atomic_items.h"
+#include "node_items.h"
 
 #include "runtime/function_item/function_item.h"
 

=== modified file 'src/store/naive/item_iterator.cpp'
--- src/store/naive/item_iterator.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/item_iterator.cpp	2012-02-02 14:45:36 +0000
@@ -15,7 +15,7 @@
  */
 #include "stdafx.h"
 #include "store/api/item.h"
-#include "store/naive/item_iterator.h"
+#include "item_iterator.h"
 #include "store/api/collection.h"
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/item_vector.cpp'
--- src/store/naive/item_vector.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/item_vector.cpp	2012-02-02 14:45:36 +0000
@@ -18,7 +18,7 @@
 #include <sstream>
 
 #include "store/api/item.h"
-#include "store/naive/item_vector.h"
+#include "item_vector.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/loader_dtd.cpp'
--- src/store/naive/loader_dtd.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/loader_dtd.cpp	2012-02-02 14:45:36 +0000
@@ -26,17 +26,17 @@
 
 #include <zorba/store_consts.h>
 
-#include "store/naive/store_defs.h"
-#include "store/naive/string_pool.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/node_items.h"
-#include "store/naive/dataguide.h"
-#include "store/naive/nsbindings.h"
-#include "store/naive/loader.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/node_factory.h"
+#include "store_defs.h"
+#include "string_pool.h"
+#include "qname_pool.h"
+#include "simple_store.h"
+#include "atomic_items.h"
+#include "node_items.h"
+#include "dataguide.h"
+#include "nsbindings.h"
+#include "loader.h"
+#include "simple_item_factory.h"
+#include "node_factory.h"
 
 #include "zorbatypes/datetime.h"
 #include "zorbatypes/URI.h"

=== modified file 'src/store/naive/loader_fast.cpp'
--- src/store/naive/loader_fast.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/loader_fast.cpp	2012-02-02 14:45:36 +0000
@@ -23,17 +23,17 @@
 
 #include <zorba/store_consts.h>
 
-#include "store/naive/store_defs.h"
-#include "store/naive/string_pool.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/node_items.h"
-#include "store/naive/dataguide.h"
-#include "store/naive/nsbindings.h"
-#include "store/naive/loader.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/node_factory.h"
+#include "store_defs.h"
+#include "string_pool.h"
+#include "qname_pool.h"
+#include "simple_store.h"
+#include "atomic_items.h"
+#include "node_items.h"
+#include "dataguide.h"
+#include "nsbindings.h"
+#include "loader.h"
+#include "simple_item_factory.h"
+#include "node_factory.h"
 
 #include "zorbatypes/datetime.h"
 #include "zorbatypes/URI.h"

=== modified file 'src/store/naive/node_factory.cpp'
--- src/store/naive/node_factory.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/node_factory.cpp	2012-02-02 14:45:36 +0000
@@ -15,10 +15,10 @@
  */
 #include "stdafx.h"
 
-#include "store/naive/node_factory.h"
-#include "store/naive/node_items.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/store_defs.h"
+#include "node_factory.h"
+#include "node_items.h"
+#include "simple_store.h"
+#include "store_defs.h"
 
 namespace zorba 
 {

=== modified file 'src/store/naive/node_items.cpp'
--- src/store/naive/node_items.cpp	2012-02-01 14:50:27 +0000
+++ src/store/naive/node_items.cpp	2012-02-02 14:45:36 +0000
@@ -30,18 +30,18 @@
 #include "zorbamisc/ns_consts.h"
 
 #include "store/api/copymode.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/node_items.h"
-#include "store/naive/node_iterators.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_collection.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/nsbindings.h"
-#include "store/naive/item_iterator.h"
-#include "store/naive/dataguide.h"
-#include "store/naive/node_factory.h"
+#include "atomic_items.h"
+#include "node_items.h"
+#include "node_iterators.h"
+#include "simple_store.h"
+#include "simple_collection.h"
+#include "simple_item_factory.h"
+#include "qname_pool.h"
+#include "store_defs.h"
+#include "nsbindings.h"
+#include "item_iterator.h"
+#include "dataguide.h"
+#include "node_factory.h"
 
 #include "util/string_util.h"
 

=== modified file 'src/store/naive/node_iterators.cpp'
--- src/store/naive/node_iterators.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/node_iterators.cpp	2012-02-02 14:45:36 +0000
@@ -20,9 +20,9 @@
 #include "diagnostics/assert.h"
 #include "diagnostics/xquery_diagnostics.h"
 
-#include "store/naive/node_items.h"
-#include "store/naive/node_iterators.h"
-#include "store/naive/store_defs.h"
+#include "node_items.h"
+#include "node_iterators.h"
+#include "store_defs.h"
 
 namespace zorba
 {

=== modified file 'src/store/naive/node_updates.cpp'
--- src/store/naive/node_updates.cpp	2012-01-10 10:52:15 +0000
+++ src/store/naive/node_updates.cpp	2012-02-02 14:45:36 +0000
@@ -27,15 +27,15 @@
 #include "store/api/collection.h"
 #include "store/api/update_consts.h"
 
-#include "store/naive/store_defs.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/nsbindings.h"
-#include "store/naive/node_items.h"
-#include "store/naive/pul_primitives.h"
-#include "store/naive/simple_pul.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/node_factory.h"
+#include "store_defs.h"
+#include "simple_store.h"
+#include "nsbindings.h"
+#include "node_items.h"
+#include "pul_primitives.h"
+#include "simple_pul.h"
+#include "atomic_items.h"
+#include "simple_item_factory.h"
+#include "node_factory.h"
 
 #include "store/api/validator.h"
 

=== modified file 'src/store/naive/nsbindings.cpp'
--- src/store/naive/nsbindings.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/nsbindings.cpp	2012-02-02 14:45:36 +0000
@@ -16,7 +16,7 @@
 #include "stdafx.h"
 
 #include "zorbautils/fatal.h"
-#include "store/naive/nsbindings.h"
+#include "nsbindings.h"
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/dict.h"
 #include "zorbamisc/ns_consts.h"

=== modified file 'src/store/naive/ordpath.cpp'
--- src/store/naive/ordpath.cpp	2011-10-14 13:52:43 +0000
+++ src/store/naive/ordpath.cpp	2012-02-02 14:45:36 +0000
@@ -22,8 +22,8 @@
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/assert.h"
 
-#include "store/naive/ordpath.h"
-#include "store/naive/store_defs.h"
+#include "ordpath.h"
+#include "store_defs.h"
 
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/properties.cpp'
--- src/store/naive/properties.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/properties.cpp	2012-02-02 14:45:36 +0000
@@ -20,7 +20,7 @@
 #include <sstream>
 #include <cstdlib>
 
-#include "store/naive/properties.h"
+#include "properties.h"
 
 
 #define CONFIG_FOLDER "zorba"

=== modified file 'src/store/naive/pul_primitive_factory.cpp'
--- src/store/naive/pul_primitive_factory.cpp	2011-10-12 20:59:49 +0000
+++ src/store/naive/pul_primitive_factory.cpp	2012-02-02 14:45:36 +0000
@@ -15,9 +15,9 @@
  */
 #include "stdafx.h"
 
-#include "store/naive/pul_primitive_factory.h"
-#include "store/naive/pul_primitives.h"
-#include "store/naive/simple_collection.h"
+#include "pul_primitive_factory.h"
+#include "pul_primitives.h"
+#include "simple_collection.h"
 
 namespace zorba { namespace simplestore {
 

=== modified file 'src/store/naive/pul_primitives.cpp'
--- src/store/naive/pul_primitives.cpp	2011-11-02 17:19:09 +0000
+++ src/store/naive/pul_primitives.cpp	2012-02-02 14:45:36 +0000
@@ -17,18 +17,18 @@
 
 #include <exception>
 
-#include "store/naive/shared_types.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_pul.h"
-#include "store/naive/pul_primitives.h"
-#include "store/naive/node_items.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/simple_collection.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/node_factory.h"
-#include "store/naive/simple_index.h"
-#include "store/naive/simple_index_value.h"
+#include "shared_types.h"
+#include "store_defs.h"
+#include "simple_store.h"
+#include "simple_pul.h"
+#include "pul_primitives.h"
+#include "node_items.h"
+#include "atomic_items.h"
+#include "simple_collection.h"
+#include "simple_item_factory.h"
+#include "node_factory.h"
+#include "simple_index.h"
+#include "simple_index_value.h"
 
 #include "store/api/iterator.h"
 #include "store/api/copymode.h"

=== modified file 'src/store/naive/qname_pool.cpp'
--- src/store/naive/qname_pool.cpp	2012-01-24 11:24:56 +0000
+++ src/store/naive/qname_pool.cpp	2012-02-02 14:45:36 +0000
@@ -18,12 +18,12 @@
 #include "diagnostics/assert.h"
 #include "system/globalenv.h"
 
-#include "store/naive/string_pool.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/node_items.h"
+#include "string_pool.h"
+#include "qname_pool.h"
+#include "atomic_items.h"
+#include "simple_store.h"
+#include "store_defs.h"
+#include "node_items.h"
 #include "store/api/collection.h"
 #include "zorbatypes/datetime.h"
 #include "util/string_util.h"

=== modified file 'src/store/naive/simple_collection.cpp'
--- src/store/naive/simple_collection.cpp	2012-01-15 09:18:22 +0000
+++ src/store/naive/simple_collection.cpp	2012-02-02 14:45:36 +0000
@@ -18,14 +18,14 @@
 #include "diagnostics/assert.h"
 #include "diagnostics/xquery_diagnostics.h"
 
-#include "store/naive/simple_collection.h"
-#include "store/naive/simple_index.h"
+#include "simple_collection.h"
+#include "simple_index.h"
 #include "store/api/ic.h"
 #include "store/api/annotation.h"
-#include "store/naive/loader.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/node_items.h"
+#include "loader.h"
+#include "simple_store.h"
+#include "store_defs.h"
+#include "node_items.h"
 #include "zorbatypes/numconversions.h"
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/simple_index.cpp'
--- src/store/naive/simple_index.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_index.cpp	2012-02-02 14:45:36 +0000
@@ -21,11 +21,11 @@
 #include "diagnostics/util_macros.h"
 
 #include "store/api/item.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/simple_index.h"
-//#include "store/naive/simple_index_general.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/simple_store.h"
+#include "store_defs.h"
+#include "simple_index.h"
+//#include "simple_index_general.h"
+#include "atomic_items.h"
+#include "simple_store.h"
 
 #include <algorithm>
 

=== modified file 'src/store/naive/simple_index_general.cpp'
--- src/store/naive/simple_index_general.cpp	2012-01-10 10:52:15 +0000
+++ src/store/naive/simple_index_general.cpp	2012-02-02 14:45:36 +0000
@@ -15,10 +15,10 @@
  */
 #include "stdafx.h"
 
-#include "store/naive/simple_index_general.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/simple_item_factory.h"
+#include "simple_index_general.h"
+#include "simple_store.h"
+#include "atomic_items.h"
+#include "simple_item_factory.h"
 
 #include "diagnostics/assert.h"
 #include "diagnostics/util_macros.h"

=== modified file 'src/store/naive/simple_index_value.cpp'
--- src/store/naive/simple_index_value.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_index_value.cpp	2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
 
 #include <algorithm>
 
-#include "store/naive/simple_index_value.h"
+#include "simple_index_value.h"
 
 #include "diagnostics/xquery_diagnostics.h"
 #include "diagnostics/util_macros.h"

=== modified file 'src/store/naive/simple_item_factory.cpp'
--- src/store/naive/simple_item_factory.cpp	2011-12-21 14:40:33 +0000
+++ src/store/naive/simple_item_factory.cpp	2012-02-02 14:45:36 +0000
@@ -22,17 +22,17 @@
 
 //#include "zorbatypes/datetime.h"
 
-#include "store/naive/store_defs.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/node_items.h"
-#include "store/naive/node_iterators.h"
-#include "store/naive/simple_temp_seq.h"
-#include "store/naive/simple_pul.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/string_pool.h"
-#include "store/naive/node_factory.h"
+#include "store_defs.h"
+#include "simple_store.h"
+#include "simple_item_factory.h"
+#include "atomic_items.h"
+#include "node_items.h"
+#include "node_iterators.h"
+#include "simple_temp_seq.h"
+#include "simple_pul.h"
+#include "qname_pool.h"
+#include "string_pool.h"
+#include "node_factory.h"
 
 #include "util/ascii_util.h"
 

=== modified file 'src/store/naive/simple_iterator_factory.cpp'
--- src/store/naive/simple_iterator_factory.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/simple_iterator_factory.cpp	2012-02-02 14:45:36 +0000
@@ -16,12 +16,12 @@
 
 #include "stdafx.h"
 
-#include "store/naive/simple_iterator_factory.h"
-#include "store/naive/node_iterators.h"
-#include "store/naive/simple_temp_seq.h"
-#include "store/naive/simple_index.h"
-#include "store/naive/simple_index_value.h"
-#include "store/naive/simple_index_general.h"
+#include "simple_iterator_factory.h"
+#include "node_iterators.h"
+#include "simple_temp_seq.h"
+#include "simple_index.h"
+#include "simple_index_value.h"
+#include "simple_index_general.h"
 
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/simple_lazy_temp_seq.cpp'
--- src/store/naive/simple_lazy_temp_seq.cpp	2011-12-21 14:40:33 +0000
+++ src/store/naive/simple_lazy_temp_seq.cpp	2012-02-02 14:45:36 +0000
@@ -21,7 +21,7 @@
 #include "diagnostics/util_macros.h"
 
 #include "store/api/item.h"
-#include "store/naive/simple_lazy_temp_seq.h"
+#include "simple_lazy_temp_seq.h"
 
 
 namespace zorba

=== modified file 'src/store/naive/simple_pul.cpp'
--- src/store/naive/simple_pul.cpp	2011-10-30 00:18:34 +0000
+++ src/store/naive/simple_pul.cpp	2012-02-02 14:45:36 +0000
@@ -19,16 +19,16 @@
 
 #include "diagnostics/xquery_diagnostics.h"
 
-#include "store/naive/store_defs.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_collection.h"
-#include "store/naive/simple_index_value.h"
-#include "store/naive/simple_pul.h"
-#include "store/naive/pul_primitives.h"
-#include "store/naive/node_items.h"
-#include "store/naive/atomic_items.h"
-#include "store/naive/pul_primitive_factory.h"
-#include "store/naive/node_factory.h"
+#include "store_defs.h"
+#include "simple_store.h"
+#include "simple_collection.h"
+#include "simple_index_value.h"
+#include "simple_pul.h"
+#include "pul_primitives.h"
+#include "node_items.h"
+#include "atomic_items.h"
+#include "pul_primitive_factory.h"
+#include "node_factory.h"
 
 #include "store/api/iterator.h"
 #include "store/api/item_factory.h"

=== modified file 'src/store/naive/simple_store.cpp'
--- src/store/naive/simple_store.cpp	2012-01-14 22:52:27 +0000
+++ src/store/naive/simple_store.cpp	2012-02-02 14:45:36 +0000
@@ -31,31 +31,31 @@
 #include "store/api/pul.h"
 #include "store/api/xs_type_codes.h"
 
-#include "store/naive/properties.h"
-#include "store/naive/string_pool.h"
-#include "store/naive/simple_store.h"
-#include "store/naive/simple_temp_seq.h"
-#include "store/naive/simple_lazy_temp_seq.h"
-#include "store/naive/simple_collection.h"
-#include "store/naive/collection_set.h"
-#include "store/naive/simple_index.h"
-#include "store/naive/simple_index_value.h"
-#include "store/naive/simple_index_general.h"
-#include "store/naive/simple_ic.h"
-#include "store/naive/qname_pool.h"
-#include "store/naive/loader.h"
-#include "store/naive/store_defs.h"
-#include "store/naive/node_items.h"
-#include "store/naive/dataguide.h"
-#include "store/naive/node_iterators.h"
-#include "store/naive/simple_item_factory.h"
-#include "store/naive/simple_iterator_factory.h"
-#include "store/naive/query_context.h"
-#include "store/naive/item_iterator.h"
-#include "store/naive/node_factory.h"
-#include "store/naive/name_iterator.h"
-#include "store/naive/document_name_iterator.h"
-#include "store/naive/pul_primitive_factory.h"
+#include "properties.h"
+#include "string_pool.h"
+#include "simple_store.h"
+#include "simple_temp_seq.h"
+#include "simple_lazy_temp_seq.h"
+#include "simple_collection.h"
+#include "collection_set.h"
+#include "simple_index.h"
+#include "simple_index_value.h"
+#include "simple_index_general.h"
+#include "simple_ic.h"
+#include "qname_pool.h"
+#include "loader.h"
+#include "store_defs.h"
+#include "node_items.h"
+#include "dataguide.h"
+#include "node_iterators.h"
+#include "simple_item_factory.h"
+#include "simple_iterator_factory.h"
+#include "query_context.h"
+#include "item_iterator.h"
+#include "node_factory.h"
+#include "name_iterator.h"
+#include "document_name_iterator.h"
+#include "pul_primitive_factory.h"
 
 #include "util/cxx_util.h"
 #include "util/uuid/uuid.h"

=== modified file 'src/store/naive/simple_temp_seq.cpp'
--- src/store/naive/simple_temp_seq.cpp	2012-01-11 17:30:25 +0000
+++ src/store/naive/simple_temp_seq.cpp	2012-02-02 14:45:36 +0000
@@ -21,7 +21,7 @@
 #include "diagnostics/util_macros.h"
 
 #include "store/api/item.h"
-#include "store/naive/simple_temp_seq.h"
+#include "simple_temp_seq.h"
 #include "store/api/copymode.h"
 
 namespace zorba { namespace simplestore {

=== modified file 'src/store/naive/string_pool.cpp'
--- src/store/naive/string_pool.cpp	2011-06-14 17:26:33 +0000
+++ src/store/naive/string_pool.cpp	2012-02-02 14:45:36 +0000
@@ -17,7 +17,7 @@
 
 #include "zorbautils/fatal.h"
 #include "util/string_util.h"
-#include "store/naive/string_pool.h"
+#include "string_pool.h"
 
 namespace zorba { namespace simplestore {