diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167dd8c..42ad3b2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,7 +52,7 @@ endif()
 add_library(riscv SHARED ${LIB_SOURCES})
 target_compile_options(riscv PRIVATE -Wno-shift-count-overflow)
 target_include_directories(riscv PUBLIC incl ../external/elfio)
-target_link_libraries(riscv PUBLIC softfloat scc-util)
+target_link_libraries(riscv PUBLIC softfloat scc-util jsoncpp)
 target_link_libraries(riscv PUBLIC -Wl,--whole-archive dbt-core -Wl,--no-whole-archive)
 set_target_properties(riscv PROPERTIES
   VERSION ${PROJECT_VERSION}
@@ -120,4 +120,4 @@ install(TARGETS riscv riscv-sim
 # CMAKE PACKAGING (for other CMake projects to use this one easily)
 # _____________________________________________________________________________
 
-#include(PackageConfigurator)
\ No newline at end of file
+#include(PackageConfigurator)
diff --git a/incl/sysc/core_complex.h b/incl/sysc/core_complex.h
index 8456f4e..f3f9787 100644
--- a/incl/sysc/core_complex.h
+++ b/incl/sysc/core_complex.h
@@ -33,10 +33,10 @@
 #ifndef _SYSC_SIFIVE_FE310_H_
 #define _SYSC_SIFIVE_FE310_H_
 
-#include "scc/initiator_mixin.h"
+#include "tlm/scc/initiator_mixin.h"
 #include "scc/traceable.h"
 #include "scc/utilities.h"
-#include "scv4tlm/tlm_rec_initiator_socket.h"
+#include "tlm/scc/scv4tlm/tlm_rec_initiator_socket.h"
 #include <cci_configuration>
 #include <tlm>
 #include <tlm_core/tlm_1/tlm_req_rsp/tlm_1_interfaces/tlm_core_ifs.h>
@@ -75,7 +75,7 @@ class core_wrapper;
 
 class core_complex : public sc_core::sc_module, public scc::traceable {
 public:
-    scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator{"intor"};
+    tlm::scc::initiator_mixin<scv4tlm::tlm_rec_initiator_socket<32>> initiator{"intor"};
 
     sc_core::sc_in<sc_core::sc_time> clk_i{"clk_i"};