Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maint

diff --git a/json-writer.h b/json-writer.h
index fc18acc7d913d170797b65b4f80071bce5310ba7..83906b09c173894111383b3fc3a0ec7e398373c7 100644 (file)
--- a/json-writer.h
+++ b/json-writer.h
@@ -42,6 +42,8 @@
  * of the given strings.
  */
 
+#include "strbuf.h"
+
 struct json_writer
 {
        /*