Some restructuring of the directory layout

src/binary/elf.hpp

@@ -1,8 +1,8 @@
 #ifndef ELF_HPP
 #define ELF_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_LINUX
 #include <array>

src/binary/mach-o.hpp

@@ -1,8 +1,8 @@
 #ifndef MACHO_HPP
 #define MACHO_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_APPLE
 

src/binary/object.hpp

@@ -1,8 +1,8 @@
 #ifndef OBJECT_HPP
 #define OBJECT_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <string>
 #include <vector>

src/binary/pe.hpp

@@ -1,9 +1,9 @@
 #ifndef PE_HPP
 #define PE_HPP
 
-#include "common.hpp"
-#include "error.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #if IS_WINDOWS
 #include <array>

src/cpptrace.cpp

@@ -15,10 +15,10 @@
 #include "symbols/symbols.hpp"
 #include "unwind/unwind.hpp"
 #include "demangle/demangle.hpp"
-#include "platform/common.hpp"
-#include "platform/exception_type.hpp"
-#include "platform/object.hpp"
-#include "platform/utils.hpp"
+#include "utils/exception_type.hpp"
+#include "utils/common.hpp"
+#include "utils/utils.hpp"
+#include "binary/object.hpp"
 
 #define ESC     "\033["
 #define RESET   ESC "0m"

src/symbols/symbols.hpp

@@ -6,7 +6,7 @@
 #include <memory>
 #include <vector>
 
-#include "../platform/object.hpp"
+#include "../binary/object.hpp"
 
 namespace cpptrace {
 namespace detail {

src/symbols/symbols_core.cpp

@@ -3,8 +3,8 @@
 #include <vector>
 #include <unordered_map>
 
-#include "../platform/common.hpp"
-#include "../platform/object.hpp"
+#include "../utils/common.hpp"
+#include "../binary/object.hpp"
 
 namespace cpptrace {
 namespace detail {

src/symbols/symbols_with_addr2line.cpp

@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "symbols.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <cstdint>
 #include <cstdio>

src/symbols/symbols_with_libdwarf.cpp

@@ -2,12 +2,12 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "symbols.hpp"
-#include "../platform/common.hpp"
-#include "../platform/dwarf.hpp"
-#include "../platform/error.hpp"
-#include "../platform/object.hpp"
-#include "../platform/program_name.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/dwarf.hpp"
+#include "../utils/error.hpp"
+#include "../binary/object.hpp"
+#include "../utils/program_name.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cstdint>

src/unwind/unwind.hpp

@@ -1,8 +1,8 @@
 #ifndef UNWIND_HPP
 #define UNWIND_HPP
 
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <cstddef>
 #include <vector>

src/unwind/unwind_with_dbghelp.cpp

@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 #include "../platform/dbghelp_syminit_manager.hpp"
 
 #include <algorithm>

src/unwind/unwind_with_execinfo.cpp

@@ -1,8 +1,8 @@
 #ifdef CPPTRACE_UNWIND_WITH_EXECINFO
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <climits>

src/unwind/unwind_with_libunwind.cpp

@@ -1,9 +1,9 @@
 #ifdef CPPTRACE_UNWIND_WITH_LIBUNWIND
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../error.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cassert>

src/unwind/unwind_with_unwind.cpp

@@ -1,9 +1,9 @@
 #ifdef CPPTRACE_UNWIND_WITH_UNWIND
 
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cassert>

src/unwind/unwind_with_winapi.cpp

@@ -2,8 +2,8 @@
 
 #include <cpptrace/cpptrace.hpp>
 #include "unwind.hpp"
-#include "../platform/common.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <algorithm>
 #include <cstdint>

src/utils/dbghelp_syminit_manager.hpp

@@ -1,8 +1,8 @@
 #ifndef DBGHELP_SYMINIT_MANAGER_HPP
 #define DBGHELP_SYMINIT_MANAGER_HPP
 
-#include "common.hpp"
-#include "utils.hpp"
+#include "../utils/common.hpp"
+#include "../utils/utils.hpp"
 
 #include <mutex>
 #include <unordered_set>

src/utils/dwarf.hpp

@@ -2,8 +2,8 @@
 #define DWARF_HPP
 
 #include <cpptrace/cpptrace.hpp>
-#include "../platform/error.hpp"
-#include "../platform/utils.hpp"
+#include "../utils/error.hpp"
+#include "../utils/utils.hpp"
 
 #include <functional>
 #include <stdexcept>

src/utils/utils.hpp

@@ -18,7 +18,6 @@
 
 #include "common.hpp"
 #include "error.hpp"
-#include "utils.hpp"
 
 #if IS_WINDOWS
  #include <windows.h>