--- src/command.h.orig	Sun Feb 11 23:22:25 2007
+++ src/command.h	Fri Apr  6 09:17:50 2007
@@ -10,6 +10,8 @@
 #ifndef _COMMAND_H_
 #define _COMMAND_H_
 
+#include "vars.h"
+
 /*
  * DEFINITIONS
  */
@@ -26,8 +28,6 @@
     struct optinfo	options;
   };
 
-  extern const struct cmdtab gCommands[];
-
   struct cmdtab;
   typedef const struct cmdtab	*CmdTab;
   struct cmdtab
@@ -38,6 +38,8 @@
     int		(*admit)(CmdTab cmd);
     void	*arg;
   };
+
+  extern const struct cmdtab gCommands[];
 
 /*
  * FUNCTIONS
--- src/ipcp.h.orig	Sun Feb 11 23:22:25 2007
+++ src/ipcp.h	Fri Apr  6 09:10:32 2007
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include "command.h"
 #include "phys.h"
 #include "fsm.h"
 #include "timer.h"
--- src/ipv6cp.h.orig	Sun Feb 11 23:22:25 2007
+++ src/ipv6cp.h	Fri Apr  6 09:10:51 2007
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
+#include "command.h"
 
 /*
  * DEFINITONS