diff --git a/src/field-cache.h b/src/field-cache.h
index 0fc21d5..ec8a7f4 100644
--- a/src/field-cache.h
+++ b/src/field-cache.h
@@ -1,3 +1,5 @@
+#include <string.h>
+
 #define MAXGASES 16
 #define MAXSTRINGS 32
 
diff --git a/src/shearwater_predator_parser.c b/src/shearwater_predator_parser.c
index bb69e8e..1be4383 100644
--- a/src/shearwater_predator_parser.c
+++ b/src/shearwater_predator_parser.c
@@ -20,13 +20,6 @@
  */
 
 #include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdarg.h>
-
-#ifdef _MSC_VER
-#define snprintf _snprintf
-#endif
 
 #include <libdivecomputer/units.h>