diff --git a/src/Allwmake b/src/Allwmake
index 04d0d5a92f..3b1b1cb5b0 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -20,11 +20,11 @@ wmakeBuildInfo -check || wrmo OpenFOAM/global/global.o 2>/dev/null
 
 wmakeLnInclude -u OpenFOAM
 wmakeLnInclude -u OSspecific/"${WM_OSTYPE:-POSIX}"
+OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
+
 Pstream/Allwmake $targetType $*
 
-OSspecific/"${WM_OSTYPE:-POSIX}"/Allwmake $targetType $*
 wmake $targetType OpenFOAM
-
 wmake $targetType fileFormats
 wmake $targetType surfMesh
 wmake $targetType meshTools
diff --git a/src/Pstream/Allwmake b/src/Pstream/Allwmake
index f7447abf1e..647d646aeb 100755
--- a/src/Pstream/Allwmake
+++ b/src/Pstream/Allwmake
@@ -17,7 +17,7 @@ wmakeMpiLib()
         objectsDir="$WM_PROJECT_DIR/build/$WM_OPTIONS/src/Pstream/$libName"
         whichmpi="$objectsDir/using:$FOAM_MPI"
         [ -e "$whichmpi" ] || wclean $libName
-        echo "wmake $targetType $libName"
+        echo "wmake $targetType $libName (mpi=$WM_MPLIB)"
         wmake $targetType $libName
         mkdir -p "$objectsDir"
         touch "$whichmpi"
@@ -25,7 +25,7 @@ wmakeMpiLib()
     done
 }
 
-echo "wmake $targetType dummy"
+echo "wmake $targetType dummy (mpi=$WM_MPLIB)"
 wmake $targetType dummy
 
 case "$WM_MPLIB" in
diff --git a/src/Pstream/dummy/UPstream.C b/src/Pstream/dummy/UPstream.C
index 9dbaf0f574..a41113ac4f 100644
--- a/src/Pstream/dummy/UPstream.C
+++ b/src/Pstream/dummy/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2018 OpenFOAM Foundation
@@ -27,7 +27,6 @@ License
 
 #include "Pstream.H"
 #include "PstreamReduceOps.H"
-#include "OSspecific.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/Pstream/mpi/UPstream.C b/src/Pstream/mpi/UPstream.C
index b9f8d1e0c0..428e21b00c 100644
--- a/src/Pstream/mpi/UPstream.C
+++ b/src/Pstream/mpi/UPstream.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2019 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
                             | Copyright (C) 2011-2017 OpenFOAM Foundation
@@ -27,7 +27,6 @@ License
 
 #include "Pstream.H"
 #include "PstreamReduceOps.H"
-#include "OSspecific.H"
 #include "PstreamGlobals.H"
 #include "SubList.H"
 #include "allReduce.H"
@@ -35,7 +34,6 @@ License
 #include "collatedFileOperation.H"
 
 #include <mpi.h>
-
 #include <cstring>
 #include <cstdlib>
 #include <csignal>
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index ea5369a94c..ddf560a4b1 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -28,7 +28,7 @@ wmakeMpiLib()
         whichmpi="$objectsDir/using:$FOAM_MPI"
         whichdecomp="$objectsDir/using:$decompName"
         [ -e "$whichmpi" -a -e "$whichdecomp" ] || wclean $libName
-        echo "wmake $targetType $libName"
+        echo "wmake $targetType $libName (mpi=$WM_MPLIB)"
         wmake $targetType $libName
         mkdir -p "$objectsDir"
         touch "$whichdecomp" "$whichmpi"