diff --git a/Gamma/cg_readin.f90 b/Gamma/cg_readin.f90
index e5383074e..ddfb74a64 100644
--- a/Gamma/cg_readin.f90
+++ b/Gamma/cg_readin.f90
@@ -10,6 +10,7 @@
 subroutine cg_readin
   !-----------------------------------------------------------------------
   !
+#include "machine.h"
   USE ions_base, ONLY : nat
   use pwcom
   use cgcom
@@ -130,7 +131,6 @@ end subroutine cg_readin
 subroutine cg_readmodes(iunit)
   !-----------------------------------------------------------------------
   !
-#include "machine.h"
   USE ions_base, ONLY : nat
   USE kinds, only: DP
   use pwcom
diff --git a/PP/bands.f90 b/PP/bands.f90
index 9a8460acf..7154cf445 100644
--- a/PP/bands.f90
+++ b/PP/bands.f90
@@ -8,6 +8,7 @@
 !-----------------------------------------------------------------------
 program bands
   !-----------------------------------------------------------------------
+#include "machine.h"
   use io_files, only: nd_nmbr, prefix, tmp_dir
 #ifdef __PARA
   use para, only: me, npool
@@ -97,7 +98,6 @@ subroutine punch_band (filband)
   !    method works in many, but not in all the cases.
   !
   !
-#include "machine.h"
 #ifdef __PARA
   use para, only: me
 #endif
diff --git a/PP/dos.f90 b/PP/dos.f90
index 7b145c4c2..c71ec08bd 100644
--- a/PP/dos.f90
+++ b/PP/dos.f90
@@ -29,6 +29,7 @@ program dos
   ! if degauss1, ngauss1 are specified they override what is
   ! specified in the input file wrt summation method
   !
+#include "machine.h"
   USE io_global,  ONLY : stdout, ionode_id
   USE io_files,   ONLY : nd_nmbr, prefix, tmp_dir
   USE kinds, ONLY : DP
diff --git a/PP/plotband.f90 b/PP/plotband.f90
index 399f5f988..7135452dc 100644
--- a/PP/plotband.f90
+++ b/PP/plotband.f90
@@ -1,5 +1,6 @@
 
 program read_bands
+#include "machine.h"
 
   USE io_global,  ONLY : stdout
 
diff --git a/PP/postproc.f90 b/PP/postproc.f90
index 59d94a52f..2ca57a4e4 100644
--- a/PP/postproc.f90
+++ b/PP/postproc.f90
@@ -16,6 +16,7 @@ program postproc
   !
   !    DESCRIPTION of the INPUT: see file pwdocs/INPUT_PP
   !
+#include "machine.h"
   USE kinds, ONLY: DP
   USE cell_base, ONLY: bg
   USE ions_base, ONLY: nat, ntyp=>nsp, ityp, tau
diff --git a/PP/projwfc.f90 b/PP/projwfc.f90
index e18457c0d..c9bd58ddc 100644
--- a/PP/projwfc.f90
+++ b/PP/projwfc.f90
@@ -24,6 +24,7 @@ program projwfc
   !   DeltaE      ...in steps of DeltaE (eV, default: 0.01) 
   !   smoothing   gaussian broadening (eV, default: DeltaE) 
   ! 
+#include "machine.h" 
   USE io_global,  ONLY : stdout 
   USE kinds, only : DP 
   use io_files,   only : nd_nmbr, prefix, tmp_dir 
@@ -121,7 +122,6 @@ end program projwfc
 subroutine projwave (io_choice,Emin, Emax, DeltaE, smoothing) 
   !----------------------------------------------------------------------- 
   ! 
-#include "machine.h" 
   USE io_global,  ONLY : stdout 
   use atom 
   USE ions_base, ONLY : nat, ityp, atm, ntyp => nsp
diff --git a/PW/bp_c_phase.f90 b/PW/bp_c_phase.f90
index 1df03ce39..e97c67537 100644
--- a/PW/bp_c_phase.f90
+++ b/PW/bp_c_phase.f90
@@ -543,10 +543,10 @@ SUBROUTINE c_phase
                ENDDO
 
 !              --- Calculate matrix determinant ---
-               CALL zgefa(mat,nbnd,nbnd,ivpt,info)
+               CALL ZGEFA(mat,nbnd,nbnd,ivpt,info)
                CALL errore('c_phase','error in zgefa',abs(info))
                job=10
-               CALL zgedi(mat,nbnd,nbnd,ivpt,cdet,cdwork,job)
+               CALL ZGEDI(mat,nbnd,nbnd,ivpt,cdet,cdwork,job)
                det=cdet(1)*10.d0**cdet(2)
 
 !              --- Multiply by the already calculated determinants ---
diff --git a/clib/cp.h b/clib/cp.h
index b39e6dcdb..94801ab3f 100644
--- a/clib/cp.h
+++ b/clib/cp.h
@@ -7,7 +7,7 @@
 */
 
 
-#if defined __T3E | defined __ABSOFT
+#if defined __T3E || defined __ABSOFT
 
 #  define FFTW_INPLACE_DRV_1D FFTW_INPLACE_DRV_1D
 #  define FFTW_INPLACE_DRV_2D FFTW_INPLACE_DRV_2D
@@ -34,7 +34,7 @@
 
 #endif
 
-#if defined __SGI | defined __FUJITSU | defined __SX4 | defined __INTEL | defined __LAHEY | defined __SX6 | defined SUN | defined __ALTIX
+#if defined __SGI || defined __FUJITSU || defined __SX4 || defined __INTEL || defined __LAHEY || defined __SX6 || defined SUN || defined __ALTIX
 
 #  define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d_
 #  define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d_
@@ -158,7 +158,7 @@
 
 #endif
 
-#if defined __AIX | defined __HP
+#if defined __AIX || defined __HP
 
 #  define FFTW_INPLACE_DRV_1D fftw_inplace_drv_1d
 #  define FFTW_INPLACE_DRV_2D fftw_inplace_drv_2d
diff --git a/pwtools/matdyn.f90 b/pwtools/matdyn.f90
index 7d7ed0c58..b033adfb7 100644
--- a/pwtools/matdyn.f90
+++ b/pwtools/matdyn.f90
@@ -56,6 +56,7 @@ program matdyn
   !  For low-symmetry crystals, specify twice q = 0 in the list
   !  if you want to have q = 0 results for two different directions
   !
+#include "machine.h"
   implicit none
   !
   ! variables *_blk refer to the original cell, other variables