diff --git a/loc_api/fake_sched_policy.c b/loc_api/fake_sched_policy.c
new file mode 100644
index 00000000..4d6a4e8d
--- /dev/null
+++ b/loc_api/fake_sched_policy.c
@@ -0,0 +1,26 @@
+/* Copyright (c) 2011, Qualcomm Technologies, Inc.  All Rights Reserved.
+ * Qualcomm Technologies Proprietary and Confidential.
+ */
+
+#include "fake_sched_policy.h"
+
+/*===========================================================================
+FUNCTION set_sched_policy
+
+DESCRIPTION
+   Local copy of this function which bypasses android set_sched_policy
+
+DEPENDENCIES
+   None
+
+RETURN VALUE
+   0
+
+SIDE EFFECTS
+   N/A
+
+===========================================================================*/
+int set_sched_policy(int tid, SchedPolicy policy)
+{
+    return 0;
+}
diff --git a/loc_api/fake_sched_policy.h b/loc_api/fake_sched_policy.h
new file mode 100644
index 00000000..1fea48a7
--- /dev/null
+++ b/loc_api/fake_sched_policy.h
@@ -0,0 +1,40 @@
+/* Copyright (c) 2013, Qualcomm Technologies, Inc.  All Rights Reserved.
+ * Qualcomm Technologies Proprietary and Confidential.
+ */
+
+#ifndef _FAKE_SCHED_POLICY_H
+#define _FAKE_SCHED_POLICY_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef enum {
+    SP_BACKGROUND = 0,
+    SP_FOREGROUND = 1,
+} SchedPolicy;
+
+/*===========================================================================
+FUNCTION set_sched_policy
+
+DESCRIPTION
+   Local copy of this function which bypasses android set_sched_policy
+
+DEPENDENCIES
+   None
+
+RETURN VALUE
+   0
+
+SIDE EFFECTS
+   N/A
+
+===========================================================================*/
+int set_sched_policy(int tid, SchedPolicy policy);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // _FAKE_SCHED_POLICY_H
+
diff --git a/loc_api/libloc_api_50001/Makefile.am b/loc_api/libloc_api_50001/Makefile.am
index d07d224b..64d4c13f 100644
--- a/loc_api/libloc_api_50001/Makefile.am
+++ b/loc_api/libloc_api_50001/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = \
      -fno-short-enums \
      -DFEATURE_GNSS_BIT_API
 
-libloc_adapter_so_la_SOURCES = loc_eng_log.cpp LocEngAdapter.cpp ../fake_property_service.c
+libloc_adapter_so_la_SOURCES = loc_eng_log.cpp LocEngAdapter.cpp ../fake_property_service.c ../fake_sched_policy.c
 
 if USE_GLIB
 libloc_adapter_so_la_CFLAGS = -DUSE_GLIB $(AM_CFLAGS) @GLIB_CFLAGS@
diff --git a/loc_api/libloc_api_50001/gps.c b/loc_api/libloc_api_50001/gps.c
index b0669af2..46596aa4 100644
--- a/loc_api/libloc_api_50001/gps.c
+++ b/loc_api/libloc_api_50001/gps.c
@@ -30,6 +30,7 @@
 #include <hardware/gps.h>
 
 #include <stdlib.h>
+#include <string.h>
 
 extern const GpsInterface* get_gps_interface();
 
diff --git a/loc_api/libloc_api_50001/loc_eng.cpp b/loc_api/libloc_api_50001/loc_eng.cpp
index 9a05dd7a..a31fb7b1 100644
--- a/loc_api/libloc_api_50001/loc_eng.cpp
+++ b/loc_api/libloc_api_50001/loc_eng.cpp
@@ -49,6 +49,10 @@
 
 #ifdef _ANDROID
 #include <cutils/sched_policy.h>
+#include <cutils/properties.h>
+#else
+#include "fake_sched_policy.h"
+#include "fake_property_service.h"
 #endif
 
 #ifndef USE_GLIB
@@ -56,12 +60,6 @@
 #include <utils/Log.h>
 #endif /* USE_GLIB */
 
-#ifndef _ANDROID
-typedef enum {
-    SP_BACKGROUND = 0,
-    SP_FOREGROUND = 1,
-} SchedPolicy;
-#endif
 
 #ifdef USE_GLIB
 #include <glib.h>
@@ -83,12 +81,6 @@ typedef enum {
 #include "loc_core_log.h"
 #include "loc_eng_log.h"
 
-#ifdef _ANDROID
-#include <cutils/properties.h>
-#else
-#include "fake_property_service.h"
-#endif
-
 #define SUCCESS TRUE
 #define FAILURE FALSE
 
@@ -2555,29 +2547,6 @@ void loc_eng_handle_engine_up(loc_eng_data_s_type &loc_eng_data)
     EXIT_LOG(%s, VOID_RET);
 }
 
-#ifdef USE_GLIB
-/*===========================================================================
-FUNCTION set_sched_policy
-
-DESCRIPTION
-   Local copy of this function which bypasses android set_sched_policy
-
-DEPENDENCIES
-   None
-
-RETURN VALUE
-   0
-
-SIDE EFFECTS
-   N/A
-
-===========================================================================*/
-static int set_sched_policy(int tid, SchedPolicy policy)
-{
-    return 0;
-}
-#endif /* USE_GLIB */
-
 /*===========================================================================
 FUNCTION    loc_eng_read_config