diff --git a/src/libspdl/core/detail/logging.cpp b/src/libspdl/common/logging.cpp
similarity index 86%
rename from src/libspdl/core/detail/logging.cpp
rename to src/libspdl/common/logging.cpp
index 5401a85b5..7dc9e08a4 100644
--- a/src/libspdl/core/detail/logging.cpp
+++ b/src/libspdl/common/logging.cpp
@@ -6,11 +6,11 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/core.h>
 
-namespace spdl::core::detail {
+namespace spdl::common {
 
 // TODO: Add stacktrace
 std::string get_err_str(
@@ -29,4 +29,4 @@ std::string get_internal_err_str(
       location.line());
 }
 
-} // namespace spdl::core::detail
+} // namespace spdl::common
diff --git a/src/libspdl/core/detail/logging.h b/src/libspdl/common/logging.h
similarity index 63%
rename from src/libspdl/core/detail/logging.h
rename to src/libspdl/common/logging.h
index af9077e8e..4b0c54289 100644
--- a/src/libspdl/core/detail/logging.h
+++ b/src/libspdl/common/logging.h
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <libspdl/core/types.h>
+#include <glog/logging.h>
 
-#include <exception>
+#include <stdexcept>
 #include <string_view>
 #include <version>
 
@@ -27,7 +27,7 @@
     "Neither <source_location> or <experimental/source_location> is available."
 #endif
 
-namespace spdl::core::detail {
+namespace spdl::common {
 
 #if defined SPDL_USE_CUDA && __has_include(<experimental/source_location>)
 using std::experimental::source_location;
@@ -45,20 +45,23 @@ std::string get_internal_err_str(
     const std::string_view msg,
     const source_location& location);
 
-} // namespace spdl::core::detail
+/// Exception thrown when unexpected internal error occurs.
+class InternalError : public std::logic_error {
+  using std::logic_error::logic_error;
+};
 
-#define SPDL_FAIL(msg)                 \
-  throw std::runtime_error(            \
-      spdl::core::detail::get_err_str( \
-          msg, spdl::core::detail::source_location::current()))
+} // namespace spdl::common
 
-#define SPDL_FAIL_INTERNAL(msg)                 \
-  throw spdl::core::InternalError(              \
-      spdl::core::detail::get_internal_err_str( \
-          msg, spdl::core::detail::source_location::current()))
+#define SPDL_FAIL(msg)           \
+  throw std::runtime_error(      \
+      spdl::common::get_err_str( \
+          msg, spdl::common::source_location::current()))
 
-#include <glog/logging.h>
+#define SPDL_FAIL_INTERNAL(msg)           \
+  throw spdl::common::InternalError(      \
+      spdl::common::get_internal_err_str( \
+          msg, spdl::common::source_location::current()))
 
-#define SPDL_WARN(msg)                              \
-  LOG(WARNING) << (spdl::core::detail::get_err_str( \
-      msg, spdl::core::detail::source_location::current()))
+#define SPDL_WARN(msg)                        \
+  LOG(WARNING) << (spdl::common::get_err_str( \
+      msg, spdl::common::source_location::current()))
diff --git a/src/libspdl/common/tracing.h b/src/libspdl/common/tracing.h
new file mode 100644
index 000000000..34912e496
--- /dev/null
+++ b/src/libspdl/common/tracing.h
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * All rights reserved.
+ *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+#pragma once
+
+#ifndef SPDL_USE_TRACING
+
+#define TRACE_COUNTER(...)
+#define TRACE_EVENT(...)
+#define TRACE_EVENT_BEGIN(...)
+#define TRACE_EVENT_END(...)
+#define TRACE_EVENT_INSTANT(...)
+
+#else
+
+#include <libspdl/common/tracing/perfetto.h>
+
+#endif
diff --git a/src/libspdl/core/detail/tracing.cpp b/src/libspdl/common/tracing/perfetto.cpp
similarity index 95%
rename from src/libspdl/core/detail/tracing.cpp
rename to src/libspdl/common/tracing/perfetto.cpp
index 2d5d7eede..59b68b15e 100644
--- a/src/libspdl/core/detail/tracing.cpp
+++ b/src/libspdl/common/tracing/perfetto.cpp
@@ -6,9 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/tracing.h"
-
-#ifdef SPDL_USE_TRACING
+#include "libspdl/common/tracing/perfetto.h"
 
 #include <glog/logging.h>
 
@@ -56,5 +54,3 @@ void stop_tracing_session(std::unique_ptr<perfetto::TracingSession> session) {
 }
 
 } // namespace spdl::core::detail
