diff --git a/cli-app/cper-convert.c b/cli-app/cper-convert.c
index b9ac711..86a6d6f 100644
--- a/cli-app/cper-convert.c
+++ b/cli-app/cper-convert.c
@@ -9,7 +9,7 @@
 #include <string.h>
 #include <libgen.h>
 #include <limits.h>
-#include "json.h"
+#include <json.h>
 #include "../cper-parse.h"
 #include "../json-schema.h"
 
diff --git a/cper-parse.c b/cper-parse.c
index 8713d03..28c2fbd 100644
--- a/cper-parse.c
+++ b/cper-parse.c
@@ -6,7 +6,7 @@
  **/
 
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "edk/Cper.h"
 #include "cper-parse.h"
diff --git a/cper-parse.h b/cper-parse.h
index 423a805..40c2bf4 100644
--- a/cper-parse.h
+++ b/cper-parse.h
@@ -1,6 +1,6 @@
 #ifndef CPER_PARSE_H
 #define CPER_PARSE_H
-#include "json.h"
+#include <json.h>
 
 #define CPER_HEADER_VALID_BITFIELD_NAMES (const char*[]) {"platformIDValid", "timestampValid", "partitionIDValid"}
 #define CPER_SECTION_DESCRIPTOR_VALID_BITFIELD_NAMES (const char*[]) {"fruIDValid", "fruStringValid"}
diff --git a/cper-parse.i b/cper-parse.i
index fa12bc3..7ba1da4 100644
--- a/cper-parse.i
+++ b/cper-parse.i
@@ -1,7 +1,7 @@
 %module cperparse
 %{
     #include "cper-parse.h"
-    #include "json.h"
+    #include <json.h>
     #include <stdio.h>
 %}
 
diff --git a/cper-utils.c b/cper-utils.c
index 519349f..8fe3a2e 100644
--- a/cper-utils.c
+++ b/cper-utils.c
@@ -5,7 +5,7 @@
  **/
 
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "edk/Cper.h"
 #include "cper-utils.h"
 
diff --git a/ir-parse.c b/ir-parse.c
index 59f693d..1748de6 100644
--- a/ir-parse.c
+++ b/ir-parse.c
@@ -6,7 +6,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "edk/Cper.h"
 #include "cper-parse.h"
diff --git a/json-schema.c b/json-schema.c
index 88cc03c..16ddef5 100644
--- a/json-schema.c
+++ b/json-schema.c
@@ -11,7 +11,7 @@
 #include <libgen.h>
 #include <limits.h>
 #include <stdarg.h>
-#include "json.h"
+#include <json.h>
 #include "json-schema.h"
 #include "edk/BaseTypes.h"
 
diff --git a/json-schema.h b/json-schema.h
index d5751c6..02e45c6 100644
--- a/json-schema.h
+++ b/json-schema.h
@@ -1,7 +1,7 @@
 #ifndef JSON_SCHEMA_H
 #define JSON_SCHEMA_H
 
-#include "json.h"
+#include <json.h>
 
 #define JSON_SCHEMA_VERSION "https://json-schema.org/draft/2020-12/schema"
 #define JSON_ERROR_MSG_MAX_LEN 512
diff --git a/sections/cper-section-arm.c b/sections/cper-section-arm.c
index cdafd34..6537f40 100644
--- a/sections/cper-section-arm.c
+++ b/sections/cper-section-arm.c
@@ -6,7 +6,7 @@
  **/
 
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-arm.h b/sections/cper-section-arm.h
index aa986ed..1468405 100644
--- a/sections/cper-section-arm.h
+++ b/sections/cper-section-arm.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_ARM_H
 #define CPER_SECTION_ARM_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define ARM_ERROR_VALID_BITFIELD_NAMES (const char*[]) \
diff --git a/sections/cper-section-ccix-per.c b/sections/cper-section-ccix-per.c
index 5beebea..4240afc 100644
--- a/sections/cper-section-ccix-per.c
+++ b/sections/cper-section-ccix-per.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-ccix-per.h b/sections/cper-section-ccix-per.h
index f74f952..a6a557c 100644
--- a/sections/cper-section-ccix-per.h
+++ b/sections/cper-section-ccix-per.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_CCIX_PER_H
 #define CPER_SECTION_CCIX_PER_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define CCIX_PER_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"ccixSourceIDValid", "ccixPortIDValid", "ccixPERLogValid"}
