Remove include of blockstore_impl.h from disk_tool and osd

src/disk_tool/disk_tool.h

@@ -8,14 +8,17 @@
 #endif
 
 #include <map>
+#include <set>
 #include <vector>
 #include <string>
 #include <functional>
 
 #include "json11/json11.hpp"
 #include "blockstore_disk.h"
-#include "blockstore_impl.h"
+#include "blockstore.h"
+#include "ondisk_formats.h"
 #include "crc32c.h"
+#include "allocator.h"
 
 // vITADisk
 #define VITASTOR_DISK_MAGIC 0x6b73694441544976

src/disk_tool/disk_tool_journal.cpp

@@ -1,7 +1,10 @@
 // Copyright (c) Vitaliy Filippov, 2019+
 // License: VNPL-1.1 (see README.md for details)
 
+#include <unistd.h>
+
 #include "disk_tool.h"
+#include "malloc_or_die.h"
 
 int disk_tool_t::dump_journal()
 {

src/disk_tool/disk_tool_meta.cpp

@@ -5,6 +5,7 @@
 #include "rw_blocking.h"
 #include "osd_id.h"
 #include "json_util.h"
+#include "malloc_or_die.h"
 
 int disk_tool_t::process_meta(std::function<void(blockstore_meta_header_v2_t *)> hdr_fn,
     std::function<void(uint64_t, clean_disk_entry*, uint8_t*)> record_fn, bool do_open)

src/disk_tool/disk_tool_resize.cpp

@@ -4,6 +4,7 @@
 #include "disk_tool.h"
 #include "rw_blocking.h"
 #include "str_util.h"
+#include "malloc_or_die.h"
 
 #define DM_ST_EMPTY 0
 #define DM_ST_TO_READ 1

src/disk_tool/disk_tool_udev.cpp

@@ -7,6 +7,7 @@
 #include "rw_blocking.h"
 #include "str_util.h"
 #include "json_util.h"
+#include "malloc_or_die.h"
 
 struct __attribute__((__packed__)) vitastor_disk_superblock_t
 {

src/disk_tool/disk_tool_utils.cpp

@@ -2,11 +2,13 @@
 // License: VNPL-1.1 (see README.md for details)
 
 #include <sys/wait.h>
+#include <sys/ioctl.h>
 #include <dirent.h>
 
 #include "disk_tool.h"
 #include "rw_blocking.h"
 #include "str_util.h"
+#include "malloc_or_die.h"
 
 uint64_t sscanf_json(const char *fmt, const json11::Json & str)
 {