diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 5d54b772cd925d6fc8f62c1069aa5203834ba514..ca3081092968651930d8d507d1b30b4f3258be02 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-06  Andreas Tobler  <a.tobler@schweiz.org>
+
+	* tests/base/locale.h: Add new test.
+	* tests/base/stdarg.h: Likewise.
+
 2009-01-05  Steve Ellcey  <sje@cup.hp.com>
 
 	* inclhack.def (hpux_spu_info):  Add files line.
diff --git a/fixincludes/tests/base/locale.h b/fixincludes/tests/base/locale.h
new file mode 100644
index 0000000000000000000000000000000000000000..7a7273e10538310510beea0dc8faedea15f31d0a
--- /dev/null
+++ b/fixincludes/tests/base/locale.h
@@ -0,0 +1,25 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/locale.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( OPENBSD_NULL_DEFINITION_CHECK )
+#ifndef NULL
+#ifdef __cplusplus
+#ifdef __GNUG__
+#define NULL	__null
+#else	 /* ! __GNUG__  */
+#define NULL	0L
+#endif	 /* __GNUG__  */
+#else	 /* ! __cplusplus  */
+#define NULL	((void *)0)
+#endif	 /* __cplusplus  */
+#endif	 /* !NULL  */
+
+#endif  /* OPENBSD_NULL_DEFINITION_CHECK */
diff --git a/fixincludes/tests/base/stdarg.h b/fixincludes/tests/base/stdarg.h
new file mode 100644
index 0000000000000000000000000000000000000000..686d0b3d6ea31829912a0f2ec35589939871cf73
--- /dev/null
+++ b/fixincludes/tests/base/stdarg.h
@@ -0,0 +1,14 @@
+/*  DO NOT EDIT THIS FILE.
+
+    It has been auto-edited by fixincludes from:
+
+	"fixinc/tests/inc/stdarg.h"
+
+    This had to be done to correct non-standard usages in the
+    original, manufacturer supplied header file.  */
+
+
+
+#if defined( OPENBSD_VA_START_CHECK )
+#define va_start(v,l)   __builtin_va_start((v),l)
+#endif  /* OPENBSD_VA_START_CHECK */