diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09e226f..4355d48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,29 +48,10 @@ endif()
 target_include_directories(${PROJECT_NAME} PRIVATE ${CURL_INCLUDE_DIRS})
 
 find_package(Backtrace QUIET)
-if (${Backtrace_FOUND})
+if (Backtrace_FOUND)
     target_link_libraries(${PROJECT_NAME} PRIVATE ${Backtrace_LIBRARIES})
-
-    find_library(DW_LIB NAMES dw)
-    if (NOT DW_LIB STREQUAL DW_LIB-NOTFOUND)
-        message("-- Enhanced stack-traces are enabled via libdw: ${DW_LIB}")
-        target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_DW=1")
-        target_link_libraries(${PROJECT_NAME} PUBLIC "${DW_LIB}")
-    else()
-        find_library(BFD_LIB NAMES bfd)
-        if (NOT BFD_LIB STREQUAL BFD_LIB-NOTFOUND)
-            message("-- Enhanced stack-traces are enabled via libbfd: ${BFD_LIB}")
-            target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_BFD=1")
-            target_link_libraries(${PROJECT_NAME} PRIVATE "${BFD_LIB}")
-        endif()
-    endif()
-
-else()
-    message("-- libbacktrace was not installed. Stacktracing will be disabled")
-    add_definitions(-Dno_backtrace)
 endif()
 
-
 target_compile_options(${PROJECT_NAME} PRIVATE
     "-fno-exceptions"
     "-fno-rtti"
@@ -82,6 +63,20 @@ target_compile_options(${PROJECT_NAME} PRIVATE
     "-Wconversion"
     "-Wno-sign-conversion")
 
+find_library(DW_LIB NAMES dw)
+if (NOT DW_LIB STREQUAL DW_LIB-NOTFOUND)
+    message("-- Enhanced stack-traces are enabled via libdw: ${DW_LIB}")
+    target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_DW=1")
+    target_link_libraries(${PROJECT_NAME} PUBLIC "${DW_LIB}")
+else()
+    find_library(BFD_LIB NAMES bfd)
+    if (NOT BFD_LIB STREQUAL BFD_LIB-NOTFOUND)
+        message("-- Enhanced stack-traces are enabled via libbfd: ${BFD_LIB}")
+        target_compile_definitions(${PROJECT_NAME} PRIVATE "BACKWARD_HAS_BFD=1")
+        target_link_libraries(${PROJECT_NAME} PRIVATE "${BFD_LIB}")
+    endif()
+endif()
+
 if (LOG_VERBOSITY)
     target_compile_definitions(${PROJECT_NAME} PRIVATE "AWS_LAMBDA_LOG=${LOG_VERBOSITY}")
 elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
diff --git a/src/backward.cpp b/src/backward.cpp
index 8649fd5..cc64abd 100644
--- a/src/backward.cpp
+++ b/src/backward.cpp
@@ -23,14 +23,10 @@
 // - g++/clang++ -lbfd ...
 // #define BACKWARD_HAS_BFD 1
 
-#ifndef no_backtrace
-
-#    include "backward.h"
+#include "backward.h"
 
 namespace backward {
 
 backward::SignalHandling sh;
 
 } // namespace backward
-
-#endif
diff --git a/src/backward.h b/src/backward.h
index 832c452..c421378 100644
--- a/src/backward.h
+++ b/src/backward.h
@@ -28,10 +28,6 @@
 #    error "It's not going to compile without a C++ compiler..."
 #endif
 
-#ifdef no_backtrace
-#   pragma message "Disabling stacktracing"
-#else
-
 #if defined(BACKWARD_CXX11)
 #elif defined(BACKWARD_CXX98)
 #else
@@ -4543,6 +4539,4 @@ class SignalHandling {
 
 } // namespace backward
 
-#endif /* no_backtrace */
-
 #endif /* H_GUARD */