refactor: fix missing includes in sources

src/json-util.cpp

@@ -33,6 +33,8 @@
 #include "bracket-note.h"
 #include "interpret.h"
 #include "json-util.h"
+#include "json.hpp"
+#include "jsonrpc-connection.h"
 #include "machine-config.h"
 #include "machine-memory-range-descr.h"
 #include "machine-merkle-tree.h"

src/jsonrpc-machine-c-api.cpp

@@ -15,6 +15,7 @@
 //
 
 #include <cassert>
+#include <cerrno>
 #include <csignal>
 #include <cstdint>
 #include <cstdio>
@@ -27,6 +28,7 @@
 #include <string>
 #include <sys/time.h>
 #include <system_error>
+#include <tuple>
 #include <unistd.h>
 
 #include "access-log.h"

src/jsonrpc-remote-machine.cpp

@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <array>
 #include <cerrno>
+#include <climits>
 #include <csignal>
 #include <cstdint>
 #include <cstdio>
@@ -26,6 +27,7 @@
 #include <exception>
 #include <iostream>
 #include <memory>
+#include <sstream>
 #include <stdexcept>
 #include <string>
 #include <string_view>
@@ -35,7 +37,9 @@
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
+#include <vector>
 
+#include <sys/socket.h>
 #include <unistd.h>
 
 #pragma GCC diagnostic push
@@ -46,17 +50,25 @@
 #include <boost/beast/version.hpp>
 #pragma GCC diagnostic pop
 
+#include <json.hpp>
+
+#include "access-log.h"
 #include "base64.h"
+#include "interpret.h"
 #include "json-util.h"
+#include "jsonrpc-connection.h"
 #include "jsonrpc-discover.h"
+#include "machine-config.h"
+#include "machine-merkle-tree.h"
+#include "machine-runtime-config.h"
 #include "machine.h"
+#include "os.h"
+#include "uarch-interpret.h"
 #include "unique-c-ptr.h"
 
 #define SLOG_PREFIX log_prefix
 #include "slog.h"
 
-#include "os.h"
-
 // NOLINTNEXTLINE(cppcoreguidelines-macro-usage)
 #define PROGRAM_NAME "jsonrpc-remote-cartesi-machine"
 

src/jsonrpc-virtual-machine.cpp

@@ -17,8 +17,14 @@
 #include "jsonrpc-virtual-machine.h"
 
 #include <csignal>
+#include <cstddef>
 #include <cstdint>
+#include <cstring>
+#include <exception>
+#include <stdexcept>
 #include <string>
+#include <tuple>
+#include <utility>
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
@@ -29,10 +35,19 @@
 #include <boost/beast/version.hpp>
 #pragma GCC diagnostic pop
 
+#include "access-log.h"
 #include "base64.h"
+#include "interpret.h"
 #include "json-util.h"
+#include "json.hpp"
 #include "jsonrpc-connection.h"
+#include "machine-config.h"
+#include "machine-memory-range-descr.h"
+#include "machine-merkle-tree.h"
+#include "machine-runtime-config.h"
 #include "os.h"
+#include "semantic-version.h"
+#include "uarch-interpret.h"
 
 using namespace std::string_literals;
 using json = nlohmann::json;

src/machine-c-api.cpp

@@ -15,27 +15,35 @@
 //
 
 #include "machine-c-api.h"
-#include "machine-c-api-internal.h"
 
 #include <any>
+#include <cstdint>
 #include <cstring>
 #include <exception>
 #include <functional>
+#include <memory>
+#include <new>
 #include <optional>
 #include <regex>
 #include <stdexcept>
 #include <string>
 #include <system_error>
+#include <typeinfo>
+#include <variant>
 
+#include "access-log.h"
+#include "htif.h"
 #include "i-virtual-machine.h"
 #include "json-util.h"
+#include "machine-c-api-internal.h"
 #include "machine-config.h"
+#include "machine-memory-range-descr.h"
+#include "machine-merkle-tree.h"
+#include "machine-runtime-config.h"
 #include "machine.h"
 #include "os-features.h"
-#include "virtual-machine.h"
-
-#include "htif.h"
 #include "pma-constants.h"
+#include "virtual-machine.h"
 
 // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)
 static THREAD_LOCAL std::string last_err_msg;

src/machine-config.cpp

@@ -16,13 +16,19 @@
 
 #include "machine-config.h"
 
+#include <cerrno>
+#include <cstdint>
+#include <exception>
 #include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <sstream>
 #include <stdexcept>
+#include <string>
+#include <system_error>
 
 #include "json-util.h"
+#include "json.hpp"
 #include "pma-constants.h"
 
 static constexpr uint32_t archive_version = 5;

src/machine-merkle-tree.cpp

@@ -15,11 +15,16 @@
 //
 
 #include "machine-merkle-tree.h"
+#include "i-hasher.h"
+#include "pristine-merkle-tree.h"
 
+#include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
+#include <tuple>
 
 /// \file
 /// \brief Merkle tree implementation.

src/machine.cpp

@@ -16,26 +16,48 @@
 
 #include "machine.h"
 
