Tidied #include's

src/ui/inputwin.c

@@ -33,14 +33,14 @@
 #include <ncurses.h>
 #endif
 
-#include "common.h"
 #include "command.h"
+#include "common.h"
 #include "contact_list.h"
 #include "log.h"
 #include "preferences.h"
 #include "profanity.h"
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 #define _inp_win_refresh() prefresh(inp_win, 0, pad_start, rows-1, 0, rows-1, cols-1)
 

src/ui/statusbar.c

@@ -32,7 +32,7 @@
 #endif
 
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 static WINDOW *status_bar;
 static char *message = NULL;

src/ui/titlebar.c

@@ -25,7 +25,7 @@
 
 #include "common.h"
 #include "theme.h"
-#include "ui.h"
+#include "ui/ui.h"
 
 static WINDOW *title_bar;
 static char *current_title = NULL;

src/ui/ui.h

@@ -28,7 +28,6 @@
 #include <wchar.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H

src/ui/window.c

@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include <glib.h>
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -34,7 +33,7 @@
 #endif
 
 #include "theme.h"
-#include "window.h"
+#include "ui/window.h"
 
 #define CONS_WIN_TITLE "_cons"
 

src/ui/window.h

@@ -23,7 +23,7 @@
 #ifndef WINDOW_H
 #define WINDOW_H
 
-#include "ui.h"
+#include "ui/ui.h"
 
 typedef struct prof_win_t {
     char *from;

src/ui/windows.c

@@ -24,20 +24,16 @@
 
 #include <stdlib.h>
 #include <string.h>
-
 #ifdef HAVE_LIBXSS
 #include <X11/extensions/scrnsaver.h>
 #endif
-
 #include <glib.h>
-
 #ifdef HAVE_LIBNOTIFY
 #include <libnotify/notify.h>
 #endif
 #ifdef PLATFORM_CYGWIN
 #include <windows.h>
 #endif
-
 #ifdef HAVE_NCURSESW_NCURSES_H
 #include <ncursesw/ncurses.h>
 #elif HAVE_NCURSES_H
@@ -51,11 +47,11 @@
 #include "contact_list.h"
 #include "jid.h"
 #include "log.h"
-#include "preferences.h"
 #include "muc.h"
+#include "preferences.h"
 #include "theme.h"
-#include "ui.h"
-#include "window.h"
+#include "ui/ui.h"
+#include "ui/window.h"
 
 #define CONS_WIN_TITLE "_cons"
 #define NUM_WINS 10