diff --git a/ze/Makefile.am b/ze/Makefile.am
index 4484cff9..d3afe47f 100644
--- a/ze/Makefile.am
+++ b/ze/Makefile.am
@@ -50,7 +50,8 @@ BTX_ZE_GENERATED = \
 EXTRA_DIST = \
 	$(top_srcdir)/utils/babeltrace_to_metababel_model.rb \
 	$(top_srcdir)/xprof/btx_interval_model.yaml \
-	btx_zematching_model.yaml
+	btx_zematching_model.yaml \
+	babeltrace_zeprofiling_apis.txt
 
 CLEANFILES = btx_ze_model.yaml
 
@@ -288,10 +289,11 @@ BUILT_SOURCES += \
 	$(BTX_ZE_GENERATED)
 
 nodist_libZEInterval_la_SOURCES = \
-	$(BTX_HIP_GENERATED) \
+	$(BTX_ZE_GENERATED) \
 	xprof_utils.hpp
 
 libZEInterval_la_SOURCES = \
+	btx_zeinterval_callbacks.cpp \
 	btx_zeinterval_callbacks.hpp
 
 libZEInterval_la_CPPFLAGS = -I$(top_srcdir)/utils -I$(top_srcdir)/utils/include -I$(srcdir)/include -I./ -I./btx_filter_ze
@@ -373,4 +375,4 @@ CLEANFILES += \
 	tests/ze_dummy_trace.yaml \
 	$(DUST_COMMON) \
 	$(DUST_SPECIFIC) \
-	$(TRACE_COMMON) 
+	$(TRACE_COMMON)
diff --git a/ze/btx_zeinterval_callbacks.cpp b/ze/btx_zeinterval_callbacks.cpp
index f6059b92..2bbd7993 100644
--- a/ze/btx_zeinterval_callbacks.cpp
+++ b/ze/btx_zeinterval_callbacks.cpp
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <string>
 #include <unordered_map>
-#include <zeinterval_callbacks.hpp>
+#include <btx_zeinterval_callbacks.hpp>
 
 std::string strip_event_class_name(const char *str) {
   std::string temp(str);
@@ -22,7 +22,7 @@ std::string strip_event_class_name(const char *str) {
 
 static void add_memory(data_t *state, hp_t hp, uintptr_t ptr, size_t size,
                        std::string source) {
-  std::unordered_map<hp_t, memory_interval_t> *mi;
+  std::unordered_map<hp_t, memory_interval_t> *mi = nullptr;
   if (source == "lttng_ust_ze:zeMemAllocHost_exit")
     mi = &state->rangeset_memory_host;
   else if (source == "lttng_ust_ze:zeMemAllocDevice_exit")