--- a/media/mtransport/third_party/moz.build
+++ b/media/mtransport/third_party/moz.build
@@ -17,64 +17,16 @@ gyp_vars_copy = gyp_vars.copy()
 if CONFIG['MOZ_VALGRIND']:
     gyp_vars_copy.update(build_for_tool="memcheck")
 elif CONFIG['MOZ_ASAN']:
     gyp_vars_copy.update(build_for_tool="asan")
 elif CONFIG['MOZ_TSAN']:
     gyp_vars_copy.update(build_for_tool="tsan")
 
 # These files cannot be built in unified mode because of name clashes on RCSSTRING
-nICEr_non_unified_sources = [
-    'nICEr/src/crypto/nr_crypto.c',
-    'nICEr/src/ice/ice_candidate.c',
-    'nICEr/src/ice/ice_candidate_pair.c',
-    'nICEr/src/ice/ice_component.c',
-    'nICEr/src/ice/ice_ctx.c',
-    'nICEr/src/ice/ice_media_stream.c',
-    'nICEr/src/ice/ice_parser.c',
-    'nICEr/src/ice/ice_peer_ctx.c',
-    'nICEr/src/ice/ice_socket.c',
-    'nICEr/src/net/nr_socket.c',
-    'nICEr/src/net/transport_addr.c',
-    'nICEr/src/net/transport_addr_reg.c',
-    'nICEr/src/stun/addrs.c',
-    'nICEr/src/stun/nr_socket_turn.c',
-    'nICEr/src/stun/stun_build.c',
-    'nICEr/src/stun/stun_client_ctx.c',
-    'nICEr/src/stun/stun_codec.c',
-    'nICEr/src/stun/stun_hint.c',
-    'nICEr/src/stun/stun_msg.c',
-    'nICEr/src/stun/stun_proc.c',
-    'nICEr/src/stun/stun_server_ctx.c',
-    'nICEr/src/stun/stun_util.c',
-    'nICEr/src/stun/turn_client_ctx.c',
-    'nICEr/src/util/cb_args.c',
-    'nICEr/src/util/ice_util.c',
-]
-
-nrappkit_non_unified_sources = [
-    'nrappkit/src/log/r_log.c',
-    'nrappkit/src/registry/registry.c',
-    'nrappkit/src/registry/registry_local.c',
-    'nrappkit/src/util/byteorder.c',
-    'nrappkit/src/util/hex.c',
-    'nrappkit/src/util/libekr/debug.c',
-    'nrappkit/src/util/libekr/r_assoc.c',
-    'nrappkit/src/util/libekr/r_crc32.c',
-    'nrappkit/src/util/libekr/r_data.c',
-    'nrappkit/src/util/libekr/r_errors.c',
-    'nrappkit/src/util/libekr/r_list.c',
-    'nrappkit/src/util/libekr/r_memory.c',
-    'nrappkit/src/util/libekr/r_replace.c',
-    'nrappkit/src/util/libekr/r_time.c',
-    'nrappkit/src/util/p_buf.c',
-    'nrappkit/src/util/util.c',
-]
 
 GYP_DIRS['nICEr'].input = 'nICEr/nicer.gyp'
 GYP_DIRS['nICEr'].variables = gyp_vars_copy
 GYP_DIRS['nICEr'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
-GYP_DIRS['nICEr'].non_unified_sources += nICEr_non_unified_sources
 
 GYP_DIRS['nrappkit'].input = 'nrappkit/nrappkit.gyp'
 GYP_DIRS['nrappkit'].variables = gyp_vars_copy
 GYP_DIRS['nrappkit'].sandbox_vars['FINAL_LIBRARY'] = 'xul'
-GYP_DIRS['nrappkit'].non_unified_sources += nrappkit_non_unified_sources

--- a/media/mtransport/third_party/nICEr/src/crypto/nr_crypto.c
+++ b/media/mtransport/third_party/nICEr/src/crypto/nr_crypto.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: nr_crypto.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <nr_api.h>
 #include "nr_crypto.h"
 
 static int nr_ice_crypto_dummy_random_bytes(UCHAR *buf, size_t len)
   {
     fprintf(stderr,"Need to define crypto API implementation\n");
 
     exit(1);

--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_candidate.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <csi_platform.h>
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/queue.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include <winsock2.h>

--- a/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_candidate_pair.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_candidate_pair.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <assert.h>
 #include <string.h>
 #include <nr_api.h>
 #include "async_timer.h"
 #include "ice_ctx.h"
 #include "ice_util.h"
 #include "ice_codeword.h"
 #include "stun.h"

--- a/media/mtransport/third_party/nICEr/src/ice/ice_component.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_component.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_component.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <string.h>
 #include <assert.h>
 #include <nr_api.h>
 #include <registry.h>
 #include <async_timer.h>
 #include "ice_ctx.h"
 #include "ice_codeword.h"
 #include "stun.h"

--- a/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_ctx.c
@@ -26,20 +26,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_ctx.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <csi_platform.h>
 #include <assert.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>

--- a/media/mtransport/third_party/nICEr/src/ice/ice_media_stream.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_media_stream.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_media_stream.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <string.h>
 #include <assert.h>
 #include <nr_api.h>
 #include <r_assoc.h>
 #include <async_timer.h>
 #include "ice_util.h"
 #include "ice_ctx.h"
 

--- a/media/mtransport/third_party/nICEr/src/ice/ice_parser.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_parser.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_parser.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <csi_platform.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include <winsock2.h>
 #else
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

--- a/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_peer_ctx.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_peer_ctx.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <string.h>
 #include <assert.h>
 #include <registry.h>
 #include <nr_api.h>
 #include "ice_ctx.h"
 #include "ice_peer_ctx.h"
 #include "ice_media_stream.h"
 #include "ice_util.h"

--- a/media/mtransport/third_party/nICEr/src/ice/ice_socket.c
+++ b/media/mtransport/third_party/nICEr/src/ice/ice_socket.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_socket.c,v 1.2 2008/04/28 17:59:01 ekr Exp $";
-
 #include <assert.h>
 #include <string.h>
 #include "nr_api.h"
 #include "ice_ctx.h"
 #include "stun.h"
 #include "nr_socket_buffered_stun.h"
 #include "nr_socket_multi_tcp.h"
 

--- a/media/mtransport/third_party/nICEr/src/net/nr_socket.c
+++ b/media/mtransport/third_party/nICEr/src/net/nr_socket.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: nr_socket.c,v 1.2 2008/04/28 17:59:02 ekr Exp $";
-
 #include <assert.h>
 #include <nr_api.h>
 #include "nr_socket.h"
 #include "local_addr.h"
 
 #define CHECK_DEFINED(f) assert(sock->vtbl->f); if (!sock->vtbl->f) ERETURN(R_INTERNAL);
 int nr_socket_create_int(void *obj, nr_socket_vtbl *vtbl, nr_socket **sockp)
   {

--- a/media/mtransport/third_party/nICEr/src/net/transport_addr.c
+++ b/media/mtransport/third_party/nICEr/src/net/transport_addr.c
@@ -25,21 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: transport_addr.c,v 1.2 2008/04/28 17:59:03 ekr Exp $";
-
-
 #include <csi_platform.h>
 #include <stdio.h>
 #include <memory.h>
 #include <sys/types.h>
 #include <errno.h>
 #ifdef WIN32
 #include <winsock2.h>
 #else

--- a/media/mtransport/third_party/nICEr/src/net/transport_addr_reg.c
+++ b/media/mtransport/third_party/nICEr/src/net/transport_addr_reg.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: transport_addr_reg.c,v 1.2 2008/04/28 17:59:03 ekr Exp $";
-
 #include <csi_platform.h>
 #include <stdio.h>
 #include <string.h>
 #include <memory.h>
 #include <sys/types.h>
 #ifdef WIN32
 #include <winsock2.h>
 #else

--- a/media/mtransport/third_party/nICEr/src/stun/addrs.c
+++ b/media/mtransport/third_party/nICEr/src/stun/addrs.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: addrs.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <csi_platform.h>
 #include <assert.h>
 #include <string.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <iphlpapi.h>
 #include <tchar.h>

--- a/media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.c
+++ b/media/mtransport/third_party/nICEr/src/stun/nr_socket_turn.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: nr_socket_turn.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #ifdef USE_TURN
 
 #include <csi_platform.h>
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
 #include <assert.h>
 

--- a/media/mtransport/third_party/nICEr/src/stun/stun_build.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_build.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_build.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <csi_platform.h>
 #include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <ctype.h>
 
 #include "nr_api.h"

--- a/media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_client_ctx.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_client_ctx.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <assert.h>
 #include <string.h>
 #include <math.h>
 
 #include <nr_api.h>
 #include "stun.h"
 #include "async_timer.h"
 #include "registry.h"

--- a/media/mtransport/third_party/nICEr/src/stun/stun_codec.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_codec.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_codec.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <errno.h>
 #include <csi_platform.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <stdlib.h>
 #include <io.h>
 #include <time.h>

--- a/media/mtransport/third_party/nICEr/src/stun/stun_hint.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_hint.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_hint.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
-
 #include <errno.h>
 #include <csi_platform.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <stdlib.h>
 #include <io.h>
 #include <time.h>

--- a/media/mtransport/third_party/nICEr/src/stun/stun_msg.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_msg.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_msg.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <errno.h>
 #include <csi_platform.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <stdlib.h>
 #include <io.h>
 #include <time.h>

--- a/media/mtransport/third_party/nICEr/src/stun/stun_proc.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_proc.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_proc.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <errno.h>
 #include <csi_platform.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <stdlib.h>
 #include <io.h>
 #include <time.h>

--- a/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_server_ctx.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: stun_server_ctx.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <string.h>
 #include <assert.h>
 
 #include "nr_api.h"
 #include "stun.h"
 
 static int nr_stun_server_destroy_client(nr_stun_server_client *clnt);
 static int nr_stun_server_send_response(nr_stun_server_ctx *ctx, nr_socket *sock, nr_transport_addr *peer_addr, nr_stun_message *res, nr_stun_server_client *clnt);

--- a/media/mtransport/third_party/nICEr/src/stun/stun_util.c
+++ b/media/mtransport/third_party/nICEr/src/stun/stun_util.c
@@ -25,19 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-static char *RCSSTRING __UNUSED__="$Id: stun_util.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #include <errno.h>
 #include <csi_platform.h>
 
 #ifdef WIN32
 #include <winsock2.h>
 #include <stdlib.h>
 #include <io.h>
 #include <time.h>

--- a/media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.c
+++ b/media/mtransport/third_party/nICEr/src/stun/turn_client_ctx.c
@@ -28,20 +28,16 @@
   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: turn_client_ctx.c,v 1.2 2008/04/28 18:21:30 ekr Exp $";
-
 #ifdef USE_TURN
 
 #include <assert.h>
 #include <string.h>
 
 #include "nr_api.h"
 #include "r_time.h"
 #include "async_timer.h"

--- a/media/mtransport/third_party/nICEr/src/util/cb_args.c
+++ b/media/mtransport/third_party/nICEr/src/util/cb_args.c
@@ -25,20 +25,16 @@ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY 
 SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-
-
-static char *RCSSTRING __UNUSED__="$Id: cb_args.c,v 1.2 2008/04/28 17:59:04 ekr Exp $";
-
 #include <stdarg.h>
 #include "nr_api.h"
 #include "cb_args.h"
 
 void **nr_pack_cb_args(int ct,...)
   {
     void **vlist;
     va_list ap;

--- a/media/mtransport/third_party/nICEr/src/util/ice_util.c
+++ b/media/mtransport/third_party/nICEr/src/util/ice_util.c
@@ -26,21 +26,16 @@ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAM
 LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
 DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
 THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <stdarg.h>
-
-
-static char *RCSSTRING __UNUSED__="$Id: ice_util.c,v 1.2 2008/04/28 17:59:05 ekr Exp $";
-
-#include <stdarg.h>
 #include <string.h>
 #include "nr_api.h"
 #include "ice_util.h"
 
 int nr_concat_strings(char **outp,...)
   {
     va_list ap;
     char *s,*out=0;

--- a/media/mtransport/third_party/nrappkit/src/log/r_log.c
+++ b/media/mtransport/third_party/nrappkit/src/log/r_log.c
@@ -31,20 +31,16 @@
    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
 
    ekr@rtfm.com  Mon Dec  3 15:24:38 2001
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: r_log.c,v 1.10 2008/11/25 22:25:18 adamcain Exp $";
-
-
 #ifdef LINUX
 #define _BSD_SOURCE
 #define _DEFAULT_SOURCE
 #endif
 
 #include "r_log.h"
 #include "hex.h"
 

--- a/media/mtransport/third_party/nrappkit/src/util/byteorder.c
+++ b/media/mtransport/third_party/nrappkit/src/util/byteorder.c
@@ -30,19 +30,16 @@
    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
 
    briank@networkresonance.com  Wed May 16 16:46:00 PDT 2007
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: byteorder.c,v 1.2 2007/06/26 22:37:55 adamcain Exp $";
-
 #include "nr_common.h"
 #ifndef WIN32
 #include <arpa/inet.h>
 #endif
 #include "r_types.h"
 #include "byteorder.h"
 
 #define IS_BIG_ENDIAN (htonl(0x1) == 0x1)

--- a/media/mtransport/third_party/nrappkit/src/util/hex.c
+++ b/media/mtransport/third_party/nrappkit/src/util/hex.c
@@ -31,19 +31,16 @@
    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
 
    briank@network-resonance.com
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: hex.c,v 1.3 2007/06/26 22:37:56 adamcain Exp $";
-
 #include <sys/types.h>
 #include <string.h>
 #include <ctype.h>
 #include "r_common.h"
 #include "hex.h"
 #include "r_log.h"
 
 static char bin2hex_map[][3] = { "00", "01", "02", "03", "04", "05", "06", "07", "08", "09", "0a", "0b", "0c", "0d", "0e", "0f", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "1a", "1b", "1c", "1d", "1e", "1f", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "2a", "2b", "2c", "2d", "2e", "2f", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "3a", "3b", "3c", "3d", "3e", "3f", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "4a", "4b", "4c", "4d", "4e", "4f", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "5a", "5b", "5c", "5d", "5e", "5f", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "6a", "6b", "6c", "6d", "6e", "6f", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "7a", "7b", "7c", "7d", "7e", "7f", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "8a", "8b", "8c", "8d", "8e", "8f", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "9a", "9b", "9c", "9d", "9e", "9f", "a0", "a1", "a2", "a3", "a4", "a5", "a6", "a7", "a8", "a9", "aa", "ab", "ac", "ad", "ae", "af", "b0", "b1", "b2", "b3", "b4", "b5", "b6", "b7", "b8", "b9", "ba", "bb", "bc", "bd", "be", "bf", "c0", "c1", "c2", "c3", "c4", "c5", "c6", "c7", "c8", "c9", "ca", "cb", "cc", "cd", "ce", "cf", "d0", "d1", "d2", "d3", "d4", "d5", "d6", "d7", "d8", "d9", "da", "db", "dc", "dd", "de", "df", "e0", "e1", "e2", "e3", "e4", "e5", "e6", "e7", "e8", "e9", "ea", "eb", "ec", "ed", "ee", "ef", "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", "f8", "f9", "fa", "fb", "fc", "fd", "fe", "ff" };

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/debug.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/debug.c
@@ -75,20 +75,16 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: debug.c,v 1.3 2007/06/26 22:37:57 adamcain Exp $
 
 
    ekr@rtfm.com  Wed Jan  6 17:08:58 1999
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: debug.c,v 1.3 2007/06/26 22:37:57 adamcain Exp $";
-
-
 #include <stdarg.h>
 #include <stdio.h>
 #include "r_common.h"
 #include "debug.h"
 
 int nr_debug(int class,char *format,...)
   {
     va_list ap;

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_assoc.c
@@ -85,18 +85,16 @@
    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_assoc.c,v 1.4 2007/06/08 17:41:49 adamcain Exp $
 
    ekr@rtfm.com  Sun Jan 17 17:57:15 1999
  */
 
-static char *RCSSTRING __UNUSED__ ="$Id: r_assoc.c,v 1.4 2007/06/08 17:41:49 adamcain Exp $";
-
 #include <r_common.h>
 #include <string.h>
 #include "r_assoc.h"
 
 typedef struct r_assoc_el_ {
      char *key;
      int key_len;
      void *data;

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_crc32.c
@@ -62,18 +62,16 @@
  * use.  An error-free packet will leave 0xDEBB20E3 in the crc.
  *			Spencer Garrett <srg@quick.com>
  */
 
 
 #include <sys/types.h>
 #include <r_types.h>
 
-static char *RCSSTRING __UNUSED__ ="$Id: r_crc32.c,v 1.4 2008/11/26 03:22:02 adamcain Exp $";
-
 #ifdef WIN32
 #define u_int32_t  UINT4
 #endif
 
 #define CRC(crc, ch)	 (crc = (crc >> 8) ^ crctab[(crc ^ (ch)) & 0xff])
 
 /* generated using the AUTODIN II polynomial
  *	x^32 + x^26 + x^23 + x^22 + x^16 +

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_data.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_data.c
@@ -74,19 +74,16 @@
    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_data.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $
 
    ekr@rtfm.com  Tue Aug 17 15:39:50 1999
  */
 
-
-static char *RCSSTRING __UNUSED__ =(char *)"$Id: r_data.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $";
-
 #include <string.h>
 #include <r_common.h>
 #include <r_data.h>
 #include <string.h>
 
 int r_data_create(dp,d,l)
   Data **dp;
   const UCHAR *d;

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_errors.c
@@ -75,19 +75,16 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_errors.c,v 1.5 2008/11/26 03:22:02 adamcain Exp $
 
 
    ekr@rtfm.com  Tue Feb 16 16:37:05 1999
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: r_errors.c,v 1.5 2008/11/26 03:22:02 adamcain Exp $";
-
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
 #include "r_common.h"
 #include "r_errors.h"
 
 static struct {
     int    errnum;

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_list.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_list.c
@@ -75,19 +75,16 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_list.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $
 
 
    ekr@rtfm.com  Tue Jan 19 08:36:39 1999
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: r_list.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $";
-
 #include <r_common.h>
 #include "r_list.h"
 
 typedef struct r_list_el_ {
      void *data;
      struct r_list_el_ *next;
      struct r_list_el_ *prev;
      int (*copy)(void **new,void *old);

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_memory.c
@@ -31,19 +31,16 @@
    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
 
    ekr@rtfm.com  Thu Apr 22 20:40:45 2004
  */
 
-
-static char *RCSSTRING __UNUSED__="$Id: r_memory.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $";
-
 #include <string.h>
 #include <stddef.h>
 #include <assert.h>
 #include "r_common.h"
 #include "r_memory.h"
 
 typedef struct r_malloc_chunk_ {
 #ifdef SANITY_CHECKS

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_replace.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_replace.c
@@ -75,19 +75,16 @@
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_replace.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $
 
 
    ekr@rtfm.com  Sun Oct  1 11:18:49 2000
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: r_replace.c,v 1.2 2006/08/16 19:39:17 adamcain Exp $";
-
 #include  "r_common.h"
 
 #ifndef HAVE_STRDUP
 
 char *strdup(str)
   char *str;
   {
     int len=strlen(str);

--- a/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c
+++ b/media/mtransport/third_party/nrappkit/src/util/libekr/r_time.c
@@ -74,19 +74,16 @@
    LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
    OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY SUCH DAMAGE.
 
    $Id: r_time.c,v 1.5 2008/11/26 03:22:02 adamcain Exp $
 
    ekr@rtfm.com  Thu Mar  4 08:43:46 1999
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: r_time.c,v 1.5 2008/11/26 03:22:02 adamcain Exp $";
-
 #include <r_common.h>
 #include <r_time.h>
 
 /*Note that t1 must be > t0 */
 int r_timeval_diff(t1,t0,diff)
   struct timeval *t1;
   struct timeval *t0;
   struct timeval *diff;

--- a/media/mtransport/third_party/nrappkit/src/util/p_buf.c
+++ b/media/mtransport/third_party/nrappkit/src/util/p_buf.c
@@ -33,18 +33,16 @@
    POSSIBILITY OF SUCH DAMAGE.
 
 
    All Rights Reserved.
 
    ekr@rtfm.com  Tue Nov 25 16:33:08 2003
  */
 
-static char *RCSSTRING __UNUSED__ ="Id: p_buf.c,v 1.3 2004/01/03 22:13:53 ekr Exp $";
-
 #include <string.h>
 #include <stddef.h>
 #include "nr_common.h"
 #include "p_buf.h"
 
 
 static int nr_p_buf_destroy_chain(nr_p_buf_head *head);
 static int nr_p_buf_destroy(nr_p_buf *buf);

--- a/media/mtransport/third_party/nrappkit/src/util/util.c
+++ b/media/mtransport/third_party/nrappkit/src/util/util.c
@@ -31,19 +31,16 @@
    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
    POSSIBILITY OF SUCH DAMAGE.
 
 
    ekr@rtfm.com  Wed Dec 26 17:19:36 2001
  */
 
-
-static char *RCSSTRING __UNUSED__ ="$Id: util.c,v 1.5 2007/11/21 00:09:13 adamcain Exp $";
-
 #ifndef WIN32
 #include <sys/uio.h>
 #include <pwd.h>
 #include <dirent.h>
 #endif
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>