diff --git a/util/hb-cairo-utils.h b/util/hb-cairo-utils.h
index c36a3a6ff..9d353be67 100644
--- a/util/hb-cairo-utils.h
+++ b/util/hb-cairo-utils.h
@@ -24,10 +24,11 @@
  * Google Author(s): Matthias Clasen
  */
 
-#ifndef HB_CAIRO_UTILS_H
-#define HB_CAIRO_UTILS_H
+#pragma once
 
-extern "C" {
+#include <hb.h>
+
+HB_BEGIN_DECLS
 
 static inline cairo_operator_t
 hb_paint_composite_mode_to_cairo (hb_paint_composite_mode_t mode)
@@ -99,6 +100,4 @@ void hb_cairo_paint_sweep_gradient (cairo_t *cr,
                                     float x0, float y0,
                                     float start_angle, float end_angle);
 
-}
-
-#endif
+HB_END_DECLS