#include <sys/types.h>
#include <unistd.h>
-#include <common/lttngerr.h>
-#include <common/lttng-share.h>
+#include <common/common.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/kernel-consumer/kernel-consumer.h>