diff --git a/include/trace/hooks/audio_usboffload.h b/include/trace/hooks/audio_usboffload.h
index 73d8bf9d7a35..e948fc6c3ae7 100644
--- a/include/trace/hooks/audio_usboffload.h
+++ b/include/trace/hooks/audio_usboffload.h
@@ -9,10 +9,8 @@
 
 #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;
+struct usb_interface;
 
 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 57cceb0d4316..c80b3c15ddc9 100644
--- a/include/trace/hooks/binder.h
+++ b/include/trace/hooks/binder.h
@@ -10,12 +10,13 @@
  * 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>
+
+struct binder_proc;
+struct binder_thread;
+struct binder_transaction;
+struct task_struct;
+struct binder_transaction_data;
+
 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 7a8613340f57..e8bee374f989 100644
--- a/include/trace/hooks/block.h
+++ b/include/trace/hooks/block.h
@@ -7,15 +7,11 @@
 #if !defined(_TRACE_HOOK_BLOCK_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_BLOCK_H
 
-#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;
+struct blk_mq_tag_set;
 
 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/cfg80211.h b/include/trace/hooks/cfg80211.h
index ccb31ccc29ac..26cef55c4e0f 100644
--- a/include/trace/hooks/cfg80211.h
+++ b/include/trace/hooks/cfg80211.h
@@ -8,7 +8,9 @@
 #define _TRACE_HOOK_CFG80211_H
 
 #include <trace/hooks/vendor_hooks.h>
-#include <net/cfg80211.h>
+
+struct wiphy;
+struct wireless_dev;
 
 DECLARE_HOOK(android_vh_cfg80211_set_context,
 	TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, int context_id,
diff --git a/include/trace/hooks/cgroup.h b/include/trace/hooks/cgroup.h
index 6cb36ed136a5..ada3e064a8df 100644
--- a/include/trace/hooks/cgroup.h
+++ b/include/trace/hooks/cgroup.h
@@ -7,16 +7,12 @@
 #define _TRACE_HOOK_CGROUP_H
 #include <trace/hooks/vendor_hooks.h>
 
-#ifndef __GENKSYMS__
+struct cgroup;
 struct cgroup_taskset;
-#else
-/* struct cgroup_taskset */
-#include <../kernel/cgroup/cgroup-internal.h>
-#endif
-/* struct cgroup_subsys */
-#include <linux/cgroup-defs.h>
-/* struct task_struct */
-#include <linux/sched.h>
+struct cgroup_subsys;
+struct cgroup_subsys_state;
+struct task_struct;
+
 DECLARE_HOOK(android_vh_cgroup_set_task,
 	TP_PROTO(int ret, struct task_struct *task),
 	TP_ARGS(ret, task));
diff --git a/include/trace/hooks/cpufreq.h b/include/trace/hooks/cpufreq.h
index 1b29b6f24913..c6c2b19cdadf 100644
--- a/include/trace/hooks/cpufreq.h
+++ b/include/trace/hooks/cpufreq.h
@@ -7,9 +7,10 @@
 #if !defined(_TRACE_HOOK_CPUFREQ_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_CPUFREQ_H
 
-#include <linux/cpufreq.h>
 #include <trace/hooks/vendor_hooks.h>
 
+struct cpufreq_policy;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_show_max_freq,
 	TP_PROTO(struct cpufreq_policy *policy, unsigned int *max_freq),
 	TP_ARGS(policy, max_freq), 1);
