Be sure to include sudo_queue.h where needed instead of relying on other headers.

diff --git a/plugins/sudoers/cvtsudoers.c b/plugins/sudoers/cvtsudoers.c
index 0221314b97f2ab75902729911b65d170f582500f..034d5f8bc02e434f99b3787ec30fdcb901a03501 100644 (file)
--- a/plugins/sudoers/cvtsudoers.c
+++ b/plugins/sudoers/cvtsudoers.c
@@ -42,7 +42,6 @@
 
 #include "sudoers.h"
 #include "sudoers_version.h"
-#include "sudo_conf.h"
 #include "sudo_lbuf.h"
 #include "redblack.h"
 #include "cvtsudoers.h"

diff --git a/plugins/sudoers/defaults.h b/plugins/sudoers/defaults.h
index 4b2db16c41f9d70bde83020af1b325254146f6ba..630c5d999fedb3d8b86a6468ba8bd5867f4b366a 100644 (file)
--- a/plugins/sudoers/defaults.h
+++ b/plugins/sudoers/defaults.h
@@ -24,6 +24,7 @@
 
 #include <time.h>
 #include <def_data.h>
+#include "sudo_queue.h"
 
 struct list_member {
     SLIST_ENTRY(list_member) entries;

diff --git a/plugins/sudoers/parse.h b/plugins/sudoers/parse.h
index 1c9d476793b192b0391d7fd25d4be170d73d2926..fd44627423c0f783eda00ce3cd293ed80022947e 100644 (file)
--- a/plugins/sudoers/parse.h
+++ b/plugins/sudoers/parse.h
@@ -18,6 +18,8 @@
 #ifndef SUDOERS_PARSE_H
 #define SUDOERS_PARSE_H
 
+#include "sudo_queue.h"
+
 /* Characters that must be quoted in sudoers. */
 #define SUDOERS_QUOTED ":\\,=#\""
 

diff --git a/plugins/sudoers/strlist.c b/plugins/sudoers/strlist.c
index 1bb763016be7bbf3699c4dae9f28525e001053df..e1f5516c094dfdddf5874e98e55d0921ef458892 100644 (file)
--- a/plugins/sudoers/strlist.c
+++ b/plugins/sudoers/strlist.c
@@ -32,8 +32,8 @@
 #endif /* HAVE_STRINGS_H */
 
 #include "sudo_compat.h"
-#include "sudo_util.h"
 #include "sudo_queue.h"
+#include "sudo_util.h"
 #include "sudoers_debug.h"
 #include "strlist.h"
 

diff --git a/src/sudo.h b/src/sudo.h
index 1d8e672dc33427d6c9d07d0ed6c06d7ac9ea897b..b575f04e3458d61ec794f82e62903a36e41ccc7d 100644 (file)
--- a/src/sudo.h
+++ b/src/sudo.h
@@ -36,6 +36,7 @@
 #include "sudo_fatal.h"
 #include "sudo_conf.h"
 #include "sudo_debug.h"
+#include "sudo_queue.h"
 #include "sudo_util.h"
 
 #ifdef HAVE_PRIV_SET