-
-#endif
diff --git a/src/libspdl/core/detail/tracing.h b/src/libspdl/common/tracing/perfetto.h
similarity index 83%
rename from src/libspdl/core/detail/tracing.h
rename to src/libspdl/common/tracing/perfetto.h
index 7dc4e99f5..7522a356c 100644
--- a/src/libspdl/core/detail/tracing.h
+++ b/src/libspdl/common/tracing/perfetto.h
@@ -8,16 +8,6 @@
 
 #pragma once
 
-#ifndef SPDL_USE_TRACING
-
-#define TRACE_COUNTER(...)
-#define TRACE_EVENT(...)
-#define TRACE_EVENT_BEGIN(...)
-#define TRACE_EVENT_END(...)
-#define TRACE_EVENT_INSTANT(...)
-
-#else
-
 #include <perfetto.h>
 
 PERFETTO_DEFINE_CATEGORIES(
@@ -37,5 +27,3 @@ std::unique_ptr<perfetto::TracingSession> start_tracing_session(
 void stop_tracing_session(std::unique_ptr<perfetto::TracingSession> sess);
 
 } // namespace spdl::core::detail
-
-#endif
diff --git a/src/libspdl/core/buffer.cpp b/src/libspdl/core/buffer.cpp
index 84ac0bf72..14cad610e 100644
--- a/src/libspdl/core/buffer.cpp
+++ b/src/libspdl/core/buffer.cpp
@@ -8,7 +8,7 @@
 
 #include <libspdl/core/buffer.h>
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>
diff --git a/src/libspdl/core/codec.cpp b/src/libspdl/core/codec.cpp
index 85703728a..bb162edf3 100644
--- a/src/libspdl/core/codec.cpp
+++ b/src/libspdl/core/codec.cpp
@@ -8,9 +8,9 @@
 
 #include <libspdl/core/codec.h>
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>
diff --git a/src/libspdl/core/decoder.cpp b/src/libspdl/core/decoder.cpp
index af4ec2605..4ef16ae0e 100644
--- a/src/libspdl/core/decoder.cpp
+++ b/src/libspdl/core/decoder.cpp
@@ -8,11 +8,11 @@
 
 #include <libspdl/core/decoder.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/decoder.h"
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core {
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/libspdl/core/demuxing.cpp b/src/libspdl/core/demuxing.cpp
index 6e6eae10e..decd6a66c 100644
--- a/src/libspdl/core/demuxing.cpp
+++ b/src/libspdl/core/demuxing.cpp
@@ -8,9 +8,9 @@
 
 #include <libspdl/core/demuxing.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/demuxer.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core {
 namespace detail {
diff --git a/src/libspdl/core/detail/ffmpeg/bsf.cpp b/src/libspdl/core/detail/ffmpeg/bsf.cpp
index 025fe8f30..c984fb68b 100644
--- a/src/libspdl/core/detail/ffmpeg/bsf.cpp
+++ b/src/libspdl/core/detail/ffmpeg/bsf.cpp
@@ -9,8 +9,8 @@
 #include "libspdl/core/detail/ffmpeg/bsf.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 namespace spdl::core::detail {
 namespace {
diff --git a/src/libspdl/core/detail/ffmpeg/conversion.cpp b/src/libspdl/core/detail/ffmpeg/conversion.cpp
index 5bc063b40..d0bb88374 100644
--- a/src/libspdl/core/detail/ffmpeg/conversion.cpp
+++ b/src/libspdl/core/detail/ffmpeg/conversion.cpp
@@ -8,11 +8,11 @@
 
 #include <libspdl/core/conversion.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>
diff --git a/src/libspdl/core/detail/ffmpeg/ctx_utils.cpp b/src/libspdl/core/detail/ffmpeg/ctx_utils.cpp
index 54878bfa0..3cb71a6c7 100644
--- a/src/libspdl/core/detail/ffmpeg/ctx_utils.cpp
+++ b/src/libspdl/core/detail/ffmpeg/ctx_utils.cpp
@@ -8,9 +8,9 @@
 
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>
diff --git a/src/libspdl/core/detail/ffmpeg/decoder.cpp b/src/libspdl/core/detail/ffmpeg/decoder.cpp
index 47d7d81e6..3d4b564ff 100644
--- a/src/libspdl/core/detail/ffmpeg/decoder.cpp
+++ b/src/libspdl/core/detail/ffmpeg/decoder.cpp
@@ -11,9 +11,9 @@
 #include <libspdl/core/rational_utils.h>
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <glog/logging.h>
 
diff --git a/src/libspdl/core/detail/ffmpeg/demuxer.cpp b/src/libspdl/core/detail/ffmpeg/demuxer.cpp
index 166bb1ed3..7379cf244 100644
--- a/src/libspdl/core/detail/ffmpeg/demuxer.cpp
+++ b/src/libspdl/core/detail/ffmpeg/demuxer.cpp
@@ -10,9 +10,9 @@
 
 #include <libspdl/core/rational_utils.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 
diff --git a/src/libspdl/core/detail/ffmpeg/encoder.cpp b/src/libspdl/core/detail/ffmpeg/encoder.cpp
index 5a13524d9..898674888 100644
--- a/src/libspdl/core/detail/ffmpeg/encoder.cpp
+++ b/src/libspdl/core/detail/ffmpeg/encoder.cpp
@@ -9,10 +9,10 @@
 #include "libspdl/core/detail/ffmpeg/encoder.h"
 
 #include <libspdl/core/generator.h>
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>
diff --git a/src/libspdl/core/detail/ffmpeg/filter_graph.cpp b/src/libspdl/core/detail/ffmpeg/filter_graph.cpp
index a676c1e8e..bc5682efb 100644
--- a/src/libspdl/core/detail/ffmpeg/filter_graph.cpp
+++ b/src/libspdl/core/detail/ffmpeg/filter_graph.cpp
@@ -8,9 +8,9 @@
 
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/format.h>
 #include <glog/logging.h>
diff --git a/src/libspdl/core/detail/ffmpeg/logging.h b/src/libspdl/core/detail/ffmpeg/logging.h
index 7399d5aaf..e2e57ad94 100644
--- a/src/libspdl/core/detail/ffmpeg/logging.h
+++ b/src/libspdl/core/detail/ffmpeg/logging.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/core.h>
 
diff --git a/src/libspdl/core/detail/ffmpeg/muxer.cpp b/src/libspdl/core/detail/ffmpeg/muxer.cpp
index defdcb980..e05397e12 100644
--- a/src/libspdl/core/detail/ffmpeg/muxer.cpp
+++ b/src/libspdl/core/detail/ffmpeg/muxer.cpp
@@ -8,11 +8,11 @@
 
 #include "libspdl/core/detail/ffmpeg/muxer.h"
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 #include <fmt/format.h>
diff --git a/src/libspdl/core/detail/ffmpeg/wrappers.cpp b/src/libspdl/core/detail/ffmpeg/wrappers.cpp
index ff55b47df..0a6a8d3a1 100644
--- a/src/libspdl/core/detail/ffmpeg/wrappers.cpp
+++ b/src/libspdl/core/detail/ffmpeg/wrappers.cpp
@@ -8,8 +8,8 @@
 
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 namespace spdl::core::detail {
 
diff --git a/src/libspdl/core/frames.cpp b/src/libspdl/core/frames.cpp
index a57ef1f9d..2e1c7594b 100644
--- a/src/libspdl/core/frames.cpp
+++ b/src/libspdl/core/frames.cpp
@@ -12,10 +12,10 @@
 #include <libspdl/core/types.h>
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/compat.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
 #include "libspdl/core/detail/ffmpeg/wrappers.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <algorithm>
 #include <cassert>
diff --git a/src/libspdl/core/muxer.cpp b/src/libspdl/core/muxer.cpp
index e490c2598..31a88ad31 100644
--- a/src/libspdl/core/muxer.cpp
+++ b/src/libspdl/core/muxer.cpp
@@ -8,8 +8,8 @@
 
 #include <libspdl/core/muxer.h>
 
+#include "libspdl/common/logging.h"
 #include "libspdl/core/detail/ffmpeg/muxer.h"
-#include "libspdl/core/detail/logging.h"
 
 #include <fmt/core.h>
 
diff --git a/src/libspdl/core/packets.cpp b/src/libspdl/core/packets.cpp
index 15e67688d..595d7c615 100644
--- a/src/libspdl/core/packets.cpp
+++ b/src/libspdl/core/packets.cpp
@@ -10,8 +10,8 @@
 
 #include <libspdl/core/rational_utils.h>
 
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
 
diff --git a/src/libspdl/core/storage.cpp b/src/libspdl/core/storage.cpp
index 3902e72ce..a5df896c4 100644
--- a/src/libspdl/core/storage.cpp
+++ b/src/libspdl/core/storage.cpp
@@ -8,8 +8,8 @@
 
 #include <libspdl/core/storage.h>
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 #include <utility>
 
diff --git a/src/libspdl/core/types.h b/src/libspdl/core/types.h
index 6f3b53794..d46e9d95b 100644
--- a/src/libspdl/core/types.h
+++ b/src/libspdl/core/types.h
@@ -11,7 +11,6 @@
 #include <cstdint>
 #include <map>
 #include <optional>
-#include <stdexcept>
 #include <string>
 
 #define SPDL_DEFAULT_BUFFER_SIZE 8096
@@ -177,9 +176,4 @@ using VideoEncodeConfig = EncodeConfigBase<MediaType::Video>;
 /// Audio encoding configuration type alias.
 using AudioEncodeConfig = EncodeConfigBase<MediaType::Audio>;
 
-/// Exception thrown when unexpected internal error occurs.
-class InternalError : public std::logic_error {
-  using std::logic_error::logic_error;
-};
-
 } // namespace spdl::core
diff --git a/src/libspdl/core/utils.cpp b/src/libspdl/core/utils.cpp
index 31ac9e092..69b61d6e0 100644
--- a/src/libspdl/core/utils.cpp
+++ b/src/libspdl/core/utils.cpp
@@ -8,10 +8,10 @@
 
 #include <libspdl/core/utils.h>
 
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/core/detail/ffmpeg/ctx_utils.h"
 #include "libspdl/core/detail/ffmpeg/filter_graph.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 
 #include <fmt/core.h>
 #include <glog/logging.h>
diff --git a/src/libspdl/cuda/color_conversion.cpp b/src/libspdl/cuda/color_conversion.cpp
index ad2729081..268160fdd 100644
--- a/src/libspdl/cuda/color_conversion.cpp
+++ b/src/libspdl/cuda/color_conversion.cpp
@@ -10,7 +10,7 @@
 #include <libspdl/cuda/buffer.h>
 #include <libspdl/cuda/color_conversion.h>
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 #include "libspdl/cuda/detail/color_conversion.h"
 
 #include <fmt/core.h>
diff --git a/src/libspdl/cuda/detail/color_conversion.cu b/src/libspdl/cuda/detail/color_conversion.cu
index 953107580..fc3262da1 100644
--- a/src/libspdl/cuda/detail/color_conversion.cu
+++ b/src/libspdl/cuda/detail/color_conversion.cu
@@ -6,7 +6,7 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/color_conversion.h"
 #include "libspdl/cuda/detail/utils.h"
 
diff --git a/src/libspdl/cuda/detail/utils.cpp b/src/libspdl/cuda/detail/utils.cpp
index 464ace80f..f25beda8b 100644
--- a/src/libspdl/cuda/detail/utils.cpp
+++ b/src/libspdl/cuda/detail/utils.cpp
@@ -7,7 +7,7 @@
  */
 
 #include "libspdl/cuda/detail/utils.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/tracing.h"
 
 #include <glog/logging.h>
 
diff --git a/src/libspdl/cuda/detail/utils.h b/src/libspdl/cuda/detail/utils.h
index 9d72b9d9d..a614c4488 100644
--- a/src/libspdl/cuda/detail/utils.h
+++ b/src/libspdl/cuda/detail/utils.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/core.h>
 
diff --git a/src/libspdl/cuda/npp/detail/resize.cpp b/src/libspdl/cuda/npp/detail/resize.cpp
index 48e2e03f8..8f084d12c 100644
--- a/src/libspdl/cuda/npp/detail/resize.cpp
+++ b/src/libspdl/cuda/npp/detail/resize.cpp
@@ -7,11 +7,12 @@
  */
 
 #include "libspdl/cuda/npp/detail/resize.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
 #include "libspdl/cuda/npp/detail/utils.h"
 #include "libspdl/cuda/nvjpeg/detail/utils.h"
 
+#include <libspdl/common/logging.h>
+#include <libspdl/common/tracing.h>
+
 #include <fmt/core.h>
 
 #include <nppi.h>
diff --git a/src/libspdl/cuda/nvdec/decoder.cpp b/src/libspdl/cuda/nvdec/decoder.cpp
index b36747c8f..9b07f57a2 100644
--- a/src/libspdl/cuda/nvdec/decoder.cpp
+++ b/src/libspdl/cuda/nvdec/decoder.cpp
@@ -8,8 +8,8 @@
 
 #include <libspdl/cuda/nvdec/decoder.h>
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 #include "libspdl/cuda/nvdec/detail/decoder.h"
 
diff --git a/src/libspdl/cuda/nvdec/detail/decoder.cpp b/src/libspdl/cuda/nvdec/detail/decoder.cpp
index 228d3639b..5976c0df9 100644
--- a/src/libspdl/cuda/nvdec/detail/decoder.cpp
+++ b/src/libspdl/cuda/nvdec/detail/decoder.cpp
@@ -10,8 +10,8 @@
 
 #include <libspdl/core/rational_utils.h>
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 #include "libspdl/cuda/detail/utils.h"
 #include "libspdl/cuda/nvdec/detail/decoder.h"
diff --git a/src/libspdl/cuda/nvdec/detail/utils.cpp b/src/libspdl/cuda/nvdec/detail/utils.cpp
index c1880fc07..1d0c07516 100644
--- a/src/libspdl/cuda/nvdec/detail/utils.cpp
+++ b/src/libspdl/cuda/nvdec/detail/utils.cpp
@@ -8,8 +8,8 @@
 
 #include "libspdl/cuda/nvdec/detail/utils.h"
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/format.h>
diff --git a/src/libspdl/cuda/nvdec/detail/wrapper.cpp b/src/libspdl/cuda/nvdec/detail/wrapper.cpp
index 1271d1e4b..e87af2f62 100644
--- a/src/libspdl/cuda/nvdec/detail/wrapper.cpp
+++ b/src/libspdl/cuda/nvdec/detail/wrapper.cpp
@@ -8,7 +8,7 @@
 
 #include "libspdl/cuda/nvdec/detail/wrapper.h"
 
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/core.h>
diff --git a/src/libspdl/cuda/nvjpeg/decoding.cpp b/src/libspdl/cuda/nvjpeg/decoding.cpp
index e1d03aca3..902b2df57 100644
--- a/src/libspdl/cuda/nvjpeg/decoding.cpp
+++ b/src/libspdl/cuda/nvjpeg/decoding.cpp
@@ -12,8 +12,8 @@
 #include <libspdl/cuda/types.h>
 #include "libspdl/cuda/detail/utils.h"
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/nvjpeg/detail/utils.h"
 
 #ifdef SPDL_USE_NPPI
diff --git a/src/libspdl/cuda/nvjpeg/detail/utils.cpp b/src/libspdl/cuda/nvjpeg/detail/utils.cpp
index cbf61a59c..e1e04506f 100644
--- a/src/libspdl/cuda/nvjpeg/detail/utils.cpp
+++ b/src/libspdl/cuda/nvjpeg/detail/utils.cpp
@@ -7,8 +7,8 @@
  */
 
 #include "libspdl/cuda/nvjpeg/detail/utils.h"
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 
 #include <glog/logging.h>
 
diff --git a/src/libspdl/cuda/nvjpeg/detail/utils.h b/src/libspdl/cuda/nvjpeg/detail/utils.h
index 99cd27846..210f6e294 100644
--- a/src/libspdl/cuda/nvjpeg/detail/utils.h
+++ b/src/libspdl/cuda/nvjpeg/detail/utils.h
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "libspdl/core/detail/logging.h"
+#include "libspdl/common/logging.h"
 
 #include <fmt/format.h>
 
diff --git a/src/libspdl/cuda/storage.cpp b/src/libspdl/cuda/storage.cpp
index af59e2546..0c90c1560 100644
--- a/src/libspdl/cuda/storage.cpp
+++ b/src/libspdl/cuda/storage.cpp
@@ -8,7 +8,7 @@
 
 #include <libspdl/cuda/storage.h>
 
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/utils.h"
 
 #include <fmt/core.h>
diff --git a/src/libspdl/cuda/transfer.cpp b/src/libspdl/cuda/transfer.cpp
index 95727f73d..c5349c9ac 100644
--- a/src/libspdl/cuda/transfer.cpp
+++ b/src/libspdl/cuda/transfer.cpp
@@ -8,8 +8,8 @@
 
 #include <libspdl/cuda/transfer.h>
 
-#include "libspdl/core/detail/logging.h"
-#include "libspdl/core/detail/tracing.h"
+#include "libspdl/common/logging.h"
+#include "libspdl/common/tracing.h"
 #include "libspdl/cuda/detail/utils.h"
 
 #include <glog/logging.h>
diff --git a/src/spdl/io/lib/core/types.cpp b/src/spdl/io/lib/core/types.cpp
index 87ee23e46..526bf638b 100644
--- a/src/spdl/io/lib/core/types.cpp
+++ b/src/spdl/io/lib/core/types.cpp
@@ -8,6 +8,7 @@
 
 #include "register_spdl_core_extensions.h"
 
+#include <libspdl/common/logging.h>
 #include <libspdl/core/types.h>
 
 #include <nanobind/nanobind.h>
@@ -43,7 +44,7 @@ void register_types(nb::module_& m) {
           nb::arg("decoder") = nb::none(),
           nb::arg("decoder_options") = nb::none());
 
-  nb::exception<spdl::core::InternalError>(
+  nb::exception<spdl::common::InternalError>(
       m, "InternalError", PyExc_AssertionError);
 }
 } // namespace spdl::core