diff --git a/src/Pstream/gamma/Make/options b/src/Pstream/gamma/Make/options
index 90632e801ed7c6d9c7e0fdbcd09cc5327477b26f..74b6659671d63a22a74713d51dcc12924af0c84e 100644
--- a/src/Pstream/gamma/Make/options
+++ b/src/Pstream/gamma/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
 
-EXE_INC = $(PFLAGS) $(PINC)
+EXE_INC  = $(PFLAGS) $(PINC)
 LIB_LIBS = $(PLIBS)
diff --git a/src/Pstream/mpi/Make/options b/src/Pstream/mpi/Make/options
index 90632e801ed7c6d9c7e0fdbcd09cc5327477b26f..74b6659671d63a22a74713d51dcc12924af0c84e 100644
--- a/src/Pstream/mpi/Make/options
+++ b/src/Pstream/mpi/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
 
-EXE_INC = $(PFLAGS) $(PINC)
+EXE_INC  = $(PFLAGS) $(PINC)
 LIB_LIBS = $(PLIBS)
diff --git a/src/parallel/decompose/ptscotchDecomp/Make/options b/src/parallel/decompose/ptscotchDecomp/Make/options
index f8e8f924602f95af3439485a0810bc63e3a35b98..b2b76fce059d37a68efcf4981896688c994ac2cf 100644
--- a/src/parallel/decompose/ptscotchDecomp/Make/options
+++ b/src/parallel/decompose/ptscotchDecomp/Make/options
@@ -1,4 +1,5 @@
-include $(RULES)/mplib$(WM_MPLIB)
+sinclude $(GENERAL_RULES)/mplib$(WM_MPLIB)
+sinclude $(RULES)/mplib$(WM_MPLIB)
 
 EXE_INC = \
     $(PFLAGS) $(PINC) \
diff --git a/wmake/MakefileFiles b/wmake/MakefileFiles
index 59eabfe5a5cacfc76c21f70f4b3640c934f7b722..7303329f69177d0bb7ee9ff3e5fc8d36c8188e89 100644
--- a/wmake/MakefileFiles
+++ b/wmake/MakefileFiles
@@ -58,7 +58,7 @@ IFILES  = $(WM_OPTIONS)/includeDeps
 allFiles : $(FILES) $(SFILES) $(OFILES) $(DFILES) $(IFILES)
 
 $(FILES) : files
-	@$(CPP) $(GFLAGS) $(FFLAGS) files > $(FILES)
+	@$(CPP) $(GFLAGS) $(FFLAGS) files | sed -e 's@   *@ @g' > $(FILES)
 
 $(SFILES): files
 	@$(WM_SCRIPTS)/makeDerivedFiles
diff --git a/wmake/MakefileOptions b/wmake/MakefileOptions
index 0a31e6f69a6b2303a3aa06879540e1fb6b25b56d..45d33ffb719bec5df9fa08880666b64e781e7cff 100644
--- a/wmake/MakefileOptions
+++ b/wmake/MakefileOptions
@@ -48,7 +48,7 @@ OPTIONS = $(WM_OPTIONS)/options
 #------------------------------------------------------------------------------
 
 $(OPTIONS) : options
-	@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options > $(OPTIONS)
+	@$(WM_SCRIPTS)/makeDir $(WM_OPTIONS) ; $(CPP) $(GFLAGS) options | sed -e 's@   *@ @g' > $(OPTIONS)
 
 
 #------------------------------------------------------------------------------
diff --git a/wmake/rules/General/standard b/wmake/rules/General/standard
index 9b2cbd252757e50e2ef531d032d14f6e896be68c..76a60a31ce27922fe5bbeec4761bf7fee2fc34e2 100644
--- a/wmake/rules/General/standard
+++ b/wmake/rules/General/standard
@@ -9,3 +9,5 @@ include $(GENERAL_RULES)/coco-cpp
 ## include $(GENERAL_RULES)/btyacc++
 include $(GENERAL_RULES)/bison
 include $(GENERAL_RULES)/moc
