diff --git a/pjnath/build/Makefile b/pjnath/build/Makefile
index 2f265f17d..7343d9227 100644
--- a/pjnath/build/Makefile
+++ b/pjnath/build/Makefile
@@ -9,7 +9,7 @@ RULES_MAK := $(PJDIR)/build/rules.mak
 
 PJLIB_LIB:=../../pjlib/lib/libpj-$(TARGET_NAME)$(LIBEXT)
 PJLIB_UTIL_LIB:=../../pjlib-util/lib/libpjlib-util-$(TARGET_NAME)$(LIBEXT)
-PJNATH_LIB:=../../pjnath/lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
+export PJNATH_LIB:=../lib/libpjnath-$(TARGET_NAME)$(LIBEXT)
 
 ###############################################################################
 # Gather all flags.
diff --git a/pjnath/src/pjnath/ice_session.c b/pjnath/src/pjnath/ice_session.c
index d68117689..aa83fe248 100644
--- a/pjnath/src/pjnath/ice_session.c
+++ b/pjnath/src/pjnath/ice_session.c
@@ -1452,12 +1452,8 @@ static pj_status_t start_periodic_check(pj_timer_heap_t *th,
     }
 
     /* Cannot start check because there's no suitable candidate pair.
-     * Set checklist state to Completed.
      */
