-#include <babeltrace/values.h>
-#include <babeltrace/private-values.h>
-#include <babeltrace/values-internal.h>
+#include <babeltrace/value.h>
+#include <babeltrace/assert-pre-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/value-const.h>
+#include <babeltrace/value-internal.h>
+#include <babeltrace/trace-ir/attributes-internal.h>