diff --git a/LibParameter.mk b/LibParameter.mk
index 4cb423e..42084d5 100644
--- a/LibParameter.mk
+++ b/LibParameter.mk
@@ -131,7 +131,11 @@
     external/libxml2/include \
     external/icu/icu4c/source/common
 
-LOCAL_CFLAGS := -frtti -fexceptions
+LOCAL_CFLAGS := -Wall -Werror
+
+LOCAL_CPPFLAGS := \
+    -frtti -fexceptions \
+    -Wno-instantiation-after-specialization \
 
 LOCAL_STATIC_LIBRARIES := \
     libpfw_utility$(SUFFIX) \
diff --git a/LibPfwUtility.mk b/LibPfwUtility.mk
index 0c8760e..2d0bcbf 100644
--- a/LibPfwUtility.mk
+++ b/LibPfwUtility.mk
@@ -42,4 +42,7 @@
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/upstream/utility/
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/upstream/utility/
-LOCAL_CFLAGS := -frtti -fexceptions
+LOCAL_CFLAGS := \
+    -frtti -fexceptions \
+    -Wall -Werror \
+
diff --git a/LibRemoteProcessor.mk b/LibRemoteProcessor.mk
index c96b8f4..320857d 100644
--- a/LibRemoteProcessor.mk
+++ b/LibRemoteProcessor.mk
@@ -60,6 +60,7 @@
     $(LOCAL_PATH)/support/android/asio
 
 LOCAL_CFLAGS :=  \
+    -Wall -Werror \
     -frtti -fexceptions \
     -isystem $(LOCAL_PATH)/asio/include
 
diff --git a/RemoteProcess.mk b/RemoteProcess.mk
index bd154d7..2578399 100644
--- a/RemoteProcess.mk
+++ b/RemoteProcess.mk
@@ -40,6 +40,7 @@
     $(LOCAL_PATH)/support/android/asio
 
 LOCAL_CFLAGS := \
+    -Wall -Werror \
     -frtti -fexceptions \
     -isystem $(LOCAL_PATH)/asio/include
 
diff --git a/TestPlatform.mk b/TestPlatform.mk
index a5bb764..82d0842 100644
--- a/TestPlatform.mk
+++ b/TestPlatform.mk
@@ -60,3 +60,5 @@
     -isystem $(LOCAL_PATH)/asio/include
 
 endif #ifeq ($(PFW_NETWORKING),false)
+
+LOCAL_CFLAGS += -Wall -Werror
diff --git a/XmlGenerator.mk b/XmlGenerator.mk
index 5bc2e4e..c1d9741 100644
--- a/XmlGenerator.mk
+++ b/XmlGenerator.mk
@@ -77,7 +77,7 @@
 LOCAL_MODULE_OWNER := intel
 LOCAL_STATIC_LIBRARIES := libpfw_utility_host
 LOCAL_SHARED_LIBRARIES := libparameter_host
-LOCAL_CFLAGS := -fexceptions
+LOCAL_CFLAGS := -fexceptions -Wall -Werror
 LOCAL_SRC_FILES := ./upstream/tools/xmlGenerator/domainGeneratorConnector.cpp
 include $(BUILD_HOST_EXECUTABLE)