diff --git a/Android.mk b/Android.mk
index ba3d0c1..ce73637 100644
--- a/Android.mk
+++ b/Android.mk
@@ -34,6 +34,7 @@
 #
 ifeq ($(TARGET_BUILD_VARIANT),user)
 PFW_NETWORKING := false
+PFW_NETWORKING_SUFFIX := -no-networking
 endif
 
 LOCAL_PATH := $(call my-dir)
@@ -96,7 +97,4 @@
 include $(LOCAL_PATH)/XmlGenerator.mk
 include $(LOCAL_PATH)/Schemas.mk
 
-# Clear variables for further use
-PFW_NETWORKING :=
-
 endif #ifneq ($(USE_CUSTOM_PARAMETER_FRAMEWORK), true)
diff --git a/LibParameter.mk b/LibParameter.mk
index d773321..fa7d26f 100644
--- a/LibParameter.mk
+++ b/LibParameter.mk
@@ -142,13 +142,12 @@
 
 LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
 
-LOCAL_SHARED_LIBRARIES := libremote-processor$(SUFFIX)
+LOCAL_SHARED_LIBRARIES := libremote-processor$(PFW_NETWORKING_SUFFIX)$(SUFFIX)
 LOCAL_C_INCLUDES += \
     external/libxml2/include \
     external/icu/icu4c/source/common
 
-LOCAL_CFLAGS := -frtti -isystem
-LOCAL_CPPFLAGS += -fexceptions
+LOCAL_CFLAGS := -frtti -fexceptions
 
 LOCAL_STATIC_LIBRARIES := \
     libpfw_utility$(SUFFIX) \
diff --git a/LibPfwUtility.mk b/LibPfwUtility.mk
index 25d4155..d2b3fbe 100644
--- a/LibPfwUtility.mk
+++ b/LibPfwUtility.mk
@@ -38,17 +38,17 @@
     upstream/utility/DynamicLibrary.cpp \
     upstream/utility/posix/DynamicLibrary.cpp \
     upstream/utility/Tokenizer.cpp \
-    upstream/utility/Utility.cpp \
+    upstream/utility/Utility.cpp
 
 target_copy_headers := \
     upstream/utility/NonCopyable.hpp \
     upstream/utility/ErrorContext.hpp \
     upstream/utility/Utility.h \
-    upstream/utility/convert.hpp \
+    upstream/utility/convert.hpp
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/upstream/utility/
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/upstream/utility/
-LOCAL_CFLAGS += -frtti -fexceptions
+LOCAL_CFLAGS := -frtti -fexceptions
 
 LOCAL_COPY_HEADERS := $(target_copy_headers)
 
diff --git a/LibRemoteProcessor.mk b/LibRemoteProcessor.mk
index 0b033e7..ed437ee 100644
--- a/LibRemoteProcessor.mk
+++ b/LibRemoteProcessor.mk
@@ -32,7 +32,7 @@
 SUFFIX :=
 endif
 
-LOCAL_MODULE := libremote-processor$(SUFFIX)
+LOCAL_MODULE := libremote-processor$(PFW_NETWORKING_SUFFIX)$(SUFFIX)
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_SRC_FILES := \
     upstream/remote-processor/RequestMessage.cpp \
@@ -46,8 +46,7 @@
     $(LOCAL_PATH)/support/android/remote-processor/
 
 LOCAL_STATIC_LIBRARIES := libpfw_utility$(SUFFIX)
-LOCAL_CFLAGS := -frtti -isystem
-LOCAL_CPPFLAGS += -fexceptions
+LOCAL_CFLAGS := -frtti -fexceptions
 
 LOCAL_C_INCLUDES := $(LOCAL_EXPORT_C_INCLUDE_DIRS)
 
@@ -58,13 +57,12 @@
 else
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/asio/include \
     $(LOCAL_PATH)/support/android/asio
 
-LOCAL_CFLAGS +=  \
-    -DASIO_STANDALONE -frtti \
-    -DASIO_DISABLE_STD_SYSTEM_ERROR -fexceptions
+LOCAL_CFLAGS :=  \
+    -frtti -fexceptions \
+    -isystem $(LOCAL_PATH)/asio/include
 
-endif #ifneq ($(PFW_NETWORKING),false)
+endif #ifeq ($(PFW_NETWORKING),false)
 
-LOCAL_CLANG := true
\ No newline at end of file
+LOCAL_CLANG := true
diff --git a/RemoteProcess.mk b/RemoteProcess.mk
index 8dae0e4..d30020f 100644
--- a/RemoteProcess.mk
+++ b/RemoteProcess.mk
@@ -32,7 +32,7 @@
 SUFFIX :=
 endif
 
-LOCAL_MODULE := remote_process$(SUFFIX)
+LOCAL_MODULE := remote-process$(SUFFIX)
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_SRC_FILES := upstream/remote-process/main.cpp
 LOCAL_C_INCLUDES := \
@@ -40,10 +40,9 @@
     $(LOCAL_PATH)/support/android/asio
 
 LOCAL_CFLAGS := \
-    -DASIO_STANDALONE -frtti -isystem \
-    $(LOCAL_PATH)/asio/include -DASIO_DISABLE_STD_SYSTEM_ERROR \
-    -fexceptions
+    -frtti -fexceptions \
+    -isystem $(LOCAL_PATH)/asio/include
 
-LOCAL_SHARED_LIBRARIES := libremote-processor$(SUFFIX)
+LOCAL_SHARED_LIBRARIES := libremote-processor$(PFW_NETWORKING_SUFFIX)$(SUFFIX)
 
-LOCAL_CLANG := true
\ No newline at end of file
+LOCAL_CLANG := true
diff --git a/TestPlatform.mk b/TestPlatform.mk
index 7a8dc5d..dbba719 100644
--- a/TestPlatform.mk
+++ b/TestPlatform.mk
@@ -43,24 +43,22 @@
 LOCAL_STATIC_LIBRARIES := libpfw_utility$(SUFFIX)
 LOCAL_SHARED_LIBRARIES := \
     libparameter$(SUFFIX) \
-    libremote-processor$(SUFFIX)
+    libremote-processor$(PFW_NETWORKING_SUFFIX)$(SUFFIX)
 
 ifeq ($(PFW_NETWORKING),false)
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)/upstream/asio/stub
-LOCAL_CFLAGS := -frtti -isystem
-LOCAL_CPPFLAGS += -fexceptions
+LOCAL_CFLAGS := -frtti -fexceptions
 
 else
 
 LOCAL_C_INCLUDES += \
-    $(LOCAL_PATH)/asio/include \
     $(LOCAL_PATH)/support/android/asio
 
-LOCAL_CFLAGS +=  \
-    -DASIO_STANDALONE -frtti -isystem \
-    -DASIO_DISABLE_STD_SYSTEM_ERROR -fexceptions
+LOCAL_CFLAGS :=  \
+    -frtti -fexceptions \
+    -isystem $(LOCAL_PATH)/asio/include
 
 endif #ifeq ($(PFW_NETWORKING),false)
 
-LOCAL_CLANG := true
\ No newline at end of file
+LOCAL_CLANG := true