diff --git a/Makefile.pc b/Makefile.pc
index 4cd7537..e6f9c3c 100644
--- a/Makefile.pc
+++ b/Makefile.pc
@@ -27,7 +27,7 @@ test : pc_main/main.cpp pc_main/pc_launch.c \
 	build_pc/interuiregular14.o build_pc/interuiregular18.o \
 	build_pc/invalid_icon.bin.o build_pc/folder_icon.bin.o \
 	build_pc/button_a_light.bin.o build_pc/button_a_dark.bin.o build_pc/button_b_light.bin.o build_pc/button_b_dark.bin.o build_pc/hbmenu_logo_light.bin.o build_pc/hbmenu_logo_dark.bin.o
-	gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -I$(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@
+	gcc -Wall -O2 -g -DVERSION=\"v$(APP_VERSION)\" $(EXTRA_CFLAGS) $^ -lsfml-graphics -lsfml-window -lsfml-system -lstdc++ -lm -lz $(EXTRA_LDFLAGS) -I. -iquote $(DEVKITPRO)/libnx/include -Ibuild_pc -g -o $@
 
 build_pc/tahoma12.o	:	data/tahoma12.nxfnt
 	mkdir -p $(dir $@)
diff --git a/common/common.h b/common/common.h
index 3fd9212..eb63c10 100644
--- a/common/common.h
+++ b/common/common.h
@@ -54,7 +54,7 @@ typedef union {
 
 // when building for pc we need to include nro.h separately
 #ifndef __SWITCH__
-#include <switch/nro.h>
+#include "switch/nro.h"
 #endif
 
 void menuStartup();
diff --git a/common/netloader.c b/common/netloader.c
index f536e57..eee0768 100644
--- a/common/netloader.c
+++ b/common/netloader.c
@@ -32,6 +32,7 @@ typedef uint32_t in_addr_t;
 
 // having trouble with non blocking sockets & udp on switch currently
 #ifndef __SWITCH__
+#include "switch/runtime/nxlink.h"
 #define PING_ENABLED 1
 #else
 #define PING_ENABLED 0