diff --git device/vr/BUILD.gn device/vr/BUILD.gn
index 7a50872f6979..03921dcf8ede 100644
--- device/vr/BUILD.gn
+++ device/vr/BUILD.gn
@@ -213,6 +213,7 @@ if (enable_openvr) {
     deps = [
       "//base",
       "//device/vr/public/mojom:test_mojom",
+      "//third_party/openvr:openvr_headers",
     ]
   }
 }
diff --git third_party/openvr/BUILD.gn third_party/openvr/BUILD.gn
index 6c208d65b35a..7a6ae8cb44fc 100644
--- third_party/openvr/BUILD.gn
+++ third_party/openvr/BUILD.gn
@@ -2,6 +2,22 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+source_set("openvr_headers") {
+  sources = [
+    "src/headers/openvr.h",
+    "src/headers/openvr_capi.h",
+    "src/headers/openvr_driver.h",
+    "src/src/ivrclientcore.h",
+    "src/src/vrcommon/dirtools_public.h",
+    "src/src/vrcommon/envvartools_public.h",
+    "src/src/vrcommon/hmderrors_public.h",
+    "src/src/vrcommon/pathtools_public.h",
+    "src/src/vrcommon/sharedlibtools_public.h",
+    "src/src/vrcommon/strtools_public.h",
+    "src/src/vrcommon/vrpathregistry_public.h",
+  ]
+}
+
 component("openvr") {
   output_name = "openvr_api"
 
@@ -20,7 +36,6 @@ component("openvr") {
   ]
 
   sources = [
-    "src/src/jsoncpp.cpp",
     "src/src/openvr_api_public.cpp",
     "src/src/vrcommon/dirtools_public.cpp",
     "src/src/vrcommon/envvartools_public.cpp",
@@ -31,6 +46,10 @@ component("openvr") {
     "src/src/vrcommon/vrpathregistry_public.cpp",
   ]
 
+  public_deps = [
+    "//third_party/jsoncpp",
+  ]
+
   if (target_cpu == "x64" && is_win) {
     defines += [ "WIN64" ]
   }
@@ -38,7 +57,7 @@ component("openvr") {
   include_dirs = [
     "src/headers",
     "src/src",
-    "src/src/json",
     "src/src/vrcommon",
+    "//third_party/jsoncpp/source/include",
   ]
 }
diff --git third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
index 137b36f57cd4..dcbb9aaed52f 100644
--- third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
+++ third_party/openvr/src/src/vrcommon/vrpathregistry_public.cpp
@@ -1,7 +1,11 @@
 //========= Copyright Valve Corporation ============//
 
 #include "vrpathregistry_public.h"
-#include "json/json.h"
+
+#include <json/reader.h>
+#include <json/value.h>
+#include <json/writer.h>
+
 #include "pathtools_public.h"
 #include "envvartools_public.h"
 #include "strtools_public.h"