core: Remove circular include

service.h includes socket.h and socket.h includes service.h. Move
service.h include from socket.h to socket.c to remove the circular
dependency.

diff --git a/src/core/socket.c b/src/core/socket.c
index 675ad3c025038aac9e51a2160991bc07984d6cdb..ceaf39bdd3eff1655141e3b99384991f1abd6fa3 100644 (file)
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -34,6 +34,7 @@
 #include "process-util.h"
 #include "selinux-util.h"
 #include "serialize.h"
+#include "service.h"
 #include "signal-util.h"
 #include "smack-util.h"
 #include "socket.h"

diff --git a/src/core/socket.h b/src/core/socket.h
index a65195f2aac890d4cc7cdf74f4574362410bdc33..6813bdcf8c8e1faed413937db02d638e5b01ae5d 100644 (file)
--- a/src/core/socket.h
+++ b/src/core/socket.h
@@ -5,7 +5,6 @@ typedef struct Socket Socket;
 typedef struct SocketPeer SocketPeer;
 
 #include "mount.h"
-#include "service.h"
 #include "socket-util.h"
 #include "unit.h"