--- a/media/webrtc/signaling/src/callcontrol/CallControlManagerImpl.cpp
+++ b/media/webrtc/signaling/src/callcontrol/CallControlManagerImpl.cpp
@@ -1,23 +1,24 @@
 /* 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/. */
 
 #include <errno.h>
 #include <string>
 
+#include "CSFLogStream.h"
+
 #include "CC_SIPCCDevice.h"
 #include "CC_SIPCCDeviceInfo.h"
 #include "CC_SIPCCFeatureInfo.h"
 #include "CC_SIPCCLine.h"
 #include "CC_SIPCCLineInfo.h"
 #include "CC_SIPCCCallInfo.h"
 #include "CallControlManagerImpl.h"
-#include "CSFLogStream.h"
 #include "csf_common.h"
 
 extern "C"
 {
 #include "config_api.h"
 }
 
 static const char* logTag = "CallControlManager";

--- a/media/webrtc/signaling/src/common/browser_logging/CSFLog.h
+++ b/media/webrtc/signaling/src/common/browser_logging/CSFLog.h
@@ -1,15 +1,25 @@
 /* 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
 
+// In order for FORCE_PR_LOG below to work, we have to define it before the
+// first time prlog is #included.
+#if defined(PR_LOG)
+#error "Must #include CSFLog.h before before any IPDL-generated files or other files that #include prlog.h."
+#endif
+
+#if defined(MOZ_LOGGING)
+#define FORCE_PR_LOG
+#endif
+
 #include <stdarg.h>
 #include "prlog.h"
 
 typedef enum{
 	CSF_LOG_CRITICAL =1,
 	CSF_LOG_ERROR,
 	CSF_LOG_WARNING,
 	CSF_LOG_NOTICE,

--- a/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/AudioConduit.cpp
@@ -1,21 +1,23 @@
 /* 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/. */
 
+#include "CSFLog.h"
+#include "nspr.h"
+
 #include "AudioConduit.h"
 #include "nsCOMPtr.h"
 #include "mozilla/Services.h"
 #include "nsServiceManagerUtils.h"
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 #include "nsThreadUtils.h"
 
