diff --git a/prov/cxi/configure.m4 b/prov/cxi/configure.m4
index ec50e18f33c..1a3b0b835c2 100644
--- a/prov/cxi/configure.m4
+++ b/prov/cxi/configure.m4
@@ -44,14 +44,6 @@ AC_DEFUN([FI_CXI_CONFIGURE],[
 
 	AS_IF([test x"$enable_cxi" != x"no"],
 		[
-			AC_CHECK_HEADER(cxi_prov_hw.h,
-				[],
-				[cxi_happy=0])
-
-			AC_CHECK_HEADER(uapi/misc/cxi.h,
-				[],
-				[cxi_happy=0])
-
 			FI_CHECK_PACKAGE([libcxi],
 				[libcxi/libcxi.h],
 				[cxi],
@@ -97,8 +89,8 @@ AC_DEFUN([FI_CXI_CONFIGURE],[
 			cxi_LIBS="$cxi_LIBS $libcurl_LIBS"
 
 			# Add on json if installed in non-default location.
-			if test "$with_json" != "" && test "$with_json" != "no"; then
-				FI_CHECK_PREFIX_DIR([$with_json], [json])
+			if test "$with_json_c" != "" && test "$with_json_c" != "no"; then
+				FI_CHECK_PREFIX_DIR([$with_json_c], [json])
 			else
 				json_PREFIX=""
 				json_LIBDIR=""