diff --git a/src/cxx/jniutils.cc b/src/cxx/jniutils.cc
index 82b1de4..b8653bf 100644
--- a/src/cxx/jniutils.cc
+++ b/src/cxx/jniutils.cc
@@ -1,7 +1,17 @@
+#include <cassert>
 #include "jniutils.hh"
 #include <pEp/pEpLog.hh>
-#include <cassert>
-#include <cstring>
+
+#ifndef __LP64__
+
+#include <time64.h>
+
+#define time_t time64_t
+#define timegm timegm64
+#define gmtime_r gmtime64_r
+#else
+#include <string.h>
+#endif
 
 namespace pEp {
 namespace JNIAdapter {