diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32a04a4b..c0c75e6d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -60,7 +60,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
         )
     endif()
 elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    # TODO: more tweaks
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -undefined dynamic_lookup")
 endif()
 
 # Compiler flags customization (by system)
diff --git a/client/Daemon.cpp b/client/Daemon.cpp
index 46ab2eb2..79b8032d 100644
--- a/client/Daemon.cpp
+++ b/client/Daemon.cpp
@@ -9,7 +9,7 @@
 #include "RouterInfo.h"
 #include "RouterContext.h"
 #include "tunnel/Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Garlic.h"
 #include "util/util.h"
 #include "Streaming.h"
diff --git a/client/HTTPServer.cpp b/client/HTTPServer.cpp
index 9a552912..617be9b5 100644
--- a/client/HTTPServer.cpp
+++ b/client/HTTPServer.cpp
@@ -7,7 +7,7 @@
 #include "tunnel/Tunnel.h"
 #include "tunnel/TransitTunnel.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/I2PEndian.h"
 #include "Streaming.h"
 #include "Destination.h"
diff --git a/client/i2pcontrol/I2PControl.cpp b/client/i2pcontrol/I2PControl.cpp
index eb699b24..059adbbc 100644
--- a/client/i2pcontrol/I2PControl.cpp
+++ b/client/i2pcontrol/I2PControl.cpp
@@ -15,7 +15,7 @@
 #include "util/Timestamp.h"
 #include "transport/Transports.h"
 #include "tunnel/Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "version.h"
 #include "Daemon.h"
 
