Clean up headers

49 files changed, 527 insertions, 725 deletions

diff --git a/pango/pango-attributes-private.h b/pango/pango-attributes-private.h
index 8301b86d..3ff30529 100644
--- a/pango/pango-attributes-private.h
+++ b/pango/pango-attributes-private.h
@@ -1,13 +1,27 @@
+/*
+ * Copyright 2022 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "pango-attributes.h"
 
-G_BEGIN_DECLS
-
 gboolean pango_attribute_affects_itemization    (PangoAttribute *attr,
                                                  gpointer        data);
 gboolean pango_attribute_affects_break_or_shape (PangoAttribute *attr,
                                                  gpointer        data);
-
-
-G_END_DECLS
diff --git a/pango/pango-attributes.h b/pango/pango-attributes.h
index 2ef507e4..36d46533 100644
--- a/pango/pango-attributes.h
+++ b/pango/pango-attributes.h
@@ -1,22 +1,20 @@
-/* Pango
- * pango-attributes.h: Attributed text
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/pango/pango-break.h b/pango/pango-break.h
index 4ff51177..3ada8a12 100644
--- a/pango/pango-break.h
+++ b/pango/pango-break.h
@@ -1,32 +1,29 @@
-/* Pango
- * pango-break.h:
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_BREAK_H__
-#define __PANGO_BREAK_H__
+#pragma once
 
 #include <glib.h>
+#include <pango/pango-item.h>
 
 G_BEGIN_DECLS
 
-#include <pango/pango-item.h>
 
 /* Logical attributes of a character.
  */
@@ -132,5 +129,3 @@ void                    pango_attr_break        (const char    *text,
                                                  int            attrs_len);
 
 G_END_DECLS
-
-#endif /* __PANGO_BREAK_H__ */
diff --git a/pango/pango-color.h b/pango/pango-color.h
index 195183ef..17e494dc 100644
--- a/pango/pango-color.h
+++ b/pango/pango-color.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-color.h: A color struct
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_COLOR_H__
-#define __PANGO_COLOR_H__
+#pragma once
 
 #include <pango/pango-types.h>
 #include <glib-object.h>
@@ -71,5 +68,3 @@ char       *pango_color_to_string        (const PangoColor *color);
 
 
 G_END_DECLS
-
-#endif /* __PANGO_COLOR_H__ */
diff --git a/pango/pango-context-private.h b/pango/pango-context-private.h
index 71f43b60..69c2287b 100644
--- a/pango/pango-context-private.h
+++ b/pango/pango-context-private.h
@@ -1,30 +1,26 @@
-/* Pango
- * pango-context-private.h: Internal structures of PangoContext
- *
+/*
  * Copyright (C) 2004 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_CONTEXT_PRIVATE_H__
-#define __PANGO_CONTEXT_PRIVATE_H__
+#pragma once
 
 #include <pango/pango-context.h>
 
-G_BEGIN_DECLS
 
 struct _PangoContext
 {
@@ -49,8 +45,3 @@ struct _PangoContext
 
   gboolean round_glyph_positions;
 };
-
-G_END_DECLS
-
-#endif /* __PANGO_CONTEXT_PRIVATE_H__ */
-
diff --git a/pango/pango-context.h b/pango/pango-context.h
index 72ca3be8..073f820f 100644
--- a/pango/pango-context.h
+++ b/pango/pango-context.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-context.h: Rendering contexts
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_CONTEXT_H__
-#define __PANGO_CONTEXT_H__
+#pragma once
 
 #include <pango/pango-types.h>
 #include <pango/pango-font.h>
@@ -108,5 +105,3 @@ PANGO_AVAILABLE_IN_ALL
 gboolean                pango_context_get_round_glyph_positions (PangoContext                 *context);
 
 G_END_DECLS
-
-#endif /* __PANGO_CONTEXT_H__ */
diff --git a/pango/pango-coverage-private.h b/pango/pango-coverage-private.h
index 8b95dc8b..716f5f19 100644
--- a/pango/pango-coverage-private.h
+++ b/pango/pango-coverage-private.h
@@ -1,33 +1,28 @@
-/* Pango
- * pango-coverage-private.h: Coverage sets for fonts
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_COVERAGE_PRIVATE_H__
-#define __PANGO_COVERAGE_PRIVATE_H__
+#pragma once
 
 #include <glib-object.h>
 #include <pango-coverage.h>
 #include <pango-font-face.h>
 
-G_BEGIN_DECLS
-
 #define PANGO_TYPE_COVERAGE              (pango_coverage_get_type ())
 #define PANGO_COVERAGE(object)           (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_COVERAGE, PangoCoverage))
 #define PANGO_IS_COVERAGE(object)        (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_COVERAGE))
@@ -60,7 +55,3 @@ struct _PangoCoverageClass
 
 PangoCoverage *pango_coverage_new_for_hb_face   (hb_face_t     *hb_face);
 PangoCoverage *pango_coverage_new_for_font_face (PangoFontFace *face);
-
-G_END_DECLS
-
-#endif /* __PANGO_COVERAGE_PRIVATE_H__ */
diff --git a/pango/pango-coverage.h b/pango/pango-coverage.h
index ecbc217a..70cf5362 100644
--- a/pango/pango-coverage.h
+++ b/pango/pango-coverage.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-coverage.h: Coverage sets for fonts
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_COVERAGE_H__
-#define __PANGO_COVERAGE_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -89,5 +86,3 @@ void               pango_coverage_set     (PangoCoverage      *coverage,
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoCoverage, g_object_unref)
 
 G_END_DECLS
