diff --git a/library/changes b/library/changes
index 8e026ff..a644ac1 100644
--- a/library/changes
+++ b/library/changes
@@ -1,3 +1,11 @@
+- <stdarg.h> now tries to use the compiler supplied, machine specific
+  <stdarg.h> file and also includes the OS4-specifc <sys/amigaos-va.h>
+  file, if necessary.
+
+- Added another test to <sys/time.h> to check if the "timeval" definition is
+  already in place. If it is, <exec/types.h> will not be included.
+
+
 c.lib 1.174 (27.8.2004)
 
 - The parameters of atan2() were swapped. Fixed.
diff --git a/library/include/stdarg.h b/library/include/stdarg.h
index a51ef90..914cc72 100644
--- a/library/include/stdarg.h
+++ b/library/include/stdarg.h
@@ -1,5 +1,5 @@
 /*
- * $Id: stdarg.h,v 1.1.1.1 2004-07-26 16:32:53 obarthel Exp $
+ * $Id: stdarg.h,v 1.2 2004-09-09 08:25:30 obarthel Exp $
  *
  * :ts=4
  *
@@ -57,12 +57,25 @@ typedef char * va_list;
 /****************************************************************************/
 
 #else
- #if defined(__GNUC__)
-  #undef _STDARG_H
-  #include_next "stdarg.h"
- #else
-  #error "Unknown compiler"
- #endif /* __GNUC__ */
+
+/****************************************************************************/
+
+#if defined(__GNUC__)
+
+/* Use the compiler supplied, machine specific <stdarg.h> file. */
+#undef _STDARG_H
+#include_next "stdarg.h"
+
+#include <sys/amigaos-va.h>
+
+#else
+
+#error "Unknown compiler"
+
+#endif /* __GNUC__ */
+
+/****************************************************************************/
+
 #endif /* __amigaos4__ */
 
 /****************************************************************************/
diff --git a/library/include/sys/time.h b/library/include/sys/time.h
index eb7aefe..aeb6b9b 100644
--- a/library/include/sys/time.h
+++ b/library/include/sys/time.h
@@ -1,5 +1,5 @@
 /*
- * $Id: time.h,v 1.2 2004-08-07 09:15:33 obarthel Exp $
+ * $Id: time.h,v 1.3 2004-09-09 08:25:31 obarthel Exp $
  *
  * :ts=4
  *
@@ -52,7 +52,7 @@ extern "C" {
    structure and try to get by with this definition. Sometimes it works,
    sometimes it doesn't. Not sure if there really is a good solution for
    this problem... */
-#ifndef DEVICES_TIMER_H
+#if !defined(__TIMEVAL_ALREADY_DEFINED) && !defined(DEVICES_TIMER_H)
 
 /****************************************************************************/
 
@@ -98,7 +98,7 @@ struct timeval
 
 /****************************************************************************/
 
-#endif /* DEVICES_TIMER_H */
+#endif /* __TIMEVAL_ALREADY_DEFINED && DEVICES_TIMER_H */
 
 /****************************************************************************/