/*
- $Id: marcomp.c,v 1.2 2003-02-28 14:34:37 adam Exp $
+ $Id: marcomp.c,v 1.3 2004-12-10 11:56:22 heikki Exp $
marcomp.c - compiler of MARC statements.
*/
#include <string.h>
#include <ctype.h>
-#include <yaz/yaz-util.h>
+
+/* Old yaz-util includes (FIXME - clean up what is not needed)*/
+#include <yaz/yconfig.h>
+#include <yaz/yaz-version.h>
+#include <yaz/xmalloc.h>
+#include <yaz/ylog.h>
+#include <yaz/tpath.h>
+#include <yaz/options.h>
+#include <yaz/wrbuf.h>
+#include <yaz/nmem.h>
+#include <yaz/readconf.h>
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-iconv.h>
#include "marcomp.h"