--- doc/interpreter/munge-texi.cc
+++ doc/interpreter/munge-texi.cc
@@ -29,6 +29,8 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include <cstring>
+#include <cstdlib>
 #include <map>
 
 static const char doc_delim = '';
--- liboctave/chMatrix.cc
+++ liboctave/chMatrix.cc
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 
 #include "lo-error.h"
 #include "str-vec.h"
--- liboctave/data-conv.cc
+++ liboctave/data-conv.cc
@@ -28,6 +28,7 @@
 #include <cctype>
 
 #include <iostream>
+#include <cstdlib>
 
 #include "byte-swap.h"
 #include "data-conv.h"
--- liboctave/lo-sysdep.cc
+++ liboctave/lo-sysdep.cc
@@ -27,6 +27,7 @@
 
 #include <iostream>
 #include <string>
+#include <cstring>
 
 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_SYS_TYPES_H
--- liboctave/lo-utils.cc
+++ liboctave/lo-utils.cc
@@ -31,6 +31,7 @@
 #include <cstdio>
 
 #include <string>
+#include <cstring>
 
 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_SYS_TYPES_H
--- liboctave/oct-env.cc
+++ liboctave/oct-env.cc
@@ -45,6 +45,7 @@
 #include <cstdlib>
 
 #include <string>
+#include <cstring>
 
 #ifdef HAVE_UNISTD_H
 #ifdef HAVE_SYS_TYPES_H
--- liboctave/oct-sort.cc
+++ liboctave/oct-sort.cc
@@ -84,6 +84,9 @@
 #include <config.h>
 #endif
 
+#include <cstdlib>
+#include <cstring>
+
 #include "lo-mappers.h"
 #include "quit.h"
 #include "oct-sort.h"
--- src/DLD-FUNCTIONS/sort.cc
+++ src/DLD-FUNCTIONS/sort.cc
@@ -294,7 +294,7 @@
 template class octave_sort<vec_index<unsigned EIGHT_BYTE_INT> *>;
 
 template <>
-static octave_value
+octave_value
 mx_sort (ArrayN<double> &m, int dim, sortmode mode)
 {
   octave_value retval;
@@ -345,11 +345,12 @@
 	  // things up.
 
 	  if (lo_ieee_signbit (octave_NaN))
+	  {
 	    if (mode == UNDEFINED || mode == ASCENDING)
 	      {
 		unsigned int i = 0;
 		double *vtmp = (double *)p;
-		while (xisnan (vtmp[i++]) && i < ns);
+		while (xisnan (vtmp[i++]) && i < ns) {}
 		for (unsigned int l = 0; l < ns - i + 1; l++)
 		  vtmp[l] = vtmp[l+i-1];
 		for (unsigned int l = ns - i + 1; l < ns; l++)
@@ -359,12 +360,13 @@
 	      {
 		unsigned int i = ns;
 		double *vtmp = (double *)p;
-		while (xisnan (vtmp[--i]) && i > 0);
+		while (xisnan (vtmp[--i]) && i > 0) {}
 		for (int l = i; l >= 0; l--)
 		  vtmp[l-i+ns-1] = vtmp[l];
 		for (unsigned int l = 0; l < ns - i - 1; l++)
 		  vtmp[l] = octave_NaN;
 	      }
+	  }
 
 	  p += ns;
 	}
@@ -404,10 +406,11 @@
 	  // fix things up.
 
 	  if (lo_ieee_signbit (octave_NaN))
+	  {
 	    if (mode == UNDEFINED || mode == ASCENDING)
 	      {
 		unsigned int i = 0;
-		while (xisnan (v[i++*stride + offset]) && i < ns);
+		while (xisnan (v[i++*stride + offset]) && i < ns) {}
 		for (unsigned int l = 0; l < ns - i + 1; l++)
 		  v[l*stride + offset] = v[(l+i-1)*stride + offset];
 		for (unsigned int l = ns - i + 1; l < ns; l++)
@@ -416,12 +419,13 @@
 	    else
 	      {
 		unsigned int i = ns;
-		while (xisnan (v[--i*stride + offset]) && i > 0);
+		while (xisnan (v[--i*stride + offset]) && i > 0) {}
 		for (int l = i; l >= 0; l--)
 		  v[(l-i+ns-1)*stride + offset] = v[l*stride + offset];
 		for (unsigned int l = 0; l < ns - i - 1; l++)
 		  v[l*stride + offset] = octave_NaN;
 	      }
+	  }
 	}
     }
 
@@ -431,7 +435,7 @@
 }
 
 template <>
-static octave_value_list
+octave_value_list
 mx_sort_indexed (ArrayN<double> &m, int dim, sortmode mode)
 {
   octave_value_list retval;
@@ -506,10 +510,11 @@
       // If it will be sorted to the beginning, fix things up.
 
       if (lo_ieee_signbit (octave_NaN))
+      {
 	if (mode == UNDEFINED || mode == ASCENDING)
 	  {
 	    unsigned int i = 0;
-	    while (xisnan (v[i++*stride+offset]) && i < ns);
+	    while (xisnan (v[i++*stride+offset]) && i < ns) {}
 	    OCTAVE_LOCAL_BUFFER (double, itmp, i - 1);
 	    for (unsigned int l = 0; l < i -1; l++)
 	      itmp[l] = idx(l*stride + offset);
@@ -527,7 +532,7 @@
 	else 
 	  {
 	    unsigned int i = ns;
-	    while (xisnan (v[--i*stride+offset]) && i > 0);
+	    while (xisnan (v[--i*stride+offset]) && i > 0) {}
 	    OCTAVE_LOCAL_BUFFER (double, itmp, ns - i - 1);
 	    for (unsigned int l = 0; l < ns - i -1; l++)
 	      itmp[l] = idx((l+i+1)*stride + offset);
@@ -542,6 +547,7 @@
 		idx(l*stride + offset) = itmp[k];
 	      }
 	  }
+	}
     }
 
   retval(1) = idx;
--- src/file-io.cc
+++ src/file-io.cc
@@ -42,6 +42,7 @@
 #include <cerrno>
 #include <climits>
 #include <cstdio>
+#include <cstring>
 
 #include <iostream>
 #include <vector>
--- src/oct-stream.cc
+++ src/oct-stream.cc
@@ -1255,7 +1255,7 @@
 			int c3 = is.get ();
 
 			if (c3 != EOF)
-
+			{
 			  if (c3 == 'f')
 			    {
 			      int c4 = is.get ();
@@ -1290,6 +1290,7 @@
 
 			      is >> ref;
 			    }
+			}
 		      }
 		    else
 		      {
--- src/ov-fcn-inline.cc
+++ src/ov-fcn-inline.cc
@@ -126,7 +126,7 @@
       OSSTREAM buf;
 
       // Skip preceeding newline(s)
-      while (is.get (c) && c == '\n');
+      while (is.get (c) && c == '\n') {}
 
       if (is)
 	{
--- src/parse.y
+++ src/parse.y
@@ -34,6 +34,7 @@
 
 #include <cassert>
 #include <cstdio>
+#include <cstring>
 
 #ifdef YYBYACC
 #include <cstdlib>
--- src/pr-output.cc
+++ src/pr-output.cc
@@ -1602,7 +1602,7 @@
 }
 
 template <>
-static inline void
+inline void
 pr_plus_format (std::ostream& os, const Complex& c)
 {
   double rp = c.real ();
--- src/unwind-prot.cc
+++ src/unwind-prot.cc
@@ -30,6 +30,7 @@
 #endif
 
 #include <cstddef>
+#include <cstring>
 
 #include "CMatrix.h"