diff --git a/include/trace/hooks/cpuidle.h b/include/trace/hooks/cpuidle.h
index 1d3094b8f808..b1ee27ed6707 100644
--- a/include/trace/hooks/cpuidle.h
+++ b/include/trace/hooks/cpuidle.h
@@ -9,8 +9,7 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct cpuidle_device */
-#include <linux/cpuidle.h>
+struct cpuidle_device;
 
 DECLARE_HOOK(android_vh_cpu_idle_enter,
 	TP_PROTO(int *state, struct cpuidle_device *dev),
diff --git a/include/trace/hooks/cpuidle_psci.h b/include/trace/hooks/cpuidle_psci.h
index ed3f775f14fd..3ca307a3d82b 100644
--- a/include/trace/hooks/cpuidle_psci.h
+++ b/include/trace/hooks/cpuidle_psci.h
@@ -10,8 +10,8 @@
  * mechanism for vendor modules to hook and extend functionality
  */
 
-/* struct cpuidle_device */
-#include <linux/cpuidle.h>
+struct cpuidle_device;
+
 DECLARE_HOOK(android_vh_cpuidle_psci_enter,
 	TP_PROTO(struct cpuidle_device *dev, bool s2idle),
 	TP_ARGS(dev, s2idle));
diff --git a/include/trace/hooks/creds.h b/include/trace/hooks/creds.h
index 737f673538ac..da3d400f0e9e 100644
--- a/include/trace/hooks/creds.h
+++ b/include/trace/hooks/creds.h
@@ -10,10 +10,9 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct cred */
-#include <linux/cred.h>
-/* struct task_struct */
-#include <linux/sched.h>
+struct cred;
+struct task_struct;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_commit_creds,
 	TP_PROTO(const struct task_struct *task, const struct cred *new),
 	TP_ARGS(task, new), 1);
