diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 976951b4f5..39d1c0b8ce 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -32,6 +32,7 @@ build_flags =
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
+  -lstdc++fs
   -lbluetooth
   -lgpiod
   -lyaml-cpp
diff --git a/src/mesh/StreamAPI.h b/src/mesh/StreamAPI.h
index 45cbb231c7..6e0364bc13 100644
--- a/src/mesh/StreamAPI.h
+++ b/src/mesh/StreamAPI.h
@@ -3,6 +3,7 @@
 #include "PhoneAPI.h"
 #include "Stream.h"
 #include "concurrency/OSThread.h"
+#include <cstdarg>
 
 // A To/FromRadio packet + our 32 bit header
 #define MAX_STREAM_BUF_SIZE (MAX_TO_FROM_RADIO_SIZE + sizeof(uint32_t))
diff --git a/src/modules/PositionModule.cpp b/src/modules/PositionModule.cpp
index b7def82426..f80d3eb679 100644
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -16,10 +16,7 @@
 #include "meshtastic/atak.pb.h"
 #include "sleep.h"
 #include "target_specific.h"
-
-extern "C" {
 #include <Throttle.h>
-}
 
 PositionModule *positionModule;
 
diff --git a/variants/portduino/platformio.ini b/variants/portduino/platformio.ini
index 46417e388e..aa11142f71 100644
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -2,7 +2,8 @@
 extends = portduino_base
 ; The pkg-config commands below optionally add link flags.
 ; the || : is just a "or run the null command" to avoid returning an error code
-build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino -I /usr/include
+build_flags = ${portduino_base.build_flags} -O0 -I variants/portduino
+  -I /usr/include
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
 board = cross_platform