diff --git a/libs/filament-matp/CMakeLists.txt b/libs/filament-matp/CMakeLists.txt
index da1f032436..5a725ca65a 100644
--- a/libs/filament-matp/CMakeLists.txt
+++ b/libs/filament-matp/CMakeLists.txt
@@ -8,26 +8,26 @@ set(PUBLIC_HDR_DIR include)
 # Sources and headers
 # ==================================================================================================
 set(PUBLIC_HDRS
-        include/filament-matp/JsonishLexeme.h
-        include/filament-matp/JsonishLexer.h
-        include/filament-matp/JsonishParser.h
-        include/filament-matp/Lexeme.h
-        include/filament-matp/Lexer.h
-        include/filament-matp/MaterialLexeme.h
-        include/filament-matp/MaterialLexer.h
-        include/filament-matp/ParametersProcessor.h
-        include/filament-matp/DirIncluder.h
         include/filament-matp/Config.h
         include/filament-matp/MaterialParser.h
 )
 
 set(SRCS
+        src/DirIncluder.h
+        src/JsonishLexeme.h
+        src/JsonishLexer.h
+        src/JsonishParser.h
+        src/Lexeme.h
+        src/Lexer.h
+        src/MaterialLexeme.h
+        src/MaterialLexer.h
+        src/ParametersProcessor.h
+        src/DirIncluder.cpp
         src/JsonishLexer.cpp
         src/JsonishParser.cpp
         src/MaterialLexer.cpp
-        src/ParametersProcessor.cpp
-        src/DirIncluder.cpp
         src/MaterialParser.cpp
+        src/ParametersProcessor.cpp
 )
 
 # ==================================================================================================
diff --git a/libs/filament-matp/include/filament-matp/Config.h b/libs/filament-matp/include/filament-matp/Config.h
index f2300c3777..28d6e4cd2f 100644
--- a/libs/filament-matp/include/filament-matp/Config.h
+++ b/libs/filament-matp/include/filament-matp/Config.h
@@ -17,8 +17,8 @@
 #ifndef TNT_CONFIG_H
 #define TNT_CONFIG_H
 
-#include <backend/DriverEnums.h>
 #include <filament/MaterialEnums.h>
+#include <backend/DriverEnums.h>
 
 #include <filamat/MaterialBuilder.h>
 
diff --git a/libs/filament-matp/include/filament-matp/MaterialParser.h b/libs/filament-matp/include/filament-matp/MaterialParser.h
index a020f7611b..970bbb2fc3 100644
--- a/libs/filament-matp/include/filament-matp/MaterialParser.h
+++ b/libs/filament-matp/include/filament-matp/MaterialParser.h
@@ -21,9 +21,6 @@
 #include <string>
 #include <unordered_map>
 
