Index: src/libchcore/CommonDataTypes.h
===================================================================
diff -u -N -ra44714d5c7ec0f50a376f4d0ea919ee5a224f834 -re96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3
--- src/libchcore/CommonDataTypes.h	(.../CommonDataTypes.h)	(revision a44714d5c7ec0f50a376f4d0ea919ee5a224f834)
+++ src/libchcore/CommonDataTypes.h	(.../CommonDataTypes.h)	(revision e96806b7f8ff7ca7e9f4afbea603e6351a3dc3e3)
@@ -19,11 +19,10 @@
 #ifndef __COMMONDATATYPES_H__
 #define __COMMONDATATYPES_H__
 
-BEGIN_CHCORE_NAMESPACE
+namespace chcore
+{
+	typedef unsigned long file_count_t;
+	typedef unsigned long long file_size_t;
+}
 
-typedef unsigned long file_count_t;
-typedef unsigned long long file_size_t;
-
-END_CHCORE_NAMESPACE
-
 #endif