diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index c4b94da75f..fdda265064 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -15,7 +15,7 @@
 ##
 
 CC = gcc
-CFLAGS = -O2 -Wall -W
+CFLAGS = -O2 -Wall -Wextra
 PROGRAM = ectool
 INSTALL = /usr/bin/env install
 PREFIX  = /usr/local
diff --git a/util/ifdtool/Makefile b/util/ifdtool/Makefile
index 4cddfc5542..cc52b1ed4a 100644
--- a/util/ifdtool/Makefile
+++ b/util/ifdtool/Makefile
@@ -18,7 +18,7 @@ PROGRAM = ifdtool
 CC      = gcc
 INSTALL = /usr/bin/env install
 PREFIX  = /usr/local
-CFLAGS  = -O2 -g -Wall -W -Wmissing-prototypes -Werror -I../../src/commonlib/include
+CFLAGS  = -O2 -g -Wall -Wextra -Wmissing-prototypes -Werror -I../../src/commonlib/include
 LDFLAGS =
 
 OBJS = ifdtool.o
diff --git a/util/intelmetool/Makefile b/util/intelmetool/Makefile
index 45a87c7e28..55ba82a424 100644
--- a/util/intelmetool/Makefile
+++ b/util/intelmetool/Makefile
@@ -17,7 +17,7 @@ PROGRAM = intelmetool
 CC      ?= gcc
 INSTALL ?= /usr/bin/env install
 PREFIX  ?= /usr/local
-CFLAGS  ?= -O0 -g -Wall -W -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function
+CFLAGS  ?= -O0 -g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wno-unused-function
 LDFLAGS += -lpci -lz
 
 OBJS = intelmetool.o me.o me_status.o mmap.o rcba.o msr.o
diff --git a/util/inteltool/Makefile b/util/inteltool/Makefile
index 0f74a7c257..cd02fa8abe 100644
--- a/util/inteltool/Makefile
+++ b/util/inteltool/Makefile
@@ -22,7 +22,7 @@ top ?= $(abspath ../..)
 CC      ?= gcc
 INSTALL ?= /usr/bin/env install
 PREFIX  ?= /usr/local
-CFLAGS  ?= -O2 -g -Wall -W -Wmissing-prototypes
+CFLAGS  ?= -O2 -g -Wall -Wextra -Wmissing-prototypes
 LDFLAGS += -lpci -lz
 
 CPPFLAGS += -I$(top)/src/commonlib/include
diff --git a/util/nvramtool/Makefile b/util/nvramtool/Makefile
index 46297a2de9..c210234dbc 100644
--- a/util/nvramtool/Makefile
+++ b/util/nvramtool/Makefile
@@ -19,7 +19,7 @@ PROGRAM = nvramtool
 CC      = gcc
 INSTALL = /usr/bin/env install
 PREFIX  = /usr/local
-CFLAGS  = -O2 -g -Wall -W -Wmissing-prototypes -I. -DCMOS_HAL=1
+CFLAGS  = -O2 -g -Wall -Wextra -Wmissing-prototypes -I. -DCMOS_HAL=1
 #CFLAGS  = -Os -Wall
 
 CLI_OBJS = cli/nvramtool.o cli/opts.o
diff --git a/util/pmh7tool/Makefile b/util/pmh7tool/Makefile
index 384d3d9c4e..034ed40c59 100644
--- a/util/pmh7tool/Makefile
+++ b/util/pmh7tool/Makefile
@@ -14,7 +14,7 @@
 ##
 
 CC = gcc
-CFLAGS = -O2 -Wall -W -Werror
+CFLAGS = -O2 -Wall -Wextra -Werror
 PROGRAM = pmh7tool
 INSTALL = /usr/bin/env install
 PREFIX	= /usr/local
diff --git a/util/viatool/Makefile b/util/viatool/Makefile
index b2a62917d6..f58cbd37fb 100644
--- a/util/viatool/Makefile
+++ b/util/viatool/Makefile
@@ -21,7 +21,7 @@ PROGRAM = viatool
 CC      ?= gcc
 INSTALL ?= /usr/bin/env install
 PREFIX  ?= /usr/local
-CFLAGS  ?= -O2 -g -Wall -W -I$(CURDIR)
+CFLAGS  ?= -O2 -g -Wall -Wextra -I$(CURDIR)
 LDFLAGS += -lpci -lz
 
 SRCS =  viatool.c \