diff --git a/src/commands.h b/src/commands.h
index 055624ba..d9d8af65 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -34,6 +34,9 @@ struct commands
 #define COMMANDS_SILENT         2 /* Silent: @.  */
 #define COMMANDS_NOERROR        4 /* No errors: -.  */
 
+struct file;
+struct child;
+
 RETSIGTYPE fatal_error_signal (int sig);
 void execute_file_commands (struct file *file);
 void print_commands (const struct commands *cmds);
diff --git a/src/remote-cstms.c b/src/remote-cstms.c
index 3602a27e..ce1a33f3 100644
--- a/src/remote-cstms.c
+++ b/src/remote-cstms.c
@@ -19,9 +19,10 @@ You should have received a copy of the GNU General Public License along with
 this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "makeint.h"
+
 #include "filedef.h"
-#include "commands.h"
 #include "job.h"
+#include "commands.h"
 #include "debug.h"
 
 #include <sys/time.h>