diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
index 87f38a6a03264669e378f776bbb091701b4f1dbf..999e0466cdcb59be93b6fbeda75dc6cd431e74b1 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
@@ -3,7 +3,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lbasicThermophysicalModels \
     -lspecie
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/options b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/options
index a178c0d55d50cfb058feaee3a1a6a458481c1dcb..1cbced1cd3e45e111288795214aa74cdf6279da7 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/options
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/coupledDerivedFvPatchFields/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiationModels/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lmeshTools \
     -lbasicThermophysicalModels \
     -lfiniteVolume \
diff --git a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
index 70c838b774c8b2609363d066e78b1a19b9306ccd..1618ab57ec2d869d439de31fd8ead10e6f2b8ae2 100644
--- a/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
+++ b/applications/utilities/mesh/generation/extrude/extrudeModel/Make/options
@@ -2,6 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lmeshTools \
     -ldynamicMesh
diff --git a/src/dummyThirdParty/MGridGen/Make/options b/src/dummyThirdParty/MGridGen/Make/options
index 4c3dd783cb4170feefb3f5385510a83257b43b18..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/src/dummyThirdParty/MGridGen/Make/options
+++ b/src/dummyThirdParty/MGridGen/Make/options
@@ -1,3 +0,0 @@
-EXE_INC =
-
-EXE_LIBS =
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
index 1bdb57a0d09f24b9fa0f94047c7c831d7e01ae9a..5698f81a651a3be1d4ee7a32fe2c7867f3a343af 100644
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -5,7 +5,7 @@ EXE_INC = \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
     -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools \
     -llagrangian \
diff --git a/src/postProcessing/foamCalcFunctions/Make/options b/src/postProcessing/foamCalcFunctions/Make/options
index fa15f124528ebfcaf279a88a73a0d7954f2e9dc1..71b7873964d544eddf96d22aa40f4c3372c23c9c 100644
--- a/src/postProcessing/foamCalcFunctions/Make/options
+++ b/src/postProcessing/foamCalcFunctions/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume
diff --git a/src/postProcessing/postCalc/Make/options b/src/postProcessing/postCalc/Make/options
index fa15f124528ebfcaf279a88a73a0d7954f2e9dc1..71b7873964d544eddf96d22aa40f4c3372c23c9c 100644
--- a/src/postProcessing/postCalc/Make/options
+++ b/src/postProcessing/postCalc/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume
diff --git a/src/regionModels/pyrolysisModels/Make/options b/src/regionModels/pyrolysisModels/Make/options
index 4b69dbaac21ec57d5230226d5d9a42f1e9692756..30a5fa428b139714341edf2f6a18ae0e26dcd655 100644
--- a/src/regionModels/pyrolysisModels/Make/options
+++ b/src/regionModels/pyrolysisModels/Make/options
@@ -1,4 +1,3 @@
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -16,10 +15,10 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lregionModels \
     -lsolidChemistryModel \
-    -lsolidThermo \
+    -lbasicSolidThermo \
     -lfiniteVolume \
     -lmeshTools \
     -lcompressibleLESModels
diff --git a/src/regionModels/regionCoupling/Make/options b/src/regionModels/regionCoupling/Make/options
index 2eaffb3b4bc8d2e49b7c8c6fe518268514ec9e65..5201314345139f7a3f96137383ee2b348ff5c945 100644
--- a/src/regionModels/regionCoupling/Make/options
+++ b/src/regionModels/regionCoupling/Make/options
@@ -1,4 +1,3 @@
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
@@ -18,8 +17,7 @@ EXE_INC = \
     -I$(LIB_SRC)/regionModels/pyrolysisModels/lnInclude \
     -I$(LIB_SRC)/regionModels/surfaceFilmModels/lnInclude \
 
-
-EXE_LIBS = \
+LIB_LIBS = \
     -lregionModels \
     -lpyrolysisModels \
     -lsurfaceFilmModels \
diff --git a/src/regionModels/regionModel/Make/options b/src/regionModels/regionModel/Make/options
index d27c95d033dd5d7b1995c8ff8dc406e35ca1f586..a3ae8da833177387e9eecf75b5e2675fc7b481f5 100644
--- a/src/regionModels/regionModel/Make/options
+++ b/src/regionModels/regionModel/Make/options
@@ -2,6 +2,6 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/regionModels/surfaceFilmModels/Make/options b/src/regionModels/surfaceFilmModels/Make/options
index 34d28d002752e936c50acd6ec6e94feab06104a5..1db0d316db04bd47bf364e0a4456007067fc7748 100644
--- a/src/regionModels/surfaceFilmModels/Make/options
+++ b/src/regionModels/surfaceFilmModels/Make/options
@@ -15,9 +15,9 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
     -I$(LIB_SRC)/regionModels/regionModel/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lregionModels \
-    -lSLGThermoNew \
+    -lSLGThermo \
     -lfiniteVolume \
     -lmeshTools \
     -ldistributionModels \
diff --git a/src/regionModels/thermoBaffleModels/Make/options b/src/regionModels/thermoBaffleModels/Make/options
index 7328b5d85609fc61117ff7743fb3735fb277d555..44ab48e4254154d0acc4df41ae5c3994fcdbe605 100644
--- a/src/regionModels/thermoBaffleModels/Make/options
+++ b/src/regionModels/thermoBaffleModels/Make/options
@@ -8,8 +8,7 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel/lnInclude
 
-
-EXE_LIBS = \
+LIB_LIBS = \
     -lregionModels \
     -lbasicSolidThermo \
     -lfiniteVolume \
