diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt
index b87bc665f..8f26d2daf 100644
--- a/code/CMakeLists.txt
+++ b/code/CMakeLists.txt
@@ -1,6 +1,5 @@
 # Open Asset Import Library (assimp)
 # ----------------------------------------------------------------------
-#
 # Copyright (c) 2006-2022, assimp team
 #
 # All rights reserved.
@@ -94,6 +93,7 @@ SET( PUBLIC_HEADERS
   ${HEADER_PATH}/vector3.inl
   ${HEADER_PATH}/version.h
   ${HEADER_PATH}/cimport.h
+  ${HEADER_PATH}/AssertHandler.h
   ${HEADER_PATH}/importerdesc.h
   ${HEADER_PATH}/Importer.hpp
   ${HEADER_PATH}/DefaultLogger.hpp
diff --git a/code/Common/AssertHandler.cpp b/code/Common/AssertHandler.cpp
index 469e7bec5..2fd4046ad 100644
--- a/code/Common/AssertHandler.cpp
+++ b/code/Common/AssertHandler.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *  @brief Implementation of assert handling logic.
  */
 
-#include "AssertHandler.h"
+#include <assimp/AssertHandler.h>
 
 #include <iostream>
 #include <cstdlib>
diff --git a/code/Common/AssertHandler.h b/include/assimp/AssertHandler.h
similarity index 100%
rename from code/Common/AssertHandler.h
rename to include/assimp/AssertHandler.h
diff --git a/test/unit/Common/utAssertHandler.cpp b/test/unit/Common/utAssertHandler.cpp
index a2585fe65..039ba8345 100644
--- a/test/unit/Common/utAssertHandler.cpp
+++ b/test/unit/Common/utAssertHandler.cpp
@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #endif
 
 #include <assimp/ai_assert.h>
-#include <code/Common/AssertHandler.h>
+#include <assimp/AssertHandler.h>
 
 namespace
 {
diff --git a/test/unit/Common/utBaseProcess.cpp b/test/unit/Common/utBaseProcess.cpp
index 978af7e99..359042315 100644
--- a/test/unit/Common/utBaseProcess.cpp
+++ b/test/unit/Common/utBaseProcess.cpp
@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "UnitTestPCH.h"
 
 #include "Common/BaseProcess.h"
-#include "Common/AssertHandler.h"
+#include <assimp/AssertHandler.h>
 
 using namespace Assimp;