From f67d98cb1035c4220b6fae8f7e5d1d429a2f152e Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Thu, 30 Apr 2020 12:56:48 +0200
Subject: [PATCH 1/3] missing header file violating C++ standard

---
 src/jniutils.hh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/jniutils.hh b/src/jniutils.hh
index a9cf9a0..e8ee16b 100644
--- a/src/jniutils.hh
+++ b/src/jniutils.hh
@@ -1,6 +1,7 @@
 #pragma once
 #include <unordered_map>
 #include <thread>
+#include <mutex>
 #include <jni.h>
 #include <pEp/stringpair.h>
 #include <pEp/identity_list.h>

From 0e14d3a76f435d55bcd501fecccfef5599ce2562 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Thu, 30 Apr 2020 13:03:00 +0200
Subject: [PATCH 2/3] another include missing

---
 src/gen_cpp_Message.ysl2 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/gen_cpp_Message.ysl2 b/src/gen_cpp_Message.ysl2
index ecefa1e..2e587de 100644
--- a/src/gen_cpp_Message.ysl2
+++ b/src/gen_cpp_Message.ysl2
@@ -12,6 +12,7 @@ tstylesheet {
 
         document("foundation_pEp_jniadapter_{$jname}.cc", "text") {
             ||
+            #include <cassert>
             #include <pEp/mime.h>
             #include <pEp/pEpLog.hh>
             #include "jniutils.hh"

From f6766d5279115c3709a9baa17dee5e442fee7b79 Mon Sep 17 00:00:00 2001
From: Volker Birk <vb@pep-project.org>
Date: Thu, 30 Apr 2020 13:43:37 +0200
Subject: [PATCH 3/3] missing headers again, correcting error coloring, too

---
 Makefile.conf                          | 19 ++++++-------------
 src/foundation_pEp_jniadapter__Blob.cc |  2 ++
 src/jniutils.cc                        |  1 +
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile.conf b/Makefile.conf
index 2624aea..fa3f751 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -16,23 +16,16 @@ BUILD_FOR:=$(shell uname)
 
 
 ######### C and C++ #########
-CXXFLAGS+=-g -O0
+CXXFLAGS+=-g -O0 -std=c++11
 LDFLAGS+=-shared $(ENGINE_LIB) $(AD_LIB)
 
 LDLIBS=-lstdc++ -lpEpEngine -lpEpAdapter
 
-
-######### C++ #########
-ifeq ($(BUILD_FOR),Linux)
-    CXX=g++ -std=c++11
-else ifeq ($(BUILD_FOR),Darwin)
-    CXX=clang -std=c++11
-endif
-
-ifeq ($(BUILD_FOR),Linux)
-    CXXFLAGS+=-fdiagnostics-color=always -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux $(AD_INC) $(ENGINE_INC)
-else ifeq ($(BUILD_FOR),Darwin)
-    CXXFLAGS+=-fcolor-diagnostics -fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/darwin $(AD_INC) $(ENGINE_INC)
+CXXFLAGS+=-fpermissive -fPIC -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/$(shell uname) $(AD_INC) $(ENGINE_INC)
+ifneq (,$(findstring g++,$(CXX)))
+    CXXFLAGS+=-fdiagnostics-color=always
+else ifneq (,$(findstring clang,$(CXX)))
+    CXXFLAGS+=-fcolor-diagnostics
 endif
 
 # DEV ENV PATHS & CFG
diff --git a/src/foundation_pEp_jniadapter__Blob.cc b/src/foundation_pEp_jniadapter__Blob.cc
index e677997..8dfbf43 100644
--- a/src/foundation_pEp_jniadapter__Blob.cc
+++ b/src/foundation_pEp_jniadapter__Blob.cc
@@ -1,3 +1,5 @@
+#include <cassert>
+#include <pEp/platform.h>
 #include <pEp/sync_codec.h>
 #include <pEp/distribution_codec.h>
 #include <pEp/pEpLog.hh>
diff --git a/src/jniutils.cc b/src/jniutils.cc
index b3eb89a..da8c6d4 100644
--- a/src/jniutils.cc
+++ b/src/jniutils.cc
@@ -1,3 +1,4 @@
+#include <cassert>
 #include "jniutils.hh"
 #include <pEp/pEpLog.hh>
 #ifndef __LP64__