2 files changed, 26 insertions, 23 deletions
diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h
index f7adedd2d4..35f7d3e017 100644
--- a/source4/heimdal_build/config.h
+++ b/source4/heimdal_build/config.h
@@ -29,9 +29,6 @@
 
 #define VERSIONLIST {"Lorikeet-Heimdal, Modified for Samba4 0.7rc1"}
 
-/* even if we do have dlopen, we don't want heimdal using it */
-#undef HAVE_DLOPEN
-
 #define VERSION "Samba"
 
 #define ROKEN_LIB_FUNCTION
@@ -39,29 +36,9 @@
 /* these should be done with configure tests */
 #define KRB5
 
-/* we need to tell roken about the functions that Samba replaces in lib/replace */
-#ifndef HAVE_SETEUID
-#define HAVE_SETEUID 1
-#endif
-
 #define GETHOSTBYADDR_PROTO_COMPATIBLE
 #define GETSERVBYNAME_PROTO_COMPATIBLE
 #define OPENLOG_PROTO_COMPATIBLE
 #define GETSOCKNAME_PROTO_COMPATIBLE
 
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
-#endif
-
-#ifndef HAVE_STRNDUP
-#define HAVE_STRNDUP
-#endif
-#ifndef HAVE_SOCKLEN_T
-#define HAVE_SOCKLEN_T
-#endif
-
-#ifndef HAVE_SSIZE_T
-#define HAVE_SSIZE_T
-#endif
-
 #endif
diff --git a/source4/heimdal_build/roken.h b/source4/heimdal_build/roken.h
index 1b9c2f0663..2af82b9e1b 100644
--- a/source4/heimdal_build/roken.h
+++ b/source4/heimdal_build/roken.h
@@ -4,5 +4,31 @@
 #ifndef _ROKEN_H_
 #define _ROKEN_H_
 #include "heimdal_build/config.h"
+
+/* even if we do have dlopen, we don't want heimdal using it */
+#undef HAVE_DLOPEN
+
+/* we need to tell roken about the functions that Samba replaces in lib/replace */
+#ifndef HAVE_SETEUID
+#define HAVE_SETEUID 1
+#endif
+
+#ifndef HAVE_SOCKLEN_T
+#define HAVE_SOCKLEN_T
+#endif
+
+#ifndef HAVE_STRNDUP
+#define HAVE_STRNDUP
+#endif
+#ifndef HAVE_SOCKLEN_T
+#define HAVE_SOCKLEN_T
+#endif
+
+#ifndef HAVE_SSIZE_T
+#define HAVE_SSIZE_T
+#endif
+
+
+
 #include "heimdal/lib/roken/roken.h"
 #endif