diff --git a/src/command/cmd_ac.c b/src/command/cmd_ac.c
index 3abe5c22..4ecbdae3 100644
--- a/src/command/cmd_ac.c
+++ b/src/command/cmd_ac.c
@@ -1,5 +1,5 @@
 /*
- * cmd_autocomplete.c
+ * cmd_ac.c
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
diff --git a/src/command/cmd_ac.h b/src/command/cmd_ac.h
index 99740246..b294fcd5 100644
--- a/src/command/cmd_ac.h
+++ b/src/command/cmd_ac.h
@@ -1,5 +1,5 @@
 /*
- * cmd_autocomplete.h
+ * cmd_ac.h
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
@@ -32,6 +32,9 @@
  *
  */
 
+#ifndef CMD_AC_H
+#define CMD_AC_H
+
 #include "config/preferences.h"
 #include "command/cmd_funcs.h"
 
@@ -55,3 +58,5 @@ void cmd_ac_remove_form_fields(DataForm *form);
 char* cmd_ac_complete(ProfWin *window, const char *const input);
 
 void cmd_ac_reset(ProfWin *window);
+
+#endif
diff --git a/src/command/cmd_defs.c b/src/command/cmd_defs.c
index b57fba9f..aa041c6a 100644
--- a/src/command/cmd_defs.c
+++ b/src/command/cmd_defs.c
@@ -1,5 +1,5 @@
 /*
- * command.c
+ * cmd_defs.c
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
diff --git a/src/command/cmd_defs.h b/src/command/cmd_defs.h
index 4764ea4d..7ff98d24 100644
--- a/src/command/cmd_defs.h
+++ b/src/command/cmd_defs.h
@@ -1,5 +1,5 @@
 /*
- * command.h
+ * cmd_defs.h
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef COMMAND_H
-#define COMMAND_H
+#ifndef CMD_DEFS_H
+#define CMD_DEFS_H
 
 #include <glib.h>
 
diff --git a/src/command/cmd_funcs.c b/src/command/cmd_funcs.c
index 4fea5e1c..5b267f90 100644
--- a/src/command/cmd_funcs.c
+++ b/src/command/cmd_funcs.c
@@ -1,5 +1,5 @@
 /*
- * commands.c
+ * cmd_funcs.c
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
diff --git a/src/command/cmd_funcs.h b/src/command/cmd_funcs.h
index 24828989..9b399a71 100644
--- a/src/command/cmd_funcs.h
+++ b/src/command/cmd_funcs.h
@@ -1,5 +1,5 @@
 /*
- * commands.h
+ * cmd_funcs.h
  *
  * Copyright (C) 2012 - 2016 James Booth <boothj5@gmail.com>
  *
@@ -32,8 +32,8 @@
  *
  */
 
-#ifndef COMMANDS_H
-#define COMMANDS_H
+#ifndef CMD_FUNCS_H
+#define CMD_FUNCS_H
 
 #include "ui/win_types.h"