diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp
index e9bec95c..8fdb8cbb 100644
--- a/core/LocAdapterBase.cpp
+++ b/core/LocAdapterBase.cpp
@@ -32,7 +32,7 @@
 #include <dlfcn.h>
 #include <LocAdapterBase.h>
 #include <loc_target.h>
-#include <platform_lib_log_util.h>
+#include <log_util.h>
 #include <LocAdapterProxyBase.h>
 
 namespace loc_core {
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index 45d16e90..dcd35fec 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -32,7 +32,7 @@
 #include <dlfcn.h>
 #include <LocApiBase.h>
 #include <LocAdapterBase.h>
-#include <platform_lib_log_util.h>
+#include <log_util.h>
 #include <LocDualContext.h>
 
 namespace loc_core {
diff --git a/core/LocDualContext.cpp b/core/LocDualContext.cpp
index 74b2903a..b5f33ac3 100644
--- a/core/LocDualContext.cpp
+++ b/core/LocDualContext.cpp
@@ -33,7 +33,6 @@
 #include <unistd.h>
 #include <LocDualContext.h>
 #include <msg_q.h>
-#include <platform_lib_log_util.h>
 #include <loc_log.h>
 
 namespace loc_core {
@@ -59,11 +58,7 @@ ContextBase* LocDualContext::mBgContext = NULL;
 ContextBase* LocDualContext::mInjectContext = NULL;
 // the name must be shorter than 15 chars
 const char* LocDualContext::mLocationHalName = "Loc_hal_worker";
-#ifndef USE_GLIB
 const char* LocDualContext::mLBSLibName = "liblbs_core.so";
-#else
-const char* LocDualContext::mLBSLibName = "liblbs_core.so.1";
-#endif
 
 pthread_mutex_t LocDualContext::mGetLocContextMutex = PTHREAD_MUTEX_INITIALIZER;
 
diff --git a/core/Makefile.am b/core/Makefile.am
index 341153ad..e2d05be4 100644
--- a/core/Makefile.am
+++ b/core/Makefile.am
@@ -1,11 +1,10 @@
 AM_CFLAGS = -I./ \
             -I../utils \
             $(LOCPLA_CFLAGS) \
-           -I$(WORKSPACE)/gps-noship/flp \
-            -D__func__=__PRETTY_FUNCTION__ \
             -fno-short-enums
 
 libloc_core_la_h_sources = \
+           MsgTask.h \
            LocApiBase.h \
            LocAdapterBase.h \
            ContextBase.h \
@@ -14,10 +13,10 @@ libloc_core_la_h_sources = \
            UlpProxyBase.h \
            gps_extended_c.h \
            gps_extended.h \
-           loc_core_log.h \
-           LocAdapterProxyBase.h
+           loc_core_log.h
 
 libloc_core_la_c_sources = \
+           MsgTask.cpp \
            LocApiBase.cpp \
            LocAdapterBase.cpp \
            ContextBase.cpp \
diff --git a/core/UlpProxyBase.h b/core/UlpProxyBase.h
index 2bafb0ab..59e265e8 100644
--- a/core/UlpProxyBase.h
+++ b/core/UlpProxyBase.h
@@ -31,6 +31,7 @@
 
 #include <gps_extended.h>
 #include "fused_location_extended.h"
+
 namespace loc_core {
 
 class LocAdapterBase;
diff --git a/loc_api/Makefile.am b/loc_api/Makefile.am
index a5f529bd..d42d4d99 100644
--- a/loc_api/Makefile.am
+++ b/loc_api/Makefile.am
@@ -5,7 +5,6 @@ AM_CFLAGS = \
      -I../utils \
      $(LOCPLA_CFLAGS) \
      -fno-short-enums \
-     -D__func__=__PRETTY_FUNCTION__ \
      -DTARGET_USES_QCOM_BSP
 
 libloc_eng_so_la_h_sources = \
@@ -82,8 +81,7 @@ libloc_ds_api_la_LDFLAGS += -Wl,--export-dynamic
 libloc_ds_api_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS) $(libloc_ds_api_CFLAGS)
 endif
 
-libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices -ldsi_netctrl $(LOCPLA_LIBS) ../utils/libgps_utils_so.la
-#libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices $(LOCPLA_LIBS) ../utils/libgps_utils_so.la
+libloc_ds_api_la_LIBADD = -lstdc++ $(QMIF_LIBS) -lqmiservices $(LOCPLA_LIBS) ../utils/libgps_utils_so.la
 
 libloc_api_v02_CFLAGS = \
      $(QMIF_CFLAGS) \
diff --git a/loc_api/libloc_api_50001/LocEngAdapter.cpp b/loc_api/libloc_api_50001/LocEngAdapter.cpp
index f3290dbd..1d1a59ed 100644
--- a/loc_api/libloc_api_50001/LocEngAdapter.cpp
+++ b/loc_api/libloc_api_50001/LocEngAdapter.cpp
@@ -339,10 +339,9 @@ void LocEngAdapter::requestPowerVote()
         LOC_LOGV("LocEngAdapterVotePower - Vote Power: %d", (int)powerUp);
         setGpsLock(powerUp ? 103 : 101);
     }
-#ifndef USE_GLIB
+
     delete mUlp;
     mUlp = ulp;
-#endif
 }
 
 void LocInternalAdapter::reportPosition(UlpLocation &location,
diff --git a/loc_api/libloc_api_50001/Makefile.am b/loc_api/libloc_api_50001/Makefile.am
deleted file mode 100644
index c7624272..00000000
--- a/loc_api/libloc_api_50001/Makefile.am
+++ /dev/null
@@ -1,78 +0,0 @@
-AM_CFLAGS = \
-     -I../../utils \
-     -I../../platform_lib_abstractions \
-     -I$(WORKSPACE)/gps-noship/flp \
-     -fno-short-enums \
-      -D__func__=__PRETTY_FUNCTION__ \
-     -DFEATURE_GNSS_BIT_API
-
-libloc_adapter_so_la_SOURCES = loc_eng_log.cpp LocEngAdapter.cpp
-
-if USE_GLIB
-libloc_adapter_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
-libloc_adapter_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
-libloc_adapter_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
-else
-libloc_adapter_so_la_CFLAGS = $(AM_CFLAGS)
-libloc_adapter_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
-libloc_adapter_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
-endif
-libloc_adapter_so_la_LIBADD = -lstdc++ -lcutils ../../utils/libgps_utils_so.la
-
-
-libloc_eng_so_la_SOURCES = \
-    loc_eng.cpp \
-    loc_eng_agps.cpp \
-    loc_eng_xtra.cpp \
-    loc_eng_ni.cpp \
-    loc_eng_log.cpp \
-    loc_eng_dmn_conn.cpp \
-    loc_eng_dmn_conn_handler.cpp \
-    loc_eng_dmn_conn_thread_helper.c \
-    loc_eng_dmn_conn_glue_msg.c \
-    loc_eng_dmn_conn_glue_pipe.c
-
-
-if USE_GLIB
-libloc_eng_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
-libloc_eng_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
-libloc_eng_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
-else
-libloc_eng_so_la_CFLAGS = $(AM_CFLAGS)
-libloc_eng_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
-libloc_eng_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
-endif
-
-libloc_eng_so_la_LIBADD = -lstdc++ -lcutils -ldl ../../utils/libgps_utils_so.la libloc_adapter_so.la
-
-
-libgps_default_so_la_SOURCES = \
-      loc.cpp \
-      gps.c
-
-if USE_GLIB
-libgps_default_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
-libgps_default_so_la_LDFLAGS = -lstdc++ -lpthread @GLIB_LIBS@ -shared -version-info 1:0:0
-libgps_default_so_la_CPPFLAGS = -DUSE_GLIB $(AM_CFLAGS) $(AM_CPPFLAGS) @GLIB_CFLAGS@
-else
-libgps_default_so_la_CFLAGS = $(AM_CFLAGS)
-libgps_default_so_la_LDFLAGS = -lpthread -shared -version-info 1:0:0
-libgps_default_so_la_CPPFLAGS = $(AM_CFLAGS) $(AM_CPPFLAGS)
-endif
-
-libgps_default_so_la_LIBADD = -lstdc++ -lcutils ../../utils/libgps_utils_so.la -ldl libloc_eng_so.la
-
-library_include_HEADERS = \
-   LocEngAdapter.h \
-   loc.h \
-   loc_eng.h \
-   loc_eng_xtra.h \
-   loc_eng_ni.h \
-   loc_eng_agps.h \
-   loc_eng_msg.h \
-   loc_eng_log.h
-
-library_includedir = $(pkgincludedir)/libloc_api_50001
-
-#Create and Install libraries
-lib_LTLIBRARIES = libloc_adapter_so.la libloc_eng_so.la libgps_default_so.la
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp
index 6aac28ba..de72aa8d 100644
--- a/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/loc_api/libloc_api_50001/loc_eng.cpp
@@ -46,7 +46,12 @@
 #include <time.h>
 #include <new>
 #include <LocEngAdapter.h>
-
+#if defined(USE_GLIB) && !defined(OFF_TARGET)
+#include <glib.h>
+#endif
+#ifdef USE_GLIB
+#include <sys/syscall.h>
+#endif /* USE_GLIB */
 
 #include <string.h>
 #include <loc_eng.h>
diff --git a/loc_api/libloc_api_50001/loc_eng_ni.cpp b/loc_api/libloc_api_50001/loc_eng_ni.cpp
index a29784fc..3b20bbbc 100644
--- a/loc_api/libloc_api_50001/loc_eng_ni.cpp
+++ b/loc_api/libloc_api_50001/loc_eng_ni.cpp
@@ -235,6 +235,8 @@ static void* ni_thread_proc(void *args)
 
     LOC_LOGD("pSession->resp is %d\n",pSession->resp);
 
+    LOC_LOGD("loc_eng_ni_data_p->resp is %d\n",loc_eng_ni_data_p->resp);
+
     // adding this check to support modem restart, in which case, we need the thread
     // to exit without calling sending data. We made sure that rawRequest is NULL in
     // loc_eng_ni_reset_on_engine_restart()
diff --git a/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h b/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h
index c712122e..32035d28 100644
--- a/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h
+++ b/platform_lib_abstractions/loc_pla/include/platform_lib_macros.h
@@ -35,8 +35,6 @@ extern "C" {
 
 #ifdef USE_GLIB
 #include <sys/time.h>
-#include <string.h>
-#include <stdlib.h>
 #ifndef OFF_TARGET
 #include <glib.h>
 #define strlcat g_strlcat
diff --git a/platform_lib_abstractions/loc_pla/include/platform_lib_time.h b/platform_lib_abstractions/loc_pla/include/platform_lib_time.h
index 7033a7a1..c05b15ce 100644
--- a/platform_lib_abstractions/loc_pla/include/platform_lib_time.h
+++ b/platform_lib_abstractions/loc_pla/include/platform_lib_time.h
@@ -30,9 +30,7 @@
 #define __PLATFORM_LIB_TIME_H__
 
 #include <stdint.h>
-#ifndef USE_GLIB
-#include <utils/SystemClock.h>
-#endif
+
 int64_t platform_lib_abstraction_elapsed_millis_since_boot();
 
 #endif /* __PLATFORM_LIB_TIME_H__ */
diff --git a/platform_lib_abstractions/loc_pla/src/Makefile.am b/platform_lib_abstractions/loc_pla/src/Makefile.am
index 6ee0be70..3936837d 100644
--- a/platform_lib_abstractions/loc_pla/src/Makefile.am
+++ b/platform_lib_abstractions/loc_pla/src/Makefile.am
@@ -1,7 +1,6 @@
 AM_CFLAGS = \
      $(LOCSTUB_CFLAGS) \
      -I../include \
-     -D__func__=__PRETTY_FUNCTION__ \
      -fno-short-enums
 
 h_sources = \
diff --git a/platform_lib_abstractions/loc_stub/src/Makefile.am b/platform_lib_abstractions/loc_stub/src/Makefile.am
index 8bda7113..c8ab5fcb 100644
--- a/platform_lib_abstractions/loc_stub/src/Makefile.am
+++ b/platform_lib_abstractions/loc_stub/src/Makefile.am
@@ -1,6 +1,5 @@
 AM_CFLAGS = \
      -I../include \
-     -D__func__=__PRETTY_FUNCTION__ \
      -fno-short-enums
 
 libloc_stub_la_extra_h = \
diff --git a/utils/LocTimer.h b/utils/LocTimer.h
index c6a63620..c1468524 100644
--- a/utils/LocTimer.h
+++ b/utils/LocTimer.h
@@ -31,7 +31,7 @@
 #define __LOC_TIMER_CPP_H__
 
 #include <stddef.h>
-#include <platform_lib_includes.h>
+#include <log_util.h>
 
 // opaque class to provide service implementation.
 class LocTimerDelegate;
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 50f10078..5e718439 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -14,24 +14,15 @@ libgps_utils_so_la_h_sources = \
         loc_cfg.h \
         loc_log.h \
         loc_target.h \
-        loc_timer.h \
-        MsgTask.h \
-        LocHeap.h \
-        LocThread.h \
-        LocTimer.h \
-        loc_misc_utils.h
+        loc_timer.h
 
 libgps_utils_so_la_c_sources = \
         linked_list.c \
         msg_q.c \
         loc_cfg.cpp \
         loc_log.cpp \
-        loc_target.cpp \
-        LocHeap.cpp \
-        LocTimer.cpp \
-        LocThread.cpp \
-        MsgTask.cpp \
-        loc_misc_utils.cpp
+        loc_timer.c \
+        loc_target.cpp
 
 library_includedir = $(pkgincludedir)/utils
 
diff --git a/utils/MsgTask.cpp b/utils/MsgTask.cpp
index 78a3fe00..f33d6024 100644
--- a/utils/MsgTask.cpp
+++ b/utils/MsgTask.cpp
@@ -33,7 +33,6 @@
 #include <MsgTask.h>
 #include <msg_q.h>
 #include <loc_log.h>
-#include <platform_lib_includes.h>
 
 static void LocMsgDestroy(void* msg) {
     delete (LocMsg*)msg;
@@ -78,7 +77,7 @@ void MsgTask::sendMsg(const LocMsg* msg) const {
 
 void MsgTask::prerun() {
     // make sure we do not run in background scheduling group
-     platform_lib_abstraction_set_sched_policy(platform_lib_abstraction_gettid(), PLA_SP_FOREGROUND);
+    set_sched_policy(gettid(), SP_FOREGROUND);
 }
 
 bool MsgTask::run() {
diff --git a/utils/loc_cfg.cpp b/utils/loc_cfg.cpp
index 926781a6..967d2f30 100644
--- a/utils/loc_cfg.cpp
+++ b/utils/loc_cfg.cpp
@@ -38,7 +38,7 @@
 #include <unistd.h>
 #include <time.h>
 #include <loc_cfg.h>
-#include <platform_lib_includes.h>
+#include <log_util.h>
 #include <loc_misc_utils.h>
 #ifdef USE_GLIB
 #include <glib.h>
diff --git a/utils/loc_misc_utils.cpp b/utils/loc_misc_utils.cpp
index dfe19a2d..7e96313f 100644
--- a/utils/loc_misc_utils.cpp
+++ b/utils/loc_misc_utils.cpp
@@ -28,7 +28,7 @@
  */
 #include <stdio.h>
 #include <string.h>
-#include <platform_lib_log_util.h>
+#include <log_util.h>
 #include <loc_misc_utils.h>
 #include <ctype.h>
 
diff --git a/utils/loc_timer.h b/utils/loc_timer.h
index 25fd1790..2967858e 100644
--- a/utils/loc_timer.h
+++ b/utils/loc_timer.h
@@ -34,7 +34,7 @@
 extern "C" {
 #endif /* __cplusplus */
 #include <stddef.h>
-#include <platform_lib_includes.h>
+
 /*
     user_data: client context pointer, passthrough. Originally received
                from calling client when loc_timer_start() is called.