diff --git a/meson.build b/meson.build
index 059f043..72e810b 100644
--- a/meson.build
+++ b/meson.build
@@ -50,6 +50,8 @@
     endif
 endif
 
+nlohmann_json_dep = dependency('nlohmann_json', include_type: 'system')
+
 phosphor_dbus_interfaces = dependency('phosphor-dbus-interfaces',
     default_options: [ 'data_com_ibm=true', 'data_org_open_power=true' ],
     fallback: ['phosphor-dbus-interfaces', 'phosphor_dbus_interfaces_dep'])
@@ -81,12 +83,6 @@
     CLI11_dep = dependency('CLI11')
 endif
 
-if compiler.has_header('nlohmann/json.hpp')
-    nlohmann_json_dep = declare_dependency()
-else
-    nlohmann_json_dep = dependency('nlohmann-json')
-endif
-
 if not build_tests.disabled()
     subdir('test')
 endif
diff --git a/subprojects/nlohmann-json.wrap b/subprojects/nlohmann-json.wrap
deleted file mode 100644
index a2884b1..0000000
--- a/subprojects/nlohmann-json.wrap
+++ /dev/null
@@ -1,6 +0,0 @@
-[wrap-git]
-url = https://github.com/nlohmann/json
-revision = HEAD
-
-[provide]
-nlohmann-json = nlohmann_json_dep
diff --git a/subprojects/nlohmann_json.wrap b/subprojects/nlohmann_json.wrap
new file mode 100644
index 0000000..3745380
--- /dev/null
+++ b/subprojects/nlohmann_json.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+revision = HEAD
+url = https://github.com/nlohmann/json.git
+
+[provide]
+nlohmann_json = nlohmann_json_dep