diff --git a/src/Makefile b/src/Makefile
index d4a2a01d..3feaf11b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -219,7 +219,11 @@ ifeq ($(COMP),icc)
 endif
 
 ### 3.2 General compiler settings
-CXXFLAGS = -g -Wall -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
+CXXFLAGS = -g -Wall -Wcast-qual -ansi -fno-exceptions -fno-rtti $(EXTRACXXFLAGS)
+
+ifeq ($(comp),gcc)
+	CXXFLAGS += -pedantic -Wno-long-long -Wextra
+endif
 
 ifeq ($(comp),icc)
 	CXXFLAGS += -wd383,869,981,10187,10188,11505,11503