--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2008-08-05  John W. Eaton  <jwe@octave.org>
 
+	* gripes.cc (gripe_truncated_conversion,
+	gripe_logical_conversion): Don't declare as extern here.
+	* utils.cc (octave_format, octave_vformat): Likewise.
+	* pr-output.cc (octave_print_internal (std::ostream&, const Cell&,
+	bool, int, bool)): Likewise.
+
 	* toplev.cc (octave_call_stack::backtrace_error_message): New
 	function.
 	* toplev.h: Provide decl.

--- a/src/gripes.cc
+++ b/src/gripes.cc
@@ -197,14 +197,14 @@
   warning_with_id ("Octave:divide-by-zero", "division by zero");
 }
 
-extern void
+void
 gripe_logical_conversion (void)
 {
   warning_with_id ("Octave:logical-conversion",
 		   "value not equal to 1 or 0 converted to logical 1");
 }
 
-extern void
+void
 gripe_truncated_conversion (const char *srctype, const char *desttype)
 {
   warning_with_id ("Octave:int-convert-overflow", 

--- a/src/pr-output.cc
+++ b/src/pr-output.cc
@@ -2740,7 +2740,7 @@
 PRINT_INT_ARRAY_INTERNAL (octave_int64)
 PRINT_INT_ARRAY_INTERNAL (octave_uint64)
 
-extern void
+void
 octave_print_internal (std::ostream&, const Cell&, bool, int, bool)
 {
   panic_impossible ();

--- a/src/utils.cc
+++ b/src/utils.cc
@@ -922,7 +922,7 @@
   return m;
 }
 
-extern int
+int
 octave_format (std::ostream& os, const char *fmt, ...)
 {
   int retval = -1;
@@ -937,7 +937,7 @@
   return retval;
 }
 
-extern int
+int
 octave_vformat (std::ostream& os, const char *fmt, va_list args)
 {
   int retval = -1;