diff --git a/Tools/AP_Periph/AP_Periph.h b/Tools/AP_Periph/AP_Periph.h
index 376e7245ba0e0..7459a179eff41 100644
--- a/Tools/AP_Periph/AP_Periph.h
+++ b/Tools/AP_Periph/AP_Periph.h
@@ -26,7 +26,6 @@
 #include <AP_Scripting/AP_Scripting.h>
 #include <AP_HAL/CANIface.h>
 #include <AP_Stats/AP_Stats.h>
-#include <AP_Networking/AP_Networking.h>
 #include <AP_RPM/AP_RPM.h>
 #include <AP_SerialManager/AP_SerialManager.h>
 #include <AP_ESC_Telem/AP_ESC_Telem_config.h>
diff --git a/Tools/AP_Periph/networking.h b/Tools/AP_Periph/networking.h
index d25dc5aa7aaa7..6b7f857fdcde8 100644
--- a/Tools/AP_Periph/networking.h
+++ b/Tools/AP_Periph/networking.h
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "AP_Periph.h"
+#include <AP_HAL/AP_HAL_Boards.h>
 
 #ifdef HAL_PERIPH_ENABLE_NETWORKING
 
+#include <AP_Networking/AP_Networking.h>
+
 #ifndef HAL_PERIPH_NETWORK_NUM_PASSTHRU
 #define HAL_PERIPH_NETWORK_NUM_PASSTHRU 2
 #endif
diff --git a/Tools/AP_Periph/networking_passthru.cpp b/Tools/AP_Periph/networking_passthru.cpp
index 18ed58bf68bac..3d2f65a1cad7b 100644
--- a/Tools/AP_Periph/networking_passthru.cpp
+++ b/Tools/AP_Periph/networking_passthru.cpp
@@ -13,7 +13,7 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "networking.h"
+#include "AP_Periph.h"
 
 #if defined(HAL_PERIPH_ENABLE_NETWORKING) && HAL_PERIPH_NETWORK_NUM_PASSTHRU > 0
 
diff --git a/libraries/AP_Networking/AP_Networking_port.cpp b/libraries/AP_Networking/AP_Networking_port.cpp
index 23c43df13304f..3cb6a2f3d17db 100644
--- a/libraries/AP_Networking/AP_Networking_port.cpp
+++ b/libraries/AP_Networking/AP_Networking_port.cpp
@@ -353,9 +353,11 @@ bool AP_Networking::Port::send_receive(void)
         // handle outgoing packets
         uint32_t available = writebuffer->available();
         available = MIN(300U, available);
+#if HAL_GCS_ENABLED
         if (packetise) {
             available = mavlink_packetise(*writebuffer, available);
         }
+#endif
         if (available > 0) {
             uint8_t buf[available];
             auto n = writebuffer->peekbytes(buf, available);