+#include <algorithm>
+#include <cerrno>
+#include <cstdint>
 #include <cstdio>
 #include <cstring>
 #include <iomanip>
 #include <iostream>
-
+#include <memory>
+#include <string>
+#include <system_error>
+#include <type_traits>
+#include <utility>
+#include <variant>
+
+#include <boost/container/static_vector.hpp>
 #include <boost/range/adaptor/sliced.hpp>
 
+#include "access-log.h"
+#include "bracket-note.h"
 #include "clint-factory.h"
 #include "dtb.h"
 #include "htif-factory.h"
 #include "htif.h"
+#include "i-device-state-access.h"
 #include "interpret.h"
+#include "machine-config.h"
+#include "machine-memory-range-descr.h"
+#include "machine-runtime-config.h"
+#include "os.h"
 #include "plic-factory.h"
+#include "pma-constants.h"
+#include "pma-defines.h"
+#include "pma.h"
 #include "record-state-access.h"
 #include "replay-state-access.h"
 #include "riscv-constants.h"
 #include "send-cmio-response.h"
 #include "shadow-pmas-factory.h"
 #include "shadow-state-factory.h"
+#include "shadow-state.h"
 #include "shadow-tlb-factory.h"
+#include "shadow-tlb.h"
 #include "shadow-uarch-state.h"
 #include "state-access.h"
 #include "strict-aliasing.h"
@@ -48,6 +70,7 @@
 #include "uarch-step.h"
 #include "unique-c-ptr.h"
 #include "virtio-console.h"
+#include "virtio-device.h"
 #include "virtio-factory.h"
 #include "virtio-net-carrier-slirp.h"
 #include "virtio-net-carrier-tuntap.h"

src/merkle-tree-hash.cpp

@@ -22,8 +22,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <iostream>
+#include <tuple>
 
 #include "back-merkle-tree.h"
+#include "i-hasher.h"
 #include "keccak-256-hasher.h"
 #include "unique-c-ptr.h"
 

src/os.cpp

@@ -15,12 +15,17 @@
 //
 
 #include <array>
+#include <cerrno>
 #include <chrono>
 #include <cstdint>
 #include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <exception>
+#include <functional>
 #include <string>
 #include <system_error>
+#include <tuple>
 #include <vector>
 
 #include "compiler-defines.h"

src/plic-factory.cpp

@@ -16,7 +16,11 @@
 
 #include "plic-factory.h"
 
+#include <cstdint>
+
 #include "plic.h"
+#include "pma-constants.h"
+#include "pma.h"
 
 namespace cartesi {
 

src/plic.cpp

@@ -15,13 +15,18 @@
 //
 
 #include "plic.h"
-#include "i-device-state-access.h"
-#include "pma-constants.h"
-#include "riscv-constants.h"
 
 #include <cassert>
+#include <cstdint>
 #include <cstdio>
 
+#include "i-device-state-access.h"
+#include "interpret.h"
+#include "pma-constants.h"
+#include "pma-defines.h"
+#include "pma-driver.h"
+#include "riscv-constants.h"
+
 // Enable these defines to debug PLIC
 // #define DEBUG_PLIC
 // #define DEBUG_PLIC_MMIO

src/pma-driver.cpp

@@ -16,6 +16,10 @@
 
 #include "pma-driver.h"
 
+#include <cstdint>
+
+#include "interpret.h"
+
 namespace cartesi {
 
 bool device_read_error(void * /*context*/, i_device_state_access * /*a*/, uint64_t /*offset*/, uint64_t * /*val*/,

src/pma.cpp

@@ -17,11 +17,18 @@
 #include "pma.h"
 
 #include <cerrno>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
 #include <cstring>
+#include <exception>
 #include <string>
 #include <system_error>
+#include <tuple>
 
 #include "os.h"
+#include "pma-constants.h"
+#include "pma-driver.h"
 #include "unique-c-ptr.h"
 
 namespace cartesi {

src/pristine-merkle-tree.cpp

@@ -16,8 +16,13 @@
 
 #include "pristine-merkle-tree.h"
 
+#include <algorithm>
 #include <cassert>
+#include <cstdint>
 #include <stdexcept>
+#include <vector>
+
+#include "i-hasher.h"
 
 /// \file
 /// \brief Pristine Merkle tree implementation.

src/send-cmio-response.cpp

@@ -24,6 +24,9 @@
 #include "state-access.h"
 
 #include "send-cmio-response.h"
+
+#include "machine-merkle-tree.h"
+#include "pma-constants.h"
 #include "uarch-solidity-compat.h"
 
 namespace cartesi {

src/shadow-pmas-factory.cpp

@@ -16,9 +16,12 @@
 
 #include "shadow-pmas-factory.h"
 
+#include <cstdint>
 #include <cstring>
 
 #include "machine.h"
+#include "pma-constants.h"
+#include "pma.h"
 #include "shadow-pmas.h"
 
 namespace cartesi {

src/shadow-pmas.cpp

@@ -16,8 +16,11 @@
 
 #include "shadow-pmas.h"
 #include "i-device-state-access.h"
+#include "pma-constants.h"
+#include "pma-driver.h"
 
 #include <cstddef>
+#include <cstdint>
 
 namespace cartesi {