#include <asoundlib.h>
+#include <polyp/xmalloc.h>
+
#include <polypcore/core.h>
#include <polypcore/module.h>
#include <polypcore/memchunk.h>
#include <polypcore/sink.h>
#include <polypcore/modargs.h>
-#include <polypcore/util.h>
+#include <polypcore/core-util.h>
#include <polypcore/sample-util.h>
-#include <polypcore/xmalloc.h>
#include <polypcore/log.h>
#include "alsa-util.h"