diff --git a/testcpp/Makefile b/testcpp/Makefile
index 6c9b360fb..67ceb1238 100644
--- a/testcpp/Makefile
+++ b/testcpp/Makefile
@@ -26,7 +26,7 @@
 BUILD_DIR       := ../build
 CONFIG_DIR      := ../config
 LIB_DIR         := ../lib
-INCLUDE_DIR     := ../src/aocl_dtl ../src/base/flamec/include -I../config/x86_64-unknown-linux-gnu
+INCLUDE_DIR     := ../src/aocl_dtl -I../src/base/flamec/include -I../config/x86_64-unknown-linux-gnu
 SRC_PATH        := ../src
 HOST            := $(shell sh $(BUILD_DIR)/ac-utils/config.guess)
 CONFIG_MK_FILE  := $(CONFIG_DIR)/$(HOST)/config.mk
diff --git a/testcpp/src/libflame_test.hh b/testcpp/src/libflame_test.hh
index a940c3d6b..54b20d3d4 100644
--- a/testcpp/src/libflame_test.hh
+++ b/testcpp/src/libflame_test.hh
@@ -43,7 +43,9 @@ extern "C"{
 #include "FLA_util_lapack_prototypes.h"
 }
 
+#ifndef FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES
 #define FLA_ENABLE_EXTERNAL_LAPACK_INTERFACES
+#endif
 
 using namespace std;
 typedef int FLA_Error;