From 6d6c8c595fb7e3ffac88774e703a6bccda39ea8a Mon Sep 17 00:00:00 2001
From: Derek Christ <derek.christ@uni-wuerzburg.de>
Date: Thu, 21 Nov 2024 12:42:12 +0100
Subject: [PATCH] Clean up private/public linking

---
 .../LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h  | 2 --
 src/configuration/DRAMSys/config/McConfig.h               | 2 --
 src/libdramsys/CMakeLists.txt                             | 3 ++-
 src/simulator/CMakeLists.txt                              | 8 ++++++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
index 823b05a3..a896ea85 100644
--- a/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
+++ b/extensions/standards/LPDDR5/DRAMSys/configuration/memspec/MemSpecLPDDR5.h
@@ -39,8 +39,6 @@
 #include <DRAMSys/configuration/memspec/MemSpec.h>
 #include <systemc>
 
-#include <nlohmann/json.hpp>
-
 namespace DRAMSys
 {
 
diff --git a/src/configuration/DRAMSys/config/McConfig.h b/src/configuration/DRAMSys/config/McConfig.h
index 0f55af7c..5741e126 100644
--- a/src/configuration/DRAMSys/config/McConfig.h
+++ b/src/configuration/DRAMSys/config/McConfig.h
@@ -39,8 +39,6 @@
 #include "DRAMSys/util/json.h"
 
 #include <optional>
-#include <string>
-#include <utility>
 
 namespace DRAMSys::Config
 {
diff --git a/src/libdramsys/CMakeLists.txt b/src/libdramsys/CMakeLists.txt
index 7f93d37e..28be9a5a 100644
--- a/src/libdramsys/CMakeLists.txt
+++ b/src/libdramsys/CMakeLists.txt
@@ -107,8 +107,9 @@ target_link_libraries(libdramsys
     PUBLIC
         SystemC::systemc
         DRAMSys::config
-        SQLite::SQLite3
         $<$<TARGET_EXISTS:DRAMPower>:DRAMPower>
+    PRIVATE
+        SQLite::SQLite3
 
 )
 
diff --git a/src/simulator/CMakeLists.txt b/src/simulator/CMakeLists.txt
index 3e4b1984..e5cc6722 100644
--- a/src/simulator/CMakeLists.txt
+++ b/src/simulator/CMakeLists.txt
@@ -54,12 +54,16 @@ add_library(simulator
     simulator/util.cpp
 )
 
-target_include_directories(simulator PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(simulator
+    PUBLIC
+        ${CMAKE_CURRENT_SOURCE_DIR}
+)
 
 target_link_libraries(simulator
     PUBLIC
-        Threads::Threads
         libdramsys
+    PRIVATE
+        Threads::Threads
 )
 
 add_library(DRAMSys::simulator ALIAS simulator)