Only include config.h in files that are compiled separately. * build-aux/mk-opts.pl: Don't emit code to include config.h in files that are only included in other files. * module.mk (libinterp_EXTRA_DIST): List ov-base-sparse.cc here. (OV_SPARSE_SRC): Not here. * op-dm-template.cc, op-scm-scm.cc, Array.cc, DiagArray2.cc, MArray.cc, MDiagArray2.cc, Sparse.cc, intNDArray.cc, bsxfun-defs.cc, mx-inlines.cc, kpse.cc, oct-sort.cc, ov-base-diag.cc, ov-base-int.cc, ov-base-mat.cc, ov-base-scalar.cc, ov-base-sparse.cc: Don't include config.h. * op-cdm-cm.cc, op-cdm-dm.cc, op-cdm-m.cc, op-cm-cdm.cc, op-cm-dm.cc, op-dm-cdm.cc, op-dm-cm.cc, op-dm-m.cc, op-fcdm-fcm.cc, op-fcdm-fm.cc, op-fcm-fcdm.cc, op-fcm-fdm.cc, op-fdm-fcdm.cc, op-fdm-fcm.cc, op-fdm-fm.cc, op-fm-fcdm.cc, op-fm-fdm.cc, op-m-cdm.cc, op-m-dm.cc: Do include config.h.

--- a/build-aux/mk-opts.pl	Thu May 12 14:46:25 2016 -0400
+++ b/build-aux/mk-opts.pl	Fri May 13 09:27:38 2016 -0400
@@ -375,8 +375,6 @@
 #if ! defined (octave_${CLASS_NAME}_h)
 #define octave_${CLASS_NAME}_h 1
 
-#include "octave-config.h"
-
 #include <cfloat>
 #include <cmath>
 
@@ -509,9 +507,9 @@
 // DO NOT EDIT!
 // Generated automatically from $DEFN_FILE.
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+// This file should not include config.h.  It is only included in other
+// C++ source files that should have included config.h before including
+// this file.
 
 #include <iomanip>
 #include <iostream>