-#include "JsonishLexeme.h"
-#include "JsonishParser.h"
-#include "MaterialLexeme.h"
 #include "Config.h"
 
 namespace filamat {
@@ -34,6 +31,8 @@ class TestMaterialParser;
 namespace matp {
 
 class JsonishValue;
+class MaterialLexeme;
+
 class MaterialParser {
 public:
     MaterialParser();
diff --git a/libs/filament-matp/src/DirIncluder.cpp b/libs/filament-matp/src/DirIncluder.cpp
index 3b231a347c..913ca3d014 100644
--- a/libs/filament-matp/src/DirIncluder.cpp
+++ b/libs/filament-matp/src/DirIncluder.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/DirIncluder.h>
+#include "DirIncluder.h"
 
 #include <utils/Log.h>
 
diff --git a/libs/filament-matp/include/filament-matp/DirIncluder.h b/libs/filament-matp/src/DirIncluder.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/DirIncluder.h
rename to libs/filament-matp/src/DirIncluder.h
diff --git a/libs/filament-matp/include/filament-matp/JsonishLexeme.h b/libs/filament-matp/src/JsonishLexeme.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/JsonishLexeme.h
rename to libs/filament-matp/src/JsonishLexeme.h
diff --git a/libs/filament-matp/src/JsonishLexer.cpp b/libs/filament-matp/src/JsonishLexer.cpp
index 886ff1addf..279b5c0e37 100644
--- a/libs/filament-matp/src/JsonishLexer.cpp
+++ b/libs/filament-matp/src/JsonishLexer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/JsonishLexer.h>
+#include "JsonishLexer.h"
 
 #include <string.h>
 
diff --git a/libs/filament-matp/include/filament-matp/JsonishLexer.h b/libs/filament-matp/src/JsonishLexer.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/JsonishLexer.h
rename to libs/filament-matp/src/JsonishLexer.h
diff --git a/libs/filament-matp/src/JsonishParser.cpp b/libs/filament-matp/src/JsonishParser.cpp
index d744acdb40..03616519f3 100644
--- a/libs/filament-matp/src/JsonishParser.cpp
+++ b/libs/filament-matp/src/JsonishParser.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/JsonishParser.h>
+#include "JsonishParser.h"
 
 #include <stdlib.h>
 
diff --git a/libs/filament-matp/include/filament-matp/JsonishParser.h b/libs/filament-matp/src/JsonishParser.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/JsonishParser.h
rename to libs/filament-matp/src/JsonishParser.h
diff --git a/libs/filament-matp/include/filament-matp/Lexeme.h b/libs/filament-matp/src/Lexeme.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/Lexeme.h
rename to libs/filament-matp/src/Lexeme.h
diff --git a/libs/filament-matp/include/filament-matp/Lexer.h b/libs/filament-matp/src/Lexer.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/Lexer.h
rename to libs/filament-matp/src/Lexer.h
diff --git a/libs/filament-matp/include/filament-matp/MaterialLexeme.h b/libs/filament-matp/src/MaterialLexeme.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/MaterialLexeme.h
rename to libs/filament-matp/src/MaterialLexeme.h
diff --git a/libs/filament-matp/src/MaterialLexer.cpp b/libs/filament-matp/src/MaterialLexer.cpp
index f89ab1df92..ffce1551a0 100644
--- a/libs/filament-matp/src/MaterialLexer.cpp
+++ b/libs/filament-matp/src/MaterialLexer.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/MaterialLexer.h>
+#include "MaterialLexer.h"
 
 namespace matp {
 
diff --git a/libs/filament-matp/include/filament-matp/MaterialLexer.h b/libs/filament-matp/src/MaterialLexer.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/MaterialLexer.h
rename to libs/filament-matp/src/MaterialLexer.h
diff --git a/libs/filament-matp/src/MaterialParser.cpp b/libs/filament-matp/src/MaterialParser.cpp
index a33b4d6de8..4fbb9eb4d4 100644
--- a/libs/filament-matp/src/MaterialParser.cpp
+++ b/libs/filament-matp/src/MaterialParser.cpp
@@ -27,12 +27,12 @@
 #include <utils/Log.h>
 #include <utils/JobSystem.h>
 
-#include <filament-matp/DirIncluder.h>
-#include <filament-matp/JsonishLexer.h>
-#include <filament-matp/JsonishParser.h>
-#include <filament-matp/MaterialLexeme.h>
-#include <filament-matp/MaterialLexer.h>
-#include <filament-matp/ParametersProcessor.h>
+#include "DirIncluder.h"
+#include "JsonishLexer.h"
+#include "JsonishParser.h"
+#include "MaterialLexeme.h"
+#include "MaterialLexer.h"
+#include "ParametersProcessor.h"
 #include <filament-matp/Config.h>
 
 using namespace utils;
diff --git a/libs/filament-matp/src/ParametersProcessor.cpp b/libs/filament-matp/src/ParametersProcessor.cpp
index a3a3b89eac..e05ee2dd8a 100644
--- a/libs/filament-matp/src/ParametersProcessor.cpp
+++ b/libs/filament-matp/src/ParametersProcessor.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <filament-matp/ParametersProcessor.h>
+#include "ParametersProcessor.h"
 
 #include <filamat/Enums.h>
 
diff --git a/libs/filament-matp/include/filament-matp/ParametersProcessor.h b/libs/filament-matp/src/ParametersProcessor.h
similarity index 100%
rename from libs/filament-matp/include/filament-matp/ParametersProcessor.h
rename to libs/filament-matp/src/ParametersProcessor.h
diff --git a/libs/filament-matp/tests/test_includer.cpp b/libs/filament-matp/tests/test_includer.cpp
index 11f1d4f754..4adc103578 100644
--- a/libs/filament-matp/tests/test_includer.cpp
+++ b/libs/filament-matp/tests/test_includer.cpp
@@ -16,7 +16,7 @@
 
 #include <gtest/gtest.h>
 
-#include <filament-matp/DirIncluder.h>
+#include "../src/DirIncluder.h"
 
 using namespace utils;
 using namespace filamat;
diff --git a/libs/filament-matp/tests/test_matp.cpp b/libs/filament-matp/tests/test_matp.cpp
index e64119da1e..22860c61ab 100644
--- a/libs/filament-matp/tests/test_matp.cpp
+++ b/libs/filament-matp/tests/test_matp.cpp
@@ -1,5 +1,5 @@
 /*
-* Copyright (C) 2018 The Android Open Source Project
+* Copyright (C) 2025 The Android Open Source Project
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -19,9 +19,9 @@
 #include "TestMaterialParser.h"
 
 #include <filament-matp/MaterialParser.h>
-#include <filament-matp/JsonishLexer.h>
-#include <filament-matp/JsonishParser.h>
-#include <filament-matp/MaterialLexer.h>
+#include "../src/JsonishLexer.h"
+#include "../src/JsonishParser.h"
+#include "../src/MaterialLexer.h"
 
 class MaterialLexer: public ::testing::Test {
 protected:
diff --git a/tools/matc/src/matc/MaterialCompiler.cpp b/tools/matc/src/matc/MaterialCompiler.cpp
index 67ed252431..0948b84ae5 100644
--- a/tools/matc/src/matc/MaterialCompiler.cpp
+++ b/tools/matc/src/matc/MaterialCompiler.cpp
@@ -25,7 +25,7 @@
 #include <utils/Log.h>
 #include <utils/JobSystem.h>
 
-#include <filament-matp/DirIncluder.h>
+#include "../../../../libs/filament-matp/src/DirIncluder.h"
 #include <filament-matp/Config.h>
 
 #include "SPIRV/GlslangToSpv.h"
diff --git a/tools/matc/src/matc/MaterialCompiler.h b/tools/matc/src/matc/MaterialCompiler.h
index 5a06930c83..a884e405a2 100644
--- a/tools/matc/src/matc/MaterialCompiler.h
+++ b/tools/matc/src/matc/MaterialCompiler.h
@@ -20,7 +20,7 @@
 #include <string>
 #include <unordered_map>
 
-#include <filament-matp/MaterialLexeme.h>
+#include "../../../../libs/filament-matp/src/MaterialLexeme.h"
 #include <filament-matp/Config.h>
 #include <filament-matp/MaterialParser.h>
 #include "Compiler.h"