diff --git a/msgpack.c b/msgpack.c
index fcda164..64c71c0 100644
--- a/msgpack.c
+++ b/msgpack.c
@@ -13,8 +13,10 @@
 #include "ext/session/php_session.h" /* for php_session_register_serializer */
 #endif
 
+#define HAVE_APCU_SUPPORT 1
+
 #if defined(HAVE_APCU_SUPPORT)
-#include "ext/apcu/apc_serializer.h"
+#include "apcu/apc_serializer.h"
 #endif /* HAVE_APCU_SUPPORT */
 
 #include "php_msgpack.h"
diff --git a/msgpack_pack.c b/msgpack_pack.c
index 57887c1..cebad6d 100644
--- a/msgpack_pack.c
+++ b/msgpack_pack.c
@@ -586,7 +586,7 @@ void msgpack_serialize_zval(smart_str *buf, zval *val, HashTable *var_hash) /* {
             msgpack_pack_false(buf);
             break;
         case IS_LONG:
-            msgpack_pack_long(buf, zval_get_long(val_noref));
+            msgpack_pack_long_long(buf, zval_get_long(val_noref));
             break;
         case IS_DOUBLE:
             if (MSGPACK_G(force_f32)) {