diff --git a/ChangeLog b/ChangeLog
index 555d959c9..c518e1562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09  Steven Borley <steven.borley@virgin.net>
+
+  *  Reverted to placing the cp_* stream variable definitions back in to
+     src/frontend/streams.c with their extern declarations in
+     src/frontend/streams.h
+
 2005-09-08  Steven Borley <steven.borley@virgin.net>
 
   * Added hard-coded paths for NGSPICEBINDIR and NGSPICEDATADIR for MinGW
diff --git a/src/frontend/streams.c b/src/frontend/streams.c
index 5a719732b..edcb7dd49 100644
--- a/src/frontend/streams.c
+++ b/src/frontend/streams.c
@@ -17,18 +17,17 @@ bool cp_debug = FALSE;
 char cp_gt = '>';
 char cp_lt = '<';
 char cp_amp = '&';
-/*
+
 FILE *cp_in=NULL;
 FILE *cp_out=NULL;
 FILE *cp_err=NULL;
-*/
+
 /* These are the fps that cp_ioreset resets the cp_* to.  They are
  * changed by the source routines.  */
-/*
 FILE *cp_curin = NULL;
 FILE *cp_curout = NULL;
 FILE *cp_curerr = NULL;
-*/
+
 /* static functions */
 static bool fileexists(char *name);
 
diff --git a/src/frontend/streams.h b/src/frontend/streams.h
index 651d37fb0..0600b2292 100644
--- a/src/frontend/streams.h
+++ b/src/frontend/streams.h
@@ -13,12 +13,12 @@ extern bool cp_debug;
 extern char cp_amp;
 extern char cp_gt;
 extern char cp_lt;
-FILE *cp_in;
-FILE *cp_out;
-FILE *cp_err;
-FILE *cp_curin;
-FILE *cp_curout;
-FILE *cp_curerr;
+extern FILE *cp_in;
+extern FILE *cp_out;
+extern FILE *cp_err;
+extern FILE *cp_curin;
+extern FILE *cp_curout;
+extern FILE *cp_curerr;
 
 void cp_ioreset(void);
 void fixdescriptors(void);