screen: added struct names

Let us declare struct names in addition to typedef names, so we can
forward-declare them.

1 files changed, 7 insertions, 6 deletions

diff --git a/src/screen_utils.h b/src/screen_utils.h
index 6928ba804..74ca7d012 100644
--- a/src/screen_utils.h
+++ b/src/screen_utils.h
@@ -1,13 +1,14 @@
 #ifndef SCREEN_UTILS_H
 #define SCREEN_UTILS_H
 
-#include "screen.h"
 #include "list_window.h"
-#include "mpdclient.h"
 #include "command.h"
 
 #include <ncurses.h>
 
+struct screen;
+struct mpdclient;
+
 /* sound an audible and/or visible bell */
 void screen_bell(void);
 
@@ -21,16 +22,16 @@ char *screen_readln(WINDOW *w, const char *prompt, const char *value,
 char *screen_readln_masked(WINDOW *w, const char *prompt);
 char *screen_read_pasword(WINDOW *w, const char *prompt);
 /* query user for a string and find it in a list window */
-int screen_find(screen_t *screen,
-		list_window_t *lw,
+int screen_find(struct screen *screen,
+		struct list_window *lw,
 		int rows,
 		command_t findcmd,
 		list_window_callback_fn_t callback_fn,
 		void *callback_data);
 
-gint screen_auth(mpdclient_t *c);
+gint screen_auth(struct mpdclient *c);
 
-void screen_display_completion_list(screen_t *screen, GList *list);
+void screen_display_completion_list(struct screen *screen, GList *list);
 
 void set_xterm_title(const char *format, ...);