15 files changed, 40 insertions, 8 deletions
diff --git a/src/monitor/monitor_iface_generated.c b/src/monitor/monitor_iface_generated.c
index 1ff1d4bb6..066612cc0 100644
--- a/src/monitor/monitor_iface_generated.c
+++ b/src/monitor/monitor_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from monitor_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/monitor/monitor_iface_generated.h b/src/monitor/monitor_iface_generated.h
index a4647fcb9..58cc6f518 100644
--- a/src/monitor/monitor_iface_generated.h
+++ b/src/monitor/monitor_iface_generated.h
@@ -4,6 +4,7 @@
 #define __MONITOR_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/providers/data_provider/dp_iface_generated.c b/src/providers/data_provider/dp_iface_generated.c
index 25ec0e29b..e2e0216bd 100644
--- a/src/providers/data_provider/dp_iface_generated.c
+++ b/src/providers/data_provider/dp_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from dp_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/providers/data_provider/dp_iface_generated.h b/src/providers/data_provider/dp_iface_generated.h
index c14b810cf..b7f63fb43 100644
--- a/src/providers/data_provider/dp_iface_generated.h
+++ b/src/providers/data_provider/dp_iface_generated.h
@@ -4,6 +4,7 @@
 #define __DP_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/providers/proxy/proxy_iface_generated.c b/src/providers/proxy/proxy_iface_generated.c
index 425727d14..9fb5b2c32 100644
--- a/src/providers/proxy/proxy_iface_generated.c
+++ b/src/providers/proxy/proxy_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from proxy_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/providers/proxy/proxy_iface_generated.h b/src/providers/proxy/proxy_iface_generated.h
index 7af074fa3..6471eafae 100644
--- a/src/providers/proxy/proxy_iface_generated.h
+++ b/src/providers/proxy/proxy_iface_generated.h
@@ -4,6 +4,7 @@
 #define __PROXY_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/responder/common/iface/responder_iface_generated.c b/src/responder/common/iface/responder_iface_generated.c
index 837e67cfd..21cc14a78 100644
--- a/src/responder/common/iface/responder_iface_generated.c
+++ b/src/responder/common/iface/responder_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from responder_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/responder/common/iface/responder_iface_generated.h b/src/responder/common/iface/responder_iface_generated.h
index 964f19b73..d78a9c6eb 100644
--- a/src/responder/common/iface/responder_iface_generated.h
+++ b/src/responder/common/iface/responder_iface_generated.h
@@ -4,6 +4,7 @@
 #define __RESPONDER_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/responder/ifp/ifp_iface_generated.c b/src/responder/ifp/ifp_iface_generated.c
index 211646b67..d276fd42e 100644
--- a/src/responder/ifp/ifp_iface_generated.c
+++ b/src/responder/ifp/ifp_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from ifp_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/responder/ifp/ifp_iface_generated.h b/src/responder/ifp/ifp_iface_generated.h
index e69fc3a3e..4fe930a4f 100644
--- a/src/responder/ifp/ifp_iface_generated.h
+++ b/src/responder/ifp/ifp_iface_generated.h
@@ -4,6 +4,7 @@
 #define __IFP_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/responder/nss/nss_iface_generated.c b/src/responder/nss/nss_iface_generated.c
index e4f3aec2d..4a8b704da 100644
--- a/src/responder/nss/nss_iface_generated.c
+++ b/src/responder/nss/nss_iface_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from nss_iface.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/responder/nss/nss_iface_generated.h b/src/responder/nss/nss_iface_generated.h
index cacadc578..11fac7916 100644
--- a/src/responder/nss/nss_iface_generated.h
+++ b/src/responder/nss/nss_iface_generated.h
@@ -4,6 +4,7 @@
 #define __NSS_IFACE_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants
diff --git a/src/sbus/sbus_codegen b/src/sbus/sbus_codegen
index 93eb9f1c1..9f215669f 100755
--- a/src/sbus/sbus_codegen
+++ b/src/sbus/sbus_codegen
@@ -497,7 +497,10 @@ def generate_source(ifaces, filename, include_header=None):
     out("/* The following definitions are auto-generated from %s */", basename)
     out("")
 
-    out("#include \"util/util.h\"")
+    out("#include <stddef.h>")
+    out("")
+    out("#include \"dbus/dbus-protocol.h\"")
+    out("#include \"util/util_errors.h\"")
     out("#include \"sbus/sssd_dbus.h\"")
     out("#include \"sbus/sssd_dbus_meta.h\"")
     out("#include \"sbus/sssd_dbus_invokers.h\"")
@@ -568,6 +571,7 @@ def generate_header(ifaces, filename):
     out("#define %s", guard)
     out("")
     out("#include \"sbus/sssd_dbus.h\"")
+    out("#include \"sbus/sssd_dbus_meta.h\"")
 
     out("")
     out("/* ------------------------------------------------------------------------")
diff --git a/src/tests/sbus_codegen_tests_generated.c b/src/tests/sbus_codegen_tests_generated.c
index 3a5db43c5..8941f132a 100644
--- a/src/tests/sbus_codegen_tests_generated.c
+++ b/src/tests/sbus_codegen_tests_generated.c
@@ -1,6 +1,9 @@
 /* The following definitions are auto-generated from sbus_codegen_tests.xml */
 
-#include "util/util.h"
+#include <stddef.h>
+
+#include "dbus/dbus-protocol.h"
+#include "util/util_errors.h"
 #include "sbus/sssd_dbus.h"
 #include "sbus/sssd_dbus_meta.h"
 #include "sbus/sssd_dbus_invokers.h"
diff --git a/src/tests/sbus_codegen_tests_generated.h b/src/tests/sbus_codegen_tests_generated.h
index 27049cd32..62486cc52 100644
--- a/src/tests/sbus_codegen_tests_generated.h
+++ b/src/tests/sbus_codegen_tests_generated.h
@@ -4,6 +4,7 @@
 #define __SBUS_CODEGEN_TESTS_XML__
 
 #include "sbus/sssd_dbus.h"
+#include "sbus/sssd_dbus_meta.h"
 
 /* ------------------------------------------------------------------------
  * DBus Constants