diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h
index dc64b16c5c7c..37c88f985215 100644
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -9,17 +9,12 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 /* struct pt_regs */
 #include <asm/ptrace.h>
 
 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>
diff --git a/include/trace/hooks/rwsem.h b/include/trace/hooks/rwsem.h
index 60245739cfff..e9a70f63e330 100644
--- a/include/trace/hooks/rwsem.h
+++ b/include/trace/hooks/rwsem.h
@@ -9,7 +9,7 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
+
 /* struct rw_semaphore, struct rwsem_waiter */
 #include <linux/rwsem.h>
 DECLARE_HOOK(android_vh_rwsem_init,
@@ -26,12 +26,6 @@ DECLARE_HOOK(android_vh_alter_rwsem_list_add,
 		 struct rw_semaphore *sem,
 		 bool *already_on_list),
 	TP_ARGS(waiter, sem, already_on_list));
-#else
-#define trace_android_vh_rwsem_init(sem)
-#define trace_android_vh_rwsem_wake(sem)
-#define trace_android_vh_rwsem_write_finished(sem)
-#define trace_android_vh_alter_rwsem_list_add(waiter, sem, already_on_list)
-#endif
 #endif /* _TRACE_HOOK_RWSEM_H */
 /* This part must be outside protection */
 #include <trace/define_trace.h>