From 177c331c53874109c404a4aa65e83aa595188bb2 Mon Sep 17 00:00:00 2001
From: Frediano Ziglio <fziglio@redhat.com>
Date: Thu, 20 Oct 2016 13:00:25 +0100
Subject: [PATCH] Avoid to typedef twice MainChannel

MainChannel is already defined in main-channel.h.

Signed-off-by: Frediano Ziglio <fziglio@redhat.com>
Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
---
 server/main-channel-client.h | 4 +---
 server/main-channel.h        | 1 -
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/server/main-channel-client.h b/server/main-channel-client.h
index 360c61e9..14fb419a 100644
--- a/server/main-channel-client.h
+++ b/server/main-channel-client.h
@@ -21,12 +21,10 @@
 #include <common/messages.h>
 
 #include "red-channel-client.h"
+#include "main-channel.h"
 
 G_BEGIN_DECLS
 
-/* FIXME: remove extra MainChannel typedef when possible */
-typedef struct MainChannel MainChannel;
-
 #define TYPE_MAIN_CHANNEL_CLIENT main_channel_client_get_type()
 
 #define MAIN_CHANNEL_CLIENT(obj) \
diff --git a/server/main-channel.h b/server/main-channel.h
index 73c8a94d..6e89f14a 100644
--- a/server/main-channel.h
+++ b/server/main-channel.h
@@ -23,7 +23,6 @@
 #include <common/marshaller.h>
 
 #include "red-channel.h"
-#include "main-channel-client.h"
 
 #define MAIN_CHANNEL(channel) ((MainChannel*)(channel))