#include <stdexcept>
#include <yaz/options.h>
-#include "util.hpp"
+#include <metaproxy/util.hpp>
#include "filter_frontend_net.hpp"
#include "filter_z3950_client.hpp"
#include "filter_virt_db.hpp"
#include "filter_log.hpp"
#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/package.hpp>
namespace mp = metaproxy_1;