diff --git a/include/chat/common.h b/include/chat/common.h
index f9c0c69..5529db4 100644
--- a/include/chat/common.h
+++ b/include/chat/common.h
@@ -16,23 +16,9 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-/*
-    DO NOT USE THIS FILE IN YOUR PROJECT!
-*/
-
 #ifndef WHY2_CHAT_COMMON_H
 #define WHY2_CHAT_COMMON_H
 
-//INCLUDES
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netinet/in.h> //TODO: Remove not 100% common includes
-#include <why2/misc.h>
-#include <why2/memory.h>
-#include <pthread.h>
-
 //DEFINES
 #define SA struct sockaddr
 #define SERVER_PORT 1204
diff --git a/src/chat/main/client.c b/src/chat/main/client.c
index 6907e46..7496c81 100644
--- a/src/chat/main/client.c
+++ b/src/chat/main/client.c
@@ -16,11 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <why2/chat/common.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <arpa/inet.h>
 
+#include <pthread.h>
+
+#include <why2/chat/common.h>
 #include <why2/chat/misc.h>
 
+#include <why2/misc.h>
+
 int main(void)
 {
     int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
diff --git a/src/chat/main/server.c b/src/chat/main/server.c
index 54e4f7a..e2ba377 100644
--- a/src/chat/main/server.c
+++ b/src/chat/main/server.c
@@ -16,12 +16,20 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-#include <why2/chat/common.h>
-
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
 #include <unistd.h>
 
+#include <pthread.h>
+
+#include <why2/chat/common.h>
 #include <why2/chat/misc.h>
 
+#include <why2/misc.h>
+
 int main(void)
 {
     int listen_socket = socket(AF_INET, SOCK_STREAM, 0); //CREATE SERVER SOCKET
diff --git a/src/chat/misc.c b/src/chat/misc.c
index 9d6e24b..66ce7ab 100644
--- a/src/chat/misc.c
+++ b/src/chat/misc.c
@@ -18,10 +18,16 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 #include <why2/chat/misc.h>
 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/socket.h>
 #include <unistd.h>
 
-#include <why2/chat/common.h>
+#include <pthread.h>
 
+#include <why2/chat/common.h>
 #include <why2/memory.h>
 
 //LINKED LIST STUFF (BIT CHANGED memory.c'S VERSION)