diff --git a/src/blas/blas.cpp b/src/blas/blas.cpp
index 706849f31896ebd8ef76ce899b0ff6d496b106a5..0c28437cb0c731469c3bd7c97f58e1fd26742709 100644
--- a/src/blas/blas.cpp
+++ b/src/blas/blas.cpp
@@ -20,7 +20,7 @@ better idea to use the full reference implementation.
 
 Erik Lindahl, 2008-10-07.
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
-#ifndef __PLUMED_EXTERNAL_BLAS
+#ifdef __PLUMED_INTERNAL_BLAS
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
diff --git a/src/blas/blas.h b/src/blas/blas.h
index 069c089787e463c067966697072b96c6ca9f9796..7344462a126ac2142821affee8ac786753408f50 100644
--- a/src/blas/blas.h
+++ b/src/blas/blas.h
@@ -92,16 +92,13 @@ Erik Lindahl, 2008-10-07.
  */
 
 #include "simple.h"
-#ifdef __PLUMED_EXTERNAL_LAPACK
-#include "def_external.h"
-#else
+#ifdef __PLUMED_INTERNAL_LAPACK
 #include "def_internal.h"
-#endif
-#ifdef __PLUMED_EXTERNAL_BLAS
-extern "C"{
-#else
 namespace PLMD{
 namespace blas{
+#else
+#include "def_external.h"
+extern "C"{
 #endif
 #if 0
 }
@@ -242,10 +239,8 @@ int
     PLUMED_BLAS_F77_FUNC(isamax, ISAMAX) (int *n, float *dx, int *incx);
 
 
-#ifdef __PLUMED_EXTERNAL_BLAS
-}
-#else
 }
+#ifdef __PLUMED_INTERNAL_BLAS
 }
 #endif
 
diff --git a/src/blas/import.sh b/src/blas/import.sh
index 97a42894d1ed7ac35aae3dd77e4b3b6a5a33ca3f..9388b509bc9377a252ab74536c7b62092886d2eb 100755
--- a/src/blas/import.sh
+++ b/src/blas/import.sh
@@ -16,23 +16,18 @@ sed 's|"types/simple.h"|"simple.h"|' "$GRO"/include/gmx_blas.h |
            a++;
            if(a==1){
              print "#include \"simple.h\""
-             print "#ifdef __PLUMED_EXTERNAL_LAPACK"
-             print "#include \"def_external.h\""
-             print "#else"
+             print "#ifdef __PLUMED_INTERNAL_LAPACK"
              print "#include \"def_internal.h\""
-             print "#endif"
-             print "#ifdef __PLUMED_EXTERNAL_BLAS"
-             print "extern \"C\"{"
-             print "#else"
              print "namespace PLMD{"
              print "namespace blas{"
+             print "#else"
+             print "#include \"def_external.h\""
+             print "extern \"C\"{"
              print "#endif"
            }
            if(a==2){
-             print "#ifdef __PLUMED_EXTERNAL_BLAS"
-             print "}"
-             print "#else"
              print "}"
+             print "#ifdef __PLUMED_INTERNAL_BLAS"
              print "}"
              print "#endif"
            }
@@ -77,7 +72,7 @@ cat << EOF > simple.h
 EOF
 
 {
-echo "#ifndef __PLUMED_EXTERNAL_BLAS"
+echo "#ifdef __PLUMED_INTERNAL_BLAS"
 for file in "$GRO"/src/gmxlib/gmx_blas/*.c
 do
   awk '{
diff --git a/src/lapack/import.sh b/src/lapack/import.sh
index 63ee16b99fcbfaf5b28b505d205bca824e957269..7893ed9b7995944de2e954cd06f755f0409aff8b 100755
--- a/src/lapack/import.sh
+++ b/src/lapack/import.sh
@@ -20,23 +20,18 @@ sed 's|"types/simple.h"|"simple.h"|' "$GRO"/include/gmx_lapack.h |
            a++;
            if(a==1){
              print "#include \"simple.h\""
-             print "#ifdef __PLUMED_EXTERNAL_LAPACK"
-             print "#include \"def_external.h\""
-             print "#else"
+             print "#ifdef __PLUMED_INTERNAL_LAPACK"
              print "#include \"def_internal.h\""
-             print "#endif"
-             print "#ifdef __PLUMED_EXTERNAL_LAPACK"
-             print "extern \"C\"{"
-             print "#else"
              print "namespace PLMD{"
              print "namespace lapack{"
+             print "#else"
+             print "#include \"def_external.h\""
+             print "extern \"C\"{"
              print "#endif"
            }
            if(a==2){
-             print "#ifdef __PLUMED_EXTERNAL_LAPACK"
-             print "}"
-             print "#else"
              print "}"
+             print "#ifdef __PLUMED_INTERNAL_LAPACK"
              print "}"
              print "#endif"
            }
@@ -82,7 +77,7 @@ cat << EOF > simple.h
 EOF
 
 {
-echo "#ifndef __PLUMED_EXTERNAL_LAPACK"
+echo "#ifdef __PLUMED_INTERNAL_LAPACK"
 for file in "$GRO"/src/gmxlib/gmx_lapack/*.c
 do
   awk '{
diff --git a/src/lapack/lapack.cpp b/src/lapack/lapack.cpp
index 3cd4b6a84a889a48983c9cd416ee3e9ed147e651..27245dae4ce653c7ba334ae4922c73b8b60d7611 100644
--- a/src/lapack/lapack.cpp
+++ b/src/lapack/lapack.cpp
@@ -21,7 +21,7 @@ better idea to use the full reference implementation.
 
 Erik Lindahl, 2008-10-07.
 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ */
-#ifndef __PLUMED_EXTERNAL_LAPACK
+#ifdef __PLUMED_INTERNAL_LAPACK
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
diff --git a/src/lapack/lapack.h b/src/lapack/lapack.h
index ebb98694fda12a865c87c1c444c33595dcb11af4..0b1a192d1d54394cbb790fe1cd8fd67cdc6fc486 100644
--- a/src/lapack/lapack.h
+++ b/src/lapack/lapack.h
@@ -92,16 +92,13 @@ Erik Lindahl, 2008-10-07.
 
 
 #include "simple.h"
-#ifdef __PLUMED_EXTERNAL_LAPACK
-#include "def_external.h"
-#else
+#ifdef __PLUMED_INTERNAL_LAPACK
 #include "def_internal.h"
-#endif
-#ifdef __PLUMED_EXTERNAL_LAPACK
-extern "C"{
-#else
 namespace PLMD{
 namespace lapack{
+#else
+#include "def_external.h"
+extern "C"{
 #endif
 #if 0
 }
@@ -896,10 +893,8 @@ void
                               float *work, int *lwork, int *info);
 
 
-#ifdef __PLUMED_EXTERNAL_LAPACK
-}
-#else
 }
+#ifdef __PLUMED_INTERNAL_LAPACK
 }
 #endif