-
-#endif /* __PANGO_COVERAGE_H__ */
diff --git a/pango/pango-direction.h b/pango/pango-direction.h
index fca94778..8857179d 100644
--- a/pango/pango-direction.h
+++ b/pango/pango-direction.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-direction.h: Unicode text direction
- *
+/*
  * Copyright (C) 2018 Matthias Clasen
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_DIRECTION_H__
-#define __PANGO_DIRECTION_H__
+#pragma once
 
 #include <glib.h>
 
@@ -59,5 +56,3 @@ typedef enum {
 } PangoDirection;
 
 G_END_DECLS
-
-#endif /* __PANGO_DIRECTION_H__ */
diff --git a/pango/pango-emoji-private.h b/pango/pango-emoji-private.h
index d5cbccf4..29878de5 100644
--- a/pango/pango-emoji-private.h
+++ b/pango/pango-emoji-private.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-emoji-private.h: Emoji handling, private definitions
- *
+/*
  * Copyright (C) 2017 Google, Inc.
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_EMOJI_PRIVATE_H__
-#define __PANGO_EMOJI_PRIVATE_H__
+#pragma once
 
 #include <glib.h>
 
@@ -55,5 +52,3 @@ _pango_emoji_iter_next (PangoEmojiIter *iter);
 
 void
 _pango_emoji_iter_fini (PangoEmojiIter *iter);
-
-#endif /* __PANGO_EMOJI_PRIVATE_H__ */
diff --git a/pango/pango-features.h.meson b/pango/pango-features.h.meson
index 1128bfe2..d39343c8 100644
--- a/pango/pango-features.h.meson
+++ b/pango/pango-features.h.meson
@@ -1,10 +1,7 @@
-#ifndef PANGO_FEATURES_H
-#define PANGO_FEATURES_H
+#pragma once
 
 #mesondefine PANGO_VERSION_MAJOR
 #mesondefine PANGO_VERSION_MINOR
 #mesondefine PANGO_VERSION_MICRO
 
 #define PANGO_VERSION_STRING "@PANGO_VERSION_MAJOR@.@PANGO_VERSION_MINOR@.@PANGO_VERSION_MICRO@"
-
-#endif /* PANGO_FEATURES_H */
diff --git a/pango/pango-font-metrics.h b/pango/pango-font-metrics.h
index 22d2ce00..e7b1b8b2 100644
--- a/pango/pango-font-metrics.h
+++ b/pango/pango-font-metrics.h
@@ -1,22 +1,20 @@
-/* Pango
- * pango-font-metrics.h: Font handling
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
diff --git a/pango/pango-font-private.h b/pango/pango-font-private.h
index df78beb2..660aab1a 100644
--- a/pango/pango-font-private.h
+++ b/pango/pango-font-private.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-font.h: Font handling
+/*
+ * Copyright 2000 Red Hat Software
  *
- * Copyright (C) 2000 Red Hat Software
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONT_PRIVATE_H__
-#define __PANGO_FONT_PRIVATE_H__
+#pragma once
 
 #include <pango/pango-font-family.h>
 #include <pango/pango-font.h>
@@ -29,7 +26,6 @@
 
 #include <glib-object.h>
 
-G_BEGIN_DECLS
 
 struct _PangoFont
 {
@@ -73,7 +69,6 @@ struct _PangoFontClass
 };
 
 #define PANGO_FONT_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT, PangoFontClass))
-#define PANGO_IS_FONT_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT))
 #define PANGO_FONT_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT, PangoFontClass))
 
 gboolean pango_font_is_hinted         (PangoFont *font);
@@ -93,7 +88,3 @@ gboolean pango_font_description_is_similar       (const PangoFontDescription *a,
 
 int      pango_font_description_compute_distance (const PangoFontDescription *a,
                                                   const PangoFontDescription *b);
-
-G_END_DECLS
-
-#endif /* __PANGO_FONT_PRIVATE_H__ */
diff --git a/pango/pango-font.h b/pango/pango-font.h
index e60fb4a2..dc9195df 100644
--- a/pango/pango-font.h
+++ b/pango/pango-font.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-font.h: Font handling
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONT_H__
-#define __PANGO_FONT_H__
+#pragma once
 
 #include <pango/pango-coverage.h>
 #include <pango/pango-types.h>
