#include "afb-auth.h"
#include "afb-event.h"
-#include "afb-req-common.h"
-#include "afb-service-common.h"
-#include "afb-daemon-common.h"
+#include "afb-req.h"
+#include "afb-service-itf.h"
+#include "afb-daemon-itf.h"
#include "afb-req-v2.h"
#include "afb-session-v2.h"