diff --git a/Makefile.bsd b/Makefile.bsd
index 59374f9d..edcc0b58 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -13,8 +13,7 @@ LDLIBS = -lcrypto -lssl -lz -lpthread -lboost_system -lboost_program_options
 ## custom FLAGS to work at build-time.
 CXXVER := $(shell $(CXX) -dumpversion)
 ifeq (${CXXVER}, "4.2.1") # older clang always returned 4.2.1
-	NEEDED_CXXFLAGS = -std=c++11
-	LDLIBS += -lboost_filesystem
+	$(error Compiler too old)
 else # newer versions support C++17
 	NEEDED_CXXFLAGS = -std=c++17
 endif
diff --git a/Makefile.linux b/Makefile.linux
index 5ac73b8b..88abdcbf 100644
--- a/Makefile.linux
+++ b/Makefile.linux
@@ -9,26 +9,17 @@ LDFLAGS ?= ${LD_DEBUG}
 ## -std=c++11. If you want to remove this variable please do so in a way that allows setting
 ## custom FDLAGS to work at build-time.
 
-# detect proper flag for c++11 support by compilers
+# detect proper flag for c++17 support by compilers
 CXXVER := $(shell $(CXX) -dumpversion)
 ifeq ($(shell expr match $(CXX) 'clang'),5)
-	NEEDED_CXXFLAGS += -std=c++11
-else ifeq ($(shell expr match ${CXXVER} "4\.[0-9][0-9]"),4) # gcc >= 4.10
-	NEEDED_CXXFLAGS += -std=c++11
-else ifeq ($(shell expr match ${CXXVER} "4\.[8-9]"),3) # gcc 4.8 - 4.9
-	NEEDED_CXXFLAGS += -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1
-else ifeq ($(shell expr match ${CXXVER} "[5-7]"),1) # gcc 5 - 7
-	NEEDED_CXXFLAGS += -std=c++11
-	LDLIBS = -latomic
+	NEEDED_CXXFLAGS += -std=c++17
 else ifeq ($(shell expr match ${CXXVER} "[8-9]"),1) # gcc 8 - 9
 	NEEDED_CXXFLAGS += -std=c++17
-	LDLIBS = -latomic -lstdc++fs
+	LDLIBS = -lstdc++fs
 else ifeq ($(shell expr match ${CXXVER} "1[0-2]"),2) # gcc 10 - 12
 	NEEDED_CXXFLAGS += -std=c++17
-	LDLIBS = -latomic
 else ifeq ($(shell expr match ${CXXVER} "1[3-9]"),2) # gcc 13+
 	NEEDED_CXXFLAGS += -std=c++20
-	LDLIBS = -latomic
 else # not supported
 $(error Compiler too old)
 endif
@@ -41,7 +32,6 @@ ifeq ($(USE_STATIC),yes)
 #   the shared libraries from the glibc version used for linking
 	LIBDIR := /usr/lib/$(SYS)
 	LDLIBS += $(LIBDIR)/libboost_system.a
-	LDLIBS += $(LIBDIR)/libboost_filesystem.a
 	LDLIBS += $(LIBDIR)/libboost_program_options.a
 	LDLIBS += $(LIBDIR)/libssl.a
 	LDLIBS += $(LIBDIR)/libcrypto.a
@@ -51,7 +41,7 @@ ifeq ($(USE_UPNP),yes)
 endif
 	LDLIBS += -lpthread -ldl
 else
-	LDLIBS += -lcrypto -lssl -lz -lboost_system -lboost_filesystem -lboost_program_options -lpthread
+	LDLIBS += -lcrypto -lssl -lz -lboost_system -lboost_program_options -lpthread -latomic
 ifeq ($(USE_UPNP),yes)
 	LDLIBS += -lminiupnpc
 endif
diff --git a/tests/Makefile b/tests/Makefile
index 7c44e467..798fab42 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -1,6 +1,6 @@
 SYS := $(shell $(CXX) -dumpmachine)
 
-CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -std=c++11 -D_GLIBCXX_USE_NANOSLEEP=1 -DOPENSSL_SUPPRESS_DEPRECATED -pthread -Wl,--unresolved-symbols=ignore-in-object-files
+CXXFLAGS += -Wall -Wno-unused-parameter -Wextra -pedantic -O0 -g -std=c++17 -D_GLIBCXX_USE_NANOSLEEP=1 -DOPENSSL_SUPPRESS_DEPRECATED -pthread -Wl,--unresolved-symbols=ignore-in-object-files
 INCFLAGS += -I../libi2pd
 
 LIBI2PD = ../libi2pd.a
@@ -18,7 +18,7 @@ ifneq (, $(findstring mingw, $(SYS))$(findstring windows-gnu, $(SYS))$(findstrin
 endif
 
 LDLIBS = \
-	-lboost_filesystem$(BOOST_SUFFIX) \
+	-lboost_system$(BOOST_SUFFIX) \
 	-lboost_program_options$(BOOST_SUFFIX) \
 	-lssl \
 	-lcrypto \