6 files changed, 73 insertions, 26 deletions
diff --git a/source4/include/includes.h b/source4/include/includes.h
index 192ec548fd..914ec2f4ea 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -317,23 +317,6 @@
 
 #endif
 
-#if defined(HAVE_SYS_IPC_H)
-#include <sys/ipc.h>
-#endif /* HAVE_SYS_IPC_H */
-
-#if defined(HAVE_SYS_SHM_H)
-#include <sys/shm.h>
-#endif /* HAVE_SYS_SHM_H */
-
-#ifdef HAVE_NATIVE_ICONV
-#ifdef HAVE_ICONV
-#include <iconv.h>
-#endif
-#ifdef HAVE_GICONV
-#include <giconv.h>
-#endif
-#endif
-
 /* we support ADS if we want it and have krb5 and ldap libs */
 #if defined(WITH_ADS) && defined(HAVE_KRB5) && defined(HAVE_LDAP)
 #define HAVE_ADS
diff --git a/source4/include/system/iconv.h b/source4/include/system/iconv.h
new file mode 100644
index 0000000000..76b767e2e8
--- /dev/null
+++ b/source4/include/system/iconv.h
@@ -0,0 +1,31 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   iconv memory system include wrappers
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifdef HAVE_NATIVE_ICONV
+#ifdef HAVE_ICONV
+#include <iconv.h>
+#endif
+#ifdef HAVE_GICONV
+#include <giconv.h>
+#endif
+#endif
+
diff --git a/source4/include/system/shmem.h b/source4/include/system/shmem.h
new file mode 100644
index 0000000000..57b47dd879
--- /dev/null
+++ b/source4/include/system/shmem.h
@@ -0,0 +1,39 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   shared memory system include wrappers
+
+   Copyright (C) Andrew Tridgell 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#if defined(HAVE_SYS_IPC_H)
+#include <sys/ipc.h>
+#endif /* HAVE_SYS_IPC_H */
+
+#if defined(HAVE_SYS_SHM_H)
+#include <sys/shm.h>
+#endif /* HAVE_SYS_SHM_H */
+
+/* NetBSD doesn't have these */
+#ifndef SHM_R
+#define SHM_R 0400
+#endif
+
+#ifndef SHM_W
+#define SHM_W 0200
+#endif
+
diff --git a/source4/lib/iconv.c b/source4/lib/iconv.c
index 3cca734d7b..98905c4b84 100644
--- a/source4/lib/iconv.c
+++ b/source4/lib/iconv.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 
 /**
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 2c2a9564bf..eeca81e470 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -22,6 +22,7 @@
 */
 
 #include "includes.h"
+#include "system/iconv.h"
 
 #if HAVE_NATIVE_ICONV
 /*
diff --git a/source4/torture/torture_util.c b/source4/torture/torture_util.c
index 8565a4d7d8..41e616b5be 100644
--- a/source4/torture/torture_util.c
+++ b/source4/torture/torture_util.c
@@ -20,6 +20,7 @@
 
 #include "includes.h"
 #include "libcli/raw/libcliraw.h"
+#include "system/shmem.h"
 
 
 static struct timeval tp1,tp2;
@@ -167,15 +168,6 @@ void *shm_setup(int size)
 	int shmid;
 	void *ret;
 
-/* NetBSD doesn't have these */
-#ifndef SHM_R
-#define SHM_R 0400
-#endif
-
-#ifndef SHM_W
-#define SHM_W 0200
-#endif
-
 	shmid = shmget(IPC_PRIVATE, size, SHM_R | SHM_W);
 	if (shmid == -1) {
 		printf("can't get shared memory\n");