Merge branch 'master' into kimkulling/remove_unused_header_issue-5247

- closes https://github.com/assimp/assimp/issues/5247

include/assimp/types.h

@@ -73,14 +73,8 @@ typedef uint32_t ai_uint32;
 
 #ifdef __cplusplus
 
-#ifdef ASSIMP_USE_HUNTER
-#   include <utf8.h>
-#else
-#   include "../contrib/utf8cpp/source/utf8.h"
-#endif
-
 #include <cstring>
-#include <new> // for std::nothrow_t
+#include <new>    // for std::nothrow_t
 #include <string> // for aiString::Set(const std::string&)
 
 namespace Assimp {
@@ -88,16 +82,16 @@ namespace Assimp {
 namespace Intern {
 // --------------------------------------------------------------------
 /** @brief Internal helper class to utilize our internal new/delete
-     *    routines for allocating object of this and derived classes.
+ *    routines for allocating object of this and derived classes.
-     *
+ *
-     * By doing this you can safely share class objects between Assimp
+ * By doing this you can safely share class objects between Assimp
-     * and the application - it works even over DLL boundaries. A good
+ * and the application - it works even over DLL boundaries. A good
-     * example is the #IOSystem where the application allocates its custom
+ * example is the #IOSystem where the application allocates its custom
-     * #IOSystem, then calls #Importer::SetIOSystem(). When the Importer
+ * #IOSystem, then calls #Importer::SetIOSystem(). When the Importer
-     * destructs, Assimp calls operator delete on the stored #IOSystem.
+ * destructs, Assimp calls operator delete on the stored #IOSystem.
-     * If it lies on a different heap than Assimp is working with,
+ * If it lies on a different heap than Assimp is working with,
-     * the application is determined to crash.
+ * the application is determined to crash.
-     */
+ */
 // --------------------------------------------------------------------
 #ifndef SWIG
 struct ASSIMP_API AllocateFromAssimpHeap {