diff --git a/lib/nanopb/src/pb.h b/lib/nanopb/include/pb.h
similarity index 100%
rename from lib/nanopb/src/pb.h
rename to lib/nanopb/include/pb.h
diff --git a/lib/nanopb/src/pb_common.h b/lib/nanopb/include/pb_common.h
similarity index 100%
rename from lib/nanopb/src/pb_common.h
rename to lib/nanopb/include/pb_common.h
diff --git a/lib/nanopb/src/pb_decode.h b/lib/nanopb/include/pb_decode.h
similarity index 100%
rename from lib/nanopb/src/pb_decode.h
rename to lib/nanopb/include/pb_decode.h
diff --git a/lib/nanopb/src/pb_encode.h b/lib/nanopb/include/pb_encode.h
similarity index 100%
rename from lib/nanopb/src/pb_encode.h
rename to lib/nanopb/include/pb_encode.h
diff --git a/platformio.ini b/platformio.ini
index 46c72b14..1db164b1 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -31,7 +31,7 @@ board_build.partitions = partition-table.csv
 
 ; note: we add src to our include search path so that lmic_project_config can override
 ; FIXME: fix lib/BluetoothOTA dependency back on src/ so we can remove -Isrc
-build_flags = -Wno-missing-field-initializers -Isrc -Isrc/rf95 -Isrc/mesh -Os -Wl,-Map,.pio/build/output.map 
+build_flags = -Wno-missing-field-initializers -Isrc -Isrc/rf95 -Isrc/mesh -Ilib/nanopb/include -Os -Wl,-Map,.pio/build/output.map 
   -DAXP_DEBUG_PORT=Serial 
   -DHW_VERSION_${sysenv.COUNTRY}
   -DAPP_VERSION=${sysenv.APP_VERSION}