diff --git a/plugins/xdebug/Cleanup.h b/include/tscpp/api/Cleanup.h
similarity index 100%
rename from plugins/xdebug/Cleanup.h
rename to include/tscpp/api/Cleanup.h
diff --git a/include/tscpp/api/Makefile.am b/include/tscpp/api/Makefile.am
index c2f4e1c1193..9dc535c43f4 100644
--- a/include/tscpp/api/Makefile.am
+++ b/include/tscpp/api/Makefile.am
@@ -22,6 +22,7 @@ library_include_HEADERS = \
         AsyncHttpFetch.h \
         AsyncTimer.h \
         CaseInsensitiveStringComparator.h \
+        Cleanup.h \
         ClientRequest.h \
         Continuation.h \
         GlobalPlugin.h \
diff --git a/plugins/xdebug/Makefile.inc b/plugins/xdebug/Makefile.inc
index a69e223ffc8..0fd8d6fcad4 100644
--- a/plugins/xdebug/Makefile.inc
+++ b/plugins/xdebug/Makefile.inc
@@ -16,5 +16,4 @@
 
 pkglib_LTLIBRARIES += xdebug/xdebug.la
 xdebug_xdebug_la_SOURCES = \
-xdebug/Cleanup.h \
 xdebug/xdebug.cc
diff --git a/plugins/xdebug/xdebug.cc b/plugins/xdebug/xdebug.cc
index 6943871fc8e..cae30e7ffb7 100644
--- a/plugins/xdebug/xdebug.cc
+++ b/plugins/xdebug/xdebug.cc
@@ -35,7 +35,7 @@
 #include "tscore/ink_defs.h"
 #include "tscpp/util/PostScript.h"
 #include "tscpp/util/TextView.h"
-#include "Cleanup.h"
+#include "tscpp/api/Cleanup.h"
 
 namespace
 {