@@ -133,5 +130,3 @@ PangoFont *           pango_font_deserialize       (PangoContext     *context,
 #endif
 
 G_END_DECLS
-
-#endif /* __PANGO_FONT_H__ */
diff --git a/pango/pango-fontmap-private.h b/pango/pango-fontmap-private.h
index 3c14c656..2e2c39d2 100644
--- a/pango/pango-fontmap-private.h
+++ b/pango/pango-fontmap-private.h
@@ -1,35 +1,30 @@
-/* Pango
- * pango-font.h: Font handling
+/*
+ * Copyright 2000 Red Hat Software
  *
- * Copyright (C) 2000 Red Hat Software
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONTMAP_PRIVATE_H__
-#define __PANGO_FONTMAP_PRIVATE_H__
+#pragma once
 
 #include <pango/pango-font-private.h>
 #include <pango/pango-fontset.h>
 #include <pango/pango-fontmap.h>
 
-G_BEGIN_DECLS
 
 #define PANGO_FONT_MAP_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
-#define PANGO_IS_FONT_MAP_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONT_MAP))
 #define PANGO_FONT_MAP_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONT_MAP, PangoFontMapClass))
 
 typedef struct _PangoFontMapClass PangoFontMapClass;
@@ -60,7 +55,3 @@ struct _PangoFontMapClass
   PangoFontFace *   (*get_face)   (PangoFontMap               *fontmap,
                                    PangoFont                  *font);
 };
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTMAP_PRIVATE_H__ */
diff --git a/pango/pango-fontmap.h b/pango/pango-fontmap.h
index 09ad48a3..d4e0a0b6 100644
--- a/pango/pango-fontmap.h
+++ b/pango/pango-fontmap.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-font.h: Font handling
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONTMAP_H__
-#define __PANGO_FONTMAP_H__
+#pragma once
 
 #include <pango/pango-types.h>
 #include <pango/pango-font.h>
@@ -55,5 +52,3 @@ PangoFontFamily *pango_font_map_get_family (PangoFontMap                 *fontma
 
 
 G_END_DECLS
-
-#endif /* __PANGO_FONTMAP_H__ */
diff --git a/pango/pango-fontset-private.h b/pango/pango-fontset-private.h
index b43196bc..af072ad7 100644
--- a/pango/pango-fontset-private.h
+++ b/pango/pango-fontset-private.h
@@ -1,11 +1,28 @@
+/*
+ * Copyright 2022 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "pango-fontset.h"
 
-G_BEGIN_DECLS
 
 #define PANGO_FONTSET_CLASS(klass)      (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_FONTSET, PangoFontsetClass))
-#define PANGO_IS_FONTSET_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_FONTSET))
 #define PANGO_FONTSET_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_FONTSET, PangoFontsetClass))
 
 
@@ -29,5 +46,3 @@ struct _PangoFontsetClass
                                      PangoFontsetForeachFunc func,
                                      gpointer                data);
 };
-
-G_END_DECLS
diff --git a/pango/pango-fontset-simple-private.h b/pango/pango-fontset-simple-private.h
index f4598df3..cf88100c 100644
--- a/pango/pango-fontset-simple-private.h
+++ b/pango/pango-fontset-simple-private.h
@@ -1,31 +1,27 @@
-/* Pango
- * pango-fontset-simple-private.h: Font handling
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONTSET_SIMPLE_PRIVATE_H__
-#define __PANGO_FONTSET_SIMPLE_PRIVATE_H__
+#pragma once
 
 #include <pango/pango-fontset-private.h>
 #include <pango/pango-fontset-simple.h>
 
-G_BEGIN_DECLS
 
 struct _PangoFontsetSimple
 {
@@ -41,7 +37,3 @@ struct _PangoFontsetSimpleClass
 {
   PangoFontsetClass parent_class;
 };
-
-G_END_DECLS
-
-#endif /* __PANGO_FONTSET_SIMPLE_PRIVATE_H__ */
diff --git a/pango/pango-fontset-simple.h b/pango/pango-fontset-simple.h
index 033a42c7..a95fc9a4 100644
--- a/pango/pango-fontset-simple.h
+++ b/pango/pango-fontset-simple.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-fontset-simple.h: Font set handling
- *
+/*
  * Copyright (C) 2001 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONTSET_SIMPLE_H__
-#define __PANGO_FONTSET_SIMPLE_H__
+#pragma once
 
 #include <pango/pango-coverage.h>
 #include <pango/pango-types.h>
@@ -58,5 +55,3 @@ int                     pango_fontset_simple_size   (PangoFontsetSimple *fontset
 
 
 G_END_DECLS
-
-#endif /* __PANGO_FONTSET_SIMPLE_H__ */
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index 548d71c8..ec939a20 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-fontset.h: Font set handling
- *
+/*
  * Copyright (C) 2001 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_FONTSET_H__
-#define __PANGO_FONTSET_H__
+#pragma once
 
 #include <pango/pango-coverage.h>
 #include <pango/pango-types.h>
@@ -85,5 +82,3 @@ PangoLanguage *         pango_fontset_get_language      (PangoFontset
 
 
 G_END_DECLS
-
-#endif /* __PANGO_FONTSET_H__ */
diff --git a/pango/pango-glyph-item.h b/pango/pango-glyph-item.h
index 69add997..953d02be 100644
--- a/pango/pango-glyph-item.h
+++ b/pango/pango-glyph-item.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-glyph-item.h: Pair of PangoItem and a glyph string
- *
+/*
  * Copyright (C) 2002 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_GLYPH_ITEM_H__
-#define __PANGO_GLYPH_ITEM_H__
+#pragma once
 
 #include <pango/pango-attributes.h>
 #include <pango/pango-break.h>
@@ -169,5 +166,3 @@ PANGO_AVAILABLE_IN_ALL
 gboolean pango_glyph_item_iter_prev_cluster (PangoGlyphItemIter *iter);
 
 G_END_DECLS
-
-#endif /* __PANGO_GLYPH_ITEM_H__ */
diff --git a/pango/pango-glyph.h b/pango/pango-glyph.h
index ebedb1c6..e61b169f 100644
--- a/pango/pango-glyph.h
+++ b/pango/pango-glyph.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-glyph.h: Glyph storage
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_GLYPH_H__
-#define __PANGO_GLYPH_H__
+#pragma once
 
 #include <pango/pango-types.h>
 #include <pango/pango-item.h>
@@ -250,5 +247,3 @@ void                    pango_shape_item        (PangoItem           *item,
 
 
 G_END_DECLS
-
-#endif /* __PANGO_GLYPH_H__ */
diff --git a/pango/pango-gravity.h b/pango/pango-gravity.h
index 11348a65..53007442 100644
--- a/pango/pango-gravity.h
+++ b/pango/pango-gravity.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-gravity.h: Gravity routines
- *
+/*
  * Copyright (C) 2006, 2007 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_GRAVITY_H__
-#define __PANGO_GRAVITY_H__
+#pragma once
 
 #include <glib.h>
 
@@ -90,7 +87,7 @@ typedef enum {
  *   %FALSE otherwise.
  */
 #define PANGO_GRAVITY_IS_VERTICAL(gravity) \
-	((gravity) == PANGO_GRAVITY_EAST || (gravity) == PANGO_GRAVITY_WEST)
+        ((gravity) == PANGO_GRAVITY_EAST || (gravity) == PANGO_GRAVITY_WEST)
 
 /**
  * PANGO_GRAVITY_IS_IMPROPER:
@@ -103,7 +100,7 @@ typedef enum {
  *   %FALSE otherwise.
  */
 #define PANGO_GRAVITY_IS_IMPROPER(gravity) \
-	((gravity) == PANGO_GRAVITY_WEST || (gravity) == PANGO_GRAVITY_NORTH)
+        ((gravity) == PANGO_GRAVITY_WEST || (gravity) == PANGO_GRAVITY_NORTH)
 
 #include <pango/pango-matrix.h>
 #include <pango/pango-script.h>
@@ -114,16 +111,14 @@ PANGO_AVAILABLE_IN_ALL
 PangoGravity pango_gravity_get_for_matrix (const PangoMatrix *matrix) G_GNUC_PURE;
 PANGO_AVAILABLE_IN_ALL
 PangoGravity pango_gravity_get_for_script (GUnicodeScript     script,
-					   PangoGravity       base_gravity,
-					   PangoGravityHint   hint) G_GNUC_CONST;
+                                           PangoGravity       base_gravity,
+                                           PangoGravityHint   hint) G_GNUC_CONST;
 PANGO_AVAILABLE_IN_ALL
 PangoGravity pango_gravity_get_for_script_and_width
-					  (GUnicodeScript     script,
-					   gboolean           wide,
-					   PangoGravity       base_gravity,
-					   PangoGravityHint   hint) G_GNUC_CONST;
+                                          (GUnicodeScript     script,
+                                           gboolean           wide,
+                                           PangoGravity       base_gravity,
+                                           PangoGravityHint   hint) G_GNUC_CONST;
 
 
 G_END_DECLS
-
-#endif /* __PANGO_GRAVITY_H__ */
diff --git a/pango/pango-impl-utils.h b/pango/pango-impl-utils.h
index cd125afe..627d0616 100644
--- a/pango/pango-impl-utils.h
+++ b/pango/pango-impl-utils.h
@@ -1,27 +1,23 @@
-/* Pango
- * pango-impl-utils.h: Macros for get_type() functions
- * Inspired by Jody Goldberg's gsf-impl-utils.h
- *
+/*
  * Copyright (C) 2003 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_IMPL_UTILS_H__
-#define __PANGO_IMPL_UTILS_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -241,5 +237,3 @@ pango_get_ignorable_size (gunichar  ch,
 #endif
 
 G_END_DECLS
-
-#endif /* __PANGO_IMPL_UTILS_H__ */
diff --git a/pango/pango-item-private.h b/pango/pango-item-private.h
index 5310c4d6..6eb033e5 100644
--- a/pango/pango-item-private.h
+++ b/pango/pango-item-private.h
@@ -1,30 +1,27 @@
-/* Pango
+/*
+ * Copyright 2021 Red Hat, Inc.
  *
- * Copyright (C) 2021 Matthias Clasen
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_ITEM_PRIVATE_H__
-#define __PANGO_ITEM_PRIVATE_H__
+#pragma once
 
 #include <pango/pango-item.h>
 #include <pango/pango-break.h>
 
-G_BEGIN_DECLS
 
 void               pango_analysis_collect_features    (const PangoAnalysis        *analysis,
                                                        hb_feature_t               *features,
@@ -73,7 +70,3 @@ struct _ItemProperties
 
 void               pango_item_get_properties          (PangoItem        *item,
                                                        ItemProperties   *properties);
-
-G_END_DECLS
-
-#endif /* __PANGO_ITEM_PRIVATE_H__ */
diff --git a/pango/pango-item.h b/pango/pango-item.h
index a0454fb6..de4b857f 100644
--- a/pango/pango-item.h
+++ b/pango/pango-item.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-item.h: Structure for storing run information
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_ITEM_H__
-#define __PANGO_ITEM_H__
+#pragma once
 
 #include <pango/pango-types.h>
 #include <pango/pango-attr-list.h>
@@ -141,5 +138,3 @@ GList *                 pango_itemize (PangoContext      *context,
 
 
 G_END_DECLS
-
-#endif /* __PANGO_ITEM_H__ */
diff --git a/pango/pango-language.h b/pango/pango-language.h
index 3431278f..fe84364c 100644
--- a/pango/pango-language.h
+++ b/pango/pango-language.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-language.h: Language handling routines
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_LANGUAGE_H__
-#define __PANGO_LANGUAGE_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -66,5 +63,3 @@ const GUnicodeScript *     pango_language_get_scripts           (PangoLanguage
                                                                  int            *num_scripts);
 
 G_END_DECLS
-
-#endif /* __PANGO_LANGUAGE_H__ */
diff --git a/pango/pango-layout.h b/pango/pango-layout.h
index 95a2f302..aa16a053 100644
--- a/pango/pango-layout.h
+++ b/pango/pango-layout.h
@@ -1,3 +1,22 @@
+/*
+ * Copyright (C) 2000 Red Hat Software
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include <glib-object.h>
diff --git a/pango/pango-markup.h b/pango/pango-markup.h
index 5ed85576..0a09e8e9 100644
--- a/pango/pango-markup.h
+++ b/pango/pango-markup.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-markup.h: Parser for attributed text
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_MARKUP_H__
-#define __PANGO_MARKUP_H__
+#pragma once
 
 #include <pango/pango-attr-list.h>
 
@@ -48,5 +45,3 @@ gboolean               pango_parse_markup        (const char            *markup_
 
 
 G_END_DECLS
-
-#endif /* __PANGO_MARKUP_H__ */
diff --git a/pango/pango-matrix.h b/pango/pango-matrix.h
index 3905ba20..9662d6a1 100644
--- a/pango/pango-matrix.h
+++ b/pango/pango-matrix.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-matrix.h: Matrix manipulation routines
- *
+/*
  * Copyright (C) 2002, 2006 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_MATRIX_H__
-#define __PANGO_MATRIX_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -128,5 +125,3 @@ double pango_matrix_get_slant_ratio (const PangoMatrix *matrix) G_GNUC_PURE;
 
 
 G_END_DECLS
-
-#endif /* __PANGO_MATRIX_H__ */
diff --git a/pango/pango-renderer.h b/pango/pango-renderer.h
index e9bece36..3baf4ca8 100644
--- a/pango/pango-renderer.h
+++ b/pango/pango-renderer.h
@@ -1,25 +1,23 @@
-/* Pango
- * pango-renderer.h: Base class for rendering
- *
+/*
  * Copyright (C) 2004, Red Hat, Inc.
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __PANGO_RENDERER_H_
-#define __PANGO_RENDERER_H_
+
+#pragma once
 
 #include <pango/pango-layout.h>
 #include <pango/pango-lines.h>
@@ -281,6 +279,3 @@ PANGO_AVAILABLE_IN_ALL
 PangoContext *     pango_renderer_get_context     (PangoRenderer     *renderer);
 
 G_END_DECLS
-
-#endif /* __PANGO_RENDERER_H_ */
-
diff --git a/pango/pango-script-private.h b/pango/pango-script-private.h
index 108109cd..cad2dcfe 100644
--- a/pango/pango-script-private.h
+++ b/pango/pango-script-private.h
@@ -1,26 +1,24 @@
-/* Pango
- * pango-script-private.h: Script tag handling, private definitions
- *
+/*
  * Copyright (C) 2002 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_SCRIPT_PRIVATE_H__
-#define __PANGO_SCRIPT_PRIVATE_H__
+#pragma once
+
 
 #define PAREN_STACK_DEPTH 128
 
@@ -52,5 +50,3 @@ _pango_script_iter_init (PangoScriptIter *iter,
 
 void
 _pango_script_iter_fini (PangoScriptIter *iter);
-
-#endif /* __PANGO_SCRIPT_PRIVATE_H__ */
diff --git a/pango/pango-script.h b/pango/pango-script.h
index 8895a0b0..cabcc902 100644
--- a/pango/pango-script.h
+++ b/pango/pango-script.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-script.h: Script tag handling
- *
+/*
  * Copyright (C) 2002 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_SCRIPT_H__
-#define __PANGO_SCRIPT_H__
+#pragma once
 
 #include <glib-object.h>
 
@@ -58,5 +55,3 @@ PANGO_AVAILABLE_IN_ALL
 PangoLanguage *pango_script_get_sample_language (GUnicodeScript    script) G_GNUC_PURE;
 
 G_END_DECLS
-
-#endif /* __PANGO_SCRIPT_H__ */
diff --git a/pango/pango-tabs.h b/pango/pango-tabs.h
index c1333974..d72c957c 100644
--- a/pango/pango-tabs.h
+++ b/pango/pango-tabs.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-tabs.h: Tab-related stuff
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_TABS_H__
-#define __PANGO_TABS_H__
+#pragma once
 
 #include <pango/pango-types.h>
 
@@ -113,5 +110,3 @@ void            pango_tab_array_sort                (PangoTabArray *tab_array);
 G_DEFINE_AUTOPTR_CLEANUP_FUNC(PangoTabArray, pango_tab_array_free)
 
 G_END_DECLS
-
-#endif /* __PANGO_TABS_H__ */
diff --git a/pango/pango-trace-private.h b/pango/pango-trace-private.h
index 8d5ebf51..fc305ea3 100644
--- a/pango/pango-trace-private.h
+++ b/pango/pango-trace-private.h
@@ -1,32 +1,30 @@
-/* Pango
- * pango-trace-private.h:
+/*
+ * Copyright 2020 Red Hat, Inc.
  *
- * Copyright (C) 2020 Red Hat, Inc
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
 
-
 #ifdef HAVE_SYSPROF
 #include <sysprof-capture.h>
 #endif
 
 #include <glib.h>
 
-G_BEGIN_DECLS
 
 #ifdef HAVE_SYSPROF
 #define PANGO_TRACE_CURRENT_TIME SYSPROF_CAPTURE_CURRENT_TIME
@@ -49,5 +47,3 @@ void pango_trace_mark (gint64       begin_time,
 /* no varargs macro support; the call will have to be optimised out by the compiler */
 #endif
 #endif
-
-G_END_DECLS
diff --git a/pango/pango-types.h b/pango/pango-types.h
index 6c2c26a4..d595587f 100644
--- a/pango/pango-types.h
+++ b/pango/pango-types.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-types.h:
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_TYPES_H__
-#define __PANGO_TYPES_H__
+#pragma once
 
 #include <glib.h>
 #include <glib-object.h>
@@ -365,5 +362,3 @@ typedef enum
 
 
 G_END_DECLS
-
-#endif /* __PANGO_TYPES_H__ */
diff --git a/pango/pango-utils-internal.h b/pango/pango-utils-internal.h
index 643a5ad9..adb62544 100644
--- a/pango/pango-utils-internal.h
+++ b/pango/pango-utils-internal.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-utils.c: Utilities for internal functions and modules
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_UTILS_INTERNAL_H__
-#define __PANGO_UTILS_INTERNAL_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -64,7 +61,4 @@ void     pango_quantize_line_geometry   (int *thickness,
                                          int *position);
 
 
-
 G_END_DECLS
-
-#endif /* __PANGO_UTILS_H__ */
diff --git a/pango/pango-utils.h b/pango/pango-utils.h
index ceace9ed..d93f5c9a 100644
--- a/pango/pango-utils.h
+++ b/pango/pango-utils.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango-utils.c: Utilities for internal functions and modules
- *
+/*
  * Copyright (C) 2000 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_UTILS_H__
-#define __PANGO_UTILS_H__
+#pragma once
 
 #include <stdio.h>
 #include <glib.h>
@@ -125,5 +122,3 @@ const char * pango_version_check (int required_major,
                                   int required_micro) G_GNUC_CONST;
 
 G_END_DECLS
-
-#endif /* __PANGO_UTILS_H__ */
diff --git a/pango/pango-version-macros.h b/pango/pango-version-macros.h
index 775102b2..1dcbb1e7 100644
--- a/pango/pango-version-macros.h
+++ b/pango/pango-version-macros.h
@@ -1,8 +1,10 @@
-/* Pango - Internationalized text layout and rendering library
+/*
  * Copyright (C) 1999 Red Hat Software
  * Copyright (C) 2012 Ryan Lortie, Matthias Clasen and Emmanuele Bassi
  * Copyright (C) 2016 Chun-wei Fan
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ -17,8 +19,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_VERSION_H__
-#define __PANGO_VERSION_H__
+#pragma once
 
 #include <pango/pango-features.h>
 
@@ -154,5 +155,3 @@
 #else
 # define PANGO_AVAILABLE_IN_2_0                 _PANGO_EXTERN
 #endif
-
-#endif /* __PANGO_VERSION_H__ */
diff --git a/pango/pango.h b/pango/pango.h
index 2364a9a9..5d9cd5e8 100644
--- a/pango/pango.h
+++ b/pango/pango.h
@@ -1,26 +1,23 @@
-/* Pango
- * pango.h:
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGO_H__
-#define __PANGO_H__
+#pragma once
 
 #include <pango/pango-attr.h>
 #include <pango/pango-attr-list.h>
@@ -66,5 +63,3 @@
 #include <pango/pango-userfont.h>
 #include <pango/pango-utils.h>
 #include <pango/pango-version-macros.h>
-
-#endif /* __PANGO_H__ */
diff --git a/pango/pangocairo-coretext.h b/pango/pangocairo-coretext.h
index ffc086ce..41ce9f65 100644
--- a/pango/pangocairo-coretext.h
+++ b/pango/pangocairo-coretext.h
@@ -1,27 +1,24 @@
-/* Pango
- * pangocairo-coretext.h:
- *
+/*
  * Copyright (C) 2005 Imendio AB
  * Copyright (C) 2010  Kristian Rietveld  <kris@gtk.org>
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCAIRO_CORETEXT_H__
-#define __PANGOCAIRO_CORETEXT_H__
+#pragma once
 
 #include "pangocoretext-private.h"
 #include <pango/pangocairo.h>
@@ -51,5 +48,3 @@ _pango_cairo_core_text_font_new (PangoCairoCoreTextFontMap  *cafontmap,
                                  PangoCoreTextFontKey       *key);
 
 G_END_DECLS
-
-#endif /* __PANGOCAIRO_CORETEXT_H__ */
diff --git a/pango/pangocairo-coretextfont.h b/pango/pangocairo-coretextfont.h
index 91bdc71e..61a72469 100644
--- a/pango/pangocairo-coretextfont.h
+++ b/pango/pangocairo-coretextfont.h
@@ -1,27 +1,26 @@
-/* Pango
- * pangocairo-coretextfont.c
- *
+/*
  * Copyright (C) 2005 Imendio AB
  * Copyright (C) 2010  Kristian Rietveld  <kris@gtk.org>
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCAIRO_CORETEXTFONT_H__
-#define __PANGOCAIRO_CORETEXTFONT_H__
+#pragma once
+
+G_BEGIN_DECLS
 
 #define PANGO_TYPE_CAIRO_CORE_TEXT_FONT            (pango_cairo_core_text_font_get_type ())
 #define PANGO_CAIRO_CORE_TEXT_FONT(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_CORE_TEXT_FONT, PangoCairoCoreTextFont))
@@ -35,4 +34,4 @@ typedef struct _PangoCairoCoreTextFontClass PangoCairoCoreTextFontClass;
 _PANGO_EXTERN
 GType pango_cairo_core_text_font_get_type (void) G_GNUC_CONST;
 
-#endif /* __PANGOCAIRO_CORETEXTFONT_H__ */
+G_END_DECLS
diff --git a/pango/pangocairo-private.h b/pango/pangocairo-private.h
index ffcb5488..8b0243bb 100644
--- a/pango/pangocairo-private.h
+++ b/pango/pangocairo-private.h
@@ -1,32 +1,27 @@
-/* Pango
- * pangocairo-private.h: private symbols for the Cairo backend
+/*
+ * Copyright (C) 2000, 2004 Red Hat, Inc.
  *
- * Copyright (C) 2000,2004 Red Hat, Inc.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCAIRO_PRIVATE_H__
-#define __PANGOCAIRO_PRIVATE_H__
+#pragma once
 
 #include <pango/pangocairo.h>
 #include <pango/pango-renderer.h>
 
-G_BEGIN_DECLS
-
 
 #define PANGO_CAIRO_FONT_MAP_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), PANGO_TYPE_CAIRO_FONT_MAP, PangoCairoFontMapIface))
 
@@ -37,7 +32,7 @@ struct _PangoCairoFontMapIface
   GTypeInterface g_iface;
 
   void           (*set_resolution) (PangoCairoFontMap *fontmap,
-				    double             dpi);
+                                    double             dpi);
   double         (*get_resolution) (PangoCairoFontMap *fontmap);
 
   cairo_font_type_t (*get_font_type) (PangoCairoFontMap *fontmap);
@@ -83,32 +78,32 @@ struct _PangoCairoFontIface
 
   cairo_font_face_t *(*create_font_face) (PangoCairoFont *cfont);
   PangoFontMetrics *(*create_base_metrics_for_context) (PangoCairoFont *cfont,
-							PangoContext   *context);
+                                                        PangoContext   *context);
 
   gssize cf_priv_offset;
 };
 
 gboolean _pango_cairo_font_install (PangoFont *font,
-				    cairo_t   *cr);
+                                    cairo_t   *cr);
 PangoFontMetrics * _pango_cairo_font_get_metrics (PangoFont     *font,
-						  PangoLanguage *language);
+                                                  PangoLanguage *language);
 PangoCairoFontHexBoxInfo *_pango_cairo_font_get_hex_box_info (PangoFont *font);
 PangoCairoFontPrivate    *_pango_font_get_cairo_font_private (PangoFont *font);
 cairo_scaled_font_t      *_pango_font_get_scaled_font        (PangoFont *font);
 
 void _pango_cairo_font_private_initialize (PangoCairoFontPrivate      *cf_priv,
-					   PangoCairoFont             *font,
-					   PangoGravity                gravity,
-					   const cairo_font_options_t *font_options,
-					   const PangoMatrix          *pango_ctm,
-					   const cairo_matrix_t       *font_matrix);
+                                           PangoCairoFont             *font,
+                                           PangoGravity                gravity,
+                                           const cairo_font_options_t *font_options,
+                                           const PangoMatrix          *pango_ctm,
+                                           const cairo_matrix_t       *font_matrix);
 void _pango_cairo_font_private_finalize (PangoCairoFontPrivate *cf_priv);
 cairo_scaled_font_t *_pango_cairo_font_private_get_scaled_font (PangoCairoFontPrivate *cf_priv);
 gboolean _pango_cairo_font_private_is_metrics_hinted (PangoCairoFontPrivate *cf_priv);
 void _pango_cairo_font_private_get_glyph_extents (PangoCairoFontPrivate *cf_priv,
-						  PangoGlyph             glyph,
-						  PangoRectangle        *ink_rect,
-						  PangoRectangle        *logical_rect);
+                                                  PangoGlyph             glyph,
+                                                  PangoRectangle        *ink_rect,
+                                                  PangoRectangle        *logical_rect);
 
 #define PANGO_TYPE_CAIRO_RENDERER            (pango_cairo_renderer_get_type())
 #define PANGO_CAIRO_RENDERER(object)         (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CAIRO_RENDERER, PangoCairoRenderer))
@@ -121,8 +116,3 @@ GType pango_cairo_renderer_get_type    (void) G_GNUC_CONST;
 
 
 const cairo_font_options_t *_pango_cairo_context_get_merged_font_options (PangoContext *context);
-
-
-G_END_DECLS
-
-#endif /* __PANGOCAIRO_PRIVATE_H__ */
diff --git a/pango/pangocairo-win32.h b/pango/pangocairo-win32.h
index 325963c5..8e77ec5a 100644
--- a/pango/pangocairo-win32.h
+++ b/pango/pangocairo-win32.h
@@ -1,26 +1,23 @@
-/* Pango
- * pangocairo-win32.h: Private header file for Cairo/Win32 combination
- *
+/*
  * Copyright (C) 2005 Red Hat, Inc.
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCAIRO_WIN32_H__
-#define __PANGOCAIRO_WIN32_H__
+#pragma once
 
 #include <pango/pangowin32.h>
 #include "pangowin32-private.h"
@@ -46,10 +43,7 @@ PANGO_AVAILABLE_IN_ALL
 GType pango_cairo_win32_font_map_get_type (void) G_GNUC_CONST;
 
 PangoFont *_pango_cairo_win32_font_new (PangoCairoWin32FontMap       *cwfontmap,
-					PangoContext                 *context,
-					PangoWin32Face               *face,
-					const PangoFontDescription   *desc);
+                                        PangoContext                 *context,
+                                        PangoWin32Face               *face,
+                                        const PangoFontDescription   *desc);
 G_END_DECLS
-
-#endif /* __PANGOCAIRO_WIN32_H__ */
-
diff --git a/pango/pangocairo.h b/pango/pangocairo.h
index c66205cb..6f99190c 100644
--- a/pango/pangocairo.h
+++ b/pango/pangocairo.h
@@ -1,26 +1,23 @@
-/* Pango
- * pangocairo.h:
- *
+/*
  * Copyright (C) 1999, 2004 Red Hat, Inc.
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCAIRO_H__
-#define __PANGOCAIRO_H__
+#pragma once
 
 #include <pango/pango.h>
 #include <cairo.h>
@@ -92,7 +89,7 @@ cairo_font_type_t pango_cairo_font_map_get_font_type (PangoCairoFontMap *fontmap
 
 PANGO_AVAILABLE_IN_ALL
 void          pango_cairo_font_map_set_resolution (PangoCairoFontMap *fontmap,
-						   double             dpi);
+                                                   double             dpi);
 PANGO_AVAILABLE_IN_ALL
 double        pango_cairo_font_map_get_resolution (PangoCairoFontMap *fontmap);
 
@@ -109,17 +106,17 @@ cairo_scaled_font_t *pango_cairo_font_get_scaled_font (PangoCairoFont *font);
  */
 PANGO_AVAILABLE_IN_ALL
 void         pango_cairo_update_context (cairo_t      *cr,
-					 PangoContext *context);
+                                         PangoContext *context);
 
 PANGO_AVAILABLE_IN_ALL
 void                        pango_cairo_context_set_font_options (PangoContext               *context,
-								  const cairo_font_options_t *options);
+                                                                  const cairo_font_options_t *options);
 PANGO_AVAILABLE_IN_ALL
 const cairo_font_options_t *pango_cairo_context_get_font_options (PangoContext               *context);
 
 PANGO_AVAILABLE_IN_ALL
 void               pango_cairo_context_set_resolution     (PangoContext       *context,
-							   double              dpi);
+                                                           double              dpi);
 PANGO_AVAILABLE_IN_ALL
 double             pango_cairo_context_get_resolution     (PangoContext       *context);
 
