diff --git a/libs/filaflat/src/BlobDictionary.h b/libs/filaflat/include/filaflat/BlobDictionary.h
similarity index 100%
rename from libs/filaflat/src/BlobDictionary.h
rename to libs/filaflat/include/filaflat/BlobDictionary.h
diff --git a/libs/filaflat/src/MaterialChunk.h b/libs/filaflat/include/filaflat/MaterialChunk.h
similarity index 97%
rename from libs/filaflat/src/MaterialChunk.h
rename to libs/filaflat/include/filaflat/MaterialChunk.h
index fb91efa735..b5fb3680b4 100644
--- a/libs/filaflat/src/MaterialChunk.h
+++ b/libs/filaflat/include/filaflat/MaterialChunk.h
@@ -17,13 +17,13 @@
 #ifndef TNT_FILAMAT_MATERIAL_CHUNK_H
 #define TNT_FILAMAT_MATERIAL_CHUNK_H
 
-#include "BlobDictionary.h"
-
-#include <filament/driver/DriverEnums.h>
 
+#include <filaflat/BlobDictionary.h>
 #include <filaflat/ShaderBuilder.h>
 #include <filaflat/Unflattener.h>
 
+#include <filament/driver/DriverEnums.h>
+
 #include <tsl/robin_map.h>
 
 namespace filaflat {
diff --git a/libs/filaflat/src/SpirvDictionaryReader.h b/libs/filaflat/include/filaflat/SpirvDictionaryReader.h
similarity index 90%
rename from libs/filaflat/src/SpirvDictionaryReader.h
rename to libs/filaflat/include/filaflat/SpirvDictionaryReader.h
index f5bb5626ff..c5b3ff33dd 100644
--- a/libs/filaflat/src/SpirvDictionaryReader.h
+++ b/libs/filaflat/include/filaflat/SpirvDictionaryReader.h
@@ -14,14 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAFLAT_DIC_SPIRV_CHUNK_H
-#define TNT_FILAFLAT_DIC_SPIRV_CHUNK_H
+#ifndef TNT_FILAFLAT_SPIRV_DICTIONARY_READER_H
+#define TNT_FILAFLAT_SPIRV_DICTIONARY_READER_H
 
+#include <filaflat/BlobDictionary.h>
 #include <filaflat/ChunkContainer.h>
 #include <filaflat/Unflattener.h>
 
-#include "BlobDictionary.h"
-
 namespace filaflat {
 
 struct SpirvDictionaryReader {
diff --git a/libs/filaflat/src/TextDictionaryReader.h b/libs/filaflat/include/filaflat/TextDictionaryReader.h
similarity index 89%
rename from libs/filaflat/src/TextDictionaryReader.h
rename to libs/filaflat/include/filaflat/TextDictionaryReader.h
index 6e791f2698..6184e4b58e 100644
--- a/libs/filaflat/src/TextDictionaryReader.h
+++ b/libs/filaflat/include/filaflat/TextDictionaryReader.h
@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-#ifndef TNT_FILAFLAT_DIC_GLSL_CHUNK_H
-#define TNT_FILAFLAT_DIC_GLSL_CHUNK_H
+#ifndef TNT_FILAFLAT_TEXT_DICTIONARY_READER_H
+#define TNT_FILAFLAT_TEXT_DICTIONARY_READER_H
 
+#include <filaflat/BlobDictionary.h>
 #include <filaflat/ChunkContainer.h>
 #include <filaflat/Unflattener.h>
 
-#include "BlobDictionary.h"
-
-#include <vector>
-#include <stdint.h>
-
 namespace filaflat {
 
 struct TextDictionaryReader {
diff --git a/libs/filaflat/src/MaterialChunk.cpp b/libs/filaflat/src/MaterialChunk.cpp
index 64d3b731aa..5056fcf583 100644
--- a/libs/filaflat/src/MaterialChunk.cpp
+++ b/libs/filaflat/src/MaterialChunk.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "MaterialChunk.h"
+#include <filaflat/MaterialChunk.h>
 
 #include <utils/Log.h>
 
diff --git a/libs/filaflat/src/MaterialParser.cpp b/libs/filaflat/src/MaterialParser.cpp
index 93dc72dc2a..03a80b2187 100644
--- a/libs/filaflat/src/MaterialParser.cpp
+++ b/libs/filaflat/src/MaterialParser.cpp
@@ -14,18 +14,19 @@
  * limitations under the License.
  */
 
-#include "filaflat/MaterialParser.h"
 
+#include <filaflat/BlobDictionary.h>
 #include <filaflat/ChunkContainer.h>
+#include <filaflat/MaterialChunk.h>
+#include <filaflat/MaterialParser.h>
 #include <filaflat/ShaderBuilder.h>
+#include <filaflat/SpirvDictionaryReader.h>
+#include <filaflat/TextDictionaryReader.h>
 #include <filaflat/Unflattener.h>
+
 #include <filament/MaterialChunkType.h>
 
-#include "BlobDictionary.h"
 #include "ChunkInterfaceBlock.h"
-#include "MaterialChunk.h"
-#include "TextDictionaryReader.h"
-#include "SpirvDictionaryReader.h"
 
 #include <private/filament/SamplerInterfaceBlock.h>
 #include <private/filament/UniformInterfaceBlock.h>
diff --git a/libs/filaflat/src/SpirvDictionaryReader.cpp b/libs/filaflat/src/SpirvDictionaryReader.cpp
index 448033b36f..bbca86b51b 100644
--- a/libs/filaflat/src/SpirvDictionaryReader.cpp
+++ b/libs/filaflat/src/SpirvDictionaryReader.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "SpirvDictionaryReader.h"
+#include <filaflat/SpirvDictionaryReader.h>
 
 #if defined (FILAMENT_DRIVER_SUPPORTS_VULKAN)
 #include <utils/Log.h>
diff --git a/libs/filaflat/src/TextDictionaryReader.cpp b/libs/filaflat/src/TextDictionaryReader.cpp
index 17f2575887..e0dc56c821 100644
--- a/libs/filaflat/src/TextDictionaryReader.cpp
+++ b/libs/filaflat/src/TextDictionaryReader.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "TextDictionaryReader.h"
+#include <filaflat/TextDictionaryReader.h>
 
 #include <utils/Log.h>