2 files changed, 8 insertions, 2 deletions
diff --git a/lib/util/time.c b/lib/util/time.c
index 78611e4324..4b78e71a78 100644
--- a/lib/util/time.c
+++ b/lib/util/time.c
@@ -21,9 +21,11 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "system/time.h"
-#include "lib/util/time_basic.h"
+#include "byteorder.h"
+#include "time_basic.h"
+#include "lib/util/time.h" /* Avoid /usr/include/time.h */
 
 /**
  * @file
diff --git a/lib/util/time.h b/lib/util/time.h
index 8595bb0613..42d23865b8 100644
--- a/lib/util/time.h
+++ b/lib/util/time.h
@@ -24,6 +24,10 @@
 #ifndef _SAMBA_TIME_H_
 #define _SAMBA_TIME_H_
 
+#include <stdbool.h>
+#include <stdint.h>
+#include <talloc.h>
+
 #ifndef TIME_T_MIN
 /* we use 0 here, because (time_t)-1 means error */
 #define TIME_T_MIN 0