diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 5cd6bf9f..6400eac0 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2635,3 +2635,6 @@ Osama Alrawab <alrawab@hotmail.com>
 
 Antti Seppälä <a.seppala@gmail.com>
  for suggesting to add cString::operator=(const char *String)
+
+Henning Heinold <heinold@inf.fu-berlin.de>
+ for fixing inclusion of <stdarg.h>
diff --git a/HISTORY b/HISTORY
index 19492eec..84bd8f59 100644
--- a/HISTORY
+++ b/HISTORY
@@ -6481,7 +6481,7 @@ Video Disk Recorder Revision History
   from Osama Alrawab). See INSTALL for information on how to turn this on.
 - Added Arabian language texts (thanks to Osama Alrawab).
 
-2010-12-12: Version 1.7.17
+2010-12-24: Version 1.7.17
 
 - Updated the Estonian OSD texts (thanks to Arthur Konovalov).
 - Fixed following symbolic links in RemoveFileOrDir() (cont'd) (thanks to
@@ -6509,3 +6509,4 @@ Video Disk Recorder Revision History
   "ST:TNG Panels" skins, because it is often wrong and nothing but irritating.
 - Added typecasts to avoid gcc 4.5 warnings in switch statements on eKeys
   variables where additional 'k_...' flags are used.
+- Fixed inclusion of <stdarg.h> (thanks to Henning Heinold).
diff --git a/osd.c b/osd.c
index 9d4e6a42..7a2b76ae 100644
--- a/osd.c
+++ b/osd.c
@@ -4,12 +4,11 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: osd.c 2.10 2010/05/02 13:56:53 kls Exp $
+ * $Id: osd.c 2.11 2010/12/12 23:16:19 kls Exp $
  */
 
 #include "osd.h"
 #include <math.h>
-#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
 #include <sys/stat.h>
diff --git a/receiver.c b/receiver.c
index 58dda78f..6a9ba045 100644
--- a/receiver.c
+++ b/receiver.c
@@ -4,11 +4,10 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: receiver.c 2.3 2010/02/28 14:25:32 kls Exp $
+ * $Id: receiver.c 2.4 2010/12/12 23:16:25 kls Exp $
  */
 
 #include "receiver.h"
-#include <stdarg.h>
 #include <stdio.h>
 #include "tools.h"
 
diff --git a/tools.c b/tools.c
index f7d6bc6d..7746dc03 100644
--- a/tools.c
+++ b/tools.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.c 2.10 2010/10/24 13:07:30 kls Exp $
+ * $Id: tools.c 2.11 2010/12/12 23:15:38 kls Exp $
  */
 
 #include "tools.h"
@@ -18,7 +18,6 @@ extern "C" {
 #include <jpeglib.h>
 #undef boolean
 }
-#include <stdarg.h>
 #include <stdlib.h>
 #include <sys/time.h>
 #include <sys/vfs.h>
diff --git a/tools.h b/tools.h
index 1a80a8d4..7a05b433 100644
--- a/tools.h
+++ b/tools.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: tools.h 2.5 2010/10/24 13:06:27 kls Exp $
+ * $Id: tools.h 2.6 2010/12/12 23:15:52 kls Exp $
  */
 
 #ifndef __TOOLS_H
@@ -17,6 +17,7 @@
 #include <iconv.h>
 #include <math.h>
 #include <poll.h>
+#include <stdarg.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>