diff --git a/kdc/Makefile.am b/kdc/Makefile.am
index a4f5e4147..3383b0ad0 100644
--- a/kdc/Makefile.am
+++ b/kdc/Makefile.am
@@ -64,7 +64,7 @@ test_kdc_ca_SOURCES = test_kdc_ca.c
 # Token plugins (for bx509d)
 if HAVE_CJWT
 cjwt_token_validator_la_SOURCES = cjwt_token_validator.c
-cjwt_token_validator_la_AM_CPPFLAGS = $(CJSON_FLAGS) $(CJWT_FLAGS)
+cjwt_token_validator_la_CFLAGS = $(CJSON_CFLAGS) $(CJWT_CFLAGS)
 cjwt_token_validator_la_LDFLAGS = -module $(CJSON_LIBS) $(CJWT_LIBS)
 endif
 
diff --git a/kdc/cjwt_token_validator.c b/kdc/cjwt_token_validator.c
index 7d077f3ba..ea76b8706 100644
--- a/kdc/cjwt_token_validator.c
+++ b/kdc/cjwt_token_validator.c
@@ -60,7 +60,7 @@
 #include <token_validator_plugin.h>
 #include <cjwt/cjwt.h>
 #ifdef HAVE_CJSON
-#include <cjson/cJSON.h>
+#include <cJSON.h>
 #endif
 
 static const char *