diff --git a/sections/cper-section-cxl-component.c b/sections/cper-section-cxl-component.c
index a4a8dec..098b20d 100644
--- a/sections/cper-section-cxl-component.c
+++ b/sections/cper-section-cxl-component.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-cxl-component.h b/sections/cper-section-cxl-component.h
index e0a585e..21a1374 100644
--- a/sections/cper-section-cxl-component.h
+++ b/sections/cper-section-cxl-component.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_CXL_COMPONENT_H
 #define CPER_SECTION_CXL_COMPONENT_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define CXL_COMPONENT_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"deviceIDValid", "deviceSerialValid", \
diff --git a/sections/cper-section-cxl-protocol.c b/sections/cper-section-cxl-protocol.c
index 43c9dd0..7cb1bbe 100644
--- a/sections/cper-section-cxl-protocol.c
+++ b/sections/cper-section-cxl-protocol.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-cxl-protocol.h b/sections/cper-section-cxl-protocol.h
index a64b83e..c7c2c1c 100644
--- a/sections/cper-section-cxl-protocol.h
+++ b/sections/cper-section-cxl-protocol.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_CXL_PROTOCOL_H
 #define CPER_SECTION_CXL_PROTOCOL_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define CXL_PROTOCOL_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"cxlAgentTypeValid", "cxlAgentAddressValid", \
diff --git a/sections/cper-section-dmar-generic.c b/sections/cper-section-dmar-generic.c
index 420dd8d..6136232 100644
--- a/sections/cper-section-dmar-generic.c
+++ b/sections/cper-section-dmar-generic.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-dmar-generic.h"
diff --git a/sections/cper-section-dmar-generic.h b/sections/cper-section-dmar-generic.h
index 634339a..e9757b0 100644
--- a/sections/cper-section-dmar-generic.h
+++ b/sections/cper-section-dmar-generic.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_DMAR_GENERIC_H
 #define CPER_SECTION_DMAR_GENERIC_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define DMAR_GENERIC_ERROR_FAULT_REASON_TYPES_KEYS (int []){0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xA, 0xB}
diff --git a/sections/cper-section-dmar-iommu.c b/sections/cper-section-dmar-iommu.c
index 0c8df4a..f33c4ec 100644
--- a/sections/cper-section-dmar-iommu.c
+++ b/sections/cper-section-dmar-iommu.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-dmar-iommu.h b/sections/cper-section-dmar-iommu.h
index eaac1ae..0fec283 100644
--- a/sections/cper-section-dmar-iommu.h
+++ b/sections/cper-section-dmar-iommu.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_DMAR_IOMMU_H
 #define CPER_SECTION_DMAR_IOMMU_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 json_object* cper_section_dmar_iommu_to_ir(void* section, EFI_ERROR_SECTION_DESCRIPTOR* descriptor);
diff --git a/sections/cper-section-dmar-vtd.c b/sections/cper-section-dmar-vtd.c
index 73fb2fc..5d938f4 100644
--- a/sections/cper-section-dmar-vtd.c
+++ b/sections/cper-section-dmar-vtd.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-dmar-vtd.h b/sections/cper-section-dmar-vtd.h
index 4a49e56..4f84657 100644
--- a/sections/cper-section-dmar-vtd.h
+++ b/sections/cper-section-dmar-vtd.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_DMAR_VTD_H
 #define CPER_SECTION_DMAR_VTD_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define VTD_FAULT_RECORD_TYPES_KEYS (int []){0, 1}
diff --git a/sections/cper-section-firmware.c b/sections/cper-section-firmware.c
index a3c3002..e45015a 100644
--- a/sections/cper-section-firmware.c
+++ b/sections/cper-section-firmware.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-firmware.h"
diff --git a/sections/cper-section-firmware.h b/sections/cper-section-firmware.h
index 531ddf7..4e0f528 100644
--- a/sections/cper-section-firmware.h
+++ b/sections/cper-section-firmware.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_FIRMWARE_H
 #define CPER_SECTION_FIRMWARE_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define FIRMWARE_ERROR_RECORD_TYPES_KEYS (int []){0, 1, 2}
diff --git a/sections/cper-section-generic.c b/sections/cper-section-generic.c
index f689945..6a0de01 100644
--- a/sections/cper-section-generic.c
+++ b/sections/cper-section-generic.c
@@ -7,7 +7,7 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-generic.h"
diff --git a/sections/cper-section-generic.h b/sections/cper-section-generic.h
index f1e180e..95ba66e 100644
--- a/sections/cper-section-generic.h
+++ b/sections/cper-section-generic.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_GENERIC_H
 #define CPER_SECTION_GENERIC_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define GENERIC_PROC_TYPES_KEYS (int []){0, 1, 2}
