--- a/project_files/frontlib/ipc/mapconn.c	Fri Jun 08 19:52:24 2012 +0200
+++ b/project_files/frontlib/ipc/mapconn.c	Sat Jun 09 03:28:38 2012 +0200
@@ -2,8 +2,8 @@
 #include "ipcconn.h"
 #include "ipcprotocol.h"
 
-#include "../logging.h"
-#include "../buffer.h"
+#include "../util/logging.h"
+#include "../util/buffer.h"
 
 #include <stdlib.h>
 
@@ -11,14 +11,14 @@
 	AWAIT_CONNECTION,
 	AWAIT_REPLY,
 	FINISHED
-} mapconn_progress;
+} mapconn_state;
 
 struct _flib_mapconn {
 	uint8_t mapBuffer[IPCCONN_MAPMSG_BYTES];
 	flib_ipcconn connection;
 	flib_vector configBuffer;
 
-	mapconn_progress progress;
+	mapconn_state progress;
 
 	void (*onSuccessCb)(void*, const uint8_t*, int);
 	void *onSuccessCtx;