diff --git a/etc/controlDict b/etc/controlDict
index b7beefbcd38992ad12619df5f140c21bf99c057c..32663f0873d50d80e846e320a8ae1cfc34102a6f 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -876,8 +876,8 @@ OptimisationSwitches
//- Modification checking:
// - timeStamp : use modification time on file
// - inotify : use inotify framework
- // - timeStampMaster : do time stamp (and file reading) only on master.
- // - inotifyMaster : do inotify (and file reading) only on master.
+ // - timeStampMaster : do time stamp (and file reading) only on master.
+ // - inotifyMaster : do inotify (and file reading) only on master.
fileModificationChecking timeStampMaster;//inotify;timeStamp;inotifyMaster;
commsType nonBlocking; //scheduled; //blocking;
diff --git a/wmake/rules/SiCortex64Gcc/c++Opt b/wmake/rules/SiCortex64Gcc/c++Opt
index 636689e9175bf6ba1007c8316e94855b11f35332..e37b9ee6e0c88a240bfacd71049d5288b79ba38d 100644
--- a/wmake/rules/SiCortex64Gcc/c++Opt
+++ b/wmake/rules/SiCortex64Gcc/c++Opt
@@ -1,4 +1,4 @@
-c++DBUG =
+c++DBUG =
c++OPT = -O3
#c++OPT = -O3
# -ftree-vectorize -ftree-vectorizer-verbose=3
diff --git a/wmake/rules/SiCortex64Gcc/cOpt b/wmake/rules/SiCortex64Gcc/cOpt
index a8b0635478db6e5968733b2f5f8f341b4af61d18..17318709f1fa39e6bf89cbe87778bc6fa459de17 100644
--- a/wmake/rules/SiCortex64Gcc/cOpt
+++ b/wmake/rules/SiCortex64Gcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3
diff --git a/wmake/rules/SunOS64Gcc/c++Opt b/wmake/rules/SunOS64Gcc/c++Opt
index 4cb95b5b3a9781b6508214a4ea55cf0930d2c9f4..2aedabd6280a3476bc58db13139a0a3aa579502b 100644
--- a/wmake/rules/SunOS64Gcc/c++Opt
+++ b/wmake/rules/SunOS64Gcc/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG =
+c++DBUG =
c++OPT = -O3
diff --git a/wmake/rules/SunOS64Gcc/cOpt b/wmake/rules/SunOS64Gcc/cOpt
index a8b0635478db6e5968733b2f5f8f341b4af61d18..17318709f1fa39e6bf89cbe87778bc6fa459de17 100644
--- a/wmake/rules/SunOS64Gcc/cOpt
+++ b/wmake/rules/SunOS64Gcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3
diff --git a/wmake/rules/linux64Gcc/c++Opt b/wmake/rules/linux64Gcc/c++Opt
index 5e2b738cd9bd0935ff3a504e9c7586c742493d63..3363be80905262684d0f126daa1cd6388231184d 100644
--- a/wmake/rules/linux64Gcc/c++Opt
+++ b/wmake/rules/linux64Gcc/c++Opt
@@ -1,3 +1,3 @@
#c++DBUG = -O0 -DFULLDEBUG -g
-c++DBUG =
+c++DBUG =
c++OPT = -O3
diff --git a/wmake/rules/linux64Icc/c b/wmake/rules/linux64Icc/c
index 527c968bc9c6da1493147b24ffe06862a34abe42..08ea0f8049ef07e00b1f00af8f11616383492907 100644
--- a/wmake/rules/linux64Icc/c
+++ b/wmake/rules/linux64Icc/c
@@ -1,6 +1,6 @@
.SUFFIXES: .c .h
-cWARN =
+cWARN =
cc = icc
diff --git a/wmake/rules/linux64Icc/c++Debug b/wmake/rules/linux64Icc/c++Debug
index cfc504ee8d2e5362b45630fef0291f692bcb4cd3..0aec1fbffe1dd092d778540c501551d87474fb8e 100644
--- a/wmake/rules/linux64Icc/c++Debug
+++ b/wmake/rules/linux64Icc/c++Debug
@@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG -O0
-c++OPT =
+c++OPT =
diff --git a/wmake/rules/linux64Icc/c++Opt b/wmake/rules/linux64Icc/c++Opt
index efd90cbbcf7094482413702d44de12dd36b3006d..8b6fbd136d63f8a14710abfed01e4a49011f4180 100644
--- a/wmake/rules/linux64Icc/c++Opt
+++ b/wmake/rules/linux64Icc/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG =
+c++DBUG =
c++OPT = -xT -O3 -no-prec-div
diff --git a/wmake/rules/linux64Icc/cDebug b/wmake/rules/linux64Icc/cDebug
index d4abf632731d801bc522d01c459e8db021b0ba65..73dce0dfd01f70663ed42deb43c46cb36c39394e 100644
--- a/wmake/rules/linux64Icc/cDebug
+++ b/wmake/rules/linux64Icc/cDebug
@@ -1,2 +1,2 @@
cDBUG = -g -DFULLDEBUG -O0
-cOPT =
+cOPT =
diff --git a/wmake/rules/linux64Icc/cOpt b/wmake/rules/linux64Icc/cOpt
index c11cbf0553b7398022d98013b8fe87e4ca40cb41..b5349135be42738b3d2ba658701c85c76d0bc0b3 100644
--- a/wmake/rules/linux64Icc/cOpt
+++ b/wmake/rules/linux64Icc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3 -no-prec-div
diff --git a/wmake/rules/linuxIA64Gcc/c++Opt b/wmake/rules/linuxIA64Gcc/c++Opt
index 4cb95b5b3a9781b6508214a4ea55cf0930d2c9f4..2aedabd6280a3476bc58db13139a0a3aa579502b 100644
--- a/wmake/rules/linuxIA64Gcc/c++Opt
+++ b/wmake/rules/linuxIA64Gcc/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG =
+c++DBUG =
c++OPT = -O3
diff --git a/wmake/rules/linuxIA64Gcc/cOpt b/wmake/rules/linuxIA64Gcc/cOpt
index a8b0635478db6e5968733b2f5f8f341b4af61d18..17318709f1fa39e6bf89cbe87778bc6fa459de17 100644
--- a/wmake/rules/linuxIA64Gcc/cOpt
+++ b/wmake/rules/linuxIA64Gcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPI b/wmake/rules/linuxIA64Gcc/mplibMPI
index 67c18b2a2616668ebe4b76959a587a5e95e869cf..186769c0c26554ded137caac1e0d727e04fafd82 100644
--- a/wmake/rules/linuxIA64Gcc/mplibMPI
+++ b/wmake/rules/linuxIA64Gcc/mplibMPI
@@ -1,3 +1,3 @@
PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND
-PINC =
+PINC =
PLIBS = -lmpi
diff --git a/wmake/rules/linuxIA64Icc/c b/wmake/rules/linuxIA64Icc/c
index 86fd59f3f07ad66f00292795b22e7de6137057e5..d05b14867e4e22eb7ab922b55da28eda31eea333 100644
--- a/wmake/rules/linuxIA64Icc/c
+++ b/wmake/rules/linuxIA64Icc/c
@@ -1,6 +1,6 @@
.SUFFIXES: .c .h
-cWARN =
+cWARN =
cc = icc
diff --git a/wmake/rules/linuxIA64Icc/c++Debug b/wmake/rules/linuxIA64Icc/c++Debug
index cfc504ee8d2e5362b45630fef0291f692bcb4cd3..0aec1fbffe1dd092d778540c501551d87474fb8e 100644
--- a/wmake/rules/linuxIA64Icc/c++Debug
+++ b/wmake/rules/linuxIA64Icc/c++Debug
@@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG -O0
-c++OPT =
+c++OPT =
diff --git a/wmake/rules/linuxIA64Icc/c++Opt b/wmake/rules/linuxIA64Icc/c++Opt
index b29c39dd528c803c4d89d2e35974e38d52bdf223..dd3d557474213cb77371150ce00dfb24ed3db919 100644
--- a/wmake/rules/linuxIA64Icc/c++Opt
+++ b/wmake/rules/linuxIA64Icc/c++Opt
@@ -1,4 +1,4 @@
-c++DBUG =
+c++DBUG =
c++OPT = \
-DICC_IA64_PREFETCH \
diff --git a/wmake/rules/linuxIA64Icc/cDebug b/wmake/rules/linuxIA64Icc/cDebug
index d4abf632731d801bc522d01c459e8db021b0ba65..73dce0dfd01f70663ed42deb43c46cb36c39394e 100644
--- a/wmake/rules/linuxIA64Icc/cDebug
+++ b/wmake/rules/linuxIA64Icc/cDebug
@@ -1,2 +1,2 @@
cDBUG = -g -DFULLDEBUG -O0
-cOPT =
+cOPT =
diff --git a/wmake/rules/linuxIA64Icc/cOpt b/wmake/rules/linuxIA64Icc/cOpt
index a8b0635478db6e5968733b2f5f8f341b4af61d18..17318709f1fa39e6bf89cbe87778bc6fa459de17 100644
--- a/wmake/rules/linuxIA64Icc/cOpt
+++ b/wmake/rules/linuxIA64Icc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3
diff --git a/wmake/rules/linuxIA64Icc/mplibIMPI b/wmake/rules/linuxIA64Icc/mplibIMPI
index 67c18b2a2616668ebe4b76959a587a5e95e869cf..186769c0c26554ded137caac1e0d727e04fafd82 100644
--- a/wmake/rules/linuxIA64Icc/mplibIMPI
+++ b/wmake/rules/linuxIA64Icc/mplibIMPI
@@ -1,3 +1,3 @@
PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND
-PINC =
+PINC =
PLIBS = -lmpi
diff --git a/wmake/rules/linuxIA64Icc/mplibMPI b/wmake/rules/linuxIA64Icc/mplibMPI
index 67c18b2a2616668ebe4b76959a587a5e95e869cf..186769c0c26554ded137caac1e0d727e04fafd82 100644
--- a/wmake/rules/linuxIA64Icc/mplibMPI
+++ b/wmake/rules/linuxIA64Icc/mplibMPI
@@ -1,3 +1,3 @@
PFLAGS = -DSGIMPI -DMPI_NO_CPPBIND
-PINC =
+PINC =
PLIBS = -lmpi
diff --git a/wmake/rules/linuxIcc/c b/wmake/rules/linuxIcc/c
index 0e755074f82efeeb6deac7bdcfad08960acb75ed..269eeaba47f37947712379112a41e8fc20b66de9 100644
--- a/wmake/rules/linuxIcc/c
+++ b/wmake/rules/linuxIcc/c
@@ -1,6 +1,6 @@
.SUFFIXES: .c .h
-cWARN =
+cWARN =
cc = icc -gcc-version=400
diff --git a/wmake/rules/linuxIcc/c++Debug b/wmake/rules/linuxIcc/c++Debug
index cfc504ee8d2e5362b45630fef0291f692bcb4cd3..0aec1fbffe1dd092d778540c501551d87474fb8e 100644
--- a/wmake/rules/linuxIcc/c++Debug
+++ b/wmake/rules/linuxIcc/c++Debug
@@ -1,2 +1,2 @@
c++DBUG = -g -DFULLDEBUG -O0
-c++OPT =
+c++OPT =
diff --git a/wmake/rules/linuxIcc/c++Opt b/wmake/rules/linuxIcc/c++Opt
index 1148721d30681d66a59a8fe3502fb711b2999c2d..62f12c3eb533c5902776749d3e3916f78fe95790 100644
--- a/wmake/rules/linuxIcc/c++Opt
+++ b/wmake/rules/linuxIcc/c++Opt
@@ -1,4 +1,4 @@
-c++DBUG =
+c++DBUG =
#c++OPT = -O3 -xP -no-prec-div
c++OPT = -ansi-alias -O3 -ftz -fno-alias \
-fargument-noalias-global \
diff --git a/wmake/rules/linuxIcc/cDebug b/wmake/rules/linuxIcc/cDebug
index d4abf632731d801bc522d01c459e8db021b0ba65..73dce0dfd01f70663ed42deb43c46cb36c39394e 100644
--- a/wmake/rules/linuxIcc/cDebug
+++ b/wmake/rules/linuxIcc/cDebug
@@ -1,2 +1,2 @@
cDBUG = -g -DFULLDEBUG -O0
-cOPT =
+cOPT =
diff --git a/wmake/rules/linuxIcc/cOpt b/wmake/rules/linuxIcc/cOpt
index c11cbf0553b7398022d98013b8fe87e4ca40cb41..b5349135be42738b3d2ba658701c85c76d0bc0b3 100644
--- a/wmake/rules/linuxIcc/cOpt
+++ b/wmake/rules/linuxIcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3 -no-prec-div
diff --git a/wmake/rules/linuxmingw32/X b/wmake/rules/linuxmingw32/X
index d4f8a960c5219f4c7310e0d17bfeec97ac2be36e..7848473828558dcba526fe65eca441eaea8cec89 100644
--- a/wmake/rules/linuxmingw32/X
+++ b/wmake/rules/linuxmingw32/X
@@ -1,3 +1,3 @@
XFLAGS =
-XINC =
+XINC =
XLIBS =
diff --git a/wmake/rules/linuxmingw32/c++Opt b/wmake/rules/linuxmingw32/c++Opt
index 8d5bc55cee782d01b0bb9366587905941b722614..548bfecef8b96869557513d09761fe1974028039 100644
--- a/wmake/rules/linuxmingw32/c++Opt
+++ b/wmake/rules/linuxmingw32/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG =
+c++DBUG =
c++OPT = -O3 -DNDEBUG
diff --git a/wmake/rules/linuxmingw32/cOpt b/wmake/rules/linuxmingw32/cOpt
index f2abb5590ac3a0853b42db299d5cbc62a4dc9458..e4572a0e47aac2a8f587ddeb55914dfe064d7175 100644
--- a/wmake/rules/linuxmingw32/cOpt
+++ b/wmake/rules/linuxmingw32/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O3 -DNDEBUG
diff --git a/wmake/rules/solarisGcc/c++Opt b/wmake/rules/solarisGcc/c++Opt
index 551785219b1e934493aded65871d5826573762f6..18428f18267ef49cb9100f03bc85573b245aecb6 100644
--- a/wmake/rules/solarisGcc/c++Opt
+++ b/wmake/rules/solarisGcc/c++Opt
@@ -1,2 +1,2 @@
-c++DBUG =
+c++DBUG =
c++OPT = -O3 -fno-schedule-insns
diff --git a/wmake/rules/solarisGcc/cOpt b/wmake/rules/solarisGcc/cOpt
index 687e27cf1304d210cebb29fac5004e86cf44e13f..b0ce51585486811e127263b8755a7c88e5ab1f99 100644
--- a/wmake/rules/solarisGcc/cOpt
+++ b/wmake/rules/solarisGcc/cOpt
@@ -1,2 +1,2 @@
-cDBUG =
+cDBUG =
cOPT = -O2 -fno-schedule-insns
diff --git a/wmake/rules/solarisGcc/mplibMPI b/wmake/rules/solarisGcc/mplibMPI
index c7096a13faa93b866ca5dcaf9bd7beb118c0c12b..0d79c1d72c738f74af4dfc47dd069c63b060fe4d 100644
--- a/wmake/rules/solarisGcc/mplibMPI
+++ b/wmake/rules/solarisGcc/mplibMPI
@@ -1,3 +1,3 @@
-PFLAGS =
-PINC = -I$(MPI_ROOT)/include
+PFLAGS =
+PINC = -I$(MPI_ROOT)/include
PLIBS = -L$(MPI_ROOT)/lib/$(MPI_ARCH) -lmpi