diff --git a/Android.bp b/Android.bp
deleted file mode 100644
index f6f6509..0000000
--- a/Android.bp
+++ /dev/null
@@ -1,12 +0,0 @@
-cc_defaults {
-    name: "system-extras-cflags-defaults",
-    cflags: [
-        "-Wall",
-        "-Werror",
-        "-Wno-unused-parameter",
-    ],
-    clang_cflags: [
-        "-Wno-incompatible-pointer-types-discards-qualifiers",
-        "-Wno-unused-const-variable",
-    ],
-}
diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
index e7d5a8e..ead4d4d 100644
--- a/ext4_utils/Android.bp
+++ b/ext4_utils/Android.bp
@@ -2,7 +2,6 @@
 
 cc_library {
     name: "libext4_utils",
-    defaults: ["system-extras-cflags-defaults"],
     host_supported: true,
     recovery_available: true,
     srcs: [
@@ -11,7 +10,7 @@
         "ext4_sb.c",
     ],
     // Various instances of dereferencing a type-punned pointer in extent.c
-    cflags: ["-fno-strict-aliasing"],
+    cflags: ["-Werror", "-fno-strict-aliasing"],
     export_include_dirs: ["include"],
     shared_libs: [
         "libsparse",
diff --git a/ext4_utils/ext4_crypt_init_extensions.cpp b/ext4_utils/ext4_crypt_init_extensions.cpp
index 52030fa..c067bb9 100644
--- a/ext4_utils/ext4_crypt_init_extensions.cpp
+++ b/ext4_utils/ext4_crypt_init_extensions.cpp
@@ -39,7 +39,6 @@
 #define TAG "ext4_utils"
 
 static const std::string arbitrary_sequence_number = "42";
-static const int vold_command_timeout_ms = 60 * 1000;
 
 static int set_system_de_policy_on(char const* dir);
 
diff --git a/ext4_utils/ext4_utils.c b/ext4_utils/ext4_utils.c
index 7be2853..04e2b6d 100644
--- a/ext4_utils/ext4_utils.c
+++ b/ext4_utils/ext4_utils.c
@@ -221,7 +221,7 @@
 	return size;
 }
 
-int is_block_device_fd(int fd)
+int is_block_device_fd(int fd __attribute__((unused)))
 {
 #ifdef _WIN32
 	return 0;
diff --git a/ext4_utils/wipe.c b/ext4_utils/wipe.c
index a519d74..7bda71c 100644
--- a/ext4_utils/wipe.c
+++ b/ext4_utils/wipe.c
@@ -68,7 +68,7 @@
 
 #else  /* WIPE_IS_SUPPORTED */
 
-int wipe_block_device(int fd, s64 len)
+int wipe_block_device(int fd __attribute__((unused)), s64 len __attribute__((unused)))
 {
 	/* Wiping is not supported on this platform. */
 	return 1;
diff --git a/f2fs_utils/Android.bp b/f2fs_utils/Android.bp
index 7a83278..f673eca 100644
--- a/f2fs_utils/Android.bp
+++ b/f2fs_utils/Android.bp
@@ -2,7 +2,7 @@
 
 cc_library_shared {
     name: "libf2fs_sparseblock",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
 
     srcs: ["f2fs_sparseblock.c"],
 
@@ -21,7 +21,7 @@
 
 cc_binary {
     name: "f2fs_sparseblock",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
 
     srcs: ["f2fs_sparseblock.c"],
 
diff --git a/libpagemap/Android.bp b/libpagemap/Android.bp
index 3baa400..6a7ee26 100644
--- a/libpagemap/Android.bp
+++ b/libpagemap/Android.bp
@@ -14,7 +14,7 @@
 
 cc_library {
     name: "libpagemap",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     vendor_available: true,
     vndk: {
         enabled: true,
@@ -31,28 +31,28 @@
 
 cc_binary {
     name: "librank",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     srcs: ["librank.cpp"],
     shared_libs: ["libpagemap"],
 }
 
 cc_binary {
     name: "procmem",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     srcs: ["procmem.cpp"],
     shared_libs: ["libpagemap"],
 }
 
 cc_binary {
     name: "procrank",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     srcs: ["procrank.cpp"],
     shared_libs: ["libpagemap", "libbase"],
 }
 
 cc_test {
     name: "pagemap_test",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     srcs: ["pagemap_test.cpp"],
     shared_libs: ["libpagemap"],
     required: ["libpagemap"],
@@ -60,7 +60,7 @@
 
 cc_test {
     name: "pagemap_static_test",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     srcs: ["pagemap_test.cpp"],
     static_libs: ["libpagemap"],
 }
diff --git a/libpagemap/pm_kernel.c b/libpagemap/pm_kernel.c
index ec47516..1a3f70b 100644
--- a/libpagemap/pm_kernel.c
+++ b/libpagemap/pm_kernel.c
@@ -75,7 +75,7 @@
 }
 
 #define INIT_PIDS 20
-int pm_kernel_pids(pm_kernel_t *ker, pid_t **pids_out, size_t *len) {
+int pm_kernel_pids(pm_kernel_t *ker __unused, pid_t **pids_out, size_t *len) {
     DIR *proc;
     struct dirent *dir;
     pid_t pid, *pids, *new_pids;
diff --git a/squashfs_utils/Android.bp b/squashfs_utils/Android.bp
index 56d50a0..d09dad6 100644
--- a/squashfs_utils/Android.bp
+++ b/squashfs_utils/Android.bp
@@ -2,7 +2,7 @@
 
 cc_library {
     name: "libsquashfs_utils",
-    defaults: ["system-extras-cflags-defaults"],
+    cflags: ["-Werror"],
     host_supported: true,
     recovery_available: true,
     srcs: [