diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc
index ecce329..e787692 100644
--- a/libtest/cmdline.cc
+++ b/libtest/cmdline.cc
@@ -54,7 +54,7 @@ using namespace libtest;
 #include <unistd.h>
 
 #ifndef __USE_GNU
-static char **environ= NULL;
+char **environ= NULL;
 #endif
 
 extern "C" {
diff --git a/util/log.hpp b/util/log.hpp
index 46ddaf4..d3cc6b8 100644
--- a/util/log.hpp
+++ b/util/log.hpp
@@ -39,6 +39,7 @@
 #include <cerrno>
 #include <cstdarg>
 #include <cstdio>
+#include <cstring>
 #include <fcntl.h>
 #include <iostream>
 #include <string>