diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..efa96e5
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,26 @@
+language: cpp
+
+compiler:
+ - clang
+ - gcc
+
+env:
+ - config=debug64   config_suffix=debug_x64_gmake
+ - config=release64 config_suffix=release_x64_gmake
+
+before_install:
+  - sudo add-apt-repository -y ppa:codegear/release
+  - sudo apt-get update -qq
+  - sudo apt-get install -y premake4
+
+install: true
+
+before_script:
+  - cd build 
+  - premake4 'gmake'
+  - cd "${TRAVIS_BUILD_DIR}"
+
+script:
+  - make -C build/gmake -f test.make unittest
+  - cd bin
+  - ./unittest_${config_suffix}
diff --git a/include/rapidjson/rapidjson.h b/include/rapidjson/rapidjson.h
index 30fd7a1..fd31aef 100644
--- a/include/rapidjson/rapidjson.h
+++ b/include/rapidjson/rapidjson.h
@@ -10,13 +10,19 @@
 ///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_NO_INT64DEFINE
 
-// Here defines int64_t and uint64_t types in global namespace.
+// Here defines int64_t and uint64_t types in global namespace as well as the
+// (U)INT64_C constant macros.
 // If user have their own definition, can define RAPIDJSON_NO_INT64DEFINE to disable this.
 #ifndef RAPIDJSON_NO_INT64DEFINE
+#ifndef __STDC_CONSTANT_MACROS
+#  define __STDC_CONSTANT_MACROS 1 // required by C++ standard
+#endif
 #ifdef _MSC_VER
+#include "msinttypes/stdint.h"
 #include "msinttypes/inttypes.h"
 #else
 // Other compilers should have this.
+#include <stdint.h>
 #include <inttypes.h>
 #endif
 #endif // RAPIDJSON_NO_INT64TYPEDEF