diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h
index 90d81041a48b..5a20141d742b 100644
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -9,16 +9,11 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 struct pt_regs;
 
 DECLARE_HOOK(android_vh_ipi_stop,
 	TP_PROTO(struct pt_regs *regs),
 	TP_ARGS(regs))
-#else
-#define trace_android_vh_ipi_stop(regs)
-#define trace_android_vh_ipi_stop_rcuidle(regs)
-#endif
 
 #endif /* _TRACE_HOOK_DEBUG_H */
 /* This part must be outside protection */
diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h
index be5345ebe3d4..a3221bc9301c 100644
--- a/include/trace/hooks/ftrace_dump.h
+++ b/include/trace/hooks/ftrace_dump.h
@@ -12,8 +12,6 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
-
 DECLARE_HOOK(android_vh_ftrace_oops_enter,
 	TP_PROTO(bool *ftrace_check),
 	TP_ARGS(ftrace_check));
@@ -34,16 +32,6 @@ DECLARE_HOOK(android_vh_ftrace_dump_buffer,
 	TP_PROTO(struct trace_seq *trace_buf, bool *dump_printk),
 	TP_ARGS(trace_buf, dump_printk));
 
-#else
-
-#define trace_android_vh_ftrace_oops_enter(ftrace_check)
-#define trace_android_vh_ftrace_oops_exit(ftrace_check)
-#define trace_android_vh_ftrace_size_check(size, ftrace_check)
-#define trace_android_vh_ftrace_format_check(ftrace_check)
-#define trace_android_vh_ftrace_dump_buffer(trace_buf, dump_printk)
-
-#endif
-
 #endif /* _TRACE_HOOK_FTRACE_DUMP_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>