diff --git a/lib/gpu/lal_lj_tip4p_long.cu b/lib/gpu/lal_lj_tip4p_long.cu
index fd254f0a03..8b52f09d68 100644
--- a/lib/gpu/lal_lj_tip4p_long.cu
+++ b/lib/gpu/lal_lj_tip4p_long.cu
@@ -20,9 +20,13 @@
 #define tagint int
 #endif
 #ifdef LAMMPS_BIGBIG
-#include "inttypes.h"
+#ifdef USE_OPENCL
+#define tagint long
+#else
+#include "stdint.h"
 #define tagint int64_t
 #endif
+#endif
 #ifdef LAMMPS_SMALLSMALL
 #define tagint int
 #endif
@@ -39,9 +43,13 @@ _texture( q_tex,int2);
 #define tagint int
 #endif
 #ifdef LAMMPS_BIGBIG
-#include "inttypes.h"
+#ifdef USE_OPENCL
+#define tagint long
+#else
+#include "stdint.h"
 #define tagint int64_t
 #endif
+#endif
 #ifdef LAMMPS_SMALLSMALL
 #define tagint int
 #endif
diff --git a/lib/gpu/lal_neighbor_gpu.cu b/lib/gpu/lal_neighbor_gpu.cu
index 6fd724b494..352f1d6138 100644
--- a/lib/gpu/lal_neighbor_gpu.cu
+++ b/lib/gpu/lal_neighbor_gpu.cu
@@ -21,9 +21,13 @@
 #define tagint int
 #endif
 #ifdef LAMMPS_BIGBIG
-#include "inttypes.h"
+#ifdef USE_OPENCL
+#define tagint long
+#else
+#include "stdint.h"
 #define tagint int64_t
 #endif
+#endif
 #ifdef LAMMPS_SMALLSMALL
 #define tagint int
 #endif
diff --git a/lib/gpu/lal_precision.h b/lib/gpu/lal_precision.h
index bb2423198f..ee1ab7b3e2 100644
--- a/lib/gpu/lal_precision.h
+++ b/lib/gpu/lal_precision.h
@@ -136,7 +136,7 @@ typedef int tagint;
 #define OCL_INT_TYPE "-DLAMMPS_SMALLBIG"
 #endif
 #ifdef LAMMPS_BIGBIG
-#include "inttypes.h"
+#include "stdint.h"
 typedef int64_t tagint;
 #define OCL_INT_TYPE "-DLAMMPS_BIGBIG"
 #endif
diff --git a/src/library.cpp b/src/library.cpp
index db609351f7..b60f8659ee 100644
--- a/src/library.cpp
+++ b/src/library.cpp
@@ -2712,7 +2712,7 @@ Below is a brief C code demonstrating accessing this collected bond information.
 
    #include <stdio.h>
    #include <stdlib.h>
-   #include <inttypes.h>
+   #include <stdint.h>
    #include "library.h"
 
    int main(int argc, char **argv)
diff --git a/src/library.h b/src/library.h
index 17943e3808..e55f906a11 100644
--- a/src/library.h
+++ b/src/library.h
@@ -35,7 +35,7 @@
 #endif
 
 #if defined(LAMMPS_BIGBIG) || defined(LAMMPS_SMALLBIG)
-#include <inttypes.h> /* for int64_t */
+#include <stdint.h> /* for int64_t */
 #endif
 
 /** Data type constants for extracting data from atoms, computes and fixes