diff --git a/.indent.pro b/.indent.pro
index 676d57b3..06299a25 100644
--- a/.indent.pro
+++ b/.indent.pro
@@ -41,6 +41,7 @@
 -T SLIST_ENTRY
 -T STAILQ_ENTRY
 -T TAILQ_ENTRY
+-T FILE
 
 /* libxlsxwriter typedefs. */
 -T lxw_app
diff --git a/include/xlsxwriter/xmlwriter.h b/include/xlsxwriter/xmlwriter.h
index 0c8fd6c6..bb0a3651 100644
--- a/include/xlsxwriter/xmlwriter.h
+++ b/include/xlsxwriter/xmlwriter.h
@@ -99,7 +99,7 @@ struct xml_attribute *lxw_new_attribute_dbl(const char *key, double value);
  *
  * @param xmlfile A FILE pointer to the output XML file.
  */
-void lxw_xml_declaration(FILE * xmlfile);
+void lxw_xml_declaration(FILE *xmlfile);
 
 /**
  * Write an XML start tag with optional attributes.
@@ -108,7 +108,7 @@ void lxw_xml_declaration(FILE * xmlfile);
  * @param tag        The XML tag to write.
  * @param attributes An optional list of attributes to add to the tag.
  */
-void lxw_xml_start_tag(FILE * xmlfile,
+void lxw_xml_start_tag(FILE *xmlfile,
                        const char *tag,
                        struct xml_attribute_list *attributes);
 
@@ -120,7 +120,7 @@ void lxw_xml_start_tag(FILE * xmlfile,
  * @param tag        The XML tag to write.
  * @param attributes An optional list of attributes to add to the tag.
  */
-void lxw_xml_start_tag_unencoded(FILE * xmlfile,
+void lxw_xml_start_tag_unencoded(FILE *xmlfile,
                                  const char *tag,
                                  struct xml_attribute_list *attributes);
 
@@ -130,7 +130,7 @@ void lxw_xml_start_tag_unencoded(FILE * xmlfile,
  * @param xmlfile    A FILE pointer to the output XML file.
  * @param tag        The XML tag to write.
  */
-void lxw_xml_end_tag(FILE * xmlfile, const char *tag);
+void lxw_xml_end_tag(FILE *xmlfile, const char *tag);
 
 /**
  * Write an XML empty tag with optional attributes.
@@ -139,7 +139,7 @@ void lxw_xml_end_tag(FILE * xmlfile, const char *tag);
  * @param tag        The XML tag to write.
  * @param attributes An optional list of attributes to add to the tag.
  */
-void lxw_xml_empty_tag(FILE * xmlfile,
+void lxw_xml_empty_tag(FILE *xmlfile,
                        const char *tag,
                        struct xml_attribute_list *attributes);
 
@@ -151,7 +151,7 @@ void lxw_xml_empty_tag(FILE * xmlfile,
  * @param tag        The XML tag to write.
  * @param attributes An optional list of attributes to add to the tag.
  */
-void lxw_xml_empty_tag_unencoded(FILE * xmlfile,
+void lxw_xml_empty_tag_unencoded(FILE *xmlfile,
                                  const char *tag,
                                  struct xml_attribute_list *attributes);
 
@@ -163,12 +163,12 @@ void lxw_xml_empty_tag_unencoded(FILE * xmlfile,
  * @param data       The data section of the XML element.
  * @param attributes An optional list of attributes to add to the tag.
  */
-void lxw_xml_data_element(FILE * xmlfile,
+void lxw_xml_data_element(FILE *xmlfile,
                           const char *tag,
                           const char *data,
                           struct xml_attribute_list *attributes);
 
-void lxw_xml_rich_si_element(FILE * xmlfile, const char *string);
+void lxw_xml_rich_si_element(FILE *xmlfile, const char *string);
 
 uint8_t lxw_has_control_characters(const char *string);
 char *lxw_escape_control_characters(const char *string);
diff --git a/src/packager.c b/src/packager.c
index cada836f..4654bf63 100644
--- a/src/packager.c
+++ b/src/packager.c
@@ -50,13 +50,13 @@
 #include "xlsxwriter/hash_table.h"
 #include "xlsxwriter/utility.h"
 
-STATIC lxw_error _add_file_to_zip(lxw_packager *self, FILE * file,
+STATIC lxw_error _add_file_to_zip(lxw_packager *self, FILE *file,
                                   const char *filename);
 
 STATIC lxw_error _add_buffer_to_zip(lxw_packager *self, const char *buffer,
                                     size_t buffer_size, const char *filename);
 
-STATIC lxw_error _add_to_zip(lxw_packager *self, FILE * file,
+STATIC lxw_error _add_to_zip(lxw_packager *self, FILE *file,
                              char **buffer, size_t *buffer_size,
                              const char *filename);
 
@@ -2055,7 +2055,7 @@ mem_error:
  ****************************************************************************/
 
 STATIC lxw_error
-_add_file_to_zip(lxw_packager *self, FILE * file, const char *filename)
+_add_file_to_zip(lxw_packager *self, FILE *file, const char *filename)
 {
     int16_t error = ZIP_OK;
     size_t size_read;
@@ -2147,7 +2147,7 @@ _add_buffer_to_zip(lxw_packager *self, const char *buffer, size_t buffer_size,
 }
 
 STATIC lxw_error
-_add_to_zip(lxw_packager *self, FILE * file, char **buffer,
+_add_to_zip(lxw_packager *self, FILE *file, char **buffer,
             size_t *buffer_size, const char *filename)
 {
     /* Flush to ensure buffer is updated when using a memory-backed file. */
diff --git a/src/xmlwriter.c b/src/xmlwriter.c
index da895764..4420e2de 100644
--- a/src/xmlwriter.c
+++ b/src/xmlwriter.c
@@ -28,16 +28,16 @@ STATIC char *_escape_attributes(struct xml_attribute *attribute);
 
 char *lxw_escape_data(const char *data);
 
-STATIC void _fprint_escaped_attributes(FILE * xmlfile,
+STATIC void _fprint_escaped_attributes(FILE *xmlfile,
                                        struct xml_attribute_list *attributes);
 
-STATIC void _fprint_escaped_data(FILE * xmlfile, const char *data);
+STATIC void _fprint_escaped_data(FILE *xmlfile, const char *data);
 
 /*
  * Write the XML declaration.
  */
 void
-lxw_xml_declaration(FILE * xmlfile)
+lxw_xml_declaration(FILE *xmlfile)
 {
     fprintf(xmlfile, "<?xml version=\"1.0\" "
             "encoding=\"UTF-8\" standalone=\"yes\"?>\n");
@@ -47,7 +47,7 @@ lxw_xml_declaration(FILE * xmlfile)
  * Write an XML start tag with optional attributes.
  */
 void
-lxw_xml_start_tag(FILE * xmlfile,
+lxw_xml_start_tag(FILE *xmlfile,
                   const char *tag, struct xml_attribute_list *attributes)
 {
     fprintf(xmlfile, "<%s", tag);
@@ -62,7 +62,7 @@ lxw_xml_start_tag(FILE * xmlfile,
  * This is a minor speed optimization for elements that don't need encoding.
  */
 void
-lxw_xml_start_tag_unencoded(FILE * xmlfile,
+lxw_xml_start_tag_unencoded(FILE *xmlfile,
                             const char *tag,
                             struct xml_attribute_list *attributes)
 {
@@ -83,7 +83,7 @@ lxw_xml_start_tag_unencoded(FILE * xmlfile,
  * Write an XML end tag.
  */
 void
-lxw_xml_end_tag(FILE * xmlfile, const char *tag)
+lxw_xml_end_tag(FILE *xmlfile, const char *tag)
 {
     fprintf(xmlfile, "</%s>", tag);
 }
@@ -92,7 +92,7 @@ lxw_xml_end_tag(FILE * xmlfile, const char *tag)
  * Write an empty XML tag with optional attributes.
  */
 void
-lxw_xml_empty_tag(FILE * xmlfile,
+lxw_xml_empty_tag(FILE *xmlfile,
                   const char *tag, struct xml_attribute_list *attributes)
 {
     fprintf(xmlfile, "<%s", tag);
@@ -107,7 +107,7 @@ lxw_xml_empty_tag(FILE * xmlfile,
  * This is a minor speed optimization for elements that don't need encoding.
  */
 void
-lxw_xml_empty_tag_unencoded(FILE * xmlfile,
+lxw_xml_empty_tag_unencoded(FILE *xmlfile,
                             const char *tag,
                             struct xml_attribute_list *attributes)
 {
@@ -128,7 +128,7 @@ lxw_xml_empty_tag_unencoded(FILE * xmlfile,
  * Write an XML element containing data with optional attributes.
  */
 void
-lxw_xml_data_element(FILE * xmlfile,
+lxw_xml_data_element(FILE *xmlfile,
                      const char *tag,
                      const char *data, struct xml_attribute_list *attributes)
 {
@@ -147,7 +147,7 @@ lxw_xml_data_element(FILE * xmlfile,
  * Write an XML <si> element for rich strings, without encoding.
  */
 void
-lxw_xml_rich_si_element(FILE * xmlfile, const char *string)
+lxw_xml_rich_si_element(FILE *xmlfile, const char *string)
 {
     fprintf(xmlfile, "<si>%s</si>", string);
 }
@@ -370,7 +370,7 @@ lxw_escape_url_characters(const char *string, uint8_t escape_hash)
 
 /* Write out escaped attributes. */
 STATIC void
-_fprint_escaped_attributes(FILE * xmlfile,
+_fprint_escaped_attributes(FILE *xmlfile,
                            struct xml_attribute_list *attributes)
 {
     struct xml_attribute *attribute;
@@ -397,7 +397,7 @@ _fprint_escaped_attributes(FILE * xmlfile,
 
 /* Write out escaped XML data. */
 STATIC void
-_fprint_escaped_data(FILE * xmlfile, const char *data)
+_fprint_escaped_data(FILE *xmlfile, const char *data)
 {
     /* Escape the data section of the XML element. */
     if (!strpbrk(data, "&<>")) {