diff --git a/ChangeLog b/ChangeLog
index b2579fd2..016d510e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,8 @@
    src/templates.c, src/templates.h:
    Rename document struct to GeanyDocument.
    Rename filetype struct to GeanyFiletype.
+ * src/build.c, src/build.h, src/plugindata.h:
+   Rename BuildInfo struct to GeanyBuildInfo.
 
 
 2008-05-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/build.c b/src/build.c
index 62ed2e97..b721076d 100644
--- a/src/build.c
+++ b/src/build.c
@@ -58,7 +58,7 @@
 #include "win32.h"
 
 
-BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL};
+GeanyBuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_NONE, NULL};
 
 static gchar *current_dir_entered = NULL;
 
diff --git a/src/build.h b/src/build.h
index 376ce56a..d6484f09 100644
--- a/src/build.h
+++ b/src/build.h
@@ -32,18 +32,18 @@ typedef enum	/* Geany Build Options */
 	GBO_MAKE_ALL,
 	GBO_MAKE_CUSTOM,
 	GBO_MAKE_OBJECT
-} build_type;
+} GeanyBuildType;
 
-typedef struct BuildInfo
+typedef struct GeanyBuildInfo
 {
-	build_type	type;	/* current action(one of the above enumeration) */
-	GPid		pid;	/* process id of the spawned process */
-	gchar		*dir;
-	guint		file_type_id;
-	gchar		*custom_target;
-} BuildInfo;
+	GeanyBuildType	 type;	/* current action(one of the above enumeration) */
+	GPid			 pid;	/* process id of the spawned process */
+	gchar			*dir;
+	guint			 file_type_id;
+	gchar			*custom_target;
+} GeanyBuildInfo;
 
-extern BuildInfo build_info;
+extern GeanyBuildInfo build_info;
 
 
 typedef struct BuildMenuItems
diff --git a/src/plugindata.h b/src/plugindata.h
index 7d3d5c01..c61ce0fb 100644
--- a/src/plugindata.h
+++ b/src/plugindata.h
@@ -165,7 +165,7 @@ typedef struct GeanyData
 	struct GeanySearchPrefs	*search_prefs;		/**< Search-related settings */
 	struct GeanyToolPrefs	*tool_prefs;		/**< Tool settings */
 	struct GeanyTemplatePrefs *template_prefs;	/**< Template settings */
-	struct BuildInfo	*build_info;			/**< Current build information */
+	struct GeanyBuildInfo	*build_info;			/**< Current build information */
 
 	struct DocumentFuncs		*documents;		/**< See document.h */
 	struct ScintillaFuncs		*sci;			/**< See sciwrappers.h */