diff --git a/libs/sipcc/Makefile.am b/libs/sipcc/Makefile.am
index f76786e5a6..d05e162ec3 100644
--- a/libs/sipcc/Makefile.am
+++ b/libs/sipcc/Makefile.am
@@ -74,7 +74,6 @@ core/sdp/sdp_base64.c \
 core/sdp/sdp_config.c \
 core/sdp/sdp_main.c \
 core/sdp/sdp_services_unix.c \
-core/sdp/sdp_services_win32.c \
 core/sdp/sdp_token.c \
 core/sdp/sdp_utils.c
 
@@ -104,8 +103,7 @@ core/sipstack/pmhutils.c \
 core/sipstack/sip_common_regmgr.c \
 core/sipstack/sip_common_transport.c \
 core/sipstack/sip_csps_transport.c \
-core/sipstack/sip_interface_regmgr.c \
-core/sipstack/sip_platform_win32_task.c
+core/sipstack/sip_interface_regmgr.c
 
 CORE_SIPSTACK_UNIX_SRC = core/sipstack/sip_platform_task.c
 
diff --git a/libs/sipcc/core/ccapp/ccprovider.c b/libs/sipcc/core/ccapp/ccprovider.c
index f6c2d944ef..69bce566b7 100755
--- a/libs/sipcc/core/ccapp/ccprovider.c
+++ b/libs/sipcc/core/ccapp/ccprovider.c
@@ -49,7 +49,7 @@
 #include "ccapi_device_info.h"
 #include "conf_roster.h"
 #include "reset_api.h"
