diff --git a/jni/libccrtp/sources/src/rtppkt.cpp b/jni/libccrtp/sources/src/rtppkt.cpp
index 1ab27f9..3d29100 100644
--- a/jni/libccrtp/sources/src/rtppkt.cpp
+++ b/jni/libccrtp/sources/src/rtppkt.cpp
@@ -46,9 +46,7 @@
 #include <ccrtp/rtppkt.h>
 #include <ccrtp/CryptoContext.h>
 
-#ifdef  CCXX_NAMESPACES
-namespace ost {
-#endif
+NAMESPACE_COMMONCPP
 
 // Default to 8Khz when no value is specified.
 const uint32 PayloadFormat::defaultRTPClockRate = 8000;
@@ -332,7 +330,7 @@
     /* Guess the index */
     uint64 guessedIndex = pcc->guessIndex(cachedSeqNum);
 
-    uint32 guessedRoc = guessedIndex >> 16;
+    uint32 guessedRoc = (uint32)(guessedIndex >> 16);
     uint8* mac = new uint8[pcc->getTagLength()];
 
     pcc->srtpAuthenticate(this, guessedRoc, mac);
@@ -351,9 +349,7 @@
     return 1;
 }
 
-#ifdef  CCXX_NAMESPACES
-}
-#endif
+END_NAMESPACE
 
 /** EMACS **
  * Local variables: