diff --git a/scons/gallium.py b/scons/gallium.py
index ee22110..31236c4 100644
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -334,6 +334,7 @@
             '-Wall',
             '-Wmissing-prototypes',
             '-Wno-long-long',
+            '-Wdeclaration-after-statement',
             '-ffast-math',
             '-std=gnu99',
             '-fmessage-length=0', # be nice to Eclipse
diff --git a/scons/generic.py b/scons/generic.py
index def2e41..26ba309 100644
--- a/scons/generic.py
+++ b/scons/generic.py
@@ -409,13 +409,11 @@
             '-Wall',
             '-Wmissing-prototypes',
             '-Wno-long-long',
+            '-Wdeclaration-after-statement',
             '-ffast-math',
             '-pedantic',
             '-fmessage-length=0', # be nice to Eclipse
         ]
-        cflags += [
-            '-Wmissing-prototypes',
-        ]
     if msvc:
         # See also:
         # - http://msdn.microsoft.com/en-us/library/19z1t1wy.aspx