Change CTPP2 #include paths (add 'ctpp2/')

src/common/kiwix/ctpp2/CTPP2VMStringLoader.cpp

@@ -19,23 +19,6 @@
 
 #include "CTPP2VMStringLoader.hpp"
 
-#include "CTPP2Util.hpp"
-#include "CTPP2Exception.hpp"
-#include "CTPP2VMExecutable.hpp"
-#include "CTPP2VMInstruction.hpp"
-#include "CTPP2VMMemoryCore.hpp"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#include <resourceTools.h>
-#include <iostream>
-#include <string>
-
 namespace CTPP // C++ Template Engine
 {
 

src/common/kiwix/ctpp2/CTPP2VMStringLoader.hpp

@@ -20,7 +20,23 @@
 #ifndef _CTPP2_VM_STRING_LOADER_HPP__
 #define _CTPP2_VM_STRING_LOADER_HPP__ 1
 
-#include "CTPP2VMLoader.hpp"
+#include "ctpp2/CTPP2VMLoader.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>
+
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <resourceTools.h>
+#include <iostream>
+#include <string>
 
 /**
   @file VMStringLoader.hpp

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"