12 files changed, 72 insertions, 13 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7c4492b01..5242d261e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -89,6 +89,7 @@ endfunction ()
 add_subdirectory(common)
 add_subdirectory(crypto)
 add_subdirectory(cryptonote_core)
+add_subdirectory(blockchain_db)
 add_subdirectory(mnemonics)
 add_subdirectory(rpc)
 add_subdirectory(wallet)
diff --git a/src/blockchain_converter/CMakeLists.txt b/src/blockchain_converter/CMakeLists.txt
index fa2c7bafc..a91624f4f 100644
--- a/src/blockchain_converter/CMakeLists.txt
+++ b/src/blockchain_converter/CMakeLists.txt
@@ -43,6 +43,7 @@ bitmonero_add_executable(blockchain_converter
 target_link_libraries(blockchain_converter
   LINK_PRIVATE
     cryptonote_core
+	blockchain_db
     ${CMAKE_THREAD_LIBS_INIT})
 
 add_dependencies(blockchain_converter
diff --git a/src/blockchain_converter/blockchain_converter.cpp b/src/blockchain_converter/blockchain_converter.cpp
index 0dfc1a2c3..aae569e58 100644
--- a/src/blockchain_converter/blockchain_converter.cpp
+++ b/src/blockchain_converter/blockchain_converter.cpp
@@ -34,9 +34,9 @@
 #include "cryptonote_core/cryptonote_format_utils.h"
 #include "misc_language.h"
 #include "cryptonote_core/blockchain_storage.h"
-#include "cryptonote_core/blockchain_db.h"
+#include "blockchain_db/blockchain_db.h"
 #include "cryptonote_core/blockchain.h"
-#include "cryptonote_core/BlockchainDB_impl/db_lmdb.h"
+#include "blockchain_db/lmdb/db_lmdb.h"
 #include "cryptonote_core/tx_pool.h"
 #include <iostream>
 
diff --git a/src/blockchain_db/CMakeLists.txt b/src/blockchain_db/CMakeLists.txt
new file mode 100644
index 000000000..84b2d6a74
--- /dev/null
+++ b/src/blockchain_db/CMakeLists.txt
@@ -0,0 +1,60 @@
+# Copyright (c) 2014-2015, The Monero Project
+#
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice, this list of
+#    conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice, this list
+#    of conditions and the following disclaimer in the documentation and/or other
+#    materials provided with the distribution.
+#
+# 3. Neither the name of the copyright holder nor the names of its contributors may be
+#    used to endorse or promote products derived from this software without specific
+#    prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
+# THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+# THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+set(blockchain_db_sources
+  blockchain_db.cpp
+  lmdb/db_lmdb.cpp
+  )
+
+set(blockchain_db_headers)
+
+set(blockchain_db_private_headers
+  blockchain_db.h
+  lmdb/db_lmdb.h
+  )
+
+bitmonero_private_headers(blockchain_db
+  ${crypto_private_headers})
+bitmonero_add_library(blockchain_db
+  ${blockchain_db_sources}
+  ${blockchain_db_headers}
+  ${blockchain_db_private_headers})
+target_link_libraries(blockchain_db
+  LINK_PUBLIC
+    common
+    crypto
+    cryptonote_core
+    ${Boost_DATE_TIME_LIBRARY}
+    ${Boost_PROGRAM_OPTIONS_LIBRARY}
+    ${Boost_SERIALIZATION_LIBRARY}
+  LINK_PRIVATE
+    ${Boost_FILESYSTEM_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${LMDB_LIBRARY}
+    ${EXTRA_LIBRARIES})
diff --git a/src/cryptonote_core/blockchain_db.cpp b/src/blockchain_db/blockchain_db.cpp
index fc8aeef4e..8b08d3805 100644
--- a/src/cryptonote_core/blockchain_db.cpp
+++ b/src/blockchain_db/blockchain_db.cpp
@@ -26,8 +26,8 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "cryptonote_core/blockchain_db.h"
-#include "cryptonote_format_utils.h"
+#include "blockchain_db.h"
+#include "cryptonote_core/cryptonote_format_utils.h"
 #include "profile_tools.h"
 
 using epee::string_tools::pod_to_hex;
diff --git a/src/cryptonote_core/blockchain_db.h b/src/blockchain_db/blockchain_db.h
index 2a7fa8f82..2a7fa8f82 100644
--- a/src/cryptonote_core/blockchain_db.h
+++ b/src/blockchain_db/blockchain_db.h
diff --git a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp b/src/blockchain_db/lmdb/db_lmdb.cpp
index feff4a272..feff4a272 100644
--- a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.cpp
+++ b/src/blockchain_db/lmdb/db_lmdb.cpp
diff --git a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.h b/src/blockchain_db/lmdb/db_lmdb.h
index 0b4b5ec1a..f6582fce4 100644
--- a/src/cryptonote_core/BlockchainDB_impl/db_lmdb.h
+++ b/src/blockchain_db/lmdb/db_lmdb.h
@@ -25,7 +25,7 @@
 // STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-#include "cryptonote_core/blockchain_db.h"
+#include "blockchain_db/blockchain_db.h"
 #include "cryptonote_protocol/blobdatatype.h" // for type blobdata
 
 #include <lmdb.h>
diff --git a/src/cryptonote_core/CMakeLists.txt b/src/cryptonote_core/CMakeLists.txt
index fc9cc629b..26122e367 100644
--- a/src/cryptonote_core/CMakeLists.txt
+++ b/src/cryptonote_core/CMakeLists.txt
@@ -30,8 +30,6 @@ set(cryptonote_core_sources
   account.cpp
   blockchain_storage.cpp
   blockchain.cpp
-  blockchain_db.cpp
-  BlockchainDB_impl/db_lmdb.cpp
   checkpoints.cpp
   checkpoints_create.cpp
   cryptonote_basic_impl.cpp
@@ -49,8 +47,6 @@ set(cryptonote_core_private_headers
   blockchain_storage.h
   blockchain_storage_boost_serialization.h
   blockchain.h
-  blockchain_db.h
-  BlockchainDB_impl/db_lmdb.h
   checkpoints.h
   checkpoints_create.h
   connection_context.h
@@ -76,6 +72,7 @@ target_link_libraries(cryptonote_core
   LINK_PUBLIC
     common
     crypto
+    blockchain_db
     ${Boost_DATE_TIME_LIBRARY}
     ${Boost_PROGRAM_OPTIONS_LIBRARY}
     ${Boost_SERIALIZATION_LIBRARY}
@@ -83,5 +80,4 @@ target_link_libraries(cryptonote_core
     ${Boost_FILESYSTEM_LIBRARY}
     ${Boost_SYSTEM_LIBRARY}
     ${Boost_THREAD_LIBRARY}
-    ${LMDB_LIBRARY}
     ${EXTRA_LIBRARIES})
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp
index b2d979432..9f4895736 100644
--- a/src/cryptonote_core/blockchain.cpp
+++ b/src/cryptonote_core/blockchain.cpp
@@ -38,8 +38,8 @@
 #include "cryptonote_basic_impl.h"
 #include "tx_pool.h"
 #include "blockchain.h"
-#include "cryptonote_core/blockchain_db.h"
-#include "cryptonote_core/BlockchainDB_impl/db_lmdb.h"
+#include "blockchain_db/blockchain_db.h"
+#include "blockchain_db/lmdb/db_lmdb.h"
 #include "cryptonote_format_utils.h"
 #include "cryptonote_boost_serialization.h"
 #include "cryptonote_config.h"
diff --git a/src/cryptonote_core/blockchain.h b/src/cryptonote_core/blockchain.h
index 3e8a2de31..477aa4964 100644
--- a/src/cryptonote_core/blockchain.h
+++ b/src/cryptonote_core/blockchain.h
@@ -50,7 +50,7 @@
 #include "verification_context.h"
 #include "crypto/hash.h"
 #include "checkpoints.h"
-#include "blockchain_db.h"
+#include "blockchain_db/blockchain_db.h"
 
 namespace cryptonote
 {
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
index 5f60857d6..1ad1949d3 100644
--- a/src/daemon/CMakeLists.txt
+++ b/src/daemon/CMakeLists.txt
@@ -59,6 +59,7 @@ bitmonero_add_executable(daemon
 target_link_libraries(daemon
   LINK_PRIVATE
     rpc
+    blockchain_db
     cryptonote_core
     crypto
     common