diff --git a/include/trace/hooks/debug.h b/include/trace/hooks/debug.h
index 37c88f985215..5a20141d742b 100644
--- a/include/trace/hooks/debug.h
+++ b/include/trace/hooks/debug.h
@@ -9,8 +9,7 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct pt_regs */
-#include <asm/ptrace.h>
+struct pt_regs;
 
 DECLARE_HOOK(android_vh_ipi_stop,
 	TP_PROTO(struct pt_regs *regs),
diff --git a/include/trace/hooks/dmabuf.h b/include/trace/hooks/dmabuf.h
index 397dd3096d7d..31ac68577522 100644
--- a/include/trace/hooks/dmabuf.h
+++ b/include/trace/hooks/dmabuf.h
@@ -11,8 +11,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct dma_buf */
-#include <linux/dma-buf.h>
+struct dma_buf;
+
 DECLARE_HOOK(android_vh_dma_buf_release,
 		TP_PROTO(struct dma_buf *data),
 		TP_ARGS(data));
diff --git a/include/trace/hooks/drm_atomic.h b/include/trace/hooks/drm_atomic.h
index 927e5d0293f6..cce7ee492a09 100644
--- a/include/trace/hooks/drm_atomic.h
+++ b/include/trace/hooks/drm_atomic.h
@@ -11,10 +11,9 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct drm_atomic_state */
-#include <drm/drm_atomic.h>
-/* struct drm_crtc */
-#include <drm/drm_crtc.h>
+struct drm_atomic_state;
+struct drm_crtc;
+
 DECLARE_HOOK(android_vh_drm_atomic_check_modeset,
 	TP_PROTO(struct drm_atomic_state *state, struct drm_crtc *crtc, bool *allow),
 	TP_ARGS(state, crtc, allow))
diff --git a/include/trace/hooks/drm_framebuffer.h b/include/trace/hooks/drm_framebuffer.h
index 677dbf4b50ad..2c2221dfa72c 100644
--- a/include/trace/hooks/drm_framebuffer.h
+++ b/include/trace/hooks/drm_framebuffer.h
@@ -11,8 +11,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct drm_framebuffer */
-#include <drm/drm_framebuffer.h>
+struct drm_framebuffer;
+
 DECLARE_HOOK(android_vh_atomic_remove_fb,
 	TP_PROTO(struct drm_framebuffer *fb, bool *allow),
 	TP_ARGS(fb, allow))
diff --git a/include/trace/hooks/dtask.h b/include/trace/hooks/dtask.h
index 2dd4baef99ca..58ca172d83be 100644
--- a/include/trace/hooks/dtask.h
+++ b/include/trace/hooks/dtask.h
@@ -10,14 +10,11 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct mutex */
-#include <linux/mutex.h>
-/* struct rt_mutex_base */
-#include <linux/rtmutex.h>
-/* struct rw_semaphore */
-#include <linux/rwsem.h>
-/* struct task_struct */
-#include <linux/sched.h>
+struct mutex;
+struct rt_mutex_base;
+struct rw_semaphore;
+struct task_struct;
+
 DECLARE_HOOK(android_vh_mutex_wait_start,
 	TP_PROTO(struct mutex *lock),
 	TP_ARGS(lock));
diff --git a/include/trace/hooks/fault.h b/include/trace/hooks/fault.h
index 502bcf1b90b8..edfdf23422f5 100644
--- a/include/trace/hooks/fault.h
+++ b/include/trace/hooks/fault.h
@@ -7,8 +7,8 @@
 #define _TRACE_HOOK_FAULT_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct pt_regs */
-#include <asm/ptrace.h>
+struct pt_regs;
+
 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/fips140.h b/include/trace/hooks/fips140.h
index 31960c814028..fd4a42c013c7 100644
--- a/include/trace/hooks/fips140.h
+++ b/include/trace/hooks/fips140.h
@@ -7,8 +7,7 @@
 #define _TRACE_HOOK_FIPS140_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct crypto_aes_ctx */
-#include <crypto/aes.h>
+struct crypto_aes_ctx;
 
 /*
  * These hooks exist only for the benefit of the FIPS140 crypto module, which
diff --git a/include/trace/hooks/fpsimd.h b/include/trace/hooks/fpsimd.h
index 3f8951eeceb6..10337180a7be 100644
--- a/include/trace/hooks/fpsimd.h
+++ b/include/trace/hooks/fpsimd.h
@@ -9,8 +9,7 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct task_struct */
-#include <linux/sched.h>
+struct task_struct;
 
 DECLARE_HOOK(android_vh_is_fpsimd_save,
 	TP_PROTO(struct task_struct *prev, struct task_struct *next),
diff --git a/include/trace/hooks/ftrace_dump.h b/include/trace/hooks/ftrace_dump.h
index a3221bc9301c..3d0b980ee85e 100644
--- a/include/trace/hooks/ftrace_dump.h
+++ b/include/trace/hooks/ftrace_dump.h
@@ -7,11 +7,10 @@
 #if !defined(_TRACE_HOOK_FTRACE_DUMP_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FTRACE_DUMP_H
 
-#include <linux/trace_seq.h>
-#include <linux/trace_events.h>
-
 #include <trace/hooks/vendor_hooks.h>
 
+struct trace_seq;
+
 DECLARE_HOOK(android_vh_ftrace_oops_enter,
 	TP_PROTO(bool *ftrace_check),
 	TP_ARGS(ftrace_check));
diff --git a/include/trace/hooks/futex.h b/include/trace/hooks/futex.h
index b3c8aca6345b..1be35fefb610 100644
--- a/include/trace/hooks/futex.h
+++ b/include/trace/hooks/futex.h
@@ -6,7 +6,9 @@
 #if !defined(_TRACE_HOOK_FUTEX_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_FUTEX_H
 #include <trace/hooks/vendor_hooks.h>
-#include <linux/plist.h>
+
+struct plist_node;
+struct plist_head;
 /*
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
diff --git a/include/trace/hooks/gic.h b/include/trace/hooks/gic.h
index 1c2bb9cd7c2c..b583d9fbe0dd 100644
--- a/include/trace/hooks/gic.h
+++ b/include/trace/hooks/gic.h
@@ -8,8 +8,8 @@
 #define _TRACE_HOOK_GIC_H
 
 #include <trace/hooks/vendor_hooks.h>
-/* struct irq_data */
-#include <linux/irq.h>
+
+struct irq_data;
 struct gic_chip_data;
 
 DECLARE_HOOK(android_vh_gic_resume,
diff --git a/include/trace/hooks/gic_v3.h b/include/trace/hooks/gic_v3.h
index ac54048a7dd5..ae7f8d1bacdd 100644
--- a/include/trace/hooks/gic_v3.h
+++ b/include/trace/hooks/gic_v3.h
@@ -9,10 +9,9 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct cpumask */
-#include <linux/cpumask.h>
-/* struct irq_data */
-#include <linux/irq.h>
+struct cpumask;
+struct irq_data;
+
 DECLARE_HOOK(android_vh_gic_v3_affinity_init,
 	TP_PROTO(int irq, u32 offset, u64 *affinity),
 	TP_ARGS(irq, offset, affinity));
diff --git a/include/trace/hooks/hung_task.h b/include/trace/hooks/hung_task.h
index 1559d3ed774f..115727d2916c 100644
--- a/include/trace/hooks/hung_task.h
+++ b/include/trace/hooks/hung_task.h
@@ -9,6 +9,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
+struct task_struct;
+
 DECLARE_HOOK(android_vh_check_uninterruptible_tasks,
 	TP_PROTO(struct task_struct *t, unsigned long timeout,
 		bool *need_check),
diff --git a/include/trace/hooks/iommu.h b/include/trace/hooks/iommu.h
index cf554c6bb92d..e9bb6642a373 100644
--- a/include/trace/hooks/iommu.h
+++ b/include/trace/hooks/iommu.h
@@ -7,12 +7,10 @@
 #if !defined(_TRACE_HOOK_IOMMU_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_IOMMU_H
 
-#include <linux/types.h>
-
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct iova_domain */
-#include <linux/iova.h>
+struct iova_domain;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_iommu_setup_dma_ops,
 	TP_PROTO(struct device *dev, u64 dma_base, u64 dma_limit),
 	TP_ARGS(dev, dma_base, dma_limit), 1);
diff --git a/include/trace/hooks/ipv4.h b/include/trace/hooks/ipv4.h
index 06fe06d675a4..cc4e3488c013 100644
--- a/include/trace/hooks/ipv4.h
+++ b/include/trace/hooks/ipv4.h
@@ -6,7 +6,6 @@
 
 #if !defined(_TRACE_HOOK_IPV4_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_IPV4_H
-#include <linux/tracepoint.h>
 #include <trace/hooks/vendor_hooks.h>
 
 DECLARE_RESTRICTED_HOOK(android_rvh_tcp_sendmsg_locked,
diff --git a/include/trace/hooks/logbuf.h b/include/trace/hooks/logbuf.h
index 6a66508a4f03..72c34f7fbad0 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_record, struct printk_ringbuffer */
-#include <../kernel/printk/printk_ringbuffer.h>
+struct printk_ringbuffer;
+struct printk_record;
 
 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 3fc350fc4ea1..a6f21167a0be 100644
--- a/include/trace/hooks/mm.h
+++ b/include/trace/hooks/mm.h
@@ -7,14 +7,11 @@
 #if !defined(_TRACE_HOOK_MM_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MM_H
 
-#include <linux/types.h>
-
-#include <linux/mm.h>
-#include <linux/oom.h>
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct slabinfo */
-#include <../mm/slab.h>
+struct oom_control;
+struct slabinfo;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_set_skip_swapcache_flags,
 			TP_PROTO(gfp_t *flags),
 			TP_ARGS(flags), 1);
diff --git a/include/trace/hooks/mmc.h b/include/trace/hooks/mmc.h
index 7f3405912f32..e6cc0c59422f 100644
--- a/include/trace/hooks/mmc.h
+++ b/include/trace/hooks/mmc.h
@@ -5,15 +5,13 @@
 #define TRACE_INCLUDE_PATH trace/hooks
 #if !defined(_TRACE_HOOK_MMC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_MMC_H
+
 #include <trace/hooks/vendor_hooks.h>
-/* struct blk_mq_queue_data */
-#include <linux/blk-mq.h>
-/* struct mmc_host */
-#include <linux/mmc/host.h>
-/* struct mmc_card */
-#include <linux/mmc/card.h>
-/* struct sdhci_host */
-#include "../../drivers/mmc/host/sdhci.h"
+
+struct blk_mq_queue_data;
+struct mmc_host;
+struct mmc_card;
+struct sdhci_host;
 
 /*
  * Following tracepoints are not exported in tracefs and provide a
diff --git a/include/trace/hooks/module.h b/include/trace/hooks/module.h
index 19f468a086ff..2c6300222b75 100644
--- a/include/trace/hooks/module.h
+++ b/include/trace/hooks/module.h
@@ -10,8 +10,8 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct module */
-#include <linux/module.h>
+struct module;
+
 DECLARE_HOOK(android_vh_set_module_permit_before_init,
 	TP_PROTO(const struct module *mod),
 	TP_ARGS(mod));
diff --git a/include/trace/hooks/mpam.h b/include/trace/hooks/mpam.h
index 3175f6faeab6..d358fe3d79eb 100644
--- a/include/trace/hooks/mpam.h
+++ b/include/trace/hooks/mpam.h
@@ -10,8 +10,8 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct task_struct */
-#include <linux/sched.h>
+struct task_struct;
+
 DECLARE_HOOK(android_vh_mpam_set,
 	TP_PROTO(struct task_struct *prev, struct task_struct *next),
 	TP_ARGS(prev, next));
diff --git a/include/trace/hooks/net.h b/include/trace/hooks/net.h
index 542944b39087..2c5e8ce17025 100644
--- a/include/trace/hooks/net.h
+++ b/include/trace/hooks/net.h
@@ -8,12 +8,10 @@
 #define _TRACE_HOOK_NET_VH_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct packet_type */
-#include <linux/netdevice.h>
-/* struct sk_buff */
-#include <linux/skbuff.h>
-/* struct list_head */
-#include <linux/types.h>
+struct packet_type;
+struct sk_buff;
+struct list_head;
+
 DECLARE_HOOK(android_vh_ptype_head,
 	TP_PROTO(const struct packet_type *pt, struct list_head *vendor_pt),
 	TP_ARGS(pt, vendor_pt));
diff --git a/include/trace/hooks/pm_domain.h b/include/trace/hooks/pm_domain.h
index 66ae1659c4d6..44c4ae7f5363 100644
--- a/include/trace/hooks/pm_domain.h
+++ b/include/trace/hooks/pm_domain.h
@@ -10,8 +10,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct generic_pm_domain */
-#include <linux/pm_domain.h>
+struct generic_pm_domain;
+
 DECLARE_HOOK(android_vh_allow_domain_state,
 	TP_PROTO(struct generic_pm_domain *genpd, uint32_t idx, bool *allow),
 	TP_ARGS(genpd, idx, allow))
diff --git a/include/trace/hooks/power.h b/include/trace/hooks/power.h
index 3370705d0832..bcf8eab2cffb 100644
--- a/include/trace/hooks/power.h
+++ b/include/trace/hooks/power.h
@@ -7,8 +7,8 @@
 #define _TRACE_HOOK_POWER_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct task_struct */
-#include <linux/sched.h>
+struct task_struct;
+
 DECLARE_HOOK(android_vh_try_to_freeze_todo,
 	TP_PROTO(unsigned int todo, unsigned int elapsed_msecs, bool wq_busy),
 	TP_ARGS(todo, elapsed_msecs, wq_busy));
diff --git a/include/trace/hooks/regmap.h b/include/trace/hooks/regmap.h
index 9860936a97e7..13cdf942d66f 100644
--- a/include/trace/hooks/regmap.h
+++ b/include/trace/hooks/regmap.h
@@ -8,10 +8,8 @@
 #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;
+struct regmap_config;
 
 /*
  * Following tracepoints are not exported in tracefs and provide a
diff --git a/include/trace/hooks/remoteproc.h b/include/trace/hooks/remoteproc.h
index fc35ef5c305c..55fae7034379 100644
--- a/include/trace/hooks/remoteproc.h
+++ b/include/trace/hooks/remoteproc.h
@@ -7,13 +7,9 @@
 #if !defined(_TRACE_HOOK_RPROC_H) || defined(TRACE_HEADER_MULTI_READ)
 #define _TRACE_HOOK_RPROC_H
 
-/* struct rproc */
-#include <linux/remoteproc.h>
-
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct rproc */
-#include <linux/remoteproc.h>
+struct rproc;
 
 /* When recovery succeeds */
 DECLARE_HOOK(android_vh_rproc_recovery,
diff --git a/include/trace/hooks/rwsem.h b/include/trace/hooks/rwsem.h
index e9a70f63e330..99c18e7e55b4 100644
--- a/include/trace/hooks/rwsem.h
+++ b/include/trace/hooks/rwsem.h
@@ -10,8 +10,9 @@
  * mechanism for vendor modules to hook and extend functionality
  */
 
-/* struct rw_semaphore, struct rwsem_waiter */
-#include <linux/rwsem.h>
+struct rw_semaphore;
+struct rwsem_waiter;
+
 DECLARE_HOOK(android_vh_rwsem_init,
 	TP_PROTO(struct rw_semaphore *sem),
 	TP_ARGS(sem));
diff --git a/include/trace/hooks/sched.h b/include/trace/hooks/sched.h
index 35f9558684b6..10c537161edc 100644
--- a/include/trace/hooks/sched.h
+++ b/include/trace/hooks/sched.h
@@ -9,20 +9,16 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-#ifndef __GENKSYMS__
+
 struct cgroup_taskset;
-#else
-/* struct cgroup_taskset */
-#include <../kernel/cgroup/cgroup-internal.h>
-#endif
-/* struct cgroup_subsys_state */
-#include <linux/cgroup-defs.h>
-/* struct em_perf_domain */
-#include <linux/energy_model.h>
-/* enum uclamp_id, struct sched_entity, struct task_struct, struct uclamp_se */
-#include <linux/sched.h>
-/* struct sched_attr */
-#include <uapi/linux/sched/types.h>
+struct cgroup_subsys_state;
+struct em_perf_domain;
+enum uclamp_id;
+struct sched_entity;
+struct task_struct;
+struct uclamp_se;
+struct sched_attr;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_select_task_rq_fair,
 	TP_PROTO(struct task_struct *p, int prev_cpu, int sd_flag, int wake_flags, int *new_cpu),
 	TP_ARGS(p, prev_cpu, sd_flag, wake_flags, new_cpu), 1);
diff --git a/include/trace/hooks/softlockup.h b/include/trace/hooks/softlockup.h
index 4e0e0171f120..52e41e3d2804 100644
--- a/include/trace/hooks/softlockup.h
+++ b/include/trace/hooks/softlockup.h
@@ -7,8 +7,8 @@
 #define _TRACE_HOOK_SOFTLOCKUP_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct pt_regs */
-#include <asm/ptrace.h>
+struct pt_regs;
+
 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/sys.h b/include/trace/hooks/sys.h
index 3ece5d070666..a14bd4135410 100644
--- a/include/trace/hooks/sys.h
+++ b/include/trace/hooks/sys.h
@@ -7,8 +7,8 @@
 #define _TRACE_HOOK_SYS_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct task_struct */
-#include <linux/sched.h>
+struct task_struct;
+
 DECLARE_HOOK(android_vh_syscall_prctl_finished,
 	TP_PROTO(int option, struct task_struct *task),
 	TP_ARGS(option, task));
diff --git a/include/trace/hooks/syscall_check.h b/include/trace/hooks/syscall_check.h
index 2f7e62bbca2d..c906ff6b8e7f 100644
--- a/include/trace/hooks/syscall_check.h
+++ b/include/trace/hooks/syscall_check.h
@@ -10,10 +10,9 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct file */
-#include <linux/fs.h>
-/* union bpf_attr */
-#include <uapi/linux/bpf.h>
+struct file;
+union bpf_attr;
+
 DECLARE_HOOK(android_vh_check_mmap_file,
 	TP_PROTO(const struct file *file, unsigned long prot,
 		unsigned long flag, unsigned long ret),
diff --git a/include/trace/hooks/thermal.h b/include/trace/hooks/thermal.h
index e0193df29f7c..199ca4ce914b 100644
--- a/include/trace/hooks/thermal.h
+++ b/include/trace/hooks/thermal.h
@@ -8,10 +8,10 @@
 #define _TRACE_HOOK_THERMAL_H
 
 #include <trace/hooks/vendor_hooks.h>
-#include <linux/cpufreq.h>
 
-/* struct thermal_cooling_device, struct thermal_zone_device */
-#include <linux/thermal.h>
+struct thermal_cooling_device;
+struct thermal_zone_device;
+
 DECLARE_HOOK(android_vh_modify_thermal_request_freq,
 	TP_PROTO(struct cpufreq_policy *policy, unsigned long *request_freq),
 	TP_ARGS(policy, request_freq));
diff --git a/include/trace/hooks/timekeeping.h b/include/trace/hooks/timekeeping.h
index e9558e48ea54..6d2bad768df9 100644
--- a/include/trace/hooks/timekeeping.h
+++ b/include/trace/hooks/timekeeping.h
@@ -9,8 +9,8 @@
 
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct timekeeper */
-#include <linux/timekeeper_internal.h>
+struct timekeeper;
+
 DECLARE_RESTRICTED_HOOK(android_rvh_tk_based_time_sync,
 	TP_PROTO(struct timekeeper *tk),
 	TP_ARGS(tk), 1);
diff --git a/include/trace/hooks/topology.h b/include/trace/hooks/topology.h
index 9c7e8c54a85b..c18eef908863 100644
--- a/include/trace/hooks/topology.h
+++ b/include/trace/hooks/topology.h
@@ -8,7 +8,8 @@
 #define _TRACE_HOOK_TOPOLOGY_H
 
 #include <trace/hooks/vendor_hooks.h>
-#include <linux/cpumask.h>
+
+struct cpumask;
 
 DECLARE_HOOK(android_vh_arch_set_freq_scale,
 	TP_PROTO(const struct cpumask *cpus, unsigned long freq,
diff --git a/include/trace/hooks/traps.h b/include/trace/hooks/traps.h
index c72ec5018f8e..4313a014d3ee 100644
--- a/include/trace/hooks/traps.h
+++ b/include/trace/hooks/traps.h
@@ -7,8 +7,8 @@
 #define _TRACE_HOOK_TRAPS_H
 #include <trace/hooks/vendor_hooks.h>
 
-/* struct pt_regs */
-#include <asm/ptrace.h>
+struct pt_regs;
+
 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 ce6d1f76efb5..44bb59df6903 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 <ufs/ufshcd.h>
-/* struct request */
-#include <linux/blkdev.h>
-/* struct scsi_device */
-#include <scsi/scsi_device.h>
+
+struct ufs_hba;
+struct ufshcd_lrb;
+struct uic_command;
+struct request;
+struct scsi_device;
 
 DECLARE_HOOK(android_vh_ufs_fill_prdt,
 	TP_PROTO(struct ufs_hba *hba, struct ufshcd_lrb *lrbp,
diff --git a/include/trace/hooks/usb.h b/include/trace/hooks/usb.h
index cc68488e8f5f..fe379b174289 100644
--- a/include/trace/hooks/usb.h
+++ b/include/trace/hooks/usb.h
@@ -10,8 +10,8 @@
  * Following tracepoints are not exported in tracefs and provide a
  * mechanism for vendor modules to hook and extend functionality
  */
-/* struct usb_device */
-#include <linux/usb.h>
+struct usb_device;
+
 DECLARE_HOOK(android_vh_usb_new_device_added,
 	TP_PROTO(struct usb_device *udev, int *err),
 	TP_ARGS(udev, err));