diff --git a/java/jni/ZT_jniutils.cpp b/java/jni/ZT_jniutils.cpp
index c479f87e2..f58154d16 100644
--- a/java/jni/ZT_jniutils.cpp
+++ b/java/jni/ZT_jniutils.cpp
@@ -21,7 +21,7 @@
 #include "ZT_jniarray.h"
 
 #include <string>
-#include <assert.h>
+#include <cassert>
 
 #include <arpa/inet.h>
 #include <netinet/in.h>
diff --git a/java/jni/ZT_jniutils.h b/java/jni/ZT_jniutils.h
index 3e81b934d..02c2e20f1 100644
--- a/java/jni/ZT_jniutils.h
+++ b/java/jni/ZT_jniutils.h
@@ -18,7 +18,7 @@
  
 #ifndef ZT_jniutils_h_
 #define ZT_jniutils_h_
-#include <stdio.h>
+
 #include <jni.h>
 #include <ZeroTierOne.h>
 
diff --git a/java/jni/com_zerotierone_sdk_Node.cpp b/java/jni/com_zerotierone_sdk_Node.cpp
index 75af18bc8..877865828 100644
--- a/java/jni/com_zerotierone_sdk_Node.cpp
+++ b/java/jni/com_zerotierone_sdk_Node.cpp
@@ -34,8 +34,8 @@
 
 #include <map>
 #include <string>
-#include <assert.h>
-#include <string.h>
+#include <cassert>
+#include <cstring>
 
 // global static JNI Lookup Object
 JniLookup lookup;