@@ -131,19 +128,19 @@ PANGO_AVAILABLE_IN_ALL
 PangoLayout *pango_cairo_create_layout (cairo_t     *cr);
 PANGO_AVAILABLE_IN_ALL
 void         pango_cairo_update_layout (cairo_t     *cr,
-					PangoLayout *layout);
+                                        PangoLayout *layout);
 
 /*
  * Rendering
  */
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_show_glyph_string (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
+                                    PangoFont        *font,
+                                    PangoGlyphString *glyphs);
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_show_glyph_item   (cairo_t          *cr,
-				    const char       *text,
-				    PangoGlyphItem   *glyph_item);
+                                    const char       *text,
+                                    PangoGlyphItem   *glyph_item);
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_show_line         (cairo_t          *cr,
                                     PangoLine        *line);
@@ -152,14 +149,14 @@ void pango_cairo_show_lines        (cairo_t          *cr,
                                     PangoLines       *lines);
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_show_layout       (cairo_t          *cr,
-				    PangoLayout      *layout);
+                                    PangoLayout      *layout);
 
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_show_error_underline (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
+                                       double         x,
+                                       double         y,
+                                       double         width,
+                                       double         height);
 
 
 /*
@@ -167,11 +164,11 @@ void pango_cairo_show_error_underline (cairo_t       *cr,
  */
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_glyph_string_path (cairo_t          *cr,
-				    PangoFont        *font,
-				    PangoGlyphString *glyphs);
+                                    PangoFont        *font,
+                                    PangoGlyphString *glyphs);
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_layout_path       (cairo_t          *cr,
-				    PangoLayout      *layout);
+                                    PangoLayout      *layout);
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_line_path         (cairo_t          *cr,
                                     PangoLine        *line);
