lib: Remove a few #include "includes.h"

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/lib/util/dprintf.c b/lib/util/dprintf.c
index 749fb3d5a21657669dedc1e9b0841793e1156371..9d1573f671f71f3928f79c2a5d73d6e3a851aa77 100644 (file)
--- 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 bf07baf029615731864b8275b9618b6c1324569c..d769b452eaad704116453c038ee806f04358ee82 100644 (file)
--- a/lib/util/fsusage.c
+++ b/lib/util/fsusage.c
@@ -17,7 +17,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 1ef4e446e187b90de8684b0f24c39cbc13c68b80..9aa35de3ae7d69dd8dbd888aba6a7f143ae3d44c 100644 (file)
--- a/lib/util/genrand_util.c
+++ b/lib/util/genrand_util.c
@@ -19,8 +19,10 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 5e05312f25afd6299e3441b6ce68d45f6fe9f71e..e43d4e0a3be415b3c022ae7d6cf4d95fc6461a72 100644 (file)
--- 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 c5bf911d4849d232c276d38e7498612bea47148f..19486f942d4f5bac7d3a902b1248f34a806fdc01 100644 (file)
--- a/lib/util/util_id.c
+++ b/lib/util/util_id.c
@@ -19,7 +19,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 d162e0a829523193fa992181d638e434597f75c3..ce93028d5630b078521de6836d2662b958458041 100644 (file)
--- a/lib/util/util_paths.c
+++ b/lib/util/util_paths.c
@@ -22,7 +22,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 721e7cc8644ced8788063fd39374a31e77b10d8e..a0f95348bc1785cce2293335d3fcea94ee7ae150 100644 (file)
--- a/lib/util/util_str.c
+++ b/lib/util/util_str.c
@@ -21,7 +21,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#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 bf0fec8eca487e0ec633f813b8aba97afb93c487..bf6664741adc3e0c6dca96a5d818655fd6ff0872 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
 
-#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 93cdd8de4a80783f4c15086c595efd9bd46b6938..ea0fcc2f9051060ba76a9447e25cb703fa0535e6 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
+#include "lib/util/debug.h"
 #include "lib/util/util_str_escape.h"