#include <errno.h>
#include <string.h>
-#include "client-conf.h"
-#include "xmalloc.h"
-#include "log.h"
-#include "conf-parser.h"
-#include "util.h"
-#include "authkey.h"
+#include <polypcore/xmalloc.h>
+#include <polypcore/log.h>
+#include <polypcore/conf-parser.h>
+#include <polypcore/util.h>
+#include <polypcore/authkey.h>
+
+#include <polyp/client-conf.h>
#ifndef DEFAULT_CONFIG_DIR
# ifndef OS_IS_WIN32