diff --git a/include/trace/hooks/binder.h b/include/trace/hooks/binder.h
index 2b9e7e09a13d..5147261de15c 100644
--- a/include/trace/hooks/binder.h
+++ b/include/trace/hooks/binder.h
@@ -11,19 +11,23 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_ANDROID_BINDER_IPC)
 struct binder_alloc;
 struct binder_proc;
 struct binder_thread;
 struct binder_transaction;
-struct task_struct;
-struct seq_file;
 struct binder_transaction_data;
 #else
 /* struct binder_alloc */
 #include <../drivers/android/binder_alloc.h>
 /* struct binder_proc, struct binder_thread, struct binder_transaction */
 #include <../drivers/android/binder_internal.h>
+#endif
+
+#ifdef __GENKSYMS__
+struct task_struct;
+struct seq_file;
+#else
 /* struct task_struct */
 #include <linux/sched.h>
 /* struct seq_file */
@@ -31,6 +35,7 @@ struct binder_transaction_data;
 /* struct binder_transaction_data */
 #include <uapi/linux/android/binder.h>
 #endif /* __GENKSYMS__ */
+
 DECLARE_HOOK(android_vh_binder_transaction_init,
 	TP_PROTO(struct binder_transaction *t),
 	TP_ARGS(t));
diff --git a/include/trace/hooks/block.h b/include/trace/hooks/block.h
index 964fff355602..a5a7ac70a2ee 100644
--- a/include/trace/hooks/block.h
+++ b/include/trace/hooks/block.h
@@ -10,7 +10,7 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !defined(CONFIG_BLOCK)
 struct blk_mq_tags;
 struct blk_mq_alloc_data;
 struct blk_mq_tag_set;
diff --git a/include/trace/hooks/logbuf.h b/include/trace/hooks/logbuf.h
index 6aeb10a4661b..3794192554cb 100644
--- a/include/trace/hooks/logbuf.h
+++ b/include/trace/hooks/logbuf.h
@@ -10,7 +10,7 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_PRINTK)
 struct printk_record;
 struct printk_ringbuffer;
 #else
diff --git a/include/trace/hooks/mmc_core.h b/include/trace/hooks/mmc_core.h
index b4b93b2f4c9e..eb012e9c8147 100644
--- a/include/trace/hooks/mmc_core.h
+++ b/include/trace/hooks/mmc_core.h
@@ -10,13 +10,17 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_MMC_SDHCI)
 struct sdhci_host;
-struct mmc_card;
-struct mmc_host;
 #else
 /* struct sdhci_host */
 #include <../drivers/mmc/host/sdhci.h>
+#endif
+
+#ifdef __GENKSYMS__
+struct mmc_card;
+struct mmc_host;
+#else
 /* struct mmc_card */
 #include <linux/mmc/card.h>
 /* struct mmc_host */
diff --git a/include/trace/hooks/psi.h b/include/trace/hooks/psi.h
index 3842118af3c3..3200b639ad3f 100644
--- a/include/trace/hooks/psi.h
+++ b/include/trace/hooks/psi.h
@@ -12,7 +12,7 @@
 
 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
 
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !defined(CONFIG_PSI)
 struct psi_group;
 struct psi_trigger;
 #else
diff --git a/include/trace/hooks/typec.h b/include/trace/hooks/typec.h
index db06fb8c30e9..825cb37bc8b2 100644
--- a/include/trace/hooks/typec.h
+++ b/include/trace/hooks/typec.h
@@ -6,12 +6,13 @@
 #define _TRACE_HOOK_TYPEC_H
 #include <linux/tracepoint.h>
 #include <linux/usb/pd.h>
+#include <linux/usb/tcpm.h>
 #include <trace/hooks/vendor_hooks.h>
 /*
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_TYPEC_TCPCI)
 struct tcpci_data;
 #else
 /* struct tcpci_data */
diff --git a/include/trace/hooks/ufshcd.h b/include/trace/hooks/ufshcd.h
index 8483dc966c6c..906e02740f3f 100644
--- a/include/trace/hooks/ufshcd.h
+++ b/include/trace/hooks/ufshcd.h
@@ -10,7 +10,7 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#ifdef __GENKSYMS__
+#if defined(__GENKSYMS__) || !IS_ENABLED(CONFIG_SCSI_UFSHCD)
 struct ufs_hba;
 struct ufshcd_lrb;
 struct uic_command;