diff --git a/utils/format_source_files/mapnik_format.el b/utils/format_source_files/mapnik_format.el
index 5de71fc0d..a6a6f0c07 100644
--- a/utils/format_source_files/mapnik_format.el
+++ b/utils/format_source_files/mapnik_format.el
@@ -1,5 +1,7 @@
 (defun mapnik-format-function ()
   "Format buffer according to mapnik style (TODO)"
+  (add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+  (c-set-style "bsd")
   (c-set-style "bsd")
   (c-set-offset 'innamespace 0)
   (c-set-offset 'template-args-cont 'c-lineup-template-args)