diff --git a/packages/templates/all/ChangeLog b/packages/templates/all/ChangeLog
index 1d749e277..3e74c9ebd 100644
--- a/packages/templates/all/ChangeLog
+++ b/packages/templates/all/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* current.ect: Provide default for CYGBLD_ISO_STDIO_FILEOPS_HEADER
+	and CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
 2003-04-29  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* current.ect: Use the new FreeBSD stack instead of the older
diff --git a/packages/templates/all/current.ect b/packages/templates/all/current.ect
index 4f70f033e..7f44c55b5 100644
--- a/packages/templates/all/current.ect
+++ b/packages/templates/all/current.ect
@@ -236,3 +236,11 @@ cdl_option CYGBLD_ISO_OPEN_MAX_HEADER {
 cdl_option CYGBLD_ISO_NAME_MAX_HEADER {
     inferred_value 1 <cyg/fileio/limits.h>
 };
+
+cdl_option CYGBLD_ISO_STDIO_FILEOPS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
+
+cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
diff --git a/packages/templates/default/ChangeLog b/packages/templates/default/ChangeLog
index 4b27977c6..3a1850e93 100644
--- a/packages/templates/default/ChangeLog
+++ b/packages/templates/default/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* current.ect: Provide default for CYGBLD_ISO_STDIO_FILEOPS_HEADER
+	and CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
 2001-11-27  Jonathan Larmour  <jlarmour@redhat.com>
 
 	 current.ect: Provide default for CYGBLD_ISO_STRING_BSD_FUNCS_HEADER
diff --git a/packages/templates/default/current.ect b/packages/templates/default/current.ect
index a0a9caa65..8bee7cb81 100644
--- a/packages/templates/default/current.ect
+++ b/packages/templates/default/current.ect
@@ -127,3 +127,11 @@ cdl_option CYGBLD_ISO_STDIO_STREAMS_HEADER {
 cdl_option CYGBLD_ISO_STRING_BSD_FUNCS_HEADER {
     inferred_value 1 <cyg/libc/string/bsdstring.h>
 };
+
+cdl_option CYGBLD_ISO_STDIO_FILEOPS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
+
+cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
diff --git a/packages/templates/net/ChangeLog b/packages/templates/net/ChangeLog
index a2c7b72f4..4b726e604 100644
--- a/packages/templates/net/ChangeLog
+++ b/packages/templates/net/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* current.ect: Provide default for CYGBLD_ISO_STDIO_FILEOPS_HEADER
+	and CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
 2003-02-25  Andrew Lunn  <andrew.lunn@ascom.ch>
 
 	* Added the Simple Network Time Protocol (SNTP) Client
diff --git a/packages/templates/net/current.ect b/packages/templates/net/current.ect
index af2e6a575..e00de0dcf 100644
--- a/packages/templates/net/current.ect
+++ b/packages/templates/net/current.ect
@@ -228,3 +228,11 @@ cdl_option CYGBLD_ISO_NETDB_SERV_HEADER {
 cdl_component CYGPKG_KERNEL_THREADS_DESTRUCTORS {
     inferred_value 1
 };
+
+cdl_option CYGBLD_ISO_STDIO_FILEOPS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
+
+cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
diff --git a/packages/templates/old_net/ChangeLog b/packages/templates/old_net/ChangeLog
index 11c7a8e7b..2d097b962 100644
--- a/packages/templates/old_net/ChangeLog
+++ b/packages/templates/old_net/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* current.ect: Provide default for CYGBLD_ISO_STDIO_FILEOPS_HEADER
+	and CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
 2003-02-25  Andrew Lunn       <andrew.lunn@ascom.ch>
 	
 	* Added the Simple Network Time Protocol (SNTP) Client
diff --git a/packages/templates/old_net/current.ect b/packages/templates/old_net/current.ect
index 2d90e5e04..5623b2018 100644
--- a/packages/templates/old_net/current.ect
+++ b/packages/templates/old_net/current.ect
@@ -229,3 +229,10 @@ cdl_component CYGPKG_KERNEL_THREADS_DESTRUCTORS {
     inferred_value 1
 };
 
+cdl_option CYGBLD_ISO_STDIO_FILEOPS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
+
+cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
diff --git a/packages/templates/uitron/ChangeLog b/packages/templates/uitron/ChangeLog
index 274d100aa..ec7e20cdd 100644
--- a/packages/templates/uitron/ChangeLog
+++ b/packages/templates/uitron/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-15  Jonathan Larmour  <jifl@eCosCentric.com>
+
+	* current.ect: Provide default for CYGBLD_ISO_STDIO_FILEOPS_HEADER
+	and CYGBLD_ISO_STDIO_FILEPOS_HEADER.
+
 2001-11-27  Jonathan Larmour  <jlarmour@redhat.com>
 
 	 current.ect: Provide default for CYGBLD_ISO_STRING_BSD_FUNCS_HEADER
diff --git a/packages/templates/uitron/current.ect b/packages/templates/uitron/current.ect
index 53377142e..7d798058e 100644
--- a/packages/templates/uitron/current.ect
+++ b/packages/templates/uitron/current.ect
@@ -127,8 +127,14 @@ cdl_option CYGBLD_ISO_SETJMP_HEADER {
     inferred_value 1 <cyg/libc/setjmp/setjmp.h>
 };
 
-
-
 cdl_option CYGBLD_ISO_STRING_BSD_FUNCS_HEADER {
     inferred_value 1 <cyg/libc/string/bsdstring.h>
 };
+
+cdl_option CYGBLD_ISO_STDIO_FILEOPS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};
+
+cdl_option CYGBLD_ISO_STDIO_FILEPOS_HEADER {
+    inferred_value 1 <cyg/libc/stdio/stdio.h>
+};