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__