diff --git a/Makefile b/Makefile
index d250f091..db38b237 100644
--- a/Makefile
+++ b/Makefile
@@ -24,16 +24,16 @@ obj:
 
 # weaker rule for building files without headers
 obj/%.o : %.cpp
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) $(INCFLAGS) -c -o $@ $<
 
 obj/%.o : %.cpp %.h
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -c -o $@ $<
+	$(CXX) $(CXXFLAGS) $(INCFLAGS) -c -o $@ $<
 
 $(I2PD):  $(patsubst %.cpp,obj/%.o,$(DAEMON_SRC))
-	$(CXX) -o $@ $^ $(LDLIBS) $(LDFLAGS) $(LIBS)
+	$(CXX) -o $@ $(LDLIBS) $(LDFLAGS) $(LIBS) $^
 
 $(SHLIB): $(patsubst %.cpp,obj/%.o,$(LIB_SRC))
-	$(CXX) $(CXXFLAGS) $(NEEDED_CXXFLAGS) $(INCFLAGS) -shared -o $@ $^
+	$(CXX) -o $@ -shared $(CXXFLAGS) $(INCFLAGS) $^
 
 clean:
 	rm -fr obj $(I2PD) $(SHLIB)
diff --git a/Makefile.bsd b/Makefile.bsd
index 777e6a73..b160f0c8 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -1,6 +1,5 @@
 CXX = g++
-CXXFLAGS = -O2
-NEEDED_CXXFLAGS = -std=c++11
+CXXFLAGS = -g -Wall -O2 -std=c++11
 INCFLAGS = -I/usr/include/ -I/usr/local/include/
 LDFLAGS = -Wl,-rpath,/usr/local/lib -L/usr/local/lib
 LDLIBS = -lcryptopp -lboost_system -lboost_date_time -lboost_filesystem -lboost_regex -lboost_program_options -lpthread
diff --git a/Makefile.linux b/Makefile.linux
index 5fbaa815..84d47e68 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -5,13 +5,13 @@ FGREP = fgrep
 IS_64 := $(shell $(CXX) -dumpmachine 2>&1 | $(FGREP) -c "64")
 USE_AESNI := yes
 ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # >= 4.10
-NEEDED_CXXFLAGS += -std=c++11
+CXXFLAGS += -std=c++11
 else ifeq ($(shell expr match ${CXXVER} "4\.[7-9]"),3) # >= 4.7
-NEEDED_CXXFLAGS += -std=c++11
+CXXFLAGS += -std=c++11
 else ifeq ($(shell expr match ${CXXVER} "4\.6"),3) # = 4.6
-NEEDED_CXXFLAGS += -std=c++0x
+CXXFLAGS += -std=c++0x
 else ifeq ($(shell expr match $(CXX) 'clang'),5)
-NEEDED_CXXFLAGS += -std=c++11
+CXXFLAGS += -std=c++11
 else # not supported
 $(error Compiler too old)
 endif