diff --git a/src/document.c b/src/document.c
index 643b31e2d1..e0d46db9e1 100644
--- a/src/document.c
+++ b/src/document.c
@@ -36,6 +36,7 @@
 #include "encodings.h"
 #include "encodingsprivate.h"
 #include "filetypesprivate.h"
+#include "build.h"
 #include "geany.h" /* FIXME: why is this needed for DOC_FILENAME()? should come from documentprivate.h/document.h */
 #include "geanyobject.h"
 #include "geanywraplabel.h"
diff --git a/src/filetypes.c b/src/filetypes.c
index 78af88505b..fc959e80c5 100644
--- a/src/filetypes.c
+++ b/src/filetypes.c
@@ -36,6 +36,7 @@
 #include "callbacks.h" /* FIXME: for ignore_callback */
 #include "document.h"
 #include "filetypesprivate.h"
+#include "build.h"
 #include "geany.h"
 #include "geanyobject.h"
 #include "highlighting.h"
diff --git a/src/filetypesprivate.h b/src/filetypesprivate.h
index 107a6392ce..2f4e6ac6ee 100644
--- a/src/filetypesprivate.h
+++ b/src/filetypesprivate.h
@@ -22,12 +22,12 @@
 #ifndef GEANY_FILETYPES_PRIVATE_H
 #define GEANY_FILETYPES_PRIVATE_H 1
 
-#include "build.h"
-
 #include "gtkcompat.h"
 
 G_BEGIN_DECLS
 
+struct GeanyBuildCommand;
+
 /* Private GeanyFiletype fields */
 typedef struct GeanyFiletypePrivate
 {
@@ -42,14 +42,14 @@ typedef struct GeanyFiletypePrivate
 	gboolean	warn_color_scheme;
 	gboolean	user_extensions;	// true if extensions were read from user config file
 
-	/* TODO: move to structure in build.h and only put a pointer here */
-	GeanyBuildCommand *filecmds;
-	GeanyBuildCommand *ftdefcmds;
-	GeanyBuildCommand *execcmds;
-	GeanyBuildCommand *homefilecmds;
-	GeanyBuildCommand *homeexeccmds;
-	GeanyBuildCommand *projfilecmds;
-	GeanyBuildCommand *projexeccmds;
+	// build fields
+	struct GeanyBuildCommand *filecmds;
+	struct GeanyBuildCommand *ftdefcmds;
+	struct GeanyBuildCommand *execcmds;
+	struct GeanyBuildCommand *homefilecmds;
+	struct GeanyBuildCommand *homeexeccmds;
+	struct GeanyBuildCommand *projfilecmds;
+	struct GeanyBuildCommand *projexeccmds;
 	gint			 project_list_entry;
 	gchar			 *projerror_regex_string;
 	gchar			 *homeerror_regex_string;