From 49c0d80832ffb0b2882318bf26550610d55e77de Mon Sep 17 00:00:00 2001
From: Kranklyboy <kranklyboy1000@gmail.com>
Date: Sun, 15 Apr 2018 19:18:37 +0200
Subject: [PATCH] Move includes to common.h

---
 Makefile |  6 +++---
 client.c | 18 ------------------
 common.h | 16 ++++++++++++++++
 server.c | 19 -------------------
 4 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/Makefile b/Makefile
index 25fd568..493f5d0 100644
--- a/Makefile
+++ b/Makefile
@@ -3,13 +3,13 @@ CFLAGS = -std=c99 -pedantic -Wall -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE
 
 all: server client
 
-server: server.o
+server: server.o common.h
 	$(CC) $^ -o $@
 
-client: client.o
+client: client.o common.h
 	$(CC) $^ -o $@
 
-%.o: %.c common.h
+%.o: %.c
 	$(CC) $(CFLAGS) $^
 
 .PHONY clean:
diff --git a/client.c b/client.c
index 89155d2..52df74c 100644
--- a/client.c
+++ b/client.c
@@ -6,24 +6,6 @@
  * @brief Client for OSUE exercise 1B `Battleship'.
  */
 
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <limits.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-
-#include <time.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <fcntl.h>
-
 #include "common.h"
 
 static const char *port = DEFAULT_PORT;
diff --git a/common.h b/common.h
index 6ff9fd1..2fc0a03 100644
--- a/common.h
+++ b/common.h
@@ -39,6 +39,22 @@
 
 #include <stdint.h>
 #include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <limits.h>
+
+#include <assert.h>
+#include <errno.h>
+#include <signal.h>
+
+#include <time.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <fcntl.h>
 
 /**
  * @brief Print a map showing the squares where ships have been hit.
diff --git a/server.c b/server.c
index 076a17d..5401203 100644
--- a/server.c
+++ b/server.c
@@ -6,25 +6,6 @@
  * @brief Server for OSUE exercise 1B `Battleship'.
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <stdint.h>
-#include <stdbool.h>
-#include <string.h>
-#include <limits.h>
-
-#include <assert.h>
-#include <errno.h>
-#include <signal.h>
-
-#include <time.h>
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <fcntl.h>
-
 #include "common.h"
 
 static const char *port = DEFAULT_PORT;