diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 640e66d1cb766bdacf6fadf82b091d94d47c2c52..4dcd6489500c4b1cbcd5d4e491b2277bdb724204 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.12)
 project(CrestContainer VERSION 6.1 LANGUAGES CXX)
 
 # Find the necessary externals.
-find_package(CrestApi 6.1 REQUIRED)
+#find_package(CrestApi 6.1 REQUIRED)
 
 
 # Set the C++ standard to use.
@@ -48,7 +48,7 @@ target_link_libraries(CrestContainerLib
         CURL::libcurl
         Boost::boost
         nlohmann_json::nlohmann_json
-        CrestApi::CrestApiLib
+	CrestApiLib
     PRIVATE
         OpenSSL::SSL
 )
diff --git a/tools/CrestContainer.cxx b/tools/CrestContainer.cxx
index 56d8c7dc1ea5a0fdcf2a29eafa548a041c263daf..747c29d7b57b0e7d001f945b50a0b0a84427c695 100644
--- a/tools/CrestContainer.cxx
+++ b/tools/CrestContainer.cxx
@@ -4,6 +4,7 @@
 
 #include "CrestContainer.h"
 
+#include <CrestApi/CrestCondException.h>
 #include <stdarg.h>
 
 #include <boost/algorithm/string.hpp>
@@ -13,8 +14,6 @@
 #include <fstream>
 #include <iomanip>
 
-#include "CrestApi/CrestCondException.h"
-
 using json = nlohmann::json;
 
 Crest::CrestContainer::CrestContainer(Crest::ModeId mode) : m_modeId(mode) {