diff --git a/include/trace/hooks/audio_usboffload.h b/include/trace/hooks/audio_usboffload.h
index bf189646b741..73d8bf9d7a35 100644
--- a/include/trace/hooks/audio_usboffload.h
+++ b/include/trace/hooks/audio_usboffload.h
@@ -9,9 +9,10 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
+/* struct snd_usb_audio */
+#include <../sound/usb/usbaudio.h>
 /* struct usb_interface */
 #include <linux/usb.h>
-struct snd_usb_audio;
 
 DECLARE_HOOK(android_vh_audio_usb_offload_vendor_set,
 	TP_PROTO(void *arg),
diff --git a/include/trace/hooks/binder.h b/include/trace/hooks/binder.h
index 8f78a1abdfcd..57cceb0d4316 100644
--- a/include/trace/hooks/binder.h
+++ b/include/trace/hooks/binder.h
@@ -10,12 +10,12 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+/* struct binder_proc, struct binder_thread, struct binder_transaction */
+#include <../drivers/android/binder_internal.h>
 /* struct task_struct */
 #include <linux/sched.h>
 /* struct binder_transaction_data */
 #include <uapi/linux/android/binder.h>
-#include <../drivers/android/binder_internal.h>
-struct seq_file;
 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 8cbc717c0a47..7a8613340f57 100644
--- a/include/trace/hooks/block.h
+++ b/include/trace/hooks/block.h
@@ -10,10 +10,12 @@
 #include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
+/* struct blk_mq_tags */
+#include <../block/blk-mq-tag.h>
+/* struct blk_mq_alloc_data */
+#include <../block/blk-mq.h>
 /* struct blk_mq_tag_set */
 #include <linux/blk-mq.h>
-struct blk_mq_tags;
-struct blk_mq_alloc_data;
 
 DECLARE_HOOK(android_vh_blk_alloc_rqs,
 	TP_PROTO(size_t *rq_size, struct blk_mq_tag_set *set,
diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h
index fd6cb092cec9..04ecb455577e 100644
--- a/include/trace/hooks/cgroup.h
+++ b/include/trace/hooks/cgroup.h
@@ -7,6 +7,8 @@
 #define _TRACE_HOOK_CGROUP_H
 #include <trace/hooks/vendor_hooks.h>
 
+/* struct cgroup_taskset */
+#include <../kernel/cgroup/cgroup-internal.h>
 /* struct cgroup_subsys */
 #include <linux/cgroup-defs.h>
 /* struct task_struct */
@@ -15,8 +17,6 @@ DECLARE_HOOK(android_vh_cgroup_set_task,
 	TP_PROTO(int ret, struct task_struct *task),
 	TP_ARGS(ret, task));
 
-struct cgroup_taskset;
-struct cgroup;
 DECLARE_HOOK(android_vh_cgroup_attach,
 	TP_PROTO(struct cgroup_subsys *ss, struct cgroup_taskset *tset),
 	TP_ARGS(ss, tset))
diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h
index 90d81041a48b..dc64b16c5c7c 100644
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -10,7 +10,8 @@
 #include <trace/hooks/vendor_hooks.h>
 
 #if defined(CONFIG_TRACEPOINTS) && defined(CONFIG_ANDROID_VENDOR_HOOKS)
-struct pt_regs;
+/* struct pt_regs */
+#include <asm/ptrace.h>
 
 DECLARE_HOOK(android_vh_ipi_stop,
 	TP_PROTO(struct pt_regs *regs),
diff --git a/include/trace/hooks/fault.h b/include/trace/hooks/fault.h
index 6efbdbb2a979..502bcf1b90b8 100644
--- a/include/trace/hooks/fault.h
+++ b/include/trace/hooks/fault.h
@@ -7,7 +7,8 @@
 #define _TRACE_HOOK_FAULT_H
 #include <trace/hooks/vendor_hooks.h>
 
-struct pt_regs;
+/* struct pt_regs */
+#include <asm/ptrace.h>
 DECLARE_RESTRICTED_HOOK(android_rvh_die_kernel_fault,
 	TP_PROTO(const char *msg, unsigned long addr, unsigned int esr, struct pt_regs *regs),
 	TP_ARGS(msg, addr, esr, regs), 1);
diff --git a/include/trace/hooks/logbuf.h b/include/trace/hooks/logbuf.h
index 72c34f7fbad0..6a66508a4f03 100644
--- a/include/trace/hooks/logbuf.h
+++ b/include/trace/hooks/logbuf.h
@@ -9,8 +9,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-struct printk_ringbuffer;
-struct printk_record;
+/* struct printk_record, struct printk_ringbuffer */
+#include <../kernel/printk/printk_ringbuffer.h>
 
 DECLARE_HOOK(android_vh_logbuf,
 	TP_PROTO(struct printk_ringbuffer *rb, struct printk_record *r),
diff --git a/include/trace/hooks/mm.h b/include/trace/hooks/mm.h
index 0a304cc2f240..0232a3da33e4 100644
--- a/include/trace/hooks/mm.h
+++ b/include/trace/hooks/mm.h
@@ -13,6 +13,8 @@
 #include <linux/oom.h>
 #include <trace/hooks/vendor_hooks.h>
 
+/* struct slabinfo */
+#include <../mm/slab.h>
 DECLARE_RESTRICTED_HOOK(android_rvh_set_skip_swapcache_flags,
 			TP_PROTO(gfp_t *flags),
 			TP_ARGS(flags), 1);
@@ -37,7 +39,6 @@ DECLARE_HOOK(android_vh_alloc_pages_slowpath,
 DECLARE_HOOK(android_vh_print_slabinfo_header,
 	TP_PROTO(struct seq_file *m),
 	TP_ARGS(m));
-struct slabinfo;
 DECLARE_HOOK(android_vh_cache_show,
 	TP_PROTO(struct seq_file *m, struct slabinfo *sinfo, struct kmem_cache *s),
 	TP_ARGS(m, sinfo, s));
diff --git a/include/trace/hooks/regmap.h b/include/trace/hooks/regmap.h
index 5314112ec078..9860936a97e7 100644
--- a/include/trace/hooks/regmap.h
+++ b/include/trace/hooks/regmap.h
@@ -8,9 +8,10 @@
 #define _TRACE_HOOK_REGMAP_H
 #include <trace/hooks/vendor_hooks.h>
 
+/* struct regmap */
+#include <../drivers/base/regmap/internal.h>
 /* struct regmap_config */
 #include <linux/regmap.h>
-struct regmap;
 
 /*
  * Following tracepoints are not exported in tracefs and provide a
diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h
index f0a5126024f2..490859df19b5 100644
--- a/include/trace/hooks/sched.h
+++ b/include/trace/hooks/sched.h
@@ -9,6 +9,8 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+/* struct cgroup_taskset */
+#include <../kernel/cgroup/cgroup-internal.h>
 /* struct cgroup_subsys_state */
 #include <linux/cgroup-defs.h>
 /* struct em_perf_domain */
@@ -233,7 +235,6 @@ DECLARE_RESTRICTED_HOOK(android_rvh_update_misfit_status,
 	TP_PROTO(struct task_struct *p, struct rq *rq, bool *need_update),
 	TP_ARGS(p, rq, need_update), 1);
 
-struct cgroup_taskset;
 DECLARE_RESTRICTED_HOOK(android_rvh_cpu_cgroup_attach,
 	TP_PROTO(struct cgroup_taskset *tset),
 	TP_ARGS(tset), 1);
diff --git a/include/trace/hooks/softlockup.h b/include/trace/hooks/softlockup.h
index eb2855379d98..4e0e0171f120 100644
--- a/include/trace/hooks/softlockup.h
+++ b/include/trace/hooks/softlockup.h
@@ -7,7 +7,8 @@
 #define _TRACE_HOOK_SOFTLOCKUP_H
 #include <trace/hooks/vendor_hooks.h>
 
-struct pt_regs;
+/* struct pt_regs */
+#include <asm/ptrace.h>
 DECLARE_HOOK(android_vh_watchdog_timer_softlockup,
 	TP_PROTO(int duration, struct pt_regs *regs, bool is_panic),
 	TP_ARGS(duration, regs, is_panic));
diff --git a/include/trace/hooks/traps.h b/include/trace/hooks/traps.h
index 775a2ec00665..c72ec5018f8e 100644
--- a/include/trace/hooks/traps.h
+++ b/include/trace/hooks/traps.h
@@ -7,7 +7,8 @@
 #define _TRACE_HOOK_TRAPS_H
 #include <trace/hooks/vendor_hooks.h>
 
-struct pt_regs;
+/* struct pt_regs */
+#include <asm/ptrace.h>
 DECLARE_RESTRICTED_HOOK(android_rvh_do_undefinstr,
 	TP_PROTO(struct pt_regs *regs),
 	TP_ARGS(regs),
diff --git a/include/trace/hooks/ufshcd.h b/include/trace/hooks/ufshcd.h
index 8c65a7bd57c4..80b8131fc716 100644
--- a/include/trace/hooks/ufshcd.h
+++ b/include/trace/hooks/ufshcd.h
@@ -9,12 +9,12 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
+/* struct ufs_hba, struct ufshcd_lrb, struct uic_command */
+#include <../drivers/scsi/ufs/ufshcd.h>
 /* struct request */
 #include <linux/blkdev.h>
 /* struct scsi_device */
 #include <scsi/scsi_device.h>
-struct ufs_hba;
-struct ufshcd_lrb;
 
 DECLARE_HOOK(android_vh_ufs_fill_prdt,
 	TP_PROTO(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
@@ -38,7 +38,6 @@ DECLARE_HOOK(android_vh_ufs_compl_command,
 	TP_PROTO(struct ufs_hba *hba, struct ufshcd_lrb *lrbp),
 	TP_ARGS(hba, lrbp));
 
-struct uic_command;
 DECLARE_HOOK(android_vh_ufs_send_uic_command,
 	TP_PROTO(struct ufs_hba *hba, struct uic_command *ucmd, int str_t),
 	TP_ARGS(hba, ucmd, str_t));