diff --git a/sections/cper-section-ia32x64.c b/sections/cper-section-ia32x64.c
index 0657b82..a7dcc18 100644
--- a/sections/cper-section-ia32x64.c
+++ b/sections/cper-section-ia32x64.c
@@ -6,7 +6,7 @@
  **/
 
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-ia32x64.h b/sections/cper-section-ia32x64.h
index a18e751..875681e 100644
--- a/sections/cper-section-ia32x64.h
+++ b/sections/cper-section-ia32x64.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_IA32X64_H
 #define CPER_SECTION_IA32X64_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define IA32X64_PROCESSOR_ERROR_VALID_BITFIELD_NAMES (const char*[]) \
diff --git a/sections/cper-section-ipf.c b/sections/cper-section-ipf.c
index b014d5d..bc62493 100644
--- a/sections/cper-section-ipf.c
+++ b/sections/cper-section-ipf.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-ipf.h"
diff --git a/sections/cper-section-ipf.h b/sections/cper-section-ipf.h
index ccd016c..e90a16e 100644
--- a/sections/cper-section-ipf.h
+++ b/sections/cper-section-ipf.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_IPF_H
 #define CPER_SECTION_IPF_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define IPF_MOD_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"checkInfoValid", "requestorIdentifierValid", \
diff --git a/sections/cper-section-memory.c b/sections/cper-section-memory.c
index af507fd..1ed2b9b 100644
--- a/sections/cper-section-memory.c
+++ b/sections/cper-section-memory.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-memory.h"
diff --git a/sections/cper-section-memory.h b/sections/cper-section-memory.h
index e0d470c..81be6ff 100644
--- a/sections/cper-section-memory.h
+++ b/sections/cper-section-memory.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_MEMORY_H
 #define CPER_SECTION_MEMORY_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define MEMORY_ERROR_VALID_BITFIELD_NAMES (const char*[]) \
diff --git a/sections/cper-section-pci-bus.c b/sections/cper-section-pci-bus.c
index 106af1c..33d0d03 100644
--- a/sections/cper-section-pci-bus.c
+++ b/sections/cper-section-pci-bus.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-pci-bus.h"
diff --git a/sections/cper-section-pci-bus.h b/sections/cper-section-pci-bus.h
index ab44b53..cf4371a 100644
--- a/sections/cper-section-pci-bus.h
+++ b/sections/cper-section-pci-bus.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_PCI_BUS_H
 #define CPER_SECTION_PCI_BUS_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define PCI_BUS_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"errorStatusValid", "errorTypeValid", \
diff --git a/sections/cper-section-pci-dev.c b/sections/cper-section-pci-dev.c
index 55b547b..5f40183 100644
--- a/sections/cper-section-pci-dev.c
+++ b/sections/cper-section-pci-dev.c
@@ -5,7 +5,7 @@
  * Author: Lawrence.Tang@arm.com
  **/
 #include <stdio.h>
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
 #include "cper-section-pci-dev.h"
diff --git a/sections/cper-section-pci-dev.h b/sections/cper-section-pci-dev.h
index ceb8a44..e261d44 100644
--- a/sections/cper-section-pci-dev.h
+++ b/sections/cper-section-pci-dev.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_PCI_DEV_H
 #define CPER_SECTION_PCI_DEV_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define PCI_DEV_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"errorStatusValid", "idInfoValid", "memoryNumberValid", \
diff --git a/sections/cper-section-pcie.c b/sections/cper-section-pcie.c
index 5b49fa2..cf68b3f 100644
--- a/sections/cper-section-pcie.c
+++ b/sections/cper-section-pcie.c
@@ -6,7 +6,7 @@
  **/
 #include <stdio.h>
 #include <string.h>
-#include "json.h"
+#include <json.h>
 #include "b64.h"
 #include "../edk/Cper.h"
 #include "../cper-utils.h"
diff --git a/sections/cper-section-pcie.h b/sections/cper-section-pcie.h
index badf422..a2a43a4 100644
--- a/sections/cper-section-pcie.h
+++ b/sections/cper-section-pcie.h
@@ -1,7 +1,7 @@
 #ifndef CPER_SECTION_PCIE_H
 #define CPER_SECTION_PCIE_H
 
-#include "json.h"
+#include <json.h>
 #include "../edk/Cper.h"
 
 #define PCIE_ERROR_VALID_BITFIELD_NAMES (const char*[]) {"portTypeValid", "versionValid", "commandStatusValid", \
diff --git a/tests/ir-tests.cpp b/tests/ir-tests.cpp
index 23c23af..a961e40 100644
--- a/tests/ir-tests.cpp
+++ b/tests/ir-tests.cpp
@@ -7,7 +7,7 @@
 #include "gtest/gtest.h"
 #include "test-utils.hpp"
 extern "C" {
-#include "json.h"
+#include <json.h>
 #include "../cper-parse.h"
 #include "../json-schema.h"
 #include "../generator/cper-generate.h"