diff --git a/inc/custom_msgq.h b/inc/custom_msgq.h
index 74d63d1..d5d76fb 100644
--- a/inc/custom_msgq.h
+++ b/inc/custom_msgq.h
@@ -1,7 +1,7 @@
 #ifndef CUSTOM_MSG_H
 #define CUSTOM_MSG_H
 
-#include <server.h>  //FIXME: non penso vada incluso ma serve al momento
+#include <server.h>
 #include <structures.h>
 
 #define MAX_NAME 16
diff --git a/inc/custom_shm.h b/inc/custom_shm.h
index e250d3c..b85f81a 100644
--- a/inc/custom_shm.h
+++ b/inc/custom_shm.h
@@ -11,7 +11,7 @@ void setupServerShm();
 void setupClientShm();
 
 int getShmidServer();
-int getShmidClient(); //FIXME: dovrebbero andare nel .c perche non vanno usate da altri file
+int getShmidClient();
 tile_t * shmServerAt();
 tile_t * shmClientAt(); 
 void shmDt(void *shm_ptr);