diff --git a/src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp b/src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp
index fa54c3ca0..a08bffd68 100644
--- a/src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp
+++ b/src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp
@@ -19,11 +19,11 @@
 
 #include "CTPP2VMStringLoader.hpp"
 
-#include "CTPP2Util.hpp"
-#include "CTPP2Exception.hpp"
-#include "CTPP2VMExecutable.hpp"
-#include "CTPP2VMInstruction.hpp"
-#include "CTPP2VMMemoryCore.hpp"
+#include "ctpp2/CTPP2Util.hpp"
+#include "ctpp2/CTPP2Exception.hpp"
+#include "ctpp2/CTPP2VMExecutable.hpp"
+#include "ctpp2/CTPP2VMInstruction.hpp"
+#include "ctpp2/CTPP2VMMemoryCore.hpp"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp b/src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp
index 665e31edb..05b34d04d 100644
--- a/src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp
+++ b/src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp
@@ -20,7 +20,7 @@
 #ifndef _CTPP2_VM_STRING_LOADER_HPP__
 #define _CTPP2_VM_STRING_LOADER_HPP__ 1
 
-#include "CTPP2VMLoader.hpp"
+#include "ctpp2/CTPP2VMLoader.hpp"
 
 /**
   @file VMStringLoader.hpp
diff --git a/src/common/kiwix/searcher.h b/src/common/kiwix/searcher.h
index efe4167d0..3cf2c6cbb 100644
--- a/src/common/kiwix/searcher.h
+++ b/src/common/kiwix/searcher.h
@@ -32,9 +32,9 @@
 #include <pathTools.h>
 #include <stringTools.h>
 
-#include <CDT.hpp>
-#include <CTPP2FileLogger.hpp>
-#include <CTPP2SimpleVM.hpp>
+#include <ctpp2/CDT.hpp>
+#include <ctpp2/CTPP2FileLogger.hpp>
+#include <ctpp2/CTPP2SimpleVM.hpp>
 
 #include "kiwix/ctpp2/CTPP2VMStringLoader.hpp"