diff --git a/Modules/blockedQR.f90 b/Modules/blockedQR.f90
index 900c96e8b..42929caea 100644
--- a/Modules/blockedQR.f90
+++ b/Modules/blockedQR.f90
@@ -5,11 +5,11 @@ implicit none
 
 PRIVATE
 
-public :: qr_rank2_real
 
 real*8 dnrm2,ddot
 EXTERNAL dnrm2,dgemv,dscal,dger,daxpy,ddot
-
+#ifdef __ELPA
+public :: qr_rank2_real
 contains
 
 subroutine qr_rank2_real(a, lda, vmr, ldv, tmat, nbw, istep, cols, nblk, mpi_comm_rows, mpi_comm_cols, work, eps)
@@ -759,5 +759,5 @@ subroutine houseLeft_2rank_MPI_reversed(rows, cols, b, a, lda, hv, ldh, tauvalue
         enddo
    endif
 end subroutine houseLeft_2rank_MPI_reversed
-
+#endif
 end module blockedqr
diff --git a/Modules/elpa1.f90 b/Modules/elpa1.f90
index eb2058f93..ab99b64a4 100644
--- a/Modules/elpa1.f90
+++ b/Modules/elpa1.f90
@@ -13,6 +13,7 @@ module ELPA1
 
   PRIVATE ! By default, all routines contained are private
 
+#ifdef __ELPA
   ! The following routines are public:
 
   public :: get_elpa_row_col_comms     ! Sets MPI row/col communicators
@@ -41,7 +42,7 @@ module ELPA1
 
   public :: hh_transform_real
   public :: hh_transform_complex
-
+#endif
 !-------------------------------------------------------------------------------
 
   ! Timing results, set by every call to solve_evp_xxx
@@ -55,7 +56,7 @@ module ELPA1
   logical, public :: elpa_print_times = .false.
 
 !-------------------------------------------------------------------------------
-
+#ifdef __ELPA
   include 'mpif.h'
 
 contains
@@ -3878,9 +3879,9 @@ subroutine hh_transform_complex(alpha, xnorm_sq, xf, tau)
 end subroutine
 
 ! --------------------------------------------------------------------------------------------------
-
+#endif
 end module ELPA1
-
+#ifdef __ELPA
 ! --------------------------------------------------------------------------------------------------
 ! Please note that the following routines are outside of the module ELPA1
 ! so that they can be used with real or complex data
@@ -4090,3 +4091,4 @@ subroutine elpa_reduce_add_vectors(vmat_s,ld_s,comm_s,vmat_t,ld_t,comm_t,nvr,nvc
 end subroutine
 
 !-------------------------------------------------------------------------------
+#endif
diff --git a/Modules/elpa2.f90 b/Modules/elpa2.f90
index bb3473176..95b6c8696 100644
--- a/Modules/elpa2.f90
+++ b/Modules/elpa2.f90
@@ -17,6 +17,7 @@ module ELPA2
   PRIVATE ! By default, all routines contained are private
 
   ! The following routines are public:
+#ifdef __ELPA
 
   public :: solve_evp_real_2stage
   public :: solve_evp_complex_2stage
@@ -33,6 +34,7 @@ module ELPA2
   
   public :: band_band_real
   public :: divide_band
+#endif
   
 !-------------------------------------------------------------------------------  
 
@@ -52,7 +54,7 @@ module ELPA2
   complex*16, allocatable :: hh_trans_complex(:,:)
 
 !-------------------------------------------------------------------------------
-
+#ifdef __ELPA
   include 'mpif.h'
 
 
@@ -3950,4 +3952,5 @@ end subroutine
 
 ! --------------------------------------------------------------------------------------------------
 
+#endif
 end module ELPA2