--- a/gcc/system.h
+++ b/gcc/system.h
@@ -202,4 +202,7 @@
 # include <string>
 #endif
+#ifdef INCLUDE_VECTOR
+# include <vector>
+#endif
 #endif
 
--- a/libcc1/libcc1plugin.cc
+++ b/libcc1/libcc1plugin.cc
@@ -20,4 +20,6 @@
 #include <cc1plugin-config.h>
 
+#include <vector>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_STRING
@@ -70,6 +72,4 @@
 #include "context.hh"
 
-#include <vector>
-
 using namespace cc1_plugin;
 
--- a/libcc1/libcp1plugin.cc
+++ b/libcc1/libcp1plugin.cc
@@ -21,4 +21,6 @@
 #include <cc1plugin-config.h>
 
+#include <vector>
+
 #undef PACKAGE_NAME
 #undef PACKAGE_STRING
@@ -72,6 +74,4 @@
 #include "context.hh"
 
-#include <vector>
-
 using namespace cc1_plugin;