diff --git a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
index fa15f124528ebfcaf279a88a73a0d7954f2e9dc1..71b7873964d544eddf96d22aa40f4c3372c23c9c 100644
--- a/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
+++ b/src/thermophysicalModels/barotropicCompressibilityModel/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
     -lfiniteVolume
diff --git a/wmake/rules/linuxmingw32/X b/wmake/rules/linuxmingw32/X
deleted file mode 100644
index 7848473828558dcba526fe65eca441eaea8cec89..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/X
+++ /dev/null
@@ -1,3 +0,0 @@
-XFLAGS     =
-XINC       =
-XLIBS      =
diff --git a/wmake/rules/linuxmingw32/c b/wmake/rules/linuxmingw32/c
deleted file mode 100644
index c74ee742ac5de472a10b7367abac80f4c7fe84b8..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/c
+++ /dev/null
@@ -1,16 +0,0 @@
-.SUFFIXES: .c .h
-
-cWARN        = -Wall
-
-cc          = mingw32-gcc -m32
-
-include $(RULES)/c$(WM_COMPILE_OPTION)
-
-cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS)
-
-ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
-
-LINK_LIBS   = $(cDBUG)
-
-LINKLIBSO   = $(cc) -Wl,--output-def,$(LIB).def,--out-implib,$(LIB).a,--enable-auto-import -shared
-LINKEXE     = $(cc) -Wl,--enable-auto-import,--force-exe-suffix
diff --git a/wmake/rules/linuxmingw32/c++ b/wmake/rules/linuxmingw32/c++
deleted file mode 100644
index 52945c1aa8b497c75b891fab453886eb8e478c60..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/c++
+++ /dev/null
@@ -1,23 +0,0 @@
-.SUFFIXES: .C .cxx .cc .cpp
-
-c++WARN     = -Wall -Wextra -Wno-unused-parameter
-
-CC          = mingw32-g++
-
-include $(RULES)/c++$(WM_COMPILE_OPTION)
-
-ptFLAGS     = -DNoRepository -ftemplate-depth-100
-
-c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS)
-
-Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
-cxxtoo      = $(Ctoo)
-cctoo       = $(Ctoo)
-cpptoo      = $(Ctoo)
-
-LINK_LIBS   = $(c++DBUG)
-
-# Tried using -Wl,-no-undefined,--enable-runtime-pseudo-reloc
-# but didnt forgive undefined symbols during linking
-LINKLIBSO   = $(CC) $(c++FLAGS) -Wl,--output-def,$(LIB).def,--out-implib,$(LIB).a,--enable-auto-import -shared
-LINKEXE     = $(CC) $(c++FLAGS) -Wl,--enable-auto-import,--force-exe-suffix
diff --git a/wmake/rules/linuxmingw32/c++Debug b/wmake/rules/linuxmingw32/c++Debug
deleted file mode 100644
index 19bdb9c3346fc7a69380dfedd6e7911fe220a965..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/c++Debug
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -ggdb3 -DFULLDEBUG
-c++OPT      = -O0 -fdefault-inline
diff --git a/wmake/rules/linuxmingw32/c++Opt b/wmake/rules/linuxmingw32/c++Opt
deleted file mode 100644
index 548bfecef8b96869557513d09761fe1974028039..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/c++Opt
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG     =
-c++OPT      = -O3 -DNDEBUG
diff --git a/wmake/rules/linuxmingw32/c++Prof b/wmake/rules/linuxmingw32/c++Prof
deleted file mode 100644
index 3bda4dad55e898a8198f6e8bfe21e8d829d7230a..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/c++Prof
+++ /dev/null
@@ -1,2 +0,0 @@
-c++DBUG    = -pg
-c++OPT     = -O2
diff --git a/wmake/rules/linuxmingw32/cDebug b/wmake/rules/linuxmingw32/cDebug
deleted file mode 100644
index 6c71ed93e8a1720b7d9e7baef5255dd8981e09f8..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/cDebug
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -ggdb -DFULLDEBUG
-cOPT        = -O1 -finline-functions
diff --git a/wmake/rules/linuxmingw32/cOpt b/wmake/rules/linuxmingw32/cOpt
deleted file mode 100644
index e4572a0e47aac2a8f587ddeb55914dfe064d7175..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/cOpt
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       =
-cOPT        = -O3 -DNDEBUG
diff --git a/wmake/rules/linuxmingw32/cProf b/wmake/rules/linuxmingw32/cProf
deleted file mode 100644
index ca3ac9bf5f0cd61fe99e0f05fa1bd4bdf9fa6cf7..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/cProf
+++ /dev/null
@@ -1,2 +0,0 @@
-cDBUG       = -pg
-cOPT        = -O2
diff --git a/wmake/rules/linuxmingw32/general b/wmake/rules/linuxmingw32/general
deleted file mode 100644
index 26658e0c98f93f352e49becb3cb9965417b4bcb1..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/general
+++ /dev/null
@@ -1,16 +0,0 @@
-LD         = mingw32-ld
-
-PROJECT_LIBS = -l$(WM_PROJECT)
-
-include $(GENERAL_RULES)/standard
-
-include $(RULES)/X
-include $(RULES)/c
-include $(RULES)/c++
-
-SO      = dll
-EXE_EXT = .exe
-
-# Ensure we know what OS we are compiling for
-# during MakefileFiles and MakefileOptions
-GFLAGS  += -DWIN32 -DLITTLE_ENDIAN