diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index 213a7334f1..dc47b25539 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -141,7 +141,6 @@ endsw
 
 # wmake configuration
 setenv WM_DIR $WM_PROJECT_DIR/wmake
-setenv WM_LINK_LANGUAGE c++
 setenv WM_LABEL_OPTION Int$WM_LABEL_SIZE
 setenv WM_OPTIONS $WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION
 
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 818a405753..9d4a22b6b6 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -53,7 +53,6 @@ unsetenv WM_HOSTS
 unsetenv WM_LABEL_OPTION
 unsetenv WM_LABEL_SIZE
 unsetenv WM_LDFLAGS
-unsetenv WM_LINK_LANGUAGE
 unsetenv WM_MPLIB
 unsetenv WM_NCOMPPROCS
 unsetenv WM_OPTIONS
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index 545e8a234f..9204f333c8 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -135,7 +135,6 @@ esac
 
 # wmake configuration
 export WM_DIR=$WM_PROJECT_DIR/wmake
-export WM_LINK_LANGUAGE=c++
 export WM_LABEL_OPTION=Int$WM_LABEL_SIZE
 export WM_OPTIONS=$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION$WM_COMPILE_OPTION
 
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index d1df193478..024ba63160 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -44,7 +44,6 @@ unset WM_HOSTS
 unset WM_LABEL_OPTION
 unset WM_LABEL_SIZE
 unset WM_LDFLAGS
-unset WM_LINK_LANGUAGE
 unset WM_MPLIB
 unset WM_NCOMPPROCS
 unset WM_OPTIONS
diff --git a/wmake/rules/General/general b/wmake/rules/General/general
index 50ae06c69a..7265697e47 100644
--- a/wmake/rules/General/general
+++ b/wmake/rules/General/general
@@ -26,9 +26,9 @@ else
 endif
 
 include $(DEFAULT_RULES)/general
-include $(DEFAULT_RULES)/$(WM_LINK_LANGUAGE)
+include $(DEFAULT_RULES)/c++
 sinclude $(RULES)/general
-sinclude $(RULES)/$(WM_LINK_LANGUAGE)
+sinclude $(RULES)/c++
 include $(GENERAL_RULES)/transform
 
 
diff --git a/wmake/scripts/wmakeFunctions b/wmake/scripts/wmakeFunctions
index 29dddd39be..d25a881167 100644
--- a/wmake/scripts/wmakeFunctions
+++ b/wmake/scripts/wmakeFunctions
@@ -27,10 +27,10 @@ MakeDir=Make
 
 checkEnv()
 {
-    for envar in WM_OPTIONS WM_LINK_LANGUAGE WM_DIR WM_PROJECT_DIR
+    for check in WM_PROJECT_DIR WM_OPTIONS WM_DIR
     do
-        eval test "\$$envar" || {
-            echo "$Script error: environment variable \$$envar not set" 1>&2
+        eval test "\$$check" || {
+            echo "$Script error: environment variable \$$check not set" 1>&2
             exit 1
         }
     done