diff --git a/src/RunGui.cpp b/src/RunGui.cpp
index 4a1aa26d4..6ce6efa68 100644
--- a/src/RunGui.cpp
+++ b/src/RunGui.cpp
@@ -134,7 +134,7 @@ namespace {
     // true.
     void initSignalHandler()
     {
-#ifndef C_DEBUG
+#ifdef NDEBUG
         signalsInitTime = std::chrono::steady_clock::now();
 
         signal(SIGSEGV, handleSignal);
diff --git a/src/widgets/Window.cpp b/src/widgets/Window.cpp
index 85e8946b8..62bd975f7 100644
--- a/src/widgets/Window.cpp
+++ b/src/widgets/Window.cpp
@@ -25,7 +25,7 @@
 #include "widgets/splits/Split.hpp"
 #include "widgets/splits/SplitContainer.hpp"
 
-#ifdef C_DEBUG
+#ifndef NDEBUG
 #    include <rapidjson/document.h>
 #    include "providers/twitch/PubsubClient.hpp"
 #    include "util/SampleCheerMessages.hpp"
@@ -178,7 +178,7 @@ void Window::addCustomTitlebarButtons()
 
 void Window::addDebugStuff()
 {
-#ifdef C_DEBUG
+#ifndef NDEBUG
     std::vector<QString> cheerMessages, subMessages, miscMessages, linkMessages,
         emoteTestMessages;