10 files changed, 14 insertions, 13 deletions
diff --git a/server/external/libevents.m4 b/server/external/libevents.m4
index 4fd2e71e..2aabb06d 100644
--- a/server/external/libevents.m4
+++ b/server/external/libevents.m4
@@ -2,6 +2,6 @@ AC_SUBST(EVENTS_OBJ)
 AC_SUBST(EVENTS_CFLAGS)
 AC_SUBST(EVENTS_LIBS)
 
-AC_CHECK_HEADER(events.h,
-   [AC_CHECK_LIB(events, event_context_init, [EVENTS_LIBS="-levents"]) ],
-   [PKG_CHECK_MODULES(EVENTS, events)])
+AC_CHECK_HEADER(tevent.h,
+   [AC_CHECK_LIB(tevent, event_context_init, [EVENTS_LIBS="-ltevent"]) ],
+   [PKG_CHECK_MODULES(EVENTS, tevent)])
diff --git a/server/external/libldb.m4 b/server/external/libldb.m4
index cb5f378d..e0b7d42f 100644
--- a/server/external/libldb.m4
+++ b/server/external/libldb.m4
@@ -3,5 +3,5 @@ AC_SUBST(LDB_CFLAGS)
 AC_SUBST(LDB_LIBS)
 
 AC_CHECK_HEADER(ldb.h,
-   [AC_CHECK_LIB(ldb, ldb_init, [LDB_LIBS="-lldb"], , -levents) ],
+   [AC_CHECK_LIB(ldb, ldb_init, [LDB_LIBS="-lldb"], , -ltevent) ],
    [PKG_CHECK_MODULES(LDB, ldb >= 0.9.2)])
diff --git a/server/monitor.c b/server/monitor.c
index c6940a83..3dc76061 100644
--- a/server/monitor.c
+++ b/server/monitor.c
@@ -27,7 +27,7 @@
 #include <sys/time.h>
 #include <time.h>
 #include "popt.h"
-#include "../events/events.h"
+#include "tevent.h"
 #include "util/util.h"
 #include "confdb/confdb.h"
 #include "monitor.h"
diff --git a/server/nss/nsssrv.h b/server/nss/nsssrv.h
index 28949879..682b6cb0 100644
--- a/server/nss/nsssrv.h
+++ b/server/nss/nsssrv.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <sys/un.h>
 #include "talloc.h"
-#include "events.h"
+#include "tevent.h"
 #include "ldb.h"
 #include "../nss_client/sss_nss.h"
 
diff --git a/server/providers/data_provider.h b/server/providers/data_provider.h
index b04c57d0..a7712d08 100644
--- a/server/providers/data_provider.h
+++ b/server/providers/data_provider.h
@@ -25,7 +25,7 @@
 #include <stdint.h>
 #include <sys/un.h>
 #include "talloc.h"
-#include "events.h"
+#include "tevent.h"
 #include "ldb.h"
 
 #define DATA_PROVIDER_VERSION 0x0001
diff --git a/server/sbus/sssd_dbus_common.c b/server/sbus/sssd_dbus_common.c
index 5e724a3a..465e920f 100644
--- a/server/sbus/sssd_dbus_common.c
+++ b/server/sbus/sssd_dbus_common.c
@@ -1,5 +1,5 @@
 #include <sys/time.h>
-#include "events.h"
+#include "tevent.h"
 #include "dbus/dbus.h"
 #include "util/util.h"
 
diff --git a/server/sbus/sssd_dbus_connection.c b/server/sbus/sssd_dbus_connection.c
index 79f138ab..497f5010 100644
--- a/server/sbus/sssd_dbus_connection.c
+++ b/server/sbus/sssd_dbus_connection.c
@@ -1,5 +1,5 @@
 #include <sys/time.h>
-#include "events.h"
+#include "tevent.h"
 #include "util/util.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
diff --git a/server/sbus/sssd_dbus_server.c b/server/sbus/sssd_dbus_server.c
index 4f38345c..03cd6524 100644
--- a/server/sbus/sssd_dbus_server.c
+++ b/server/sbus/sssd_dbus_server.c
@@ -19,7 +19,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <sys/time.h>
-#include "events.h"
+#include "tevent.h"
 #include "util/util.h"
 #include "dbus/dbus.h"
 #include "sbus/sssd_dbus.h"
diff --git a/server/util/server.c b/server/util/server.c
index 87b2f8c2..b61d2501 100644
--- a/server/util/server.c
+++ b/server/util/server.c
@@ -30,8 +30,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include "../events/events.h"
-#include "../ldb/include/ldb.h"
+#include "tevent.h"
+#include "ldb.h"
 #include "confdb/confdb.h"
 #include "util/util.h"
 
diff --git a/server/util/service_helpers.c b/server/util/service_helpers.c
index 0c5661b2..9f07abd7 100644
--- a/server/util/service_helpers.c
+++ b/server/util/service_helpers.c
@@ -21,12 +21,13 @@
 
 #include "util/util.h"
 #include "talloc.h"
-#include "events.h"
 #include "sbus/sssd_dbus.h"
 #include "confdb/confdb.h"
 #include "service_helpers.h"
 #include "sbus_interfaces.h"
 
+struct event_context;
+
 /*
  * Set up an SBUS connection to the monitor
  */