diff --git a/CMakeLists.txt b/CMakeLists.txt
index c44dedf7c0..1cbb1a45b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,9 +41,6 @@ option(
 option(
    SURELOG_WITH_TCMALLOC
    "Use tcmalloc if installed" ON)
-option(
-  SURELOG_SYMBOLID_DEBUG_ENABLED
-  "Enable SymbolId debugging" OFF)
 option(
   SURELOG_PATHID_DEBUG_ENABLED
   "Enable PathId debugging" OFF)
@@ -59,11 +56,6 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 
-# Make sure both SURELOG_SYMBOLID_DEBUG_ENABLED & UHDM_SYMBOLID_DEBUG_ENABLED
-# are set the same
-set(UHDM_SYMBOLID_DEBUG_ENABLED ${SURELOG_SYMBOLID_DEBUG_ENABLED}
-  CACHE BOOL "Enforcing" FORCE)
-
 # Setup code generation directory
 set(GENDIR ${CMAKE_CURRENT_BINARY_DIR}/generated)
 
diff --git a/include/Surelog/Common/PathId.h b/include/Surelog/Common/PathId.h
index ff5326c02c..d0f2bec35d 100644
--- a/include/Surelog/Common/PathId.h
+++ b/include/Surelog/Common/PathId.h
@@ -18,6 +18,8 @@
 #define SURELOG_PATHID_H
 #pragma once
 
+#include "Surelog/config.h"
+
 #include <Surelog/Common/SymbolId.h>
 
 #include <cstdint>
diff --git a/include/Surelog/config.h.in b/include/Surelog/config.h.in
index 6e20e5ba57..fe38a259d1 100644
--- a/include/Surelog/config.h.in
+++ b/include/Surelog/config.h.in
@@ -24,7 +24,6 @@
 
 #include <uhdm/config.h>
 
-#cmakedefine01 SURELOG_SYMBOLID_DEBUG_ENABLED
 #cmakedefine01 SURELOG_PATHID_DEBUG_ENABLED
 
 #if defined(_MSC_VER)
diff --git a/shell.nix b/shell.nix
index 73048f3eb7..d4e92582bf 100644
--- a/shell.nix
+++ b/shell.nix
@@ -39,9 +39,6 @@ pkgs.mkShell {
     ];
   shellHook = ''
     export CMAKE_CXX_COMPILER_LAUNCHER=ccache
-    export ADDITIONAL_CMAKE_OPTIONS="-DSURELOG_USE_HOST_GTEST=On -DSURELOG_USE_HOST_ANTLR=On -DANTLR_JAR_LOCATION=${pkgs.antlr4.jarLocation}"
-
-    # For the UHDM dependency: tell it to use local capnp
-    export ADDITIONAL_CMAKE_OPTIONS="$ADDITIONAL_CMAKE_OPTIONS -DUHDM_USE_HOST_CAPNP=On"
+    export ADDITIONAL_CMAKE_OPTIONS="-DSURELOG_USE_HOST_GTEST=On -DSURELOG_USE_HOST_CAPNP=On -DSURELOG_USE_HOST_ANTLR=On -DANTLR_JAR_LOCATION=${pkgs.antlr4.jarLocation}"
   '';
 }
diff --git a/src/Cache/PPCache.cpp b/src/Cache/PPCache.cpp
index 63da6abd33..6dd8dfaefe 100644
--- a/src/Cache/PPCache.cpp
+++ b/src/Cache/PPCache.cpp
@@ -41,6 +41,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "Surelog/config.h"
+
 #if defined(_MSC_VER)
 #include <io.h>
 #else
diff --git a/src/Cache/ParseCache.cpp b/src/Cache/ParseCache.cpp
index 4d6843db79..451855ff2a 100644
--- a/src/Cache/ParseCache.cpp
+++ b/src/Cache/ParseCache.cpp
@@ -39,6 +39,8 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 
+#include "Surelog/config.h"
+
 #if defined(_MSC_VER)
 #include <io.h>
 #else