diff --git a/persistent-data/math_utils.h b/base/math_utils.h
similarity index 96%
rename from persistent-data/math_utils.h
rename to base/math_utils.h
index cb387f4..9c1bb0c 100644
--- a/persistent-data/math_utils.h
+++ b/base/math_utils.h
@@ -16,8 +16,8 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#ifndef THINP_MATH_H
-#define THINP_MATH_H
+#ifndef BASE_MATH_H
+#define BASE_MATH_H
 
 //----------------------------------------------------------------
 
diff --git a/persistent-data/data-structures/array.h b/persistent-data/data-structures/array.h
index f7a3ac4..d5063e7 100644
--- a/persistent-data/data-structures/array.h
+++ b/persistent-data/data-structures/array.h
@@ -19,7 +19,7 @@
 #ifndef ARRAY_H
 #define ARRAY_H
 
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 #include "persistent-data/data-structures/btree.h"
 #include "persistent-data/data-structures/btree_counter.h"
 #include "persistent-data/data-structures/btree_damage_visitor.h"
diff --git a/persistent-data/data-structures/bitset.cc b/persistent-data/data-structures/bitset.cc
index a4f0b67..02b6b9e 100644
--- a/persistent-data/data-structures/bitset.cc
+++ b/persistent-data/data-structures/bitset.cc
@@ -1,6 +1,6 @@
 #include "persistent-data/data-structures/array.h"
 #include "persistent-data/data-structures/bitset.h"
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 
 using namespace persistent_data;
 using namespace persistent_data::bitset_detail;
diff --git a/persistent-data/file_utils.cc b/persistent-data/file_utils.cc
index 98b31c4..329af86 100644
--- a/persistent-data/file_utils.cc
+++ b/persistent-data/file_utils.cc
@@ -1,4 +1,4 @@
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 #include "persistent-data/file_utils.h"
 #include "persistent-data/space-maps/core.h"
 
diff --git a/persistent-data/space-maps/core.cc b/persistent-data/space-maps/core.cc
index 463d212..4251ef6 100644
--- a/persistent-data/space-maps/core.cc
+++ b/persistent-data/space-maps/core.cc
@@ -17,7 +17,7 @@
 // <http://www.gnu.org/licenses/>.
 
 #include "persistent-data/space-maps/core.h"
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 
 #include <stdexcept>
 
diff --git a/persistent-data/space-maps/disk.cc b/persistent-data/space-maps/disk.cc
index 28e13d3..87c8fe5 100644
--- a/persistent-data/space-maps/disk.cc
+++ b/persistent-data/space-maps/disk.cc
@@ -26,7 +26,7 @@
 #include "persistent-data/data-structures/btree_damage_visitor.h"
 #include "persistent-data/data-structures/btree_counter.h"
 #include "persistent-data/checksum.h"
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 #include "persistent-data/transaction_manager.h"
 
 using namespace persistent_data;
diff --git a/thin-provisioning/metadata.cc b/thin-provisioning/metadata.cc
index 9f81a51..3c5446a 100644
--- a/thin-provisioning/metadata.cc
+++ b/thin-provisioning/metadata.cc
@@ -20,7 +20,7 @@
 #include "thin-provisioning/metadata.h"
 
 #include "persistent-data/file_utils.h"
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 #include "persistent-data/space-maps/core.h"
 #include "persistent-data/space-maps/disk.h"
 
diff --git a/thin-provisioning/thin_pool.cc b/thin-provisioning/thin_pool.cc
index 2b58e4d..3dca9de 100644
--- a/thin-provisioning/thin_pool.cc
+++ b/thin-provisioning/thin_pool.cc
@@ -16,7 +16,7 @@
 // with thin-provisioning-tools.  If not, see
 // <http://www.gnu.org/licenses/>.
 
-#include "persistent-data/math_utils.h"
+#include "base/math_utils.h"
 #include "thin-provisioning/thin_pool.h"
 
 #include <stdexcept>