diff --git a/FEXCore/Source/Interface/Core/Core.cpp b/FEXCore/Source/Interface/Core/Core.cpp
index e7931fb5d..616e2c953 100644
--- a/FEXCore/Source/Interface/Core/Core.cpp
+++ b/FEXCore/Source/Interface/Core/Core.cpp
@@ -52,7 +52,6 @@ $end_info$
 #include <FEXCore/fextl/sstream.h>
 #include <FEXCore/fextl/vector.h>
 #include <FEXHeaderUtils/Syscalls.h>
-#include <FEXHeaderUtils/TodoDefines.h>
 
 #include <algorithm>
 #include <array>
@@ -405,7 +404,7 @@ void ContextImpl::ExecuteThread(FEXCore::Core::InternalThreadState* Thread) {
   }
 
   // If it is the parent thread that died then just leave
-  FEX_TODO("This doesn't make sense when the parent thread doesn't outlive its children");
+  // TODO: This doesn't make sense when the parent thread doesn't outlive its children
 }
 
 void ContextImpl::InitializeCompiler(FEXCore::Core::InternalThreadState* Thread) {
diff --git a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h b/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h
index 69c9f4191..91d2e6039 100644
--- a/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h
+++ b/FEXHeaderUtils/FEXHeaderUtils/TodoDefines.h
@@ -6,17 +6,15 @@
 #endif
 
 #if FEX_WARN_TODO
-// FEX_TODO_ISSUE(github ticket number, "comment")
-#define FEX_TODO_ISSUE(github_ticket, comment) DO_PRAGMA(GCC warning "TODO: https://github.com/FEX-Emu/FEX/issues/" #github_ticket comment);
-// FEX_TODO("comment")
-#define FEX_TODO(comment) DO_PRAGMA(GCC warning "TODO: " comment);
+// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or
+// FEX_TODO_ISSUE(github ticket number, comment)
+#define FEX_TODO_ISSUE(number, ...) DO_PRAGMA(GCC warning "TODO: https://github.com/FEX-Emu/FEX/issues/" #number __VA_ARGS__)
+// Use like FEX_TODO(username, comment) or FEX_TODO(comment)
+#define FEX_TODO(...) DO_PRAGMA(GCC warning "TODO: " __VA_ARGS__);
 #else
-// FEX_TODO_ISSUE(github ticket number, "comment")
-#define FEX_TODO_ISSUE(github_ticket, comment)
-// FEX_TODO("comment")
-#define FEX_TODO(comment)
+// Use like FEX_TODO_ISSUE(github ticket number, username, comment) or
+// FEX_TODO_ISSUE(github ticket number, comment)
+#define FEX_TODO_ISSUE(number, ...) do {} while (false)
+// Use like FEX_TODO(username, comment) or FEX_TODO(comment)
+#define FEX_TODO(...) do {} while (false)
 #endif
-
-// For linking to tickets, non-todo
-// FEX_TICKET(github ticket number) or FEX_TICKET(github ticket number, "comment")
-#define FEX_TICKET(github_ticket, ...)
\ No newline at end of file