-#include "prlog.h"
+//#include "prlog.h"
 
 /*---------------------------------------------------------
  *
diff --git a/libs/sipcc/core/gsm/fim.c b/libs/sipcc/core/gsm/fim.c
index e910db6c47..c435fbecb9 100755
--- a/libs/sipcc/core/gsm/fim.c
+++ b/libs/sipcc/core/gsm/fim.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "mozilla/Assertions.h"
+//#include "mozilla/Assertions.h"
 #include "cpr_types.h"
 #include "cpr_stdlib.h"
 #include "cpr_stdio.h"
diff --git a/libs/sipcc/core/gsm/fsmdef.c b/libs/sipcc/core/gsm/fsmdef.c
index cec9eb5f99..69e30df4d1 100755
--- a/libs/sipcc/core/gsm/fsmdef.c
+++ b/libs/sipcc/core/gsm/fsmdef.c
@@ -36,7 +36,7 @@
 #include "text_strings.h"
 #include "platform_api.h"
 #include "peer_connection_types.h"
-#include "prlog.h"
+//#include "prlog.h"
 #include "sessionHash.h"
 
 extern void update_kpmlconfig(int kpmlVal);
diff --git a/libs/sipcc/core/gsm/gsm_sdp.c b/libs/sipcc/core/gsm/gsm_sdp.c
index 53d442c89d..6a795200fd 100644
--- a/libs/sipcc/core/gsm/gsm_sdp.c
+++ b/libs/sipcc/core/gsm/gsm_sdp.c
@@ -21,8 +21,8 @@
 #include "sip_interface_regmgr.h"
 #include "platform_api.h"
 #include "vcm.h"
-#include "prlog.h"
-#include "plstr.h"
+//#include "prlog.h"
+//#include "plstr.h"
 #include "sdp_private.h"
 
 //TODO Need to place this in a portable location
diff --git a/libs/sipcc/core/includes/CSFLog.h b/libs/sipcc/core/includes/CSFLog.h
new file mode 100644
index 0000000000..c21592528c
--- /dev/null
+++ b/libs/sipcc/core/includes/CSFLog.h
@@ -0,0 +1,45 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef CSFLOG_H
+#define CSFLOG_H
+
+#include <stdarg.h>
+
+typedef enum{
+	CSF_LOG_CRITICAL =1,
+	CSF_LOG_ERROR,
+	CSF_LOG_WARNING,
+	CSF_LOG_NOTICE,
+	CSF_LOG_INFO,
+	CSF_LOG_DEBUG
+} CSFLogLevel;
+
+
+
+#define CSFLogError(tag , format, ...) CSFLog( CSF_LOG_ERROR, __FILE__ , __LINE__ , tag , format , ## __VA_ARGS__ )
+#define CSFLogErrorV(tag , format, va_list_arg) CSFLogV(CSF_LOG_ERROR, __FILE__ , __LINE__ , tag , format , va_list_arg )
+#define CSFLogWarn(tag , format, ...) CSFLog( CSF_LOG_WARNING, __FILE__ , __LINE__ , tag , format , ## __VA_ARGS__ )
+#define CSFLogWarnV(tag , format, va_list_arg) CSFLogV(CSF_LOG_WARNING, __FILE__ , __LINE__ , tag , format , va_list_arg )
+#define CSFLogInfo(tag , format, ...) CSFLog( CSF_LOG_INFO, __FILE__ , __LINE__ , tag , format , ## __VA_ARGS__ )
+#define CSFLogInfoV(tag , format, va_list_arg) CSFLogV(CSF_LOG_INFO, __FILE__ , __LINE__ , tag , format , va_list_arg )
+#define CSFLogDebug(tag , format, ...) CSFLog(CSF_LOG_DEBUG, __FILE__ , __LINE__ , tag , format , ## __VA_ARGS__ )
+#define CSFLogDebugV(tag , format, va_list_arg) CSFLogV(CSF_LOG_DEBUG, __FILE__ , __LINE__ , tag , format , va_list_arg )
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+#if 0
+void CSFLog( CSFLogLevel priority, const char* sourceFile, int sourceLine, const char* tag , const char* format, ...);
+void CSFLogV( CSFLogLevel priority, const char* sourceFile, int sourceLine, const char* tag , const char* format, va_list args);
+#else
+#endif
+#define CSFLog(pri, file, line, tag, format, ...)
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/libs/sipcc/core/includes/ccapi.h b/libs/sipcc/core/includes/ccapi.h
index 666397742a..011b57e8fb 100755
--- a/libs/sipcc/core/includes/ccapi.h
+++ b/libs/sipcc/core/includes/ccapi.h
@@ -5,7 +5,7 @@
 #ifndef _CCAPI_H_
 #define _CCAPI_H_
 
-#include "prtypes.h"
+//#include "prtypes.h"
 #include "cpr_types.h"
 #include "cpr_memory.h"
 #include "phone_types.h"
@@ -170,7 +170,7 @@ static const char *cc_feature_names[] = {
 /* This checks at compile-time that the cc_feature_names list
  * is the same size as the cc_group_feature_t enum
  */
-PR_STATIC_ASSERT(PR_ARRAY_SIZE(cc_feature_names) == CC_FEATURE_MAX + 1);
+//PR_STATIC_ASSERT(PR_ARRAY_SIZE(cc_feature_names) == CC_FEATURE_MAX + 1);
 
 #endif
 
