diff --git a/libminkadaptor/CMakeLists.txt b/libminkadaptor/CMakeLists.txt
index 3247906..0212c14 100644
--- a/libminkadaptor/CMakeLists.txt
+++ b/libminkadaptor/CMakeLists.txt
@@ -31,6 +31,13 @@ endif()
 
 include_directories(${QCOMTEE_INCLUDE_DIRS})
 
+set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
+
+find_package(QCBOR REQUIRED)
+if(NOT QCBOR_FOUND)
+       message(FATAL_ERROR "QCBOR not found")
+endif()
+
 # ''Source files''.
 
 set(SRC
@@ -61,6 +68,7 @@ target_include_directories(minkadaptor
 
 target_link_libraries(minkadaptor
 	PRIVATE ${QCOMTEE_LIBRARIES}
+	PRIVATE ${QCBOR_LIBRARIES}
 	PRIVATE ${CMAKE_THREAD_LIBS_INIT}
 )
 
diff --git a/libminkadaptor/tests/smcinvoke_client/cmake/FindQCBOR.cmake b/libminkadaptor/cmake/FindQCBOR.cmake
similarity index 100%
rename from libminkadaptor/tests/smcinvoke_client/cmake/FindQCBOR.cmake
rename to libminkadaptor/cmake/FindQCBOR.cmake
diff --git a/libminkadaptor/tests/smcinvoke_client/CMakeLists.txt b/libminkadaptor/tests/smcinvoke_client/CMakeLists.txt
index 2cb36ba..208e4e1 100644
--- a/libminkadaptor/tests/smcinvoke_client/CMakeLists.txt
+++ b/libminkadaptor/tests/smcinvoke_client/CMakeLists.txt
@@ -1,19 +1,5 @@
 project(smcinvoke_client CXX)
 
-# ''Packages''.
-
-# Append modules directory.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
-
-find_package(QCBOR REQUIRED)
-if(NOT QCBOR_FOUND)
-	message(FATAL_ERROR "QCBOR not found")
-endif()
-
-include_directories(${QCBOR_INCLUDE_DIRS})
-
 # ''CXX configuration''.
 
 set(CMAKE_CXX_STANDARD 11)
@@ -86,7 +72,6 @@ target_include_directories(${PROJECT_NAME}
 
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE minkadaptor
-	PRIVATE ${QCBOR_LIBRARIES}
 )
 
 install(TARGETS ${PROJECT_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}")
diff --git a/libminkteec/include/tee_client_api.h b/libminkteec/include/tee_client_api.h
index 0718a6b..e3de9d8 100644
--- a/libminkteec/include/tee_client_api.h
+++ b/libminkteec/include/tee_client_api.h
@@ -83,6 +83,9 @@ typedef uint32_t TEEC_Result;
 /* An external event has caused a User Interface operation to be aborted */
 #define TEE_ERROR_EXTERNAL_CANCEL 0xFFFF0011
 
+/* Deprecated: not specified in client API, use TEE_ERROR_EXTERNAL_CANCEL intead. */
+#define TEEC_ERROR_EXTERNAL_CANCEL 0xFFFF0011
+
 /* Internal TEE error - documented for completeness*/
 #define TEE_ERROR_OVERFLOW 0xFFFF300F
 
diff --git a/libminkteec/tests/gp_test_client/CMakeLists.txt b/libminkteec/tests/gp_test_client/CMakeLists.txt
index 8589614..c0a01d8 100644
--- a/libminkteec/tests/gp_test_client/CMakeLists.txt
+++ b/libminkteec/tests/gp_test_client/CMakeLists.txt
@@ -2,16 +2,6 @@ project(gp_test_client C)
 
 # ''Packages''.
 
-# Append modules directory.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
-
-find_package(QCBOR REQUIRED)
-if(NOT QCBOR_FOUND)
-	message(FATAL_ERROR "QCBOR not found")
-endif()
-
 find_package(Threads REQUIRED)
 if(NOT THREADS_FOUND)
 	message(FATAL_ERROR "Threads not found")
@@ -79,7 +69,6 @@ target_include_directories(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME}
 	PRIVATE minkteec
 	PRIVATE minkadaptor
-	PRIVATE ${QCBOR_LIBRARIES}
 	PRIVATE ${CMAKE_THREAD_LIBS_INIT}
 )
 
diff --git a/libminkteec/tests/gp_test_client/cmake/FindQCBOR.cmake b/libminkteec/tests/gp_test_client/cmake/FindQCBOR.cmake
deleted file mode 100644
index fce5259..0000000
--- a/libminkteec/tests/gp_test_client/cmake/FindQCBOR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_path(QCBOR_INCLUDE_DIR
-        NAMES qcbor/qcbor.h
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES include
-)
-
-find_library(QCBOR_LIBRARY
-        NAMES qcbor
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES lib
-)
-
-if(QCBOR_INCLUDE_DIR AND QCBOR_LIBRARY)
-        set(QCBOR_FOUND TRUE)
-        set(QCBOR_LIBRARIES ${QCBOR_LIBRARY})
-        set(QCBOR_INCLUDE_DIRS ${QCBOR_INCLUDE_DIR})
-else()
-        set(QCBOR_FOUND FALSE)
-endif()
-
-mark_as_advanced(QCBOR_INCLUDE_DIR QCBOR_LIBRARY)
diff --git a/listeners/libfsservice/fs/CMakeLists.txt b/listeners/libfsservice/fs/CMakeLists.txt
index 5ce1cd9..03f2eab 100644
--- a/listeners/libfsservice/fs/CMakeLists.txt
+++ b/listeners/libfsservice/fs/CMakeLists.txt
@@ -5,16 +5,6 @@ project(libfsservice
 
 # ''Packages''.
 
-# Append modules directory.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
-
-find_package(QCBOR REQUIRED)
-if(NOT QCBOR_FOUND)
-	message(FATAL_ERROR "QCBOR not found")
-endif()
-
 find_package(Threads REQUIRED)
 if(NOT THREADS_FOUND)
         message(FATAL_ERROR "Threads not found")
@@ -51,7 +41,6 @@ target_include_directories(fsservice
 
 target_link_libraries(fsservice
 	PRIVATE minkadaptor
-	PRIVATE ${QCBOR_LIBRARIES}
 )
 
 if(${USE_GLIB})
diff --git a/listeners/libfsservice/fs/cmake/FindQCBOR.cmake b/listeners/libfsservice/fs/cmake/FindQCBOR.cmake
deleted file mode 100644
index fce5259..0000000
--- a/listeners/libfsservice/fs/cmake/FindQCBOR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_path(QCBOR_INCLUDE_DIR
-        NAMES qcbor/qcbor.h
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES include
-)
-
-find_library(QCBOR_LIBRARY
-        NAMES qcbor
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES lib
-)
-
-if(QCBOR_INCLUDE_DIR AND QCBOR_LIBRARY)
-        set(QCBOR_FOUND TRUE)
-        set(QCBOR_LIBRARIES ${QCBOR_LIBRARY})
-        set(QCBOR_INCLUDE_DIRS ${QCBOR_INCLUDE_DIR})
-else()
-        set(QCBOR_FOUND FALSE)
-endif()
-
-mark_as_advanced(QCBOR_INCLUDE_DIR QCBOR_LIBRARY)
diff --git a/listeners/libfsservice/gpfs/CMakeLists.txt b/listeners/libfsservice/gpfs/CMakeLists.txt
index 07cd557..3019585 100644
--- a/listeners/libfsservice/gpfs/CMakeLists.txt
+++ b/listeners/libfsservice/gpfs/CMakeLists.txt
@@ -5,16 +5,6 @@ project(libgpfsservice
 
 # ''Packages''.
 
-# Append modules directory.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
-
-find_package(QCBOR REQUIRED)
-if(NOT QCBOR_FOUND)
-	message(FATAL_ERROR "QCBOR not found")
-endif()
-
 find_package(Threads REQUIRED)
 if(NOT THREADS_FOUND)
         message(FATAL_ERROR "Threads not found")
@@ -51,7 +41,6 @@ target_include_directories(gpfsservice
 
 target_link_libraries(gpfsservice
 	PRIVATE minkadaptor
-	PRIVATE ${QCBOR_LIBRARIES}
 )
 
 if(${USE_GLIB})
diff --git a/listeners/libfsservice/gpfs/cmake/FindQCBOR.cmake b/listeners/libfsservice/gpfs/cmake/FindQCBOR.cmake
deleted file mode 100644
index fce5259..0000000
--- a/listeners/libfsservice/gpfs/cmake/FindQCBOR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_path(QCBOR_INCLUDE_DIR
-        NAMES qcbor/qcbor.h
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES include
-)
-
-find_library(QCBOR_LIBRARY
-        NAMES qcbor
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES lib
-)
-
-if(QCBOR_INCLUDE_DIR AND QCBOR_LIBRARY)
-        set(QCBOR_FOUND TRUE)
-        set(QCBOR_LIBRARIES ${QCBOR_LIBRARY})
-        set(QCBOR_INCLUDE_DIRS ${QCBOR_INCLUDE_DIR})
-else()
-        set(QCBOR_FOUND FALSE)
-endif()
-
-mark_as_advanced(QCBOR_INCLUDE_DIR QCBOR_LIBRARY)
diff --git a/listeners/libtimeservice/CMakeLists.txt b/listeners/libtimeservice/CMakeLists.txt
index 683ea44..6798b6b 100644
--- a/listeners/libtimeservice/CMakeLists.txt
+++ b/listeners/libtimeservice/CMakeLists.txt
@@ -5,16 +5,6 @@ project(libtimeservice
 
 # ''Packages''.
 
-# Append modules directory.
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-
-set(QCBOR_DIR_HINT "" CACHE PATH "Hint path for QCBOR directory")
-
-find_package(QCBOR REQUIRED)
-if(NOT QCBOR_FOUND)
-	message(FATAL_ERROR "QCBOR not found")
-endif()
-
 find_package(Threads REQUIRED)
 if(NOT THREADS_FOUND)
         message(FATAL_ERROR "Threads not found")
@@ -54,7 +44,6 @@ target_include_directories(timeservice
 
 target_link_libraries(timeservice
 	PRIVATE minkadaptor
-	PRIVATE ${QCBOR_LIBRARIES}
 )
 
 # ''Install targets''.
diff --git a/listeners/libtimeservice/cmake/FindQCBOR.cmake b/listeners/libtimeservice/cmake/FindQCBOR.cmake
deleted file mode 100644
index fce5259..0000000
--- a/listeners/libtimeservice/cmake/FindQCBOR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_path(QCBOR_INCLUDE_DIR
-        NAMES qcbor/qcbor.h
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES include
-)
-
-find_library(QCBOR_LIBRARY
-        NAMES qcbor
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES lib
-)
-
-if(QCBOR_INCLUDE_DIR AND QCBOR_LIBRARY)
-        set(QCBOR_FOUND TRUE)
-        set(QCBOR_LIBRARIES ${QCBOR_LIBRARY})
-        set(QCBOR_INCLUDE_DIRS ${QCBOR_INCLUDE_DIR})
-else()
-        set(QCBOR_FOUND FALSE)
-endif()
-
-mark_as_advanced(QCBOR_INCLUDE_DIR QCBOR_LIBRARY)
diff --git a/qtee_supplicant/cmake/FindQCBOR.cmake b/qtee_supplicant/cmake/FindQCBOR.cmake
deleted file mode 100644
index fce5259..0000000
--- a/qtee_supplicant/cmake/FindQCBOR.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-find_path(QCBOR_INCLUDE_DIR
-        NAMES qcbor/qcbor.h
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES include
-)
-
-find_library(QCBOR_LIBRARY
-        NAMES qcbor
-        HINTS ${QCBOR_DIR_HINT}
-        PATH_SUFFIXES lib
-)
-
-if(QCBOR_INCLUDE_DIR AND QCBOR_LIBRARY)
-        set(QCBOR_FOUND TRUE)
-        set(QCBOR_LIBRARIES ${QCBOR_LIBRARY})
-        set(QCBOR_INCLUDE_DIRS ${QCBOR_INCLUDE_DIR})
-else()
-        set(QCBOR_FOUND FALSE)
-endif()
-
-mark_as_advanced(QCBOR_INCLUDE_DIR QCBOR_LIBRARY)