Index: b/tests/t-lock.c
===================================================================
--- b/tests/t-lock.c
+++ b/tests/t-lock.c
@@ -25,6 +25,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
+#include <sys/types.h> /* getpid() */
+#include <unistd.h>    /* getpid() */
 #ifdef _WIN32
 # include <windows.h>
 #else
@@ -132,7 +134,7 @@
 revision_thread (void *arg)
 {
   gpg_err_code_t rc;
-  int i;
+  int i = 0;
 
   (void)arg;