Move most of what was left in core to utils (since that is what they are,

basically). buf_comp and data_src might need their own directory, but it
doesn't really feel like it.

8 files changed, 7 insertions, 11 deletions

diff --git a/src/core/info.txt b/src/core/info.txt
index 21eb5e0d7..df1d73b77 100644
--- a/src/core/info.txt
+++ b/src/core/info.txt
@@ -4,17 +4,7 @@ load_on auto
 
 define CORE_MODULE
 
-<requires>
-utils
-</requires>
-
 <add>
 botan.h
-data_src.cpp
-buf_comp.h
-data_src.h
 enums.h
-exceptn.cpp
-exceptn.h
-secmem.h
 </add>
diff --git a/src/core/buf_comp.h b/src/utils/buf_comp.h
index c05324b8f..c05324b8f 100644
--- a/src/core/buf_comp.h
+++ b/src/utils/buf_comp.h
diff --git a/src/core/data_src.cpp b/src/utils/data_src.cpp
index de5544885..de5544885 100644
--- a/src/core/data_src.cpp
+++ b/src/utils/data_src.cpp
diff --git a/src/core/data_src.h b/src/utils/data_src.h
index 25bdce00f..25bdce00f 100644
--- a/src/core/data_src.h
+++ b/src/utils/data_src.h
diff --git a/src/core/exceptn.cpp b/src/utils/exceptn.cpp
index 29357afa5..29357afa5 100644
--- a/src/core/exceptn.cpp
+++ b/src/utils/exceptn.cpp
diff --git a/src/core/exceptn.h b/src/utils/exceptn.h
index 3bfec2fd2..3bfec2fd2 100644
--- a/src/core/exceptn.h
+++ b/src/utils/exceptn.h
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 127ea5e2f..4999a08e7 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -15,12 +15,17 @@ filters
 <add>
 bit_ops.h
 bswap.h
+buf_comp.h
 charset.cpp
 charset.h
+data_src.cpp
+data_src.h
 datastor.cpp
 datastor.h
-entropy.h
 entropy.cpp
+entropy.h
+exceptn.cpp
+exceptn.h
 loadstor.h
 mem_ops.h
 mlock.cpp
@@ -28,6 +33,7 @@ mutex.h
 parsing.cpp
 parsing.h
 rotate.h
+secmem.h
 stl_util.h
 types.h
 ui.cpp
diff --git a/src/core/secmem.h b/src/utils/secmem.h
index 8e353a68b..8e353a68b 100644
--- a/src/core/secmem.h
+++ b/src/utils/secmem.h