diff --git a/src/common/strbuf.h b/src/common/strbuf.h
index 4ea708071..fc904a1d2 100644
--- a/src/common/strbuf.h
+++ b/src/common/strbuf.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2001-2008 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2001-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -69,7 +69,7 @@ extern const StrBuf EmptyStrBuf;
 #define STATIC_STRBUF_INITIALIZER 	{ 0, 0, 0, 0 }
 
 /* Initializer for auto string bufs */
-#define AUTO_STRBUF_INITIALIZER         EmptyStrBuf
+#define AUTO_STRBUF_INITIALIZER         { 0, 0, 0, 0 }
 
 /* Initialize with a string literal (beware: evaluates str twice!) */
 #define LIT_STRBUF_INITIALIZER(str)     { (char*)str, sizeof(str)-1, 0, 0 }
diff --git a/src/common/strpool.c b/src/common/strpool.c
index 4bb19fcdd..0387de403 100644
--- a/src/common/strpool.c
+++ b/src/common/strpool.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003-2008 Ullrich von Bassewitz                                       */
-/*               Roemerstrasse 52                                            */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -84,8 +84,8 @@ static StringPoolEntry* NewStringPoolEntry (const StrBuf* S, unsigned Hash, unsi
     /* Initialize the fields */
     E->Next = 0;
     E->Hash = Hash;
-    E->Id   = Id;
-    E->Buf  = AUTO_STRBUF_INITIALIZER;
+    E->Id   = Id;                                                       
+    SB_Init (&E->Buf);
     SB_Copy (&E->Buf, S);
 
     /* Always zero terminate the string */