-    if (start_count==0) {
-	clist_set_state(ice, clist, PJ_ICE_SESS_CHECKLIST_ST_COMPLETED);
-
-    } else {
+    if (start_count!=0) {
 	/* Schedule for next timer */
 	pj_time_val timeout = {0, PJ_ICE_TA_VAL};
 
diff --git a/third_party/build/portaudio/src/pa_allocation.c b/third_party/build/portaudio/src/pa_allocation.c
index 44929773f..adbf57756 120000
--- a/third_party/build/portaudio/src/pa_allocation.c
+++ b/third_party/build/portaudio/src/pa_allocation.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_allocation.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_allocation.c"
diff --git a/third_party/build/portaudio/src/pa_allocation.h b/third_party/build/portaudio/src/pa_allocation.h
index d87f87dec..358aefc86 120000
--- a/third_party/build/portaudio/src/pa_allocation.h
+++ b/third_party/build/portaudio/src/pa_allocation.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_allocation.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_allocation.h"
diff --git a/third_party/build/portaudio/src/pa_converters.c b/third_party/build/portaudio/src/pa_converters.c
index cebfaeb47..2b32e0153 120000
--- a/third_party/build/portaudio/src/pa_converters.c
+++ b/third_party/build/portaudio/src/pa_converters.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_converters.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_converters.c"
diff --git a/third_party/build/portaudio/src/pa_converters.h b/third_party/build/portaudio/src/pa_converters.h
index 7fe7c9a4f..8ef807d2f 120000
--- a/third_party/build/portaudio/src/pa_converters.h
+++ b/third_party/build/portaudio/src/pa_converters.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_converters.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_converters.h"
diff --git a/third_party/build/portaudio/src/pa_cpuload.c b/third_party/build/portaudio/src/pa_cpuload.c
index 513bcde80..c15fb7da5 120000
--- a/third_party/build/portaudio/src/pa_cpuload.c
+++ b/third_party/build/portaudio/src/pa_cpuload.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_cpuload.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_cpuload.c"
diff --git a/third_party/build/portaudio/src/pa_cpuload.h b/third_party/build/portaudio/src/pa_cpuload.h
index 851824161..2759e98fa 120000
--- a/third_party/build/portaudio/src/pa_cpuload.h
+++ b/third_party/build/portaudio/src/pa_cpuload.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_cpuload.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_cpuload.h"
diff --git a/third_party/build/portaudio/src/pa_debugprint.c b/third_party/build/portaudio/src/pa_debugprint.c
index 24cd0c9a7..7f0ecda39 120000
--- a/third_party/build/portaudio/src/pa_debugprint.c
+++ b/third_party/build/portaudio/src/pa_debugprint.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_debugprint.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_debugprint.c"
diff --git a/third_party/build/portaudio/src/pa_debugprint.h b/third_party/build/portaudio/src/pa_debugprint.h
index 5489aa6e3..cba4ab375 120000
--- a/third_party/build/portaudio/src/pa_debugprint.h
+++ b/third_party/build/portaudio/src/pa_debugprint.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_debugprint.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_debugprint.h"
diff --git a/third_party/build/portaudio/src/pa_dither.c b/third_party/build/portaudio/src/pa_dither.c
index 87c2ee175..061ca9ab8 120000
--- a/third_party/build/portaudio/src/pa_dither.c
+++ b/third_party/build/portaudio/src/pa_dither.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_dither.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_dither.c"
diff --git a/third_party/build/portaudio/src/pa_dither.h b/third_party/build/portaudio/src/pa_dither.h
index e3ec249a3..698bc431c 120000
--- a/third_party/build/portaudio/src/pa_dither.h
+++ b/third_party/build/portaudio/src/pa_dither.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_dither.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_dither.h"
diff --git a/third_party/build/portaudio/src/pa_endianness.h b/third_party/build/portaudio/src/pa_endianness.h
index dc5552a78..48573ee4e 120000
--- a/third_party/build/portaudio/src/pa_endianness.h
+++ b/third_party/build/portaudio/src/pa_endianness.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_endianness.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_endianness.h"
diff --git a/third_party/build/portaudio/src/pa_front.c b/third_party/build/portaudio/src/pa_front.c
index db1f8201a..2a85b91f0 120000
--- a/third_party/build/portaudio/src/pa_front.c
+++ b/third_party/build/portaudio/src/pa_front.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_front.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_front.c"
diff --git a/third_party/build/portaudio/src/pa_hostapi.h b/third_party/build/portaudio/src/pa_hostapi.h
index 69f1a5740..cf4247f45 120000
--- a/third_party/build/portaudio/src/pa_hostapi.h
+++ b/third_party/build/portaudio/src/pa_hostapi.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_hostapi.h
\ No newline at end of file
+#include "../../portaudio/src/common/pa_hostapi.h"
diff --git a/third_party/build/portaudio/src/pa_linux_alsa.c b/third_party/build/portaudio/src/pa_linux_alsa.c
index f21696611..3280719fe 120000
--- a/third_party/build/portaudio/src/pa_linux_alsa.c
+++ b/third_party/build/portaudio/src/pa_linux_alsa.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/alsa/pa_linux_alsa.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/alsa/pa_linux_alsa.c"
diff --git a/third_party/build/portaudio/src/pa_linux_alsa.h b/third_party/build/portaudio/src/pa_linux_alsa.h
index a97f6eb04..a95c06070 120000
--- a/third_party/build/portaudio/src/pa_linux_alsa.h
+++ b/third_party/build/portaudio/src/pa_linux_alsa.h
@@ -1 +1 @@
-../../../portaudio/include/pa_linux_alsa.h
\ No newline at end of file
+#include "../../../portaudio/include/pa_linux_alsa.h"
diff --git a/third_party/build/portaudio/src/pa_mac_core.c b/third_party/build/portaudio/src/pa_mac_core.c
index 22e225d03..b6adb3144 120000
--- a/third_party/build/portaudio/src/pa_mac_core.c
+++ b/third_party/build/portaudio/src/pa_mac_core.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core.c"
diff --git a/third_party/build/portaudio/src/pa_mac_core_blocking.c b/third_party/build/portaudio/src/pa_mac_core_blocking.c
index 08b297c11..cf823a771 120000
--- a/third_party/build/portaudio/src/pa_mac_core_blocking.c
+++ b/third_party/build/portaudio/src/pa_mac_core_blocking.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.c"
diff --git a/third_party/build/portaudio/src/pa_mac_core_blocking.h b/third_party/build/portaudio/src/pa_mac_core_blocking.h
index 2b5c8249f..544b8b656 120000
--- a/third_party/build/portaudio/src/pa_mac_core_blocking.h
+++ b/third_party/build/portaudio/src/pa_mac_core_blocking.h
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_blocking.h"
diff --git a/third_party/build/portaudio/src/pa_mac_core_internal.h b/third_party/build/portaudio/src/pa_mac_core_internal.h
index 9ec427d03..af6c00b3d 120000
--- a/third_party/build/portaudio/src/pa_mac_core_internal.h
+++ b/third_party/build/portaudio/src/pa_mac_core_internal.h
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_internal.h"
diff --git a/third_party/build/portaudio/src/pa_mac_core_old.c b/third_party/build/portaudio/src/pa_mac_core_old.c
index 8c35ed0a8..c2ba87169 120000
--- a/third_party/build/portaudio/src/pa_mac_core_old.c
+++ b/third_party/build/portaudio/src/pa_mac_core_old.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_old.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_old.c"
diff --git a/third_party/build/portaudio/src/pa_mac_core_utilities.c b/third_party/build/portaudio/src/pa_mac_core_utilities.c
index c6b56243b..89a6d803d 120000
--- a/third_party/build/portaudio/src/pa_mac_core_utilities.c
+++ b/third_party/build/portaudio/src/pa_mac_core_utilities.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.c"
diff --git a/third_party/build/portaudio/src/pa_mac_core_utilities.h b/third_party/build/portaudio/src/pa_mac_core_utilities.h
index d2bebf848..3c740c071 120000
--- a/third_party/build/portaudio/src/pa_mac_core_utilities.h
+++ b/third_party/build/portaudio/src/pa_mac_core_utilities.h
@@ -1 +1 @@
-../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/coreaudio/pa_mac_core_utilities.h"
diff --git a/third_party/build/portaudio/src/pa_mac_hostapis.c b/third_party/build/portaudio/src/pa_mac_hostapis.c
index ec9cb7d86..2f66a6a88 120000
--- a/third_party/build/portaudio/src/pa_mac_hostapis.c
+++ b/third_party/build/portaudio/src/pa_mac_hostapis.c
@@ -1 +1 @@
-../../../portaudio/src/os/mac_osx/pa_mac_hostapis.c
\ No newline at end of file
+#include "../../../portaudio/src/os/mac_osx/pa_mac_hostapis.c"
diff --git a/third_party/build/portaudio/src/pa_process.c b/third_party/build/portaudio/src/pa_process.c
index 1f0a98235..4ab1abdaa 120000
--- a/third_party/build/portaudio/src/pa_process.c
+++ b/third_party/build/portaudio/src/pa_process.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_process.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_process.c"
diff --git a/third_party/build/portaudio/src/pa_process.h b/third_party/build/portaudio/src/pa_process.h
index 476abbe68..c13a864c1 120000
--- a/third_party/build/portaudio/src/pa_process.h
+++ b/third_party/build/portaudio/src/pa_process.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_process.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_process.h"
diff --git a/third_party/build/portaudio/src/pa_ringbuffer.c b/third_party/build/portaudio/src/pa_ringbuffer.c
index 28faea940..4c5368264 120000
--- a/third_party/build/portaudio/src/pa_ringbuffer.c
+++ b/third_party/build/portaudio/src/pa_ringbuffer.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_ringbuffer.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_ringbuffer.c"
diff --git a/third_party/build/portaudio/src/pa_ringbuffer.h b/third_party/build/portaudio/src/pa_ringbuffer.h
index b900663df..9fe568f99 120000
--- a/third_party/build/portaudio/src/pa_ringbuffer.h
+++ b/third_party/build/portaudio/src/pa_ringbuffer.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_ringbuffer.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_ringbuffer.h"
diff --git a/third_party/build/portaudio/src/pa_skeleton.c b/third_party/build/portaudio/src/pa_skeleton.c
index e9a7d6f8e..874c366cf 120000
--- a/third_party/build/portaudio/src/pa_skeleton.c
+++ b/third_party/build/portaudio/src/pa_skeleton.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_skeleton.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_skeleton.c"
diff --git a/third_party/build/portaudio/src/pa_stream.c b/third_party/build/portaudio/src/pa_stream.c
index 9dd689a9f..6e33a13e2 120000
--- a/third_party/build/portaudio/src/pa_stream.c
+++ b/third_party/build/portaudio/src/pa_stream.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_stream.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_stream.c"
diff --git a/third_party/build/portaudio/src/pa_stream.h b/third_party/build/portaudio/src/pa_stream.h
index c0ec7445f..687fafd7d 120000
--- a/third_party/build/portaudio/src/pa_stream.h
+++ b/third_party/build/portaudio/src/pa_stream.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_stream.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_stream.h"
diff --git a/third_party/build/portaudio/src/pa_trace.c b/third_party/build/portaudio/src/pa_trace.c
index 400df5edd..2e5feaa30 120000
--- a/third_party/build/portaudio/src/pa_trace.c
+++ b/third_party/build/portaudio/src/pa_trace.c
@@ -1 +1 @@
-../../../portaudio/src/common/pa_trace.c
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_trace.c"
diff --git a/third_party/build/portaudio/src/pa_trace.h b/third_party/build/portaudio/src/pa_trace.h
index f459f7362..86cc89e7d 120000
--- a/third_party/build/portaudio/src/pa_trace.h
+++ b/third_party/build/portaudio/src/pa_trace.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_trace.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_trace.h"
diff --git a/third_party/build/portaudio/src/pa_types.h b/third_party/build/portaudio/src/pa_types.h
index a8838a9c5..6b1d96e22 120000
--- a/third_party/build/portaudio/src/pa_types.h
+++ b/third_party/build/portaudio/src/pa_types.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_types.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_types.h"
diff --git a/third_party/build/portaudio/src/pa_unix_hostapis.c b/third_party/build/portaudio/src/pa_unix_hostapis.c
index c013734d5..7e389cc90 120000
--- a/third_party/build/portaudio/src/pa_unix_hostapis.c
+++ b/third_party/build/portaudio/src/pa_unix_hostapis.c
@@ -1 +1 @@
-../../../portaudio/src/os/unix/pa_unix_hostapis.c
\ No newline at end of file
+#include "../../../portaudio/src/os/unix/pa_unix_hostapis.c"
diff --git a/third_party/build/portaudio/src/pa_unix_oss.c b/third_party/build/portaudio/src/pa_unix_oss.c
index 608846cc3..131353372 120000
--- a/third_party/build/portaudio/src/pa_unix_oss.c
+++ b/third_party/build/portaudio/src/pa_unix_oss.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/oss/pa_unix_oss.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/oss/pa_unix_oss.c"
diff --git a/third_party/build/portaudio/src/pa_unix_util.c b/third_party/build/portaudio/src/pa_unix_util.c
index e21719048..e36be49a9 120000
--- a/third_party/build/portaudio/src/pa_unix_util.c
+++ b/third_party/build/portaudio/src/pa_unix_util.c
@@ -1 +1 @@
-../../../portaudio/src/os/unix/pa_unix_util.c
\ No newline at end of file
+#include "../../../portaudio/src/os/unix/pa_unix_util.c"
diff --git a/third_party/build/portaudio/src/pa_unix_util.h b/third_party/build/portaudio/src/pa_unix_util.h
index 9381e8570..411a1169a 120000
--- a/third_party/build/portaudio/src/pa_unix_util.h
+++ b/third_party/build/portaudio/src/pa_unix_util.h
@@ -1 +1 @@
-../../../portaudio/src/os/unix/pa_unix_util.h
\ No newline at end of file
+#include "../../../portaudio/src/os/unix/pa_unix_util.h"
diff --git a/third_party/build/portaudio/src/pa_util.h b/third_party/build/portaudio/src/pa_util.h
index 4aecbe869..20b2154d9 120000
--- a/third_party/build/portaudio/src/pa_util.h
+++ b/third_party/build/portaudio/src/pa_util.h
@@ -1 +1 @@
-../../../portaudio/src/common/pa_util.h
\ No newline at end of file
+#include "../../../portaudio/src/common/pa_util.h"
diff --git a/third_party/build/portaudio/src/pa_win_hostapis.c b/third_party/build/portaudio/src/pa_win_hostapis.c
index b8638bce6..a51009983 120000
--- a/third_party/build/portaudio/src/pa_win_hostapis.c
+++ b/third_party/build/portaudio/src/pa_win_hostapis.c
@@ -1 +1 @@
-../../../portaudio/src/os/win/pa_win_hostapis.c
\ No newline at end of file
+#include "../../portaudio/src/os/win/pa_win_hostapis.c"
diff --git a/third_party/build/portaudio/src/pa_win_util.c b/third_party/build/portaudio/src/pa_win_util.c
index e6057963f..95fedaec9 120000
--- a/third_party/build/portaudio/src/pa_win_util.c
+++ b/third_party/build/portaudio/src/pa_win_util.c
@@ -1 +1 @@
-../../../portaudio/src/os/win/pa_win_util.c
\ No newline at end of file
+#include "../../../portaudio/src/os/win/pa_win_util.c"
diff --git a/third_party/build/portaudio/src/pa_win_wmme.c b/third_party/build/portaudio/src/pa_win_wmme.c
index ba28bff83..ab1ba6d92 120000
--- a/third_party/build/portaudio/src/pa_win_wmme.c
+++ b/third_party/build/portaudio/src/pa_win_wmme.c
@@ -1 +1 @@
-../../../portaudio/src/hostapi/wmme/pa_win_wmme.c
\ No newline at end of file
+#include "../../../portaudio/src/hostapi/wmme/pa_win_wmme.c"
diff --git a/third_party/build/portaudio/src/pa_win_wmme.h b/third_party/build/portaudio/src/pa_win_wmme.h
new file mode 100644
index 000000000..697dc6a95
--- /dev/null
+++ b/third_party/build/portaudio/src/pa_win_wmme.h
@@ -0,0 +1 @@
+#include "../../../portaudio/include/pa_win_wmme.h"
diff --git a/third_party/build/portaudio/src/portaudio.h b/third_party/build/portaudio/src/portaudio.h
index a917b3be5..509b15af2 120000
--- a/third_party/build/portaudio/src/portaudio.h
+++ b/third_party/build/portaudio/src/portaudio.h
@@ -1 +1 @@
-../../../portaudio/include/portaudio.h
\ No newline at end of file
+#include "../../../portaudio/include/portaudio.h"