@@ -292,7 +292,7 @@ static const char *cc_msg_names[] = {
 /* This checks at compile-time that the cc_msg_names list
  * is the same size as the cc_msgs_t enum
  */
-PR_STATIC_ASSERT(PR_ARRAY_SIZE(cc_msg_names) == CC_MSG_MAX + 1);
+//PR_STATIC_ASSERT(PR_ARRAY_SIZE(cc_msg_names) == CC_MSG_MAX + 1);
 
 #endif //__CC_MESSAGES_STRINGS__
 
diff --git a/libs/sipcc/core/sdp/sdp_attr.c b/libs/sipcc/core/sdp/sdp_attr.c
index 177628ff3d..fadaceede8 100644
--- a/libs/sipcc/core/sdp/sdp_attr.c
+++ b/libs/sipcc/core/sdp/sdp_attr.c
@@ -5,12 +5,12 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "plstr.h"
+//#include "plstr.h"
 #include "sdp_os_defs.h"
 #include "sdp.h"
 #include "sdp_private.h"
 #include "sdp_base64.h"
-#include "mozilla/Assertions.h"
+//#include "mozilla/Assertions.h"
 #include "CSFLog.h"
 
 static const char* logTag = "sdp_attr";
diff --git a/libs/sipcc/core/sipstack/ccsip_messaging.c b/libs/sipcc/core/sipstack/ccsip_messaging.c
index d9a79651e9..515d0a90bc 100644
--- a/libs/sipcc/core/sipstack/ccsip_messaging.c
+++ b/libs/sipcc/core/sipstack/ccsip_messaging.c
@@ -2,7 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-#include "plstr.h"
+//#include "plstr.h"
 #include "cpr_types.h"
 #include "cpr_time.h"
 #include "cpr_stdio.h"
diff --git a/libs/sipcc/core/sipstack/ccsip_pmh.c b/libs/sipcc/core/sipstack/ccsip_pmh.c
index e298993c09..9717058a3a 100644
--- a/libs/sipcc/core/sipstack/ccsip_pmh.c
+++ b/libs/sipcc/core/sipstack/ccsip_pmh.c
@@ -15,7 +15,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "plstr.h"
+//#include "plstr.h"
 #include "cpr_types.h"
 #include "cpr_stdio.h"
 #include "cpr_stdlib.h"
diff --git a/libs/sipcc/core/sipstack/ccsip_spi_utils.c b/libs/sipcc/core/sipstack/ccsip_spi_utils.c
index 97ce502d31..781bee2d43 100755
--- a/libs/sipcc/core/sipstack/ccsip_spi_utils.c
+++ b/libs/sipcc/core/sipstack/ccsip_spi_utils.c
@@ -9,7 +9,7 @@
  * CCAPI callids, conversion from CCAPI to SIP cause codes and the
  * like.
  */
-#include "plstr.h"
+//#include "plstr.h"
 #include "cpr_types.h"
 #include "cpr_stdlib.h"
 #include "cpr_string.h"
diff --git a/libs/sipcc/core/sipstack/httpish.c b/libs/sipcc/core/sipstack/httpish.c
index f909a7baf2..ed4a87a243 100644
--- a/libs/sipcc/core/sipstack/httpish.c
+++ b/libs/sipcc/core/sipstack/httpish.c
@@ -11,7 +11,7 @@
 #include <errno.h>
 #include <limits.h>
 
-#include "plstr.h"
+//#include "plstr.h"
 #include "cpr_types.h"
 #include "cpr_stdio.h"
 #include "cpr_stdlib.h"
diff --git a/libs/sipcc/cpr/common/cpr_string.c b/libs/sipcc/cpr/common/cpr_string.c
index 13276e9135..4330175c67 100644
--- a/libs/sipcc/cpr/common/cpr_string.c
+++ b/libs/sipcc/cpr/common/cpr_string.c
@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <stdarg.h>
 
-#include "mozilla/Assertions.h"
+//#include "mozilla/Assertions.h"
 #include "cpr_types.h"
 #include "cpr_stdlib.h"
 #include "cpr_string.h"
diff --git a/libs/sipcc/cpr/include/cpr_stdlib.h b/libs/sipcc/cpr/include/cpr_stdlib.h
index 65e4c5558f..da5d912f28 100644
--- a/libs/sipcc/cpr/include/cpr_stdlib.h
+++ b/libs/sipcc/cpr/include/cpr_stdlib.h
@@ -13,12 +13,12 @@
 #include <errno.h>
 #endif
 
-#include "mozilla/mozalloc.h"
+//#include "mozilla/mozalloc.h"
 
-#define cpr_malloc(a) moz_xmalloc(a)
-#define cpr_calloc(a, b) moz_xcalloc(a, b)
-#define cpr_realloc(a, b) moz_xrealloc(a, b)
-#define cpr_free(a) moz_free(a)
+#define cpr_malloc(a) malloc(a)
+#define cpr_calloc(a, b) calloc(a, b)
+#define cpr_realloc(a, b) realloc(a, b)
+#define cpr_free(a) free(a)
 
 #endif