*/
#include "config.hpp"
-#include "filter.hpp"
-#include "package.hpp"
-#include "util.hpp"
+#include "filter_zeerex_explain.hpp"
+#include <metaproxy/package.hpp>
+#include <metaproxy/util.hpp>
#include "gduutil.hpp"
#include "sru_util.hpp"
-#include "filter_zeerex_explain.hpp"
#include <yaz/zgdu.h>
#include <yaz/z-core.h>