Index: Makefile.in
--- Makefile.in.orig	2018-02-08 15:32:52.000000000 +0100
+++ Makefile.in	2018-02-09 08:58:59.178320000 +0100
@@ -497,7 +497,7 @@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = dbus bus tools test doc
+SUBDIRS = dbus bus tools doc
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dbus-1.pc
 cmakeconfigdir = $(libdir)/cmake/DBus1
Index: dbus/dbus-internals.c
--- dbus/dbus-internals.c.orig	2018-01-29 12:55:17.000000000 +0100
+++ dbus/dbus-internals.c	2018-02-09 08:58:59.178539000 +0100
@@ -690,6 +690,14 @@
       return FALSE;
     }
 
+  /* brand UUID as variant DCE 1.1 */
+  uuid->as_bytes[8] &= ~0xc0;
+  uuid->as_bytes[8] |= (0x02 << 6);
+
+  /* brand UUID as version 4 */
+  uuid->as_bytes[6] &= ~0xf0;
+  uuid->as_bytes[6] |= (0x04 << 4);
+
   return TRUE;
 }
 
Index: dbus/dbus-sysdeps-util-unix.c
--- dbus/dbus-sysdeps-util-unix.c.orig	2018-02-09 08:58:59.178930000 +0100
+++ dbus/dbus-sysdeps-util-unix.c	2018-02-09 09:01:10.202057000 +0100
@@ -35,6 +35,7 @@
 #include "dbus-test.h"
 
 #include <sys/types.h>
+#include <sys/param.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>