5 files changed, 6 insertions, 4 deletions
diff --git a/source3/ubiqx/ubi_AVLtree.c b/source3/ubiqx/ubi_AVLtree.c
index c02765f441..8f7cb29764 100644
--- a/source3/ubiqx/ubi_AVLtree.c
+++ b/source3/ubiqx/ubi_AVLtree.c
@@ -128,8 +128,8 @@
  *  ========================================================================= **
  */
 
+#include "../includes.h"
 #include "ubi_AVLtree.h"            /* Header for THIS module.             */
-#include <stdlib.h>                 /* Standard C definitions, etc.        */
 
 /* ========================================================================== **
  * Static data.
diff --git a/source3/ubiqx/ubi_BinTree.c b/source3/ubiqx/ubi_BinTree.c
index ed565bbfba..16640f278e 100644
--- a/source3/ubiqx/ubi_BinTree.c
+++ b/source3/ubiqx/ubi_BinTree.c
@@ -122,8 +122,9 @@
  * ========================================================================== **
  */
 
+#include "../includes.h"
 #include "ubi_BinTree.h"            /* Header for this module          */
-#include <stdlib.h>                 /* Standard C definitions.         */
+
 
 /* ========================================================================== **
  * Static data.
diff --git a/source3/ubiqx/ubi_Cache.c b/source3/ubiqx/ubi_Cache.c
index e566e6c7da..290f7593e7 100644
--- a/source3/ubiqx/ubi_Cache.c
+++ b/source3/ubiqx/ubi_Cache.c
@@ -97,7 +97,7 @@
  * ========================================================================== **
  */
 
-#include <stdlib.h>     /* Defines NULL. */
+#include "../includes.h"
 #include "ubi_Cache.h"  /* Header for *this* module. */
 
 /* -------------------------------------------------------------------------- **
diff --git a/source3/ubiqx/ubi_SplayTree.c b/source3/ubiqx/ubi_SplayTree.c
index 89ddfb988a..7bc1070bc7 100644
--- a/source3/ubiqx/ubi_SplayTree.c
+++ b/source3/ubiqx/ubi_SplayTree.c
@@ -123,7 +123,7 @@
  * ========================================================================== **
  */
 
-#include <stdlib.h>        /* Defines NULL for us.                */
+#include "../includes.h"
 #include "ubi_SplayTree.h" /* Header for THIS module.             */
 
 /* ========================================================================== **
diff --git a/source3/ubiqx/ubi_dLinkList.c b/source3/ubiqx/ubi_dLinkList.c
index c903dcbc04..65c11d225d 100644
--- a/source3/ubiqx/ubi_dLinkList.c
+++ b/source3/ubiqx/ubi_dLinkList.c
@@ -52,6 +52,7 @@
  * ========================================================================== **
  */
 
+#include "../includes.h"
 #include "ubi_dLinkList.h"
 
 /* ========================================================================== **