diff --git a/Makefile b/Makefile
index c2e938ab87..d3b03825df 100644
--- a/Makefile
+++ b/Makefile
@@ -299,7 +299,7 @@ ifeq ($(DEBUG), 1)
    OPTIMIZE_FLAG = -O0
 endif
 
-CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I. -pedantic
+CFLAGS += -Wall $(OPTIMIZE_FLAG) $(INCLUDE_DIRS) -g -I.
 ifeq ($(CXX_BUILD), 1)
    LD = $(CXX)
    CFLAGS += -std=c++0x -xc++ -D__STDC_CONSTANT_MACROS
@@ -315,9 +315,6 @@ endif
 ifeq ($(NOUNUSED), yes)
    CFLAGS += -Wno-unused-result
 endif
-ifeq ($(NOEXTTOKEN), yes)
-   CFLAGS += -Wno-language-extension-token
-endif
 
 all: $(TARGET) config.mk
 
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 7cecd5bcbc..e27a35da22 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -1,9 +1,7 @@
 check_switch_c C99 -std=gnu99  "Cannot find C99 compatible compiler."
 
 check_switch_c NOUNUSED -Wno-unused-result
-check_switch_c NOEXTTOKEN -Wno-language-extension-token
 add_define_make NOUNUSED "$HAVE_NOUNUSED"
-add_define_make NOEXTTOKEN "$HAVE_NOEXTTOKEN"
 
 # There are still broken 64-bit Linux distros out there. :)
 [ -d /usr/lib64 ] && add_library_dirs /usr/lib64