diff --git a/ChangeLog b/ChangeLog
index 5a79486..138c94a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-14  Bruno Haible  <bruno@clisp.org>
 
+	* src/options.cc: Don't include "vector.h".
+	(Options::parse_options): Don't initialize Vectors::ALPHA_SIZE here.
+	* src/vectors.cc (Vectors::ALPHA_SIZE): Don't initialize here.
+	* src/gen-perf.cc (Gen_Perf::Gen_Perf): Initialize Vectors::ALPHA_SIZE.
+
 	* src/options.h (Positions): New class.
 	(PositionIterator): New class.
 	(Options::parse_options): Renamed from Options::operator().
diff --git a/src/gen-perf.cc b/src/gen-perf.cc
index 138e719..c054f1d 100644
--- a/src/gen-perf.cc
+++ b/src/gen-perf.cc
@@ -40,6 +40,7 @@ Gen_Perf::Gen_Perf ()
   int asso_value_max;
   int non_linked_length;
 
+  Vectors::ALPHA_SIZE = (option[SEVENBIT] ? 128 : 256);
   Key_List::read_keys ();
   if (option[ORDER])
     reorder ();
diff --git a/src/options.cc b/src/options.cc
index 1f58a24..02fe224 100644
--- a/src/options.cc
+++ b/src/options.cc
@@ -24,7 +24,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA.  */
 #include <ctype.h>  /* declares isdigit() */
 #include "getopt.h"
 #include "options.h"
-#include "vectors.h"
 #include "version.h"
 
 /* Global option coordinator for the entire program.  */
@@ -765,7 +764,6 @@ Options::parse_options (int argc, char *argv[])
         case '7':               /* Assume 7-bit characters. */
           {
             _option_word |= SEVENBIT;
-            Vectors::ALPHA_SIZE = 128;
             break;
           }
         default:
diff --git a/src/vectors.cc b/src/vectors.cc
index ef61ef2..84030ad 100644
--- a/src/vectors.cc
+++ b/src/vectors.cc
@@ -20,6 +20,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111, USA.  */
 
 #include "vectors.h"
 
-int Vectors::ALPHA_SIZE = MAX_ALPHA_SIZE;
+int Vectors::ALPHA_SIZE;
 int Vectors::_occurrences[MAX_ALPHA_SIZE];
 int Vectors::_asso_values[MAX_ALPHA_SIZE];