17 files changed, 23 insertions, 22 deletions
diff --git a/src/command/cmd_autocomplete.c b/src/command/cmd_ac.c
index cce4855b..3abe5c22 100644
--- a/src/command/cmd_autocomplete.c
+++ b/src/command/cmd_ac.c
@@ -38,11 +38,12 @@
 #include <string.h>
 #include <assert.h>
 #include <libgen.h>
+#include <dirent.h>
 
 #include "common.h"
 #include "tools/parser.h"
 #include "ui/win_types.h"
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "config/preferences.h"
 #include "config/scripts.h"
 #include "muc.h"
@@ -50,7 +51,7 @@
 #include "roster_list.h"
 #include "window_list.h"
 #include "plugins/plugins.h"
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_ac.h"
 
 #ifdef HAVE_LIBGPGME
 #include "pgp/gpg.h"
diff --git a/src/command/cmd_autocomplete.h b/src/command/cmd_ac.h
index 0d9e5f28..99740246 100644
--- a/src/command/cmd_autocomplete.h
+++ b/src/command/cmd_ac.h
@@ -33,7 +33,7 @@
  */
 
 #include "config/preferences.h"
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 
 void cmd_ac_init(void);
 void cmd_ac_uninit(void);
diff --git a/src/command/command.c b/src/command/cmd_defs.c
index 408b59a7..b57fba9f 100644
--- a/src/command/command.c
+++ b/src/command/cmd_defs.c
@@ -49,9 +49,9 @@
 #include <glib.h>
 
 #include "chat_session.h"
-#include "command/command.h"
-#include "command/commands.h"
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_funcs.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
diff --git a/src/command/command.h b/src/command/cmd_defs.h
index 4764ea4d..4764ea4d 100644
--- a/src/command/command.h
+++ b/src/command/cmd_defs.h
diff --git a/src/command/commands.c b/src/command/cmd_funcs.c
index d4df39b8..4fea5e1c 100644
--- a/src/command/commands.c
+++ b/src/command/cmd_funcs.c
@@ -50,9 +50,9 @@
 #include <ctype.h>
 
 #include "chat_session.h"
-#include "command/commands.h"
-#include "command/command.h"
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_funcs.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/account.h"
diff --git a/src/command/commands.h b/src/command/cmd_funcs.h
index 24828989..24828989 100644
--- a/src/command/commands.h
+++ b/src/command/cmd_funcs.h
diff --git a/src/config/scripts.c b/src/config/scripts.c
index 0f8800d8..945aaec2 100644
--- a/src/config/scripts.c
+++ b/src/config/scripts.c
@@ -43,7 +43,7 @@
 #include "common.h"
 #include "log.h"
 #include "window_list.h"
-#include "command/command.h"
+#include "command/cmd_defs.h"
 #include "ui/ui.h"
 #include "xmpp/xmpp.h"
 
diff --git a/src/main.c b/src/main.c
index 7f87c165..b15293d0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -43,7 +43,7 @@
 
 #include "profanity.h"
 #include "common.h"
-#include "command/command.h"
+#include "command/cmd_defs.h"
 
 static gboolean version = FALSE;
 static char *log = "INFO";
diff --git a/src/plugins/api.c b/src/plugins/api.c
index 0a4b04af..326ec61d 100644
--- a/src/plugins/api.c
+++ b/src/plugins/api.c
@@ -49,7 +49,7 @@
 #include "profanity.h"
 #include "ui/ui.h"
 #include "config/theme.h"
-#include "command/command.h"
+#include "command/cmd_defs.h"
 #include "window_list.h"
 #include "common.h"
 
diff --git a/src/plugins/callbacks.c b/src/plugins/callbacks.c
index ad09abef..2572f7a4 100644
--- a/src/plugins/callbacks.c
+++ b/src/plugins/callbacks.c
@@ -35,8 +35,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "command/command.h"
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_ac.h"
 #include "plugins/callbacks.h"
 #include "plugins/plugins.h"
 #include "tools/autocomplete.h"
diff --git a/src/plugins/callbacks.h b/src/plugins/callbacks.h
index dc6b78bb..9b175d0a 100644
--- a/src/plugins/callbacks.h
+++ b/src/plugins/callbacks.h
@@ -37,7 +37,7 @@
 
 #include <glib.h>
 
-#include "command/command.h"
+#include "command/cmd_defs.h"
 
 typedef struct p_command {
     const char *command_name;
diff --git a/src/plugins/plugins.h b/src/plugins/plugins.h
index b7eb4c80..b03248ab 100644
--- a/src/plugins/plugins.h
+++ b/src/plugins/plugins.h
@@ -35,7 +35,7 @@
 #ifndef PLUGINS_H
 #define PLUGINS_H
 
-#include "command/command.h"
+#include "command/cmd_defs.h"
 
 typedef enum {
     LANG_PYTHON,
diff --git a/src/profanity.c b/src/profanity.c
index 56f242ef..c9e19fa8 100644
--- a/src/profanity.c
+++ b/src/profanity.c
@@ -55,7 +55,7 @@
 #include "config/preferences.h"
 #include "config/theme.h"
 #include "config/scripts.h"
-#include "command/command.h"
+#include "command/cmd_defs.h"
 #include "common.h"
 #include "contact.h"
 #include "roster_list.h"
diff --git a/src/ui/console.c b/src/ui/console.c
index 5c5afbd9..b14d36cf 100644
--- a/src/ui/console.c
+++ b/src/ui/console.c
@@ -43,7 +43,7 @@
 #include <ncurses.h>
 #endif
 
-#include "command/command.h"
+#include "command/cmd_defs.h"
 #include "common.h"
 #include "log.h"
 #include "muc.h"
diff --git a/src/ui/core.c b/src/ui/core.c
index 4397044b..3a89008f 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -55,8 +55,8 @@
 #endif
 
 #include "chat_session.h"
-#include "command/command.h"
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_defs.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/preferences.h"
 #include "config/theme.h"
diff --git a/src/ui/inputwin.c b/src/ui/inputwin.c
index 72f65271..8f896dbe 100644
--- a/src/ui/inputwin.c
+++ b/src/ui/inputwin.c
@@ -53,7 +53,7 @@
 #include <ncurses.h>
 #endif
 
-#include "command/cmd_autocomplete.h"
+#include "command/cmd_ac.h"
 #include "common.h"
 #include "config/accounts.h"
 #include "config/preferences.h"
diff --git a/src/ui/ui.h b/src/ui/ui.h
index 18a5864f..2213ccc1 100644
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -37,7 +37,7 @@
 
 #include "config.h"
 
-#include "command/commands.h"
+#include "command/cmd_funcs.h"
 #include "ui/win_types.h"
 #include "muc.h"
 #include "config/tlscerts.h"