diff --git a/Android.mk b/Android.mk
index 5f654f6..c0525ae 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,15 +20,12 @@
 # ========================================================
 
 libweaveCommonCppExtension := .cc
-libweaveCommonCFlags := -Wall -Werror \
-	-Wno-char-subscripts -Wno-missing-field-initializers \
-	-Wno-unused-function -Wno-unused-parameter
+libweaveCommonCFlags := \
+	-Wall -Wextra -Werror \
+	-Wno-missing-field-initializers \
+	-Wno-unused-parameter \
 
-libweaveCommonCppFlags := \
-	-Wno-deprecated-register \
-	-Wno-sign-compare \
-	-Wno-sign-promo \
-	-Wno-non-virtual-dtor \
+libweaveCommonCppFlags :=
 
 libweaveCommonCIncludes := \
 	$(LOCAL_PATH)/.. \