diff --git a/scripts/tools/check_includes_config.py b/scripts/tools/check_includes_config.py
index ae06b487cbaba8..bfd7f15c5ccf17 100644
--- a/scripts/tools/check_includes_config.py
+++ b/scripts/tools/check_includes_config.py
@@ -162,5 +162,6 @@
     # Not intended for embedded clients
     'src/lib/support/jsontlv/JsonToTlv.cpp': {'sstream'},
     'src/lib/support/jsontlv/JsonToTlv.h': {'string'},
-    'src/lib/support/jsontlv/TlvToJson.h': {'string'}
+    'src/lib/support/jsontlv/TlvToJson.h': {'string'},
+    'src/lib/support/jsontlv/TextFormat.h': {'string'}
 }
diff --git a/src/lib/support/jsontlv/BUILD.gn b/src/lib/support/jsontlv/BUILD.gn
index 186a6d0a0a7522..6ec611913b6945 100644
--- a/src/lib/support/jsontlv/BUILD.gn
+++ b/src/lib/support/jsontlv/BUILD.gn
@@ -28,7 +28,7 @@ static_library("jsontlv") {
 
   public = [
     "JsonToTlv.h",
-    "JsonUtilities.h",
+    "TextFormat.h",
     "TlvJson.h",
     "TlvToJson.h",
   ]
diff --git a/src/lib/support/jsontlv/JsonUtilities.h b/src/lib/support/jsontlv/TextFormat.h
similarity index 98%
rename from src/lib/support/jsontlv/JsonUtilities.h
rename to src/lib/support/jsontlv/TextFormat.h
index 5e3544b8693ced..ecef17c66b08a9 100644
--- a/src/lib/support/jsontlv/JsonUtilities.h
+++ b/src/lib/support/jsontlv/TextFormat.h
@@ -19,6 +19,7 @@
 #include <algorithm>
 #include <json/json.h>
 #include <lib/core/TLV.h>
+#include <string>
 
 namespace chip {
 /*
diff --git a/src/lib/support/tests/TestJsonToTlv.cpp b/src/lib/support/tests/TestJsonToTlv.cpp
index 999d6ac506f27a..87f37ab4e052b1 100644
--- a/src/lib/support/tests/TestJsonToTlv.cpp
+++ b/src/lib/support/tests/TestJsonToTlv.cpp
@@ -22,7 +22,7 @@
 #include <lib/core/TLVReader.h>
 #include <lib/support/UnitTestRegistration.h>
 #include <lib/support/jsontlv/JsonToTlv.h>
-#include <lib/support/jsontlv/JsonUtilities.h>
+#include <lib/support/jsontlv/TextFormat.h>
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <nlunit-test.h>
 
diff --git a/src/lib/support/tests/TestJsonToTlvToJson.cpp b/src/lib/support/tests/TestJsonToTlvToJson.cpp
index 2dfc7d031a28ee..b67ae7ce7f3abc 100644
--- a/src/lib/support/tests/TestJsonToTlvToJson.cpp
+++ b/src/lib/support/tests/TestJsonToTlvToJson.cpp
@@ -20,7 +20,7 @@
 #include <app/data-model/Encode.h>
 #include <lib/support/UnitTestRegistration.h>
 #include <lib/support/jsontlv/JsonToTlv.h>
-#include <lib/support/jsontlv/JsonUtilities.h>
+#include <lib/support/jsontlv/TextFormat.h>
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <nlunit-test.h>
 
diff --git a/src/lib/support/tests/TestTlvToJson.cpp b/src/lib/support/tests/TestTlvToJson.cpp
index cf98ecdc0d3346..c88167dcdee1e4 100644
--- a/src/lib/support/tests/TestTlvToJson.cpp
+++ b/src/lib/support/tests/TestTlvToJson.cpp
@@ -19,7 +19,7 @@
 #include <app/data-model/Decode.h>
 #include <app/data-model/Encode.h>
 #include <lib/support/UnitTestRegistration.h>
-#include <lib/support/jsontlv/JsonUtilities.h>
+#include <lib/support/jsontlv/TextFormat.h>
 #include <lib/support/jsontlv/TlvToJson.h>
 #include <nlunit-test.h>
 #include <system/SystemPacketBuffer.h>