From e2d30fd5b7670c58cc26610a4aeb9ef091edbd3c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sat, 25 Jun 2022 11:07:44 +0200 Subject: lib: Remove a few #include "includes.h" Signed-off-by: Volker Lendecke Reviewed-by: Ralph Boehme --- lib/util/dprintf.c | 3 ++- lib/util/fsusage.c | 3 ++- lib/util/genrand_util.c | 4 +++- lib/util/ms_fnmatch.c | 3 ++- lib/util/util_id.c | 3 ++- lib/util/util_paths.c | 2 +- lib/util/util_str.c | 3 ++- lib/util/util_str_common.c | 4 +++- lib/util/util_str_escape.c | 3 ++- 9 files changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c index 749fb3d5a21..9d1573f671f 100644 --- a/lib/util/dprintf.c +++ b/lib/util/dprintf.c @@ -31,8 +31,9 @@ conversion */ -#include "includes.h" +#include "replace.h" #include "system/locale.h" +#include "lib/util/samba_util.h" static int d_vfprintf(FILE *f, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); diff --git a/lib/util/fsusage.c b/lib/util/fsusage.c index bf07baf0296..d769b452eaa 100644 --- a/lib/util/fsusage.c +++ b/lib/util/fsusage.c @@ -17,7 +17,8 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "lib/util/samba_util.h" #include "system/filesys.h" /** diff --git a/lib/util/genrand_util.c b/lib/util/genrand_util.c index 1ef4e446e18..9aa35de3ae7 100644 --- a/lib/util/genrand_util.c +++ b/lib/util/genrand_util.c @@ -19,8 +19,10 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" #include "system/locale.h" +#include "lib/util/samba_util.h" +#include "lib/util/debug.h" /** * @file diff --git a/lib/util/ms_fnmatch.c b/lib/util/ms_fnmatch.c index 5e05312f25a..e43d4e0a3be 100644 --- a/lib/util/ms_fnmatch.c +++ b/lib/util/ms_fnmatch.c @@ -28,7 +28,8 @@ * @brief MS-style Filename matching */ -#include "includes.h" +#include "replace.h" +#include "lib/util/samba_util.h" #include "libcli/smb/smb_constants.h" static int null_match(const char *p) diff --git a/lib/util/util_id.c b/lib/util/util_id.c index c5bf911d484..19486f942d4 100644 --- a/lib/util/util_id.c +++ b/lib/util/util_id.c @@ -19,7 +19,8 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "lib/util/samba_util.h" /**************************************************************************** Add a gid to an array of gids if it's not already there. diff --git a/lib/util/util_paths.c b/lib/util/util_paths.c index d162e0a8295..ce93028d563 100644 --- a/lib/util/util_paths.c +++ b/lib/util/util_paths.c @@ -22,7 +22,7 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" #include "dynconfig/dynconfig.h" #include "lib/util/util_paths.h" #include "system/passwd.h" diff --git a/lib/util/util_str.c b/lib/util/util_str.c index 721e7cc8644..a0f95348bc1 100644 --- a/lib/util/util_str.c +++ b/lib/util/util_str.c @@ -21,7 +21,8 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "lib/util/samba_util.h" #include "system/locale.h" #include "smb_strtox.h" #undef strncasecmp diff --git a/lib/util/util_str_common.c b/lib/util/util_str_common.c index bf0fec8eca4..bf6664741ad 100644 --- a/lib/util/util_str_common.c +++ b/lib/util/util_str_common.c @@ -21,7 +21,9 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "system/locale.h" +#include "lib/util/samba_util.h" /** Do a case-insensitive, whitespace-ignoring ASCII string compare. diff --git a/lib/util/util_str_escape.c b/lib/util/util_str_escape.c index 93cdd8de4a8..ea0fcc2f905 100644 --- a/lib/util/util_str_escape.c +++ b/lib/util/util_str_escape.c @@ -17,7 +17,8 @@ along with this program. If not, see . */ -#include "includes.h" +#include "replace.h" +#include "lib/util/debug.h" #include "lib/util/util_str_escape.h" -- cgit v1.2.1