diff --git a/girepository/girwriter.h b/girepository/girwriter-private.h
similarity index 93%
rename from girepository/girwriter.h
rename to girepository/girwriter-private.h
index b809ac81a..c0a768af8 100644
--- a/girepository/girwriter.h
+++ b/girepository/girwriter-private.h
@@ -21,12 +21,15 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#ifndef __GIRWRITER_H__
-#define __GIRWRITER_H__
+#pragma once
+
+#include <glib.h>
+
+G_BEGIN_DECLS
 
 void gir_writer_write (const char *filename,
 		       const char *namespace,
 		       gboolean    needs_prefix,
 		       gboolean    show_all);
 
-#endif  /* __GIRWRITER_H__ */
+G_END_DECLS
diff --git a/girepository/girwriter.c b/girepository/girwriter.c
index d8a61df94..4066eb273 100644
--- a/girepository/girwriter.c
+++ b/girepository/girwriter.c
@@ -22,6 +22,13 @@
  * Boston, MA 02111-1307, USA.
  */
 
+#include "config.h"
+
+#include "girwriter-private.h"
+
+#include "girepository.h"
+#include "gitypelib-internal.h"
+
 #include <errno.h>
 #include <string.h>
 #include <stdio.h>
@@ -30,10 +37,6 @@
 #include <glib-object.h>
 #include <glib/gstdio.h>
 
-#include "girwriter.h"
-#include "girepository.h"
-#include "gitypelib-internal.h"
-
 typedef struct {
   FILE *file;
   GSList *stack;