diff --git a/src/ar65/error.h b/src/ar65/error.h
index 61d2a0394..f7a5122e6 100644
--- a/src/ar65/error.h
+++ b/src/ar65/error.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               R�merstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -52,10 +52,10 @@
 void Warning (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print a warning message */
 
-void Error (const char* Format, ...) attribute((format(printf,1,2)));
+void Error (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an error message and die */
 
-void Internal (const char* Format, ...) attribute((format(printf,1,2)));
+void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an internal error message and die */
 
 
diff --git a/src/cl65/error.h b/src/cl65/error.h
index 755e91476..5517d91f2 100644
--- a/src/cl65/error.h
+++ b/src/cl65/error.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998     Ullrich von Bassewitz                                        */
-/*              Wacholderweg 14                                              */
-/*              D-70597 Stuttgart                                            */
-/* EMail:       uz@musoftware.de                                             */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               R�merstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -44,13 +44,13 @@
 
 
 
-void Warning (const char* Format, ...);
+void Warning (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print a warning message */
 
-void Error (const char* Format, ...);
+void Error (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an error message and die */
 
-void Internal (const char* Format, ...);
+void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an internal error message and die */
 
 
diff --git a/src/da65/error.h b/src/da65/error.h
index c75d96bd1..17fb87d46 100644
--- a/src/da65/error.h
+++ b/src/da65/error.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000      Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 2000-2003 Ullrich von Bassewitz                                       */
+/*               R�merstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -52,10 +52,10 @@
 void Warning (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print a warning message */
 
-void Error (const char* Format, ...) attribute((format(printf,1,2)));
+void Error (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an error message and die */
 
-void Internal (const char* Format, ...) attribute((format(printf,1,2)));
+void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an internal error message and die */
 
 
diff --git a/src/ld65/error.h b/src/ld65/error.h
index a29a08229..b3d8ecfbc 100644
--- a/src/ld65/error.h
+++ b/src/ld65/error.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               R�merstrasse 52                                             */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -52,13 +52,13 @@
 void Warning (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print a warning message */
 
-void Error (const char* Format, ...) attribute((format(printf,1,2)));
+void Error (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an error message and die */
 
-void Internal (const char* Format, ...) attribute((format(printf,1,2)));
+void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an internal error message and die */
 
-									     
+
 
 /* End of error.h */
 
diff --git a/src/sim65/error.h b/src/sim65/error.h
index 92d4cb253..8a50bab07 100644
--- a/src/sim65/error.h
+++ b/src/sim65/error.h
@@ -52,10 +52,10 @@
 void Warning (const char* Format, ...) attribute((format(printf,1,2)));
 /* Print a warning message */
 
-void Error (const char* Format, ...) attribute((format(printf,1,2)));
+void Error (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an error message and die */
 
-void Internal (const char* Format, ...) attribute((format(printf,1,2)));
+void Internal (const char* Format, ...) attribute((noreturn, format(printf,1,2)));
 /* Print an internal error message and die */