apps+helper+utils: Fixes of consumer and producer apps to work with the new codebase
This commit also replaces boost::tuple with std::tuple in Batches class
Credits for the commit also to Spyros Mastorakis and Alex Afanasyev
diff --git a/helper/ndn-app-helper.cpp b/helper/ndn-app-helper.cpp
index f1f4381..845ea96 100644
--- a/helper/ndn-app-helper.cpp
+++ b/helper/ndn-app-helper.cpp
@@ -22,7 +22,8 @@
#include "ns3/log.h"
#include "ns3/string.h"
#include "ns3/names.h"
-#include "ns3/ndn-app.hpp"
+
+#include "apps/ndn-app.hpp"
#ifdef NS3_MPI
#include "ns3/mpi-interface.h"