#include <stdio.h>
#include <stddef.h>
#include <stdbool.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/assert-internal.h>
#include <string.h>
-#include <babeltrace/bitfield-internal.h>
-#include <babeltrace/common-internal.h>
-#include <babeltrace/babeltrace.h>
-#include <babeltrace/ref.h>
-#include <babeltrace/align-internal.h>
+#include <babeltrace2/bitfield-internal.h>
+#include <babeltrace2/common-internal.h>
+#include <babeltrace2/babeltrace.h>
+#include <babeltrace2/align-internal.h>
#include <glib.h>
#include "bfcr.h"
available = available_bits(bfcr);
needed_bits = fc->size - bfcr->stitch.at;
BT_LOGV("Continuing basic field decoding: "
- "bfcr-addr=%p, field-size=%u, needed-size=%" PRId64 ", "
+ "bfcr-addr=%p, field-size=%u, needed-size=%zu, "
"available-size=%zu",
bfcr, fc->size, needed_bits, available);
if (needed_bits <= available) {