+
+include $(GENERAL_RULES)/X
diff --git a/wmake/rules/SiCortex64Gcc/mplib b/wmake/rules/SiCortex64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/SiCortex64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/SiCortex64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplib b/wmake/rules/SunOS64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/SunOS64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibOPENMPI b/wmake/rules/SunOS64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/SunOS64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/SunOS64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/X b/wmake/rules/linux64Gcc/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/general b/wmake/rules/linux64Gcc/general
index 7285501d981c0bd3c55ca4134d0457d0fca23239..e7faa0c0f2019de8ef82545820d26f5b4787e460 100644
--- a/wmake/rules/linux64Gcc/general
+++ b/wmake/rules/linux64Gcc/general
@@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc/mplib b/wmake/rules/linux64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibGAMMA b/wmake/rules/linux64Gcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibMPICH b/wmake/rules/linux64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibMPICH-GM b/wmake/rules/linux64Gcc/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibOPENMPI b/wmake/rules/linux64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibQSMPI b/wmake/rules/linux64Gcc/mplibQSMPI
deleted file mode 120000
index d3446c68f17809e1cb6e97cbe53156c29ba4c105..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/X b/wmake/rules/linux64Gcc43/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/general b/wmake/rules/linux64Gcc43/general
index 7285501d981c0bd3c55ca4134d0457d0fca23239..e7faa0c0f2019de8ef82545820d26f5b4787e460 100644
--- a/wmake/rules/linux64Gcc43/general
+++ b/wmake/rules/linux64Gcc43/general
@@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc43/mplib b/wmake/rules/linux64Gcc43/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibGAMMA b/wmake/rules/linux64Gcc43/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH b/wmake/rules/linux64Gcc43/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibMPICH-GM b/wmake/rules/linux64Gcc43/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibOPENMPI b/wmake/rules/linux64Gcc43/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibQSMPI b/wmake/rules/linux64Gcc43/mplibQSMPI
deleted file mode 120000
index d3446c68f17809e1cb6e97cbe53156c29ba4c105..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc43/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/X b/wmake/rules/linux64Gcc44/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/general b/wmake/rules/linux64Gcc44/general
index 7285501d981c0bd3c55ca4134d0457d0fca23239..e7faa0c0f2019de8ef82545820d26f5b4787e460 100644
--- a/wmake/rules/linux64Gcc44/general
+++ b/wmake/rules/linux64Gcc44/general
@@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc44/mplib b/wmake/rules/linux64Gcc44/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibGAMMA b/wmake/rules/linux64Gcc44/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH b/wmake/rules/linux64Gcc44/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibMPICH-GM b/wmake/rules/linux64Gcc44/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibOPENMPI b/wmake/rules/linux64Gcc44/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibQSMPI b/wmake/rules/linux64Gcc44/mplibQSMPI
deleted file mode 120000
index d3446c68f17809e1cb6e97cbe53156c29ba4c105..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc44/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/X b/wmake/rules/linux64Gcc45/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/general b/wmake/rules/linux64Gcc45/general
index bfe6574e818489ff4e833b3ee9b0506d53dc2ec1..f9bb2e6b1e5263d0b8c898a72ba3ade1e3e66a9a 100644
--- a/wmake/rules/linux64Gcc45/general
+++ b/wmake/rules/linux64Gcc45/general
@@ -5,6 +5,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linux64Gcc45/mplib b/wmake/rules/linux64Gcc45/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibGAMMA b/wmake/rules/linux64Gcc45/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibMPICH b/wmake/rules/linux64Gcc45/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibMPICH-GM b/wmake/rules/linux64Gcc45/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibOPENMPI b/wmake/rules/linux64Gcc45/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibQSMPI b/wmake/rules/linux64Gcc45/mplibQSMPI
deleted file mode 120000
index d3446c68f17809e1cb6e97cbe53156c29ba4c105..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI b/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Gcc45/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/X b/wmake/rules/linux64Icc/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Icc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/general b/wmake/rules/linux64Icc/general
index 7285501d981c0bd3c55ca4134d0457d0fca23239..e7faa0c0f2019de8ef82545820d26f5b4787e460 100644
--- a/wmake/rules/linux64Icc/general
+++ b/wmake/rules/linux64Icc/general
@@ -2,6 +2,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linux64Icc/mplib b/wmake/rules/linux64Icc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Icc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibMPICH b/wmake/rules/linux64Icc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Icc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibOPENMPI b/wmake/rules/linux64Icc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Icc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linux64Icc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/X b/wmake/rules/linuxGcc/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/general b/wmake/rules/linuxGcc/general
index c19ca193948e1c52ce231f177f7ea3efa8366678..ce84842fee3e8cf5493ae29693e0391613115cb8 100644
--- a/wmake/rules/linuxGcc/general
+++ b/wmake/rules/linuxGcc/general
@@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc/mplib b/wmake/rules/linuxGcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibGAMMA b/wmake/rules/linuxGcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibMPICH b/wmake/rules/linuxGcc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibMPICH-GM b/wmake/rules/linuxGcc/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibOPENMPI b/wmake/rules/linuxGcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/X b/wmake/rules/linuxGcc43/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/general b/wmake/rules/linuxGcc43/general
index c19ca193948e1c52ce231f177f7ea3efa8366678..ce84842fee3e8cf5493ae29693e0391613115cb8 100644
--- a/wmake/rules/linuxGcc43/general
+++ b/wmake/rules/linuxGcc43/general
@@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc43/mplib b/wmake/rules/linuxGcc43/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibGAMMA b/wmake/rules/linuxGcc43/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibMPICH b/wmake/rules/linuxGcc43/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibMPICH-GM b/wmake/rules/linuxGcc43/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibOPENMPI b/wmake/rules/linuxGcc43/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc43/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/X b/wmake/rules/linuxGcc44/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/general b/wmake/rules/linuxGcc44/general
index c19ca193948e1c52ce231f177f7ea3efa8366678..ce84842fee3e8cf5493ae29693e0391613115cb8 100644
--- a/wmake/rules/linuxGcc44/general
+++ b/wmake/rules/linuxGcc44/general
@@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc44/mplib b/wmake/rules/linuxGcc44/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibGAMMA b/wmake/rules/linuxGcc44/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibMPICH b/wmake/rules/linuxGcc44/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibMPICH-GM b/wmake/rules/linuxGcc44/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibOPENMPI b/wmake/rules/linuxGcc44/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc44/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/X b/wmake/rules/linuxGcc45/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/general b/wmake/rules/linuxGcc45/general
index 7e9226e7954168748a5b5145fe52cec580bf2492..91c54db85d6abfe3914892c18e54146370d9a9d4 100644
--- a/wmake/rules/linuxGcc45/general
+++ b/wmake/rules/linuxGcc45/general
@@ -6,6 +6,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linuxGcc45/mplib b/wmake/rules/linuxGcc45/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibGAMMA b/wmake/rules/linuxGcc45/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibMPICH b/wmake/rules/linuxGcc45/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibMPICH-GM b/wmake/rules/linuxGcc45/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibOPENMPI b/wmake/rules/linuxGcc45/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI b/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxGcc45/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplib b/wmake/rules/linuxIA64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibMPICH b/wmake/rules/linuxIA64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibOPENMPI b/wmake/rules/linuxIA64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplib b/wmake/rules/linuxIA64Icc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Icc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibMPICH b/wmake/rules/linuxIA64Icc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Icc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibOPENMPI b/wmake/rules/linuxIA64Icc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Icc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIA64Icc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/X b/wmake/rules/linuxIcc/X
deleted file mode 120000
index 73572d6c04ba6d0bef91422cdb0d4fb51385fb5f..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIcc/X
+++ /dev/null
@@ -1 +0,0 @@
-../General/X
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/general b/wmake/rules/linuxIcc/general
index c19ca193948e1c52ce231f177f7ea3efa8366678..ce84842fee3e8cf5493ae29693e0391613115cb8 100644
--- a/wmake/rules/linuxIcc/general
+++ b/wmake/rules/linuxIcc/general
@@ -4,6 +4,5 @@ PROJECT_LIBS = -l$(WM_PROJECT) -liberty -ldl
 
 include $(GENERAL_RULES)/standard
 
