diff --git a/tools/Makefile b/tools/Makefile
index f0687de..87e04ff 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -5,7 +5,9 @@
 # Licensed under the GNU Public License.
 
 CC	= gcc
-CFLAGS	= -Wall -I../include
+CFLAGS	= -Wall -Wstrict-prototypes -Wshadow -Wpointer-arith -Wcast-qual \
+	  -Wcast-align -Wwrite-strings -Wnested-externs -Winline -W \
+	  -I../include
 
 CFLAGS	+= -O2
 # When debugging, use the following instead
diff --git a/tools/i2cdetect.c b/tools/i2cdetect.c
index a28a6a1..d1843a9 100644
--- a/tools/i2cdetect.c
+++ b/tools/i2cdetect.c
@@ -152,7 +152,7 @@ static const struct func all_func[] = {
 	  .name = "I2C Block Write" },
 	{ .value = I2C_FUNC_SMBUS_READ_I2C_BLOCK,
 	  .name = "I2C Block Read" },
-	{ }
+	{ .value = 0, .name = "" }
 };
 
 void print_functionality(unsigned long funcs)