diff --git a/isisd/ChangeLog b/isisd/ChangeLog
index 50028a9..a9ea3ce 100644
--- a/isisd/ChangeLog
+++ b/isisd/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-24 Hasso Tepper <hasso at quagga.net>
+
+	* isisd.c: thread_master *master is already defined in isis_main.c.
+	* isis_misc.[c|h], isis_lsp.[c|h]: Move static variables out of
+	  header files.
+
 2004-09-23 Hasso Tepper <hasso at quagga.net>
 
 	* *.[c|h]: list -> struct list *, listnode -> struct listnode *.
diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c
index d0764e0..5467b48 100644
--- a/isisd/isis_lsp.c
+++ b/isisd/isis_lsp.c
@@ -60,6 +60,9 @@
 extern struct isis *isis;
 extern struct thread_master *master;
 
+/* staticly assigned vars for printing purposes */
+char lsp_bits_string[200];     /* FIXME: enough ? */
+
 int
 lsp_id_cmp (u_char * id1, u_char * id2)
 {
diff --git a/isisd/isis_lsp.h b/isisd/isis_lsp.h
index c6eb7c2..d92175c 100644
--- a/isisd/isis_lsp.h
+++ b/isisd/isis_lsp.h
@@ -120,9 +120,6 @@
 		   char dynhost);
 char *lsp_bits2string (u_char *);
 
-/* staticly assigned vars for printing purposes */
-char lsp_bits_string[200];	/* FIXME: enough ? */
-
 #ifdef TOPOLOGY_GENERATE
 void generate_topology_lsps (struct isis_area *area);
 void remove_topology_lsps (struct isis_area *area);
diff --git a/isisd/isis_misc.c b/isisd/isis_misc.c
index 7fe5286..51c4d92 100644
--- a/isisd/isis_misc.c
+++ b/isisd/isis_misc.c
@@ -46,6 +46,21 @@
 #include "isisd/isis_constants.h"
 #include "isisd/isis_adjacency.h"
 
+/* staticly assigned vars for printing purposes */
+struct in_addr new_prefix;
+/* len of xxxx.xxxx.xxxx + place for #0 termination */
+char sysid[15];
+/* len of xxxx.xxxx.xxxx + place for #0 termination */
+char snpa[15];
+/* len of xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx */
+char isonet[51];
+/* + place for #0 termination */
+/* len of xxxx.xxxx.xxxx.xx.xx + place for #0 termination */
+char lspid[21];
+/* len of xxYxxMxWxdxxhxxmxxs + place for #0 termination */
+char datestring[20];
+char nlpidstring[30];
+
 /*
  * This converts the isonet to its printable format
  */
diff --git a/isisd/isis_misc.h b/isisd/isis_misc.h
index 75c8d8b..330556a 100644
--- a/isisd/isis_misc.h
+++ b/isisd/isis_misc.h
@@ -60,21 +60,6 @@
  */
 #define GETSYSID(A,L) (A->area_addr + (A->addr_len - (L + 1)))
 
-/* staticly assigned vars for printing purposes */
-struct in_addr new_prefix;
-/* len of xxxx.xxxx.xxxx + place for #0 termination */
-char sysid[15];
-/* len of xxxx.xxxx.xxxx + place for #0 termination */
-char snpa[15];
-/* len of xx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xxxx.xx */
-char isonet[51];
-/* + place for #0 termination */
-/* len of xxxx.xxxx.xxxx.xx.xx + place for #0 termination */
-char lspid[21];
-/* len of xxYxxMxWxdxxhxxmxxs + place for #0 termination */
-char datestring[20];
-char nlpidstring[30];
-
 /* used for calculating nice string representation instead of plain seconds */
 
 #define SECS_PER_MINUTE 60
diff --git a/isisd/isisd.c b/isisd/isisd.c
index 3fbed0b..af05cd1 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -60,7 +60,7 @@
 #endif /* TOPOLOGY_GENERATE */
 
 struct isis *isis = NULL;
-struct thread_master *master;
+extern struct thread_master *master;
 
 void
 isis_new (unsigned long process_id)