--- gvpe/src/util.h	2003/10/16 02:41:21	1.9
+++ gvpe/src/util.h	2003/10/16 14:12:00	1.10
@@ -22,8 +22,10 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
+#include "gettext.h"
+
+#include "slog.h"
 #include "iom.h"
-#include "device.h"
 
 /*
  * check for an existing vped for this net, and write pid to pidfile
@@ -50,6 +52,8 @@
  */
 #define ABSOLUTE_PATH(c) ((c)[0] == '/')
 
+typedef u8 mac[6];
+
 extern void id2mac (unsigned int id, void *m);
 
 #define mac2id(p) ((p)[0] & 0x01 ? 0 : ((p)[4] << 8) | (p)[5])