#include "common/ust-fd.h"
#include "common/dynamic-type.h"
#include "common/ust-context-provider.h"
-#include "error.h"
#include "lttng-ust-uuid.h"
-#include "tracepoint-internal.h"
-#include "string-utils.h"
+#include "common/tracepoint.h"
+#include "common/strutils.h"
#include "lttng-bytecode.h"
#include "lttng-tracer.h"
#include "lttng-tracer-core.h"