-#include "CSFLog.h"
 #include "voice_engine/include/voe_errors.h"
 
 
 namespace mozilla {
 
 static const char* logTag ="WebrtcAudioSessionConduit";
 
 // 32 bytes is what WebRTC CodecInst expects

--- a/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
+++ b/media/webrtc/signaling/src/media-conduit/MediaConduitInterface.h
@@ -1,18 +1,15 @@
 /* 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 MEDIA_CONDUIT_ABSTRACTION_
 #define MEDIA_CONDUIT_ABSTRACTION_
 
-#include "nspr.h"
-#include "prerror.h"
-
 #include "nsISupportsImpl.h"
 #include "nsXPCOM.h"
 #include "mozilla/RefPtr.h"
 #include "CodecConfig.h"
 #include "VideoTypes.h"
 #include "MediaConduitErrors.h"
 
 #include <vector>

--- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
+++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
@@ -1,16 +1,18 @@
 /* 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/. */
 
+#include "CSFLog.h"
+#include "nspr.h"
+
 #include "VideoConduit.h"
 #include "AudioConduit.h"
 #include "video_engine/include/vie_errors.h"
-#include "CSFLog.h"
 
 namespace mozilla {
 
 static const char* logTag ="WebrtcVideoSessionConduit";
 
 const unsigned int WebrtcVideoConduit::CODEC_PLNAME_SIZE = 32;
 
 //Factory Implementation

--- a/media/webrtc/signaling/src/media/CSFAudioControlWrapper.cpp
+++ b/media/webrtc/signaling/src/media/CSFAudioControlWrapper.cpp
@@ -1,14 +1,14 @@
 /* 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/. */
 
+#include "CSFLogStream.h"
 #include "CSFAudioControlWrapper.h"
-#include "CSFLogStream.h"
 
 static const char* logTag = "VcmSipccBinding";
 
 namespace CSF {
 
 	std::vector<std::string> AudioControlWrapper::getRecordingDevices()
 	{
 		if (_realAudioControl != NULL)

--- a/media/webrtc/signaling/src/media/CSFVideoControlWrapper.cpp
+++ b/media/webrtc/signaling/src/media/CSFVideoControlWrapper.cpp
@@ -1,14 +1,14 @@
 /* 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/. */
 
+#include "CSFLogStream.h"
 #include "CSFVideoControlWrapper.h"
-#include "CSFLogStream.h"
 
 static const char* logTag = "VcmSipccBinding";
 
 namespace CSF {
 
 void VideoControlWrapper::setVideoMode( bool enable )
 {
 	if (_realVideoControl != NULL)

--- a/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
+++ b/media/webrtc/signaling/src/media/VcmSIPCCBinding.cpp
@@ -1,15 +1,15 @@
 /* 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/. */
 
-#include "CC_Common.h"
+#include "CSFLogStream.h"
 
-#include "CSFLogStream.h"
+#include "CC_Common.h"
 
 #include "CSFMediaProvider.h"
 #include "CSFAudioTermination.h"
 #include "CSFVideoTermination.h"
 #include "MediaConduitErrors.h"
 #include "MediaConduitInterface.h"
 #include "MediaPipeline.h"
 #include "VcmSIPCCBinding.h"

--- a/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
+++ b/media/webrtc/signaling/src/mediapipeline/MediaPipeline.cpp
@@ -1,14 +1,16 @@
 /* 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/. */
 
 // Original author: ekr@rtfm.com
 
+#include "CSFLog.h"
+
 #include "MediaPipeline.h"
 
 #include <math.h>
 
 #include "nspr.h"
 #include <prlog.h>
 #include "srtp.h"
 
@@ -33,17 +35,17 @@
 #include "runnable_utils.h"
 
 using namespace mozilla;
 
 #ifdef DEBUG
 // Dial up pipeline logging in debug mode
 #define MP_LOG_INFO PR_LOG_WARN
 #else
-#define MP_LOG_INFO PR_LOG_INFO
+#define MP_LOG_INFO PR_LOG_DEBUG
 #endif
 
 
 // Logging context
 MOZ_MTLOG_MODULE("mediapipeline")
 
 namespace mozilla {
 

--- a/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
+++ b/media/webrtc/signaling/src/peerconnection/MediaStreamList.cpp
@@ -1,12 +1,13 @@
 /* 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/. */
 
+#include "CSFLog.h"
 #include "base/basictypes.h"
 #include "MediaStreamList.h"
 #ifdef MOZILLA_INTERNAL_API
 #include "mozilla/dom/MediaStreamListBinding.h"
 #endif
 #include "nsIScriptGlobalObject.h"
 #include "PeerConnectionImpl.h"
 

--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionCtx.cpp
@@ -1,22 +1,22 @@
 /* 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/. */
 
+#include "CSFLog.h"
 
 #include "CallControlManager.h"
 #include "CC_Device.h"
 #include "CC_Call.h"
 #include "CC_Observer.h"
 #include "ccapi_call_info.h"
 #include "CC_SIPCCCallInfo.h"
 #include "ccapi_device_info.h"
 #include "CC_SIPCCDeviceInfo.h"
-#include "CSFLog.h"
 #include "vcm.h"
 #include "VcmSIPCCBinding.h"
 #include "PeerConnectionImpl.h"
 #include "PeerConnectionCtx.h"
 #include "runnable_utils.h"
 #include "cpr_socket.h"
 
 #include "nsIObserverService.h"

--- a/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
+++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionMedia.cpp
@@ -1,17 +1,18 @@
 /* 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/. */
 #include <string>
 
+#include "CSFLog.h"
+#include "CSFLogStream.h"
+
 #include "nspr.h"
 #include "cc_constants.h"
-#include "CSFLog.h"
-#include "CSFLogStream.h"
 
 #include "nricectx.h"
 #include "nricemediastream.h"
 #include "PeerConnectionImpl.h"
 #include "PeerConnectionMedia.h"
 #include "AudioConduit.h"
 #include "VideoConduit.h"
 #include "runnable_utils.h"

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCall.cpp
@@ -1,12 +1,14 @@
 /* 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/. */
 
+#include "CSFLogStream.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCCall.h"
 #include "CC_SIPCCCallInfo.h"
 #include "VcmSIPCCBinding.h"
 #include "CSFVideoTermination.h"
 #include "CSFAudioTermination.h"
 #include "CSFAudioControl.h"
@@ -16,17 +18,16 @@ extern "C"
 #include "ccapi_call.h"
 #include "ccapi_call_listener.h"
 #include "config_api.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLogStream.h"
 static const char* logTag = "CC_SIPCCCall";
 
 CSF_IMPLEMENT_WRAP(CC_SIPCCCall, cc_call_handle_t);
 
 CC_SIPCCCall::CC_SIPCCCall (cc_call_handle_t aCallHandle) :
             callHandle(aCallHandle),
             pMediaData(new CC_SIPCCCallMediaData(NULL,false,false,-1)),
             m_lock("CC_SIPCCCall")

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallInfo.cpp
@@ -1,25 +1,25 @@
 /* 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/. */
 
+#include "CSFLogStream.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCCallInfo.h"
 #include "CC_SIPCCLine.h"
 
 extern "C"
 {
 #include "ccapi_call.h"
 #include "ccapi_call_info.h"
 }
 
-#include "CSFLogStream.h"
-
 static const char* logTag = "CC_SIPCCCallInfo";
 
 using namespace std;
 using namespace CSF;
 
 CC_SIPCCCallInfo::CC_SIPCCCallInfo (cc_callinfo_ref_t callinfo) : callinfo_ref(callinfo)
 {
     CCAPI_Call_retainCallInfo(callinfo);

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallServerInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCCallServerInfo.cpp
@@ -1,27 +1,25 @@
 /* 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/. */
 
+#include "CSFLog.h"
 #include "CC_Common.h"
 
 #include "CC_SIPCCCallServerInfo.h"
 
 extern "C"
 {
 #include "ccapi_device_info.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLog.h"
-
-
 CC_SIPCCCallServerInfo::CC_SIPCCCallServerInfo (cc_callserver_ref_t call_serverinfo) : callserverinfo_ref(call_serverinfo)
 {
 }
 
 CSF_IMPLEMENT_WRAP(CC_SIPCCCallServerInfo, cc_callserver_ref_t);
 
 CC_SIPCCCallServerInfo::~CC_SIPCCCallServerInfo()
 {

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCDevice.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCDevice.cpp
@@ -1,12 +1,14 @@
 /* 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/. */
 
+#include "CSFLogStream.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCDevice.h"
 #include "CC_SIPCCDeviceInfo.h"
 #include "CC_SIPCCFeatureInfo.h"
 #include "CC_SIPCCCall.h"
 
 extern "C"
@@ -16,18 +18,16 @@ extern "C"
 #include "ccapi_device.h"
 #include "ccapi_device_info.h"
 #include "ccapi_device_listener.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLogStream.h"
-
 CSF_IMPLEMENT_WRAP(CC_SIPCCDevice, cc_device_handle_t);
 
 CC_DevicePtr CC_SIPCCDevice::createDevice ()
 {
     cc_device_handle_t deviceHandle = CCAPI_Device_getDeviceID();
 
     CC_SIPCCDevicePtr pSIPCCDevice = CC_SIPCCDevice::wrap(deviceHandle);
 

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCDeviceInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCDeviceInfo.cpp
@@ -1,12 +1,14 @@
 /* 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/. */
 
+#include "CSFLog.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCDeviceInfo.h"
 #include "CC_SIPCCFeatureInfo.h"
 #include "CC_SIPCCCallServerInfo.h"
 #include "CC_SIPCCCall.h"
 #include "CC_SIPCCLine.h"
 
@@ -17,18 +19,16 @@ extern "C"
 #include "cpr_types.h"
 #include "ccapi_device.h"
 #include "ccapi_device_info.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLog.h"
-
 #define MAX_SUPPORTED_NUM_CALLS        100
 #define MAX_SUPPORTED_NUM_LINES        100
 #define MAX_SUPPORTED_NUM_FEATURES     100
 #define MAX_SUPPORTED_NUM_CALL_SERVERS 100
 
 
 CSF_IMPLEMENT_WRAP(CC_SIPCCDeviceInfo, cc_deviceinfo_ref_t);
 

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCFeatureInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCFeatureInfo.cpp
@@ -1,28 +1,28 @@
 /* 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/. */
 
+#include "CSFLog.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCFeatureInfo.h"
 #include "CC_SIPCCDeviceInfo.h"
 
 extern "C"
 {
 #include "ccapi_device.h"
 #include "ccapi_feature_info.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLog.h"
-
 CSF_IMPLEMENT_WRAP(CC_SIPCCFeatureInfo, cc_featureinfo_ref_t);
 
 CC_SIPCCFeatureInfo::CC_SIPCCFeatureInfo (cc_featureinfo_ref_t featureinfo) : featureinfo_ref(featureinfo)
 {
 //    CCAPI_Device_retainFeatureInfo(featureinfo);
 }
 
 CC_SIPCCFeatureInfo::~CC_SIPCCFeatureInfo()

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCLine.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCLine.cpp
@@ -1,29 +1,29 @@
 /* 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/. */
 
+#include "CSFLog.h"
+
 #include "CC_Common.h"
 
 #include "CC_SIPCCLine.h"
 #include "CC_SIPCCCall.h"
 #include "CC_SIPCCLineInfo.h"
 
 extern "C"
 {
 #include "ccapi_line.h"
 #include "ccapi_line_listener.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLog.h"
-
 CSF_IMPLEMENT_WRAP(CC_SIPCCLine, cc_lineid_t);
 
 cc_lineid_t CC_SIPCCLine::getID()
 {
     return lineId;
 }
 
 CC_LineInfoPtr CC_SIPCCLine::getLineInfo ()

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCLineInfo.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCLineInfo.cpp
@@ -1,12 +1,14 @@
 /* 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/. */
 
+#include "CSFLog.h"
+
 #include "CC_Common.h"
 
 #include "csf_common.h"
 #include "CC_SIPCCLineInfo.h"
 #include "CC_SIPCCLine.h"
 #include "CC_SIPCCCall.h"
 
 extern "C"
@@ -14,18 +16,16 @@ extern "C"
 #include "cpr_types.h"
 #include "ccapi_line.h"
 #include "ccapi_line_info.h"
 }
 
 using namespace std;
 using namespace CSF;
 
-#include "CSFLog.h"
-
 #define MAX_SUPPORTED_NUM_CALLS 100
 
 //FIXME: Header file "ccapi_line.h" has misnamed the retain function as "CCAPI_Device_retainLineInfo"
 //       Checked the source file and it's declared correctly there, so I have to declare it myself here.
 
 //Also CCAPI_LineInfo_getCalls() in source file and CCAPI_lineInfo_getCalls() in header (lowercase 'l' in lineInfo)
 
 extern "C" void CCAPI_Line_retainLineInfo(cc_lineinfo_ref_t ref);

--- a/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/CC_SIPCCService.cpp
@@ -1,16 +1,18 @@
 /* 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/. */
 
 #ifdef _WIN32
 #include <windows.h> //plat_api.h seems to need some of the types defined in Windows.h (e.g. boolean)
 #endif
 
+#include "CSFLogStream.h"
+
 #include "CC_CallTypes.h"
 #include "CC_SIPCCService.h"
 #include "NullDeleter.h"
 #include "CC_SIPCCDevice.h"
 #include "CC_SIPCCDeviceInfo.h"
 #include "CC_SIPCCFeatureInfo.h"
 #include "CC_SIPCCCallServerInfo.h"
 #include "CC_SIPCCCall.h"
@@ -27,17 +29,16 @@
 extern "C" {
 #include "ccapi_device.h"
 }
 #include "debug-psipcc-types.h"
 #include "VcmSIPCCBinding.h"
 
 #include "csf_common.h"
 
-#include "CSFLogStream.h"
 static const char* logTag = "CC_SIPCCService";
 
 using namespace std;
 
 #define MAX_SUPPORTED_NUM_CALLS        100
 #define MAX_SUPPORTED_NUM_LINES        100
 #define MAX_SUPPORTED_NUM_FEATURES     100
 #define MAX_SUPPORTED_NUM_CALL_SERVERS 100

--- a/media/webrtc/signaling/src/softphonewrapper/ccapi_plat_api_impl.cpp
+++ b/media/webrtc/signaling/src/softphonewrapper/ccapi_plat_api_impl.cpp
@@ -1,29 +1,31 @@
 /* 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/. */
 
+#include "CSFLog.h"
+
 #include "CC_Common.h"
 #include "csf_common.h"
 #ifdef WIN32
 #include <windows.h>
 #else
 #ifdef LINUX
 // for platGetIPAddr
 #include <sys/ioctl.h>
 #include <sys/types.h>
 #include <arpa/inet.h>
 #include <net/if.h>
 #include <fcntl.h>
 #endif
 #endif
 
 #include "cpr_string.h"
-#include "CSFLog.h"
+
 static const char* logTag = "sipcc";
 
 extern "C"
 {
 #include "plat_api.h"
 #include <stdarg.h>