diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options b/applications/solvers/compressible/rhoCentralFoam/BCs/Make/options
index 87f38a6a03..999e0466cd 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 a178c0d55d..1cbced1cd3 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 70c838b774..1618ab57ec 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 4c3dd783cb..e69de29bb2 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 1bdb57a0d0..5698f81a65 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 fa15f12452..71b7873964 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 fa15f12452..71b7873964 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 4b69dbaac2..30a5fa428b 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 2eaffb3b4b..5201314345 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 d27c95d033..a3ae8da833 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 34d28d0027..1db0d316db 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 7328b5d856..44ab48e425 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 fa15f12452..71b7873964 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 7848473828..0000000000
--- 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 c74ee742ac..0000000000
--- 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 52945c1aa8..0000000000
--- 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 19bdb9c334..0000000000
--- 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 548bfecef8..0000000000
--- 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 3bda4dad55..0000000000
--- 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 6c71ed93e8..0000000000
--- 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 e4572a0e47..0000000000
--- 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 ca3ac9bf5f..0000000000
--- 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 26658e0c98..0000000000
--- 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