--- common/channel.h.orig	2005-07-31 19:51:06.935081655 +0200
+++ common/channel.h	2005-07-31 19:56:19.863791783 +0200
@@ -8,6 +8,9 @@
 #define CAPTURE_GRABDISPLAY  2
 #define CAPTURE_ON           9
 
+#define BOOLTAB_SIZE         7
+#define CAPTAB_SIZE         11
+
 struct CHANNEL {
     char  *name;
     char  *key;
@@ -90,8 +93,8 @@
 
 /* ----------------------------------------------------------------------- */
 
-extern struct STRTAB booltab[];
-extern struct STRTAB captab[];
+extern struct STRTAB booltab[BOOLTAB_SIZE];
+extern struct STRTAB captab[CAPTAB_SIZE];
 
 int str_to_int(char *str, struct STRTAB *tab);
 const char* int_to_str(int n, struct STRTAB *tab);
--- common/channel.c.orig	2005-07-31 19:51:07.584101785 +0200
+++ common/channel.c	2005-07-31 19:58:23.814650547 +0200
@@ -167,7 +167,7 @@
 
 /* ----------------------------------------------------------------------- */
 
-struct STRTAB captab[] = {
+struct STRTAB captab[CAPTAB_SIZE] = {
     {  CAPTURE_ON,          "on"          },
     {  CAPTURE_ON,          "yes"         },
     {  CAPTURE_ON,          "true"        },
@@ -722,7 +722,7 @@
 
 /* ----------------------------------------------------------------------- */
 
-struct STRTAB booltab[] = {
+struct STRTAB booltab[BOOLTAB_SIZE] = {
     {  0, "no" },
     {  0, "false" },
     {  0, "off" },
--- x11/vbi-gui.c.orig	2005-07-31 19:51:08.214121324 +0200
+++ x11/vbi-gui.c	2005-07-31 19:47:01.712472123 +0200
@@ -44,6 +44,7 @@
 #include "vbi-x11.h"
 #include "vbi-gui.h"
 
+#include "grab-ng.h"
 #include "channel.h"
 
 static int tt_debug = 1;