-include $(RULES)/X
 include $(RULES)/c
 include $(RULES)/c++
diff --git a/wmake/rules/linuxIcc/mplib b/wmake/rules/linuxIcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibMPICH b/wmake/rules/linuxIcc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibOPENMPI b/wmake/rules/linuxIcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxIcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplib b/wmake/rules/linuxPPC64Gcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibGAMMA b/wmake/rules/linuxPPC64Gcc/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH b/wmake/rules/linuxPPC64Gcc/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM b/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibQSMPI b/wmake/rules/linuxPPC64Gcc/mplibQSMPI
deleted file mode 120000
index d3446c68f17809e1cb6e97cbe53156c29ba4c105..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibQSMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibQSMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI b/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxPPC64Gcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplib b/wmake/rules/linuxmingw32/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibGAMMA b/wmake/rules/linuxmingw32/mplibGAMMA
deleted file mode 120000
index 4b41692bf6243abf2681f5897ff6c74acdc5f0ee..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplibGAMMA
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibGAMMA
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibMPICH b/wmake/rules/linuxmingw32/mplibMPICH
deleted file mode 120000
index c83eb564e1bae8c134819f6e3966e2acf50fc672..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibMPICH-GM b/wmake/rules/linuxmingw32/mplibMPICH-GM
deleted file mode 120000
index 621d0857d321e265a85598b307bc524063a49964..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplibMPICH-GM
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibMPICH-GM
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibOPENMPI b/wmake/rules/linuxmingw32/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI b/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/linuxmingw32/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplib b/wmake/rules/solarisGcc/mplib
deleted file mode 120000
index 1fa0d64ec89dca4cb9401564a1c6f0f30268af77..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/mplib
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplib
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibOPENMPI b/wmake/rules/solarisGcc/mplibOPENMPI
deleted file mode 120000
index 2d938a16a6ce5f466058278adb2625688c5aac79..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/mplibOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibOPENMPI
\ No newline at end of file
diff --git a/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI b/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
deleted file mode 120000
index cc63a574c364d8150d41d98c3da13deaf139a1b3..0000000000000000000000000000000000000000
--- a/wmake/rules/solarisGcc/mplibSYSTEMOPENMPI
+++ /dev/null
@@ -1 +0,0 @@
-../General/mplibSYSTEMOPENMPI
\ No newline at end of file