diff --git a/public/TracyClient.cpp b/public/TracyClient.cpp
index 26387b76..74811901 100644
--- a/public/TracyClient.cpp
+++ b/public/TracyClient.cpp
@@ -31,20 +31,22 @@
 #include "client/TracyAlloc.cpp"
 #include "client/TracyOverride.cpp"
 
-#if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6
-#  include "libbacktrace/alloc.cpp"
-#  include "libbacktrace/dwarf.cpp"
-#  include "libbacktrace/fileline.cpp"
-#  include "libbacktrace/mmapio.cpp"
-#  include "libbacktrace/posix.cpp"
-#  include "libbacktrace/sort.cpp"
-#  include "libbacktrace/state.cpp"
-#  if TRACY_HAS_CALLSTACK == 4
-#    include "libbacktrace/macho.cpp"
-#  else
-#    include "libbacktrace/elf.cpp"
+#if defined(TRACY_HAS_CALLSTACK)
+#  if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 3 || TRACY_HAS_CALLSTACK == 4 || TRACY_HAS_CALLSTACK == 6
+#    include "libbacktrace/alloc.cpp"
+#    include "libbacktrace/dwarf.cpp"
+#    include "libbacktrace/fileline.cpp"
+#    include "libbacktrace/mmapio.cpp"
+#    include "libbacktrace/posix.cpp"
+#    include "libbacktrace/sort.cpp"
+#    include "libbacktrace/state.cpp"
+#    if TRACY_HAS_CALLSTACK == 4
+#      include "libbacktrace/macho.cpp"
+#    else
+#      include "libbacktrace/elf.cpp"
+#    endif
+#    include "common/TracyStackFrames.cpp"
 #  endif
-#  include "common/TracyStackFrames.cpp"
 #endif
 
 #ifdef _MSC_VER
diff --git a/public/client/TracyCallstack.hpp b/public/client/TracyCallstack.hpp
index e1de3821..fdc9345d 100644
--- a/public/client/TracyCallstack.hpp
+++ b/public/client/TracyCallstack.hpp
@@ -5,6 +5,15 @@
 #include "../common/TracyForceInline.hpp"
 #include "TracyCallstack.h"
 
+#ifndef TRACY_HAS_CALLSTACK
+
+namespace tracy
+{
+static tracy_force_inline void* Callstack( int /*depth*/ ) { return nullptr; }
+}
+
+#else
+
 #if TRACY_HAS_CALLSTACK == 2 || TRACY_HAS_CALLSTACK == 5
 #  include <unwind.h>
 #elif TRACY_HAS_CALLSTACK >= 3
@@ -17,15 +26,6 @@
 #  endif
 #endif
 
-#ifndef TRACY_HAS_CALLSTACK
-
-namespace tracy
-{
-static tracy_force_inline void* Callstack( int depth ) { return nullptr; }
-}
-
-#else
-
 #ifdef TRACY_DEBUGINFOD
 #  include <elfutils/debuginfod.h>
 #endif