[apparmor] [PATCH] apparmor: make include headers self-contained

[John Johansen]

On 2/13/26 12:33, Ryan Lee wrote:
> Besides of resolving clangd IDE warnings, self-contained headers will be
> less likely to break if the surrounding includes in .c files using them
> change.
> 
> Signed-off-by: Ryan Lee <ryan.lee at canonical.com>
Acked-by: John Johansen <john.johansen at canonical.com>

> ---
>   security/apparmor/include/apparmorfs.h    | 3 +++
>   security/apparmor/include/capability.h    | 1 +
>   security/apparmor/include/ipc.h           | 1 +
>   security/apparmor/include/path.h          | 3 +++
>   security/apparmor/include/policy_unpack.h | 1 +
>   security/apparmor/include/procattr.h      | 2 ++
>   security/apparmor/include/task.h          | 5 +++++
>   7 files changed, 16 insertions(+)
> 
> This patch applies cleanly to the Ubuntu 6.17 kernel.
> 
> diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
> index 61d37ab9ee4b..ba922b918d32 100644
> --- a/security/apparmor/include/apparmorfs.h
> +++ b/security/apparmor/include/apparmorfs.h
> @@ -11,6 +11,9 @@
>   #ifndef __AA_APPARMORFS_H
>   #define __AA_APPARMORFS_H
>   
> +#include <linux/init.h>
> +#include <linux/types.h>
> +
>   extern struct path aa_null;
>   
>   enum aa_sfs_type {
> diff --git a/security/apparmor/include/capability.h b/security/apparmor/include/capability.h
> index 1ddcec2d1160..3fb8b8f2182a 100644
> --- a/security/apparmor/include/capability.h
> +++ b/security/apparmor/include/capability.h
> @@ -11,6 +11,7 @@
>   #ifndef __AA_CAPABILITY_H
>   #define __AA_CAPABILITY_H
>   
> +#include <linux/capability.h>
>   #include <linux/sched.h>
>   
>   #include "apparmorfs.h"
> diff --git a/security/apparmor/include/ipc.h b/security/apparmor/include/ipc.h
> index 72f2a6112892..0291da598881 100644
> --- a/security/apparmor/include/ipc.h
> +++ b/security/apparmor/include/ipc.h
> @@ -13,6 +13,7 @@
>   
>   #include <linux/msg.h>
>   #include <linux/sched.h>
> +#include "audit.h"
>   #include "inode.h"
>   #include "perms.h"
>   
> diff --git a/security/apparmor/include/path.h b/security/apparmor/include/path.h
> index 43e61c9f1fe2..b4adfb676a59 100644
> --- a/security/apparmor/include/path.h
> +++ b/security/apparmor/include/path.h
> @@ -11,6 +11,9 @@
>   #ifndef __AA_PATH_H
>   #define __AA_PATH_H
>   
> +#include <linux/path.h>
> +#include <linux/types.h>
> +
>   enum path_flags {
>   	PATH_IS_DIR = 0x1,		/* path is a directory */
>   	PATH_SOCK_COND = 0x2,
> diff --git a/security/apparmor/include/policy_unpack.h b/security/apparmor/include/policy_unpack.h
> index 1cb72267ea0f..7ca7d710251f 100644
> --- a/security/apparmor/include/policy_unpack.h
> +++ b/security/apparmor/include/policy_unpack.h
> @@ -16,6 +16,7 @@
>   #include <linux/dcache.h>
>   #include <linux/workqueue.h>
>   
> +#include "lib.h"
>   
>   struct aa_load_ent {
>   	struct list_head list;
> diff --git a/security/apparmor/include/procattr.h b/security/apparmor/include/procattr.h
> index 03dbfdb2f2c0..56acd1bdb634 100644
> --- a/security/apparmor/include/procattr.h
> +++ b/security/apparmor/include/procattr.h
> @@ -11,6 +11,8 @@
>   #ifndef __AA_PROCATTR_H
>   #define __AA_PROCATTR_H
>   
> +#include "label.h"
> +
>   int aa_getprocattr(struct aa_label *label, char **string, bool newline);
>   int aa_setprocattr_changehat(char *args, size_t size, int flags);
>   
> diff --git a/security/apparmor/include/task.h b/security/apparmor/include/task.h
> index ff8bed8f60b2..452d3b3baa9b 100644
> --- a/security/apparmor/include/task.h
> +++ b/security/apparmor/include/task.h
> @@ -10,6 +10,11 @@
>   #ifndef __AA_TASK_H
>   #define __AA_TASK_H
>   
> +#include <linux/sched.h>
> +
> +#include "audit.h"
> +#include "label.h"
> +
>   static inline struct aa_task_ctx *task_ctx(struct task_struct *task)
>   {
>   	return task->security + apparmor_blob_sizes.lbs_task;