diff --git a/tool-openssl/internal.h b/tool-openssl/internal.h
index cd8195e280..153c805f9d 100644
--- a/tool-openssl/internal.h
+++ b/tool-openssl/internal.h
@@ -7,7 +7,7 @@
 #include "../tool/internal.h"
 #include <string>
 #include <vector>
-#include <string>
+
 
 
 typedef bool (*tool_func_t)(const std::vector<std::string> &args);
diff --git a/tool-openssl/md5_test.cc b/tool-openssl/md5_test.cc
index c4c5d117b5..061fb3a8cc 100644
--- a/tool-openssl/md5_test.cc
+++ b/tool-openssl/md5_test.cc
@@ -5,7 +5,6 @@
 #include <openssl/pem.h>
 #include "internal.h"
 #include "test_util.h"
-#include <fstream>
 #include <cctype>
 
 
diff --git a/tool-openssl/rsa_test.cc b/tool-openssl/rsa_test.cc
index 23d6de670c..10fba1e09f 100644
--- a/tool-openssl/rsa_test.cc
+++ b/tool-openssl/rsa_test.cc
@@ -6,9 +6,6 @@
 #include <openssl/pem.h>
 #include "internal.h"
 #include "test_util.h"
-#include <fstream>
-#include <sstream>
-#include <iterator>
 #include <cctype>
 
 
diff --git a/tool-openssl/test_util.h b/tool-openssl/test_util.h
index 53ed2e4935..0792f4ca0c 100644
--- a/tool-openssl/test_util.h
+++ b/tool-openssl/test_util.h
@@ -4,7 +4,6 @@
 #ifndef TEST_UTIL_H
 #define TEST_UTIL_H
 
-#include "../tool/internal.h"
 #include <gtest/gtest.h>
 #include <string>
 #include <vector>
diff --git a/tool-openssl/x509_test.cc b/tool-openssl/x509_test.cc
index 764ed1da09..9c1ae0ce95 100644
--- a/tool-openssl/x509_test.cc
+++ b/tool-openssl/x509_test.cc
@@ -6,7 +6,6 @@
 #include <openssl/pem.h>
 #include "internal.h"
 #include "test_util.h"
-#include <fstream>
 #include <cctype>