diff --git a/tools/etc1tool/Android.mk b/tools/etc1tool/Android.mk
index 0cf7fe27a..1dacdca0c 100644
--- a/tools/etc1tool/Android.mk
+++ b/tools/etc1tool/Android.mk
@@ -9,12 +9,6 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := etc1tool.cpp
 
-LOCAL_C_INCLUDES += external/libpng
-LOCAL_C_INCLUDES += external/zlib
-LOCAL_C_INCLUDES += build/libs/host/include
-LOCAL_C_INCLUDES += frameworks/base/opengl/include
-
-#LOCAL_WHOLE_STATIC_LIBRARIES := 
 LOCAL_STATIC_LIBRARIES := \
 	libhost \
 	libexpat \
diff --git a/tools/etc1tool/etc1tool.cpp b/tools/etc1tool/etc1tool.cpp
index 4cc020290..376cbf843 100644
--- a/tools/etc1tool/etc1tool.cpp
+++ b/tools/etc1tool/etc1tool.cpp
@@ -28,7 +28,7 @@ int writePNGFile(const char* pOutput, png_uint_32 width, png_uint_32 height,
 const char* gpExeName;
 
 static
-void usage(char* message, ...) {
+void usage(const char* message, ...) {
     if (message) {
         va_list ap;
         va_start(ap, message);
@@ -97,11 +97,11 @@ int changeExtension(char* pPath, size_t pathCapacity, const char* pExtension) {
     return 0;
 }
 
-void PNGAPI user_error_fn(png_structp png_ptr, png_const_charp message) {
+void PNGAPI user_error_fn(png_structp /*png_ptr*/, png_const_charp message) {
     fprintf(stderr, "PNG error: %s\n", message);
 }
 
-void PNGAPI user_warning_fn(png_structp png_ptr, png_const_charp message) {
+void PNGAPI user_warning_fn(png_structp /*png_ptr*/, png_const_charp message) {
     fprintf(stderr, "PNG warning: %s\n", message);
 }