diff --git a/Android.mk b/Android.mk
index 2329f32..cc47da7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -6,16 +6,16 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := parsersvg
 
 # name of the dependency
-LOCAL_STATIC_LIBRARIES := libetk libagg libtinyxml
+LOCAL_STATIC_LIBRARIES := etk agg tinyxml
 
-LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_C_INCLUDES :=
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 ifeq ($(DEBUG),1)
 LOCAL_CFLAGS := -D__PLATFORM__Android \
                 -DSVG_DEBUG_LEVEL=3 \
-                -DPARSER_SVG_VERSION_TAG_NAME="\"???-debug\"" \
+                -DPARSER_SVG_VERSION_TAG_NAME="\"???-debug\""
 else
 LOCAL_CFLAGS := -D__PLATFORM__Android \
                 -DSVG_DEBUG_LEVEL=1 \
diff --git a/Linux.mk b/Linux.mk
index 126e083..9ad90d1 100644
--- a/Linux.mk
+++ b/Linux.mk
@@ -8,17 +8,18 @@ LOCAL_MODULE := parsersvg
 # name of the dependency
 LOCAL_STATIC_LIBRARIES := etk agg tinyxml
 
-LOCAL_C_INCLUDES := 
+LOCAL_C_INCLUDES :=
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
 ifeq ($(DEBUG),1)
 LOCAL_CFLAGS := -D__PLATFORM__Linux \
                 -DSVG_DEBUG_LEVEL=3 \
-                -Wall
+                -DPARSER_SVG_VERSION_TAG_NAME="\"???-debug\""
 else
 LOCAL_CFLAGS := -D__PLATFORM__Linux \
-                -DSVG_DEBUG_LEVEL=1
+                -DSVG_DEBUG_LEVEL=1 \
+                -DPARSER_SVG_VERSION_TAG_NAME="\"???-release\""
 endif
 
 # load the common sources file of the platform