diff --git a/tools/aidl/Android.mk b/tools/aidl/Android.mk
index cb94a3626270d..6866c6c9a55ae 100644
--- a/tools/aidl/Android.mk
+++ b/tools/aidl/Android.mk
@@ -8,6 +8,17 @@ ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
+LOCAL_CLANG_CFLAGS := -Wall -Werror
+# Tragically, the code is riddled with unused parameters.
+LOCAL_CLANG_CFLAGS += -Wno-unused-parameter
+# yacc dumps a lot of code *just in case*.
+LOCAL_CLANG_CFLAGS += -Wno-unused-function
+LOCAL_CLANG_CFLAGS += -Wno-unneeded-internal-declaration
+# yacc is a tool from a more civilized age.
+LOCAL_CLANG_CFLAGS += -Wno-deprecated-register
+# yacc also has a habit of using char* over const char*.
+LOCAL_CLANG_CFLAGS += -Wno-writable-strings
+
 LOCAL_SRC_FILES := \
     AST.cpp \
     Type.cpp \
@@ -22,7 +33,6 @@ LOCAL_SRC_FILES := \
     options.cpp \
     search_path.cpp \
 
-LOCAL_CFLAGS := -g
 LOCAL_MODULE := aidl
 LOCAL_MODULE_HOST_OS := darwin linux windows
 
diff --git a/tools/aidl/aidl.cpp b/tools/aidl/aidl.cpp
index 0ef4e278247ba..a4ecb758046e9 100644
--- a/tools/aidl/aidl.cpp
+++ b/tools/aidl/aidl.cpp
@@ -162,11 +162,6 @@ import_import_parsed(buffer_type* statement)
 {
 }
 
-static ParserCallbacks g_importCallbacks = {
-    &main_document_parsed,
-    &import_import_parsed
-};
-
 // ==========================================================
 static int
 check_filename(const char* filename, const char* package, buffer_type* name)