diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 46d146273..cd62d93d3 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -186,7 +186,7 @@ endif
 
 
 # compiler flags etc.
-BASECONLYFLAGS=-Wimplicit
+BASECONLYFLAGS=-Wimplicit -Wdeclaration-after-statement
 BASECXXFLAGS= -fno-exceptions -fno-rtti
 BASEASFLAGS=-s #-g
 BASELDFLAGS=
@@ -269,7 +269,7 @@ else
     W_NO_UNUSED_RESULT :=
 endif
 
-CWARNS := -W -Wall -Wdeclaration-after-statement -Werror-implicit-function-declaration \
+CWARNS := -W -Wall -Werror-implicit-function-declaration \
     -Wpointer-arith \
     -Wextra \
     #-Wstrict-prototypes \
diff --git a/polymer/eduke32/build/src/misc/makesdlkeytrans.c b/polymer/eduke32/build/src/misc/makesdlkeytrans.c
index ea76c1d59..91133d32f 100644
--- a/polymer/eduke32/build/src/misc/makesdlkeytrans.c
+++ b/polymer/eduke32/build/src/misc/makesdlkeytrans.c
@@ -146,7 +146,7 @@ static int buildkeytranslationtable(void)
 
 #undef main
 
-int main(int argc, char **argv)
+int main(void)
 {
     int i;
 
diff --git a/polymer/eduke32/build/src/util/arttool.cc b/polymer/eduke32/build/src/util/arttool.cc
index de3c6c1d6..19076229c 100644
--- a/polymer/eduke32/build/src/util/arttool.cc
+++ b/polymer/eduke32/build/src/util/arttool.cc
@@ -62,13 +62,13 @@ private:
 
     void writeShort(ofstream &ofs, short s)
     {
-        char d[2] = { s&255, (s>>8)&255 };
+        char d[2] = { static_cast<char>(s&255), static_cast<char>((s>>8)&255) };
         ofs.write(d, 2);
     }
 
     void writeLong(ofstream &ofs, long l)
     {
-        char d[4] = { l&255, (l>>8)&255, (l>>16)&255, (l>>24)&255 };
+        char d[4] = { static_cast<char>(l&255), static_cast<char>((l>>8)&255), static_cast<char>((l>>16)&255), static_cast<char>((l>>24)&255) };
         ofs.write(d, 4);
     }