diff --git a/cmake/macos.cmake b/cmake/macos.cmake
index a15a86e3d..7510ba1fe 100644
--- a/cmake/macos.cmake
+++ b/cmake/macos.cmake
@@ -137,13 +137,13 @@ if(BUILD_PACKAGE)
     COMMAND create-dmg
       --volname "Lokinet ${PROJECT_VERSION}"
       --volicon lokinet.icns
-      #--background ... FIXME
+      --background "${PROJECT_SOURCE_DIR}/contrib/macos/installer.tiff"
       --text-size 16
       --icon-size 128
-      --window-size 500 300
-      --icon Lokinet.app 100 100
+      --window-size 555 440
+      --icon Lokinet.app 151 196
       --hide-extension Lokinet.app
-      --app-drop-link 350 100
+      --app-drop-link 403 196
       --eula "${PROJECT_SOURCE_DIR}/LICENSE"
       --no-internet-enable
       "${lokinet_installer}.dmg"
diff --git a/contrib/macos/installer.png b/contrib/macos/installer.png
new file mode 100644
index 000000000..1be3b2839
Binary files /dev/null and b/contrib/macos/installer.png differ
diff --git a/contrib/macos/installer.tiff b/contrib/macos/installer.tiff
new file mode 100644
index 000000000..569c5bcc1
Binary files /dev/null and b/contrib/macos/installer.tiff differ
diff --git a/contrib/macos/installer@2x.png b/contrib/macos/installer@2x.png
new file mode 100644
index 000000000..d8c289635
Binary files /dev/null and b/contrib/macos/installer@2x.png differ
diff --git a/llarp/bootstrap.cpp b/llarp/bootstrap.cpp
index 7d221ab66..32f830bdc 100644
--- a/llarp/bootstrap.cpp
+++ b/llarp/bootstrap.cpp
@@ -2,6 +2,7 @@
 #include "util/bencode.hpp"
 #include "util/logging.hpp"
 #include "util/logging/buffer.hpp"
+#include "util/fs.hpp"
 
 namespace llarp
 {
diff --git a/llarp/util/fs.hpp b/llarp/util/fs.hpp
index 09399646d..93f326fb3 100644
--- a/llarp/util/fs.hpp
+++ b/llarp/util/fs.hpp
@@ -1,5 +1,5 @@
 #pragma once
-
+#include <fstream>
 #ifdef USE_GHC_FILESYSTEM
 #include <ghc/filesystem.hpp>
 namespace fs = ghc::filesystem;
diff --git a/llarp/vpn/linux.hpp b/llarp/vpn/linux.hpp
index 9dcf9b761..cfc99cdc8 100644
--- a/llarp/vpn/linux.hpp
+++ b/llarp/vpn/linux.hpp
@@ -10,10 +10,7 @@
 #include <linux/if_tun.h>
 
 #include <cstring>
-#include <sys/types.h>
-#include <unistd.h>
 #include <arpa/inet.h>
-#include <sys/socket.h>
 #include <linux/rtnetlink.h>
 #include <llarp/net/net.hpp>
 #include <llarp/util/str.hpp>
@@ -24,6 +21,8 @@
 #include <llarp/router/abstractrouter.hpp>
 #include <llarp.hpp>
 
+#include <llarp/util/fs.hpp>
+
 namespace llarp::vpn
 {
   struct in6_ifreq