From b15a460416b1289e0a4989b80d24fbdec9d51caa Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Thu, 8 Feb 2018 12:26:44 +0200
Subject: [PATCH] MXS-1659 Do not include C++ headers from C header

---
 include/maxscale/json_api.h                  | 4 ++--
 server/modules/filter/qlafilter/qlafilter.cc | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/maxscale/json_api.h b/include/maxscale/json_api.h
index c124ae6e9..217e9be3d 100644
--- a/include/maxscale/json_api.h
+++ b/include/maxscale/json_api.h
@@ -18,8 +18,8 @@
  * @see http://jsonapi.org/format/
  */
 
-#include <maxscale/cppdefs.hh>
-#include <maxscale/jansson.hh>
+#include <maxscale/cdefs.h>
+#include <maxscale/jansson.h>
 
 MXS_BEGIN_DECLS
 
diff --git a/server/modules/filter/qlafilter/qlafilter.cc b/server/modules/filter/qlafilter/qlafilter.cc
index d44b04076..820100740 100644
--- a/server/modules/filter/qlafilter/qlafilter.cc
+++ b/server/modules/filter/qlafilter/qlafilter.cc
@@ -31,6 +31,7 @@
 #include <time.h>
 #include <stdio.h>
 #include <string.h>
+#include <sstream>
 #include <sys/time.h>
 #include <fstream>