diff --git a/core/gps_extended.h b/core/gps_extended.h
index e0be6f3e..9eec3f92 100644
--- a/core/gps_extended.h
+++ b/core/gps_extended.h
@@ -34,7 +34,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 #include <gps_extended_c.h>
-#ifdef USE_GLIB
+#if defined(USE_GLIB) || defined(OFF_TARGET)
 #include <string.h>
 #endif
 
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp
index a31fb7b1..eb307719 100644
--- a/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/loc_api/libloc_api_50001/loc_eng.cpp
@@ -61,8 +61,10 @@
 #endif /* USE_GLIB */
 
 
-#ifdef USE_GLIB
+#if defined(USE_GLIB) && !defined(OFF_TARGET)
 #include <glib.h>
+#endif
+#ifdef USE_GLIB
 #include <sys/syscall.h>
 #endif /* USE_GLIB */
 
diff --git a/loc_api/libloc_api_50001/loc_eng_agps.h b/loc_api/libloc_api_50001/loc_eng_agps.h
index 8bab3cd5..81a4133e 100644
--- a/loc_api/libloc_api_50001/loc_eng_agps.h
+++ b/loc_api/libloc_api_50001/loc_eng_agps.h
@@ -41,7 +41,7 @@
 #include <loc_timer.h>
 #include <LocEngAdapter.h>
 
-#ifdef USE_GLIB
+#if defined(USE_GLIB) && !defined(OFF_TARGET)
 #include <glib.h>
 #endif /* USE_GLIB */
 
diff --git a/loc_api/libloc_api_50001/loc_eng_msg.h b/loc_api/libloc_api_50001/loc_eng_msg.h
index ae962f55..f4ba2dc5 100644
--- a/loc_api/libloc_api_50001/loc_eng_msg.h
+++ b/loc_api/libloc_api_50001/loc_eng_msg.h
@@ -43,7 +43,7 @@
 #ifndef SSID_BUF_SIZE
     #define SSID_BUF_SIZE (32+1)
 #endif
-#ifdef USE_GLIB
+#if defined(USE_GLIB) && !defined(OFF_TARGET)
 
 #include <glib.h>
 
diff --git a/platform_lib_abstractions/platform_lib_macros.h b/platform_lib_abstractions/platform_lib_macros.h
index a09a4a23..a1db21a9 100644
--- a/platform_lib_abstractions/platform_lib_macros.h
+++ b/platform_lib_abstractions/platform_lib_macros.h
@@ -51,10 +51,13 @@ extern "C" {
 
 
 #ifdef USE_GLIB
-
+#ifndef OFF_TARGET
 #define strlcat g_strlcat
 #define strlcpy g_strlcpy
-
+#else
+#define strlcat strncat
+#define strlcpy strncpy
+#endif
 #define ALOGE(format, x...) TS_PRINTF("E/%s (%d): " format , LOG_TAG, getpid(), ##x)
 #define ALOGW(format, x...) TS_PRINTF("W/%s (%d): " format , LOG_TAG, getpid(), ##x)
 #define ALOGI(format, x...) TS_PRINTF("I/%s (%d): " format , LOG_TAG, getpid(), ##x)
@@ -66,7 +69,6 @@ extern "C" {
 #define LOC_EXT_CREATE_THREAD_CB_PLATFORM_LIB_ABSTRACTION createPthread
 #define ELAPSED_MILLIS_SINCE_BOOT_PLATFORM_LIB_ABSTRACTION (elapsedMillisSinceBoot())
 
-
 #else
 
 pid_t gettid(void);
diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp
index 73d1ca41..037ffaf8 100644
--- a/utils/loc_cfg.cpp
+++ b/utils/loc_cfg.cpp
@@ -39,7 +39,7 @@
 #include <time.h>
 #include <loc_cfg.h>
 #include <log_util.h>
-#ifdef USE_GLIB
+#if defined(USE_GLIB) && !defined(OFF_TARGET)
 #include <glib.h>
 #endif
 #include "platform_lib_includes.h"