Introduce persistent-data/data-structures/

persistent-data/data-structures/btree.h

@@ -19,8 +19,8 @@
 #ifndef BTREE_H
 #define BTREE_H
 
-#include "endian_utils.h"
-#include "transaction_manager.h"
+#include "persistent-data/endian_utils.h"
+#include "persistent-data/transaction_manager.h"
 
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>

persistent-data/data-structures/btree.tcc

@@ -18,9 +18,9 @@
 
 #include "btree.h"
 
-#include "errors.h"
-#include "checksum.h"
-#include "transaction_manager.h"
+#include "persistent-data/errors.h"
+#include "persistent-data/checksum.h"
+#include "persistent-data/transaction_manager.h"
 
 #include <iostream>
 

persistent-data/data-structures/btree_checker.h

@@ -19,10 +19,11 @@
 #ifndef BTREE_CHECKER_H
 #define BTREE_CHECKER_H
 
-#include "block_counter.h"
 #include "btree.h"
-#include "checksum.h"
-#include "error_set.h"
+
+#include "persistent-data/block_counter.h"
+#include "persistent-data/checksum.h"
+#include "persistent-data/error_set.h"
 
 #include <sstream>
 #include <map>

persistent-data/space-maps/disk.h

@@ -20,7 +20,7 @@
 #define SPACE_MAP_DISK_H
 
 // FIXME: why is btree_checker needed?
-#include "persistent-data/btree_checker.h"
+#include "persistent-data/data-structures/btree_checker.h"
 #include "persistent-data/space_map.h"
 
 //----------------------------------------------------------------

persistent-data/space-maps/disk_structures.h

@@ -20,7 +20,9 @@
 #define SPACE_MAP_DISK_STRUCTURES_H
 
 #include "persistent-data/endian_utils.h"
-#include "persistent-data/btree.h"
+
+// FIXME: what's this included for?
+#include "persistent-data/data-structures/btree.h"
 
 //----------------------------------------------------------------