diff --git a/ohos/CMakeLists.txt b/ohos/CMakeLists.txt
index 67357ef6..1baafc0d 100644
--- a/ohos/CMakeLists.txt
+++ b/ohos/CMakeLists.txt
@@ -10,6 +10,7 @@ if (USE_DEBUG_RENDERER)
 add_library(freetype STATIC IMPORTED GLOBAL)
 set_target_properties(freetype PROPERTIES
   IMPORTED_LOCATION ${ohos_lib_dir}/libfreetype.a
+  INTERFACE_INCLUDE_DIRECTORIES ${platform_spec_path}/include/freetype
 )
 endif()
 
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/config/ftconfig.h b/ohos/arm64-v8a/include/freetype/freetype/config/ftconfig.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/config/ftconfig.h
rename to ohos/arm64-v8a/include/freetype/freetype/config/ftconfig.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/config/ftheader.h b/ohos/arm64-v8a/include/freetype/freetype/config/ftheader.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/config/ftheader.h
rename to ohos/arm64-v8a/include/freetype/freetype/config/ftheader.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/config/ftmodule.h b/ohos/arm64-v8a/include/freetype/freetype/config/ftmodule.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/config/ftmodule.h
rename to ohos/arm64-v8a/include/freetype/freetype/config/ftmodule.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/config/ftoption.h b/ohos/arm64-v8a/include/freetype/freetype/config/ftoption.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/config/ftoption.h
rename to ohos/arm64-v8a/include/freetype/freetype/config/ftoption.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/config/ftstdlib.h b/ohos/arm64-v8a/include/freetype/freetype/config/ftstdlib.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/config/ftstdlib.h
rename to ohos/arm64-v8a/include/freetype/freetype/config/ftstdlib.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/freetype.h b/ohos/arm64-v8a/include/freetype/freetype/freetype.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/freetype.h
rename to ohos/arm64-v8a/include/freetype/freetype/freetype.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftadvanc.h b/ohos/arm64-v8a/include/freetype/freetype/ftadvanc.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftadvanc.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftadvanc.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftbbox.h b/ohos/arm64-v8a/include/freetype/freetype/ftbbox.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftbbox.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftbbox.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftbdf.h b/ohos/arm64-v8a/include/freetype/freetype/ftbdf.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftbdf.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftbdf.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftbitmap.h b/ohos/arm64-v8a/include/freetype/freetype/ftbitmap.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftbitmap.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftbitmap.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftbzip2.h b/ohos/arm64-v8a/include/freetype/freetype/ftbzip2.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftbzip2.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftbzip2.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftcache.h b/ohos/arm64-v8a/include/freetype/freetype/ftcache.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftcache.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftcache.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftchapters.h b/ohos/arm64-v8a/include/freetype/freetype/ftchapters.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftchapters.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftchapters.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftcid.h b/ohos/arm64-v8a/include/freetype/freetype/ftcid.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftcid.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftcid.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftcolor.h b/ohos/arm64-v8a/include/freetype/freetype/ftcolor.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftcolor.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftcolor.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftdriver.h b/ohos/arm64-v8a/include/freetype/freetype/ftdriver.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftdriver.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftdriver.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/fterrdef.h b/ohos/arm64-v8a/include/freetype/freetype/fterrdef.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/fterrdef.h
rename to ohos/arm64-v8a/include/freetype/freetype/fterrdef.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/fterrors.h b/ohos/arm64-v8a/include/freetype/freetype/fterrors.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/fterrors.h
rename to ohos/arm64-v8a/include/freetype/freetype/fterrors.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftfntfmt.h b/ohos/arm64-v8a/include/freetype/freetype/ftfntfmt.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftfntfmt.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftfntfmt.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftgasp.h b/ohos/arm64-v8a/include/freetype/freetype/ftgasp.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftgasp.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftgasp.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftglyph.h b/ohos/arm64-v8a/include/freetype/freetype/ftglyph.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftglyph.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftglyph.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftgxval.h b/ohos/arm64-v8a/include/freetype/freetype/ftgxval.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftgxval.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftgxval.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftgzip.h b/ohos/arm64-v8a/include/freetype/freetype/ftgzip.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftgzip.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftgzip.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftimage.h b/ohos/arm64-v8a/include/freetype/freetype/ftimage.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftimage.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftimage.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftincrem.h b/ohos/arm64-v8a/include/freetype/freetype/ftincrem.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftincrem.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftincrem.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftlcdfil.h b/ohos/arm64-v8a/include/freetype/freetype/ftlcdfil.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftlcdfil.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftlcdfil.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftlist.h b/ohos/arm64-v8a/include/freetype/freetype/ftlist.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftlist.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftlist.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftlzw.h b/ohos/arm64-v8a/include/freetype/freetype/ftlzw.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftlzw.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftlzw.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftmac.h b/ohos/arm64-v8a/include/freetype/freetype/ftmac.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftmac.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftmac.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftmm.h b/ohos/arm64-v8a/include/freetype/freetype/ftmm.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftmm.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftmm.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftmodapi.h b/ohos/arm64-v8a/include/freetype/freetype/ftmodapi.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftmodapi.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftmodapi.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftmoderr.h b/ohos/arm64-v8a/include/freetype/freetype/ftmoderr.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftmoderr.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftmoderr.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftotval.h b/ohos/arm64-v8a/include/freetype/freetype/ftotval.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftotval.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftotval.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftoutln.h b/ohos/arm64-v8a/include/freetype/freetype/ftoutln.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftoutln.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftoutln.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftparams.h b/ohos/arm64-v8a/include/freetype/freetype/ftparams.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftparams.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftparams.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftpfr.h b/ohos/arm64-v8a/include/freetype/freetype/ftpfr.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftpfr.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftpfr.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftrender.h b/ohos/arm64-v8a/include/freetype/freetype/ftrender.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftrender.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftrender.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftsizes.h b/ohos/arm64-v8a/include/freetype/freetype/ftsizes.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftsizes.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftsizes.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftsnames.h b/ohos/arm64-v8a/include/freetype/freetype/ftsnames.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftsnames.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftsnames.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftstroke.h b/ohos/arm64-v8a/include/freetype/freetype/ftstroke.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftstroke.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftstroke.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftsynth.h b/ohos/arm64-v8a/include/freetype/freetype/ftsynth.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftsynth.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftsynth.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftsystem.h b/ohos/arm64-v8a/include/freetype/freetype/ftsystem.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftsystem.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftsystem.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/fttrigon.h b/ohos/arm64-v8a/include/freetype/freetype/fttrigon.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/fttrigon.h
rename to ohos/arm64-v8a/include/freetype/freetype/fttrigon.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/fttypes.h b/ohos/arm64-v8a/include/freetype/freetype/fttypes.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/fttypes.h
rename to ohos/arm64-v8a/include/freetype/freetype/fttypes.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ftwinfnt.h b/ohos/arm64-v8a/include/freetype/freetype/ftwinfnt.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ftwinfnt.h
rename to ohos/arm64-v8a/include/freetype/freetype/ftwinfnt.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/t1tables.h b/ohos/arm64-v8a/include/freetype/freetype/t1tables.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/t1tables.h
rename to ohos/arm64-v8a/include/freetype/freetype/t1tables.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/ttnameid.h b/ohos/arm64-v8a/include/freetype/freetype/ttnameid.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/ttnameid.h
rename to ohos/arm64-v8a/include/freetype/freetype/ttnameid.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/tttables.h b/ohos/arm64-v8a/include/freetype/freetype/tttables.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/tttables.h
rename to ohos/arm64-v8a/include/freetype/freetype/tttables.h
diff --git a/ohos/arm64-v8a/include/freetype2/freetype/tttags.h b/ohos/arm64-v8a/include/freetype/freetype/tttags.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/freetype/tttags.h
rename to ohos/arm64-v8a/include/freetype/freetype/tttags.h
diff --git a/ohos/arm64-v8a/include/freetype2/ft2build.h b/ohos/arm64-v8a/include/freetype/ft2build.h
similarity index 100%
rename from ohos/arm64-v8a/include/freetype2/ft2build.h
rename to ohos/arm64-v8a/include/freetype/ft2build.h