diff --git a/pjlib/include/pj/compat/cc_codew.h b/pjlib/include/pj/compat/cc_codew.h
index cad9d0c..bf39c8b 100644
--- a/pjlib/include/pj/compat/cc_codew.h
+++ b/pjlib/include/pj/compat/cc_codew.h
@@ -16,8 +16,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
  */
-#ifndef __PJ_COMPAT_CC_GCC_H__
-#define __PJ_COMPAT_CC_GCC_H__
+#ifndef __PJ_COMPAT_CC_CODEW_H__
+#define __PJ_COMPAT_CC_CODEW_H__
 
 /**
  * @file cc_codew.h
@@ -44,8 +44,10 @@
 typedef long long pj_int64_t;
 typedef unsigned long long pj_uint64_t;
 
+#define PJ_INT64(val)		val##LL
+#define PJ_UINT64(val)		val##LLU
 #define PJ_INT64_FMT		"L"
 
 
-#endif	/* __PJ_COMPAT_CC_GCC_H__ */
+#endif	/* __PJ_COMPAT_CC_CODEW_H__ */
 
diff --git a/pjlib/include/pj/compat/cc_gcce.h b/pjlib/include/pj/compat/cc_gcce.h
index d27dd2c..c7f4488 100644
--- a/pjlib/include/pj/compat/cc_gcce.h
+++ b/pjlib/include/pj/compat/cc_gcce.h
@@ -44,6 +44,8 @@
 typedef long long pj_int64_t;
 typedef unsigned long long pj_uint64_t;
 
+#define PJ_INT64(val)		val##LL
+#define PJ_UINT64(val)		val##LLU
 #define PJ_INT64_FMT		"L"
 
 
diff --git a/pjlib/include/pj/compat/cc_mwcc.h b/pjlib/include/pj/compat/cc_mwcc.h
index e22e9fb..11fadf6 100644
--- a/pjlib/include/pj/compat/cc_mwcc.h
+++ b/pjlib/include/pj/compat/cc_mwcc.h
@@ -44,6 +44,8 @@
 typedef long long pj_int64_t;
 typedef unsigned long long pj_uint64_t;
 
+#define PJ_INT64(val)		val##LL
+#define PJ_UINT64(val)		val##LLU
 #define PJ_INT64_FMT		"L"