diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5f5dbc542..2d05eec6a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -436,6 +436,8 @@ CHECK_TYPE_SIZE("off_t"		 SIZEOF_OFF_T)
 CHECK_TYPE_SIZE("short"		 SIZEOF_SHORT)
 CHECK_TYPE_SIZE("size_t"	 SIZEOF_SIZE_T)
 CHECK_TYPE_SIZE("uchar"		 SIZEOF_UCHAR)
+CHECK_TYPE_SIZE("int64_t"	 SIZEOF_INT64_T)
+CHECK_TYPE_SIZE("uint64_t"	 SIZEOF_UINT64_T)
 
 # Check for various functions. 
 CHECK_FUNCTION_EXISTS(fsync	HAVE_FSYNC)
diff --git a/cmake_config.h.in b/cmake_config.h.in
index 764e4822a..15694ea13 100644
--- a/cmake_config.h.in
+++ b/cmake_config.h.in
@@ -157,42 +157,16 @@
 /* Define to 1 if you have the <fcntl.h> header file. */
 #cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@
 
-#if !defined(__APPLE__)
-/* The size of `double` as computed by sizeof. */
-#cmakedefine SIZEOF_DOUBLE @SIZEOF_DOUBLE@ 
-/* The size of `float` as computed by sizeof. */
-#cmakedefine SIZEOF_FLOAT @SIZEOF_FLOAT@
-/* The size of `int` as computed by sizeof. */
-#cmakedefine SIZEOF_INT @SIZEOF_INT@
-/* The size of `long` as computed by sizeof. */
-#cmakedefine SIZEOF_LONG @SIZEOF_LONG@
-/* The size of `long long` as computed by sizeof. */
-#cmakedefine SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
-/* The size of `off_t` as computed by sizeof. */
-#cmakedefine SIZEOF_OFF_T @SIZEOF_OFF_T@
-/* The size of `short` as computed by sizeof. */
-#cmakedefine SIZEOF_SHORT @SIZEOF_SHORT@
-/* The size of `size_t` as computed by sizeof. */
-#cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@
-/* The size of `uchar` as computed by sizeof. */
-#cmakedefine SIZEOF_UCHAR @SIZEOF_UCHAR@
-#else
 #define SIZEOF_SHORT	@SIZEOF_DOUBLE@
 #define	SIZEOF_INT	@SIZEOF_INT@
-#if defined(__LP64__) && __LP64__ /* Linux, OSX, Unix */
 #define SIZEOF_LONG	@SIZEOF_LONG@
+#define SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
 #define SIZEOF_SIZE_T	@SIZEOF_SIZE_T@
-#elif defined(_WIN64) /* Windows */
-#define SIZEOF_LONG 	@SIZEOF_LONG@
-#define SIZEOF_SIZE_T	@SIZEOF_SIZE_T@
-#else
-#define SIZEOF_LONG	@SIZEOF_LONG@
-#define SIZEOF_SIZE_T	@SIZEOF_SIZE_T@
-#endif
 #define SIZEOF_FLOAT	@SIZEOF_FLOAT@
 #define SIZEOF_DOUBLE	@SIZEOF_DOUBLE@
 #define SIZEOF_OFF_T	@SIZEOF_OFF_T@
-#endif
+#define SIZEOF_INT64_T  @SIZEOF_INT64_T@
+#define SIZEOF_UINT64_T @SIZEOF_UINT64_T@
 
 /* Set if we have strdup */
 #cmakedefine HAVE_STRDUP
diff --git a/ncdump/ncdump.c b/ncdump/ncdump.c
index e32d1e067..5bd4dc201 100644
--- a/ncdump/ncdump.c
+++ b/ncdump/ncdump.c
@@ -38,7 +38,7 @@ int optind;
 #include "isnan.h"
 #include "cdl.h"
 
-#define int64_t long long
+//#define int64_t long long
 #define uint64_t unsigned long long
 
 /* globals */