@@ -181,11 +178,9 @@ void pango_cairo_lines_path        (cairo_t          *cr,
 
 PANGO_AVAILABLE_IN_ALL
 void pango_cairo_error_underline_path (cairo_t       *cr,
-				       double         x,
-				       double         y,
-				       double         width,
-				       double         height);
+                                       double         x,
+                                       double         y,
+                                       double         width,
+                                       double         height);
 
 G_END_DECLS
-
-#endif /* __PANGOCAIRO_H__ */
diff --git a/pango/pangocoretext-private.h b/pango/pangocoretext-private.h
index eae7a0c0..82e3494d 100644
--- a/pango/pangocoretext-private.h
+++ b/pango/pangocoretext-private.h
@@ -1,37 +1,32 @@
-/* Pango
- * pangocoretext-private.h:
- *
+/*
  * Copyright (C) 2003 Red Hat Software
  * Copyright (C) 2005-2007 Imendio AB
  * Copyright (C) 2010  Kristian Rietveld  <kris@gtk.org>
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCORETEXT_PRIVATE_H__
-#define __PANGOCORETEXT_PRIVATE_H__
+#pragma once
 
 #include "pangocoretext.h"
 #include "pango-font-private.h"
 #include "pango-fontmap-private.h"
 
-G_BEGIN_DECLS
 
 #define PANGO_CORE_TEXT_FONT_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CORE_TEXT_FONT, PangoCoreTextFontClass))
-#define PANGO_IS_CORE_TEXT_FONT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CORE_TEXT_FONT))
 #define PANGO_CORE_TEXT_FONT_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CORE_TEXT_FONT, PangoCoreTextFontClass))
 
 typedef struct _PangoCoreTextFontPrivate  PangoCoreTextFontPrivate;
@@ -60,7 +55,6 @@ struct _PangoCoreTextFontClass
 #define PANGO_CORE_TEXT_FONT_MAP(object)          (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_CORE_TEXT_FONT_MAP, PangoCoreTextFontMap))
 #define PANGO_CORE_TEXT_IS_FONT_MAP(object)       (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_CORE_TEXT_FONT_MAP))
 #define PANGO_CORE_TEXT_FONT_MAP_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), PANGO_TYPE_CORE_TEXT_FONT_MAP, PangoCoreTextFontMapClass))
-#define PANGO_IS_CORE_TEXT_FONT_MAP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), PANGO_TYPE_CORE_TEXT_FONT_MAP))
 #define PANGO_CORE_TEXT_FONT_MAP_GET_CLASS(obj)   (G_TYPE_INSTANCE_GET_CLASS ((obj), PANGO_TYPE_CORE_TEXT_FONT_MAP, PangoCoreTextFontMapClass))
 
 
@@ -143,7 +137,3 @@ CTFontDescriptorRef   pango_core_text_font_key_get_ctfontdescriptor (const Pango
 
 PangoCoreTextFace *   pango_core_text_font_map_find_face (PangoCoreTextFontMap       *map,
                                                           const PangoCoreTextFontKey *key);
-
-G_END_DECLS
-
-#endif /* __PANGOCORETEXT_PRIVATE_H__ */
diff --git a/pango/pangocoretext.h b/pango/pangocoretext.h
index 05d94ada..2df8e4b5 100644
--- a/pango/pangocoretext.h
+++ b/pango/pangocoretext.h
@@ -1,27 +1,24 @@
-/* Pango
- * pangocoretext.h:
- *
+/*
  * Copyright (C) 2005 Imendio AB
  * Copyright (C) 2010  Kristian Rietveld  <kris@gtk.org>
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOCORETEXT_H__
-#define __PANGOCORETEXT_H__
+#pragma once
 
 #include <pango/pango.h>
 #include <Carbon/Carbon.h>
@@ -43,5 +40,3 @@ PANGO_AVAILABLE_IN_ALL
 CTFontRef  pango_core_text_font_get_ctfont  (PangoCoreTextFont *font);
 
 G_END_DECLS
-
-#endif /* __PANGOCORETEXT_H__ */
diff --git a/pango/pangowin32-private.h b/pango/pangowin32-private.h
index 9102662a..c9fe3357 100644
--- a/pango/pangowin32-private.h
+++ b/pango/pangowin32-private.h
@@ -1,28 +1,25 @@
-/* Pango
- * pangowin32-private.h:
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  * Copyright (C) 2000-2002 Tor Lillqvist
  * Copyright (C) 2001 Alexander Larsson
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOWIN32_PRIVATE_H__
-#define __PANGOWIN32_PRIVATE_H__
+#pragma once
 
 /* Define if you want the possibility to get copious debugging output.
  * (You still need to set the PANGO_WIN32_DEBUG environment variable
@@ -280,5 +277,3 @@ gpointer        _pango_win32_copy_cmap (gpointer cmap,
                                         guint16 cmap_format);
 
 extern gboolean _pango_win32_debug;
-
-#endif /* __PANGOWIN32_PRIVATE_H__ */
diff --git a/pango/pangowin32.h b/pango/pangowin32.h
index 4c36b280..3dcf1a92 100644
--- a/pango/pangowin32.h
+++ b/pango/pangowin32.h
@@ -1,28 +1,25 @@
-/* Pango
- * pangowin32.h:
- *
+/*
  * Copyright (C) 1999 Red Hat Software
  * Copyright (C) 2000 Tor Lillqvist
  * Copyright (C) 2001 Alexander Larsson
  *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
  * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
+ * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
+ * version 2.1 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Library General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __PANGOWIN32_H__
-#define __PANGOWIN32_H__
+#pragma once
 
 #include <glib.h>
 #include <pango/pango-font.h>
@@ -105,5 +102,3 @@ PANGO_AVAILABLE_IN_1_16
 PangoFontDescription *pango_win32_font_description_from_logfontw (const LOGFONTW *lfp);
 
 G_END_DECLS
-
-#endif /* __PANGOWIN32_H__ */