diff --git a/Makefile.conf b/Makefile.conf
index f4c1b40..7e79ab6 100644
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -12,13 +12,11 @@ TARGET=libpEpAdapter.a
 DEBUG=1
 PREFIX?=$(HOME)
 
-CXXFLAGS+=-std=c++11 -fPIC
-
 # Overrides
 -include $(HERE)local.conf
 
 # Constants
-CXXFLAGS+=-std=c++11 -fPIC
+CXXFLAGS+=-std=c++11 -fPIC -Wall -Wextra -pedantic
 CXXFLAGS+=-I$(PREFIX)/include
 LDFLAGS+=-L$(PREFIX)/lib
 
diff --git a/src/Makefile b/src/Makefile
index 6310421..6ce2f6e 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -12,7 +12,6 @@ OBJ_CXX=$(subst .cc,.o,$(SRC_CXX))
 OBJ_C=$(subst .c,.o,$(SRC_C))
 OBJECTS=$(OBJ_CXX) $(OBJ_C)
 DEPENDS=$(subst .cc,.d,$(SRC_CXX))
-CFLAGS=-fPIC
 CXXFLAGS+= -MMD -MP
 
 ifneq ($(MAKECMDGOALS),clean)