diff --git a/core/AddressBook.cpp b/core/AddressBook.cpp
index fcb041f5..dde56ab0 100644
--- a/core/AddressBook.cpp
+++ b/core/AddressBook.cpp
@@ -12,7 +12,7 @@
 #include "util/util.h"
 #include "Identity.h"
 #include "util/Log.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "AddressBook.h"
 #include "Destination.h"
 
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index d14fccf6..c560ebcb 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -22,7 +22,7 @@ set(CORE_SRC
   "Identity.cpp"
   "LeaseSet.cpp"
   "NetDbRequests.cpp"	
-  "NetDb.cpp"
+  "NetworkDatabase.cpp"
   "Profiling.cpp"
   "RouterContext.cpp"
   "RouterInfo.cpp"
diff --git a/core/Destination.cpp b/core/Destination.cpp
index 456768c2..2b432f5f 100644
--- a/core/Destination.cpp
+++ b/core/Destination.cpp
@@ -5,7 +5,7 @@
 #include "util/util.h"
 #include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Destination.h"
 #include "AddressBook.h"
 
diff --git a/core/Destination.h b/core/Destination.h
index 789474e2..cf09ce36 100644
--- a/core/Destination.h
+++ b/core/Destination.h
@@ -14,7 +14,7 @@
 #include "crypto/CryptoConst.h"
 #include "LeaseSet.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Streaming.h"
 #include "Datagram.h"
 
diff --git a/core/I2NPProtocol.cpp b/core/I2NPProtocol.cpp
index 82a015d1..d069555f 100644
--- a/core/I2NPProtocol.cpp
+++ b/core/I2NPProtocol.cpp
@@ -5,7 +5,7 @@
 #include "crypto/ElGamal.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "tunnel/Tunnel.h"
 #include "transport/Transports.h"
 #include "Garlic.h"
diff --git a/core/LeaseSet.cpp b/core/LeaseSet.cpp
index 15771f65..30bc191e 100644
--- a/core/LeaseSet.cpp
+++ b/core/LeaseSet.cpp
@@ -5,7 +5,7 @@
 #include "crypto/CryptoConst.h"
 #include "util/Log.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "tunnel/TunnelPool.h"
 #include "LeaseSet.h"
 
diff --git a/core/NetDbRequests.cpp b/core/NetDbRequests.cpp
index 382d0e3b..9324e1aa 100644
--- a/core/NetDbRequests.cpp
+++ b/core/NetDbRequests.cpp
@@ -1,7 +1,7 @@
 #include "util/Log.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "NetDbRequests.h"
 
 namespace i2p
diff --git a/core/NetDb.cpp b/core/NetworkDatabase.cpp
similarity index 99%
rename from core/NetDb.cpp
rename to core/NetworkDatabase.cpp
index 23d69226..ad5ced7f 100644
--- a/core/NetDb.cpp
+++ b/core/NetworkDatabase.cpp
@@ -12,7 +12,7 @@
 #include "transport/Transports.h"
 #include "RouterContext.h"
 #include "Garlic.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 
 using namespace i2p::transport;
diff --git a/core/NetDb.h b/core/NetworkDatabase.h
similarity index 95%
rename from core/NetDb.h
rename to core/NetworkDatabase.h
index 84280332..f82ea37c 100644
--- a/core/NetDb.h
+++ b/core/NetworkDatabase.h
@@ -1,3 +1,8 @@
+/**
+ * @note This file is named NetworkDatabase.h instead of NetDb.h to avoid
+ *  a possible nameclash with a file included by boost on case insensitive
+ *  filesystems.
+ */
 #ifndef NETDB_H__
 #define NETDB_H__
 
diff --git a/core/Reseed.cpp b/core/Reseed.cpp
index 3e16f48b..37867b30 100644
--- a/core/Reseed.cpp
+++ b/core/Reseed.cpp
@@ -16,7 +16,7 @@
 #include "util/Log.h"
 #include "Identity.h"
 #include "crypto/CryptoConst.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 
 
diff --git a/core/RouterContext.cpp b/core/RouterContext.cpp
index 7032ea66..94a3eeec 100644
--- a/core/RouterContext.cpp
+++ b/core/RouterContext.cpp
@@ -6,7 +6,7 @@
 #include "RouterContext.h"
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 #include "version.h"
 
diff --git a/core/UPnP.cpp b/core/UPnP.cpp
index 175528b4..988484a3 100644
--- a/core/UPnP.cpp
+++ b/core/UPnP.cpp
@@ -17,7 +17,7 @@
 
 #include "RouterContext.h"
 #include "UPnP.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/util.h"
 
 #include <miniupnpc/miniupnpc.h>
diff --git a/core/api.cpp b/core/api.cpp
index cd24d15a..5cee6323 100644
--- a/core/api.cpp
+++ b/core/api.cpp
@@ -1,7 +1,7 @@
 #include <string>
 #include <map>
 #include "util/Log.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "transport/Transports.h"
 #include "tunnel/Tunnel.h"
 #include "RouterContext.h"
diff --git a/core/transport/NTCPSession.cpp b/core/transport/NTCPSession.cpp
index d323041b..7e70ee89 100644
--- a/core/transport/NTCPSession.cpp
+++ b/core/transport/NTCPSession.cpp
@@ -10,7 +10,7 @@
 #include "I2NPProtocol.h"
 #include "RouterContext.h"
 #include "Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "NTCPSession.h"
 
 using namespace i2p::crypto;
diff --git a/core/transport/SSU.cpp b/core/transport/SSU.cpp
index 9c1337ec..2b658e27 100644
--- a/core/transport/SSU.cpp
+++ b/core/transport/SSU.cpp
@@ -3,7 +3,7 @@
 #include "util/Log.h"
 #include "util/Timestamp.h"
 #include "RouterContext.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "SSU.h"
 
 namespace i2p
diff --git a/core/transport/SSUData.cpp b/core/transport/SSUData.cpp
index a1d49ba9..356e4e2b 100644
--- a/core/transport/SSUData.cpp
+++ b/core/transport/SSUData.cpp
@@ -2,7 +2,7 @@
 #include <boost/bind.hpp>
 #include "util/Log.h"
 #include "util/Timestamp.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "SSU.h"
 #include "SSUData.h"
 
diff --git a/core/transport/Transports.cpp b/core/transport/Transports.cpp
index 45e2346c..06eee72f 100644
--- a/core/transport/Transports.cpp
+++ b/core/transport/Transports.cpp
@@ -3,7 +3,7 @@
 #include "crypto/CryptoConst.h"
 #include "RouterContext.h"
 #include "I2NPProtocol.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Transports.h"
 
 using namespace i2p::data;
diff --git a/core/tunnel/Tunnel.cpp b/core/tunnel/Tunnel.cpp
index a209d3b8..1ecdf13d 100644
--- a/core/tunnel/Tunnel.cpp
+++ b/core/tunnel/Tunnel.cpp
@@ -9,7 +9,7 @@
 #include "util/Timestamp.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "Tunnel.h"
 
 namespace i2p
diff --git a/core/tunnel/TunnelEndpoint.cpp b/core/tunnel/TunnelEndpoint.cpp
index bd982358..38fc288d 100644
--- a/core/tunnel/TunnelEndpoint.cpp
+++ b/core/tunnel/TunnelEndpoint.cpp
@@ -1,7 +1,7 @@
 #include "util/I2PEndian.h"
 #include <string.h>
 #include "util/Log.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "I2NPProtocol.h"
 #include "transport/Transports.h"
 #include "RouterContext.h"
diff --git a/core/tunnel/TunnelPool.cpp b/core/tunnel/TunnelPool.cpp
index a790ca66..30ebf731 100644
--- a/core/tunnel/TunnelPool.cpp
+++ b/core/tunnel/TunnelPool.cpp
@@ -2,7 +2,7 @@
 #include "util/I2PEndian.h"
 #include "crypto/CryptoConst.h"
 #include "Tunnel.h"
-#include "NetDb.h"
+#include "NetworkDatabase.h"
 #include "util/Timestamp.h"
 #include "Garlic.h"
 #include "transport/Transports.h"