[pango/pango2: 1/10] Move the code from pango/ to pango2/

[Matthias Clasen <matthiasc src gnome org>]

commit c556432cbd952b978f79c6d3a60a2d22f5162f36
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Jun 25 12:28:15 2022 -0400

    Move the code from pango/ to pango2/
    
    Life is easier if the src path matches the installed
    header path prefix, so make them match. Update all
    users.

 .gitlab-ci.yml                                     |  2 +-
 docs/meson.build                                   |  2 +-
 examples/cairoshape.c                              |  2 +-
 examples/cairosimple.c                             |  2 +-
 examples/cairotwisted.c                            |  2 +-
 examples/columns.c                                 |  3 +-
 examples/first-steps.c                             |  2 +-
 examples/parshape.c                                |  3 +-
 examples/userfont.c                                |  2 +-
 meson.build                                        |  4 +-
 pango/pango.h                                      | 61 ----------------------
 {pango => pango2}/break-arabic.c                   |  0
 {pango => pango2}/break-indic.c                    |  0
 {pango => pango2}/break-latin.c                    |  0
 {pango => pango2}/break-thai.c                     |  0
 {pango => pango2}/break.c                          |  0
 {pango => pango2}/ellipsize.c                      |  0
 {pango => pango2}/emoji_presentation_scanner.c     |  0
 {pango => pango2}/emoji_presentation_scanner.rl    |  0
 {pango => pango2}/glyphstring.c                    |  0
 {pango => pango2}/itemize.c                        |  0
 {pango => pango2}/json/gtkjsonparser.c             |  0
 {pango => pango2}/json/gtkjsonparserprivate.h      |  0
 {pango => pango2}/json/gtkjsonprinter.c            |  0
 {pango => pango2}/json/gtkjsonprinterprivate.h     |  0
 {pango => pango2}/meson.build                      |  0
 {pango => pango2}/pango-attr-iterator-private.h    |  2 +-
 {pango => pango2}/pango-attr-iterator.c            |  0
 {pango => pango2}/pango-attr-iterator.h            |  2 +-
 {pango => pango2}/pango-attr-list-private.h        |  2 +-
 {pango => pango2}/pango-attr-list.c                |  0
 {pango => pango2}/pango-attr-list.h                |  2 +-
 {pango => pango2}/pango-attr-private.h             |  2 +-
 {pango => pango2}/pango-attr.c                     |  0
 {pango => pango2}/pango-attr.h                     |  4 +-
 {pango => pango2}/pango-attributes-private.h       |  0
 {pango => pango2}/pango-attributes.c               |  0
 {pango => pango2}/pango-attributes.h               |  6 +--
 {pango => pango2}/pango-bidi-private.h             |  4 +-
 {pango => pango2}/pango-bidi.c                     |  0
 {pango => pango2}/pango-break-table.h              |  0
 {pango => pango2}/pango-break.h                    |  2 +-
 {pango => pango2}/pango-color-table.h              |  0
 {pango => pango2}/pango-color.c                    |  0
 {pango => pango2}/pango-color.h                    |  2 +-
 {pango => pango2}/pango-context-private.h          |  2 +-
 {pango => pango2}/pango-context.c                  |  0
 {pango => pango2}/pango-context.h                  | 10 ++--
 {pango => pango2}/pango-direction.h                |  0
 {pango => pango2}/pango-emoji-private.h            |  0
 {pango => pango2}/pango-emoji-table.h              |  0
 {pango => pango2}/pango-emoji.c                    |  0
 {pango => pango2}/pango-enum-types.c.template      |  0
 {pango => pango2}/pango-enum-types.h.template      |  2 +-
 {pango => pango2}/pango-features.h.meson           |  0
 {pango => pango2}/pango-font-description-private.h |  0
 {pango => pango2}/pango-font-description.c         |  0
 {pango => pango2}/pango-font-description.h         |  2 +-
 {pango => pango2}/pango-font-face-private.h        |  4 +-
 {pango => pango2}/pango-font-face.c                |  0
 {pango => pango2}/pango-font-face.h                |  2 +-
 {pango => pango2}/pango-font-family-private.h      |  2 +-
 {pango => pango2}/pango-font-family.c              |  0
 {pango => pango2}/pango-font-family.h              |  2 +-
 {pango => pango2}/pango-font-metrics-private.h     |  2 +-
 {pango => pango2}/pango-font-metrics.c             |  0
 {pango => pango2}/pango-font-metrics.h             |  2 +-
 {pango => pango2}/pango-font-private.h             |  6 +--
 {pango => pango2}/pango-font.c                     |  0
 {pango => pango2}/pango-font.h                     |  8 +--
 {pango => pango2}/pango-fontmap-private.h          |  6 +--
 {pango => pango2}/pango-fontmap.c                  |  0
 {pango => pango2}/pango-fontmap.h                  |  6 +--
 {pango => pango2}/pango-fontset-cached-private.h   |  6 +--
 {pango => pango2}/pango-fontset-cached.c           |  0
 {pango => pango2}/pango-fontset-private.h          |  0
 {pango => pango2}/pango-fontset.c                  |  0
 {pango => pango2}/pango-fontset.h                  |  4 +-
 {pango => pango2}/pango-generic-family-private.h   |  0
 {pango => pango2}/pango-generic-family.c           |  0
 {pango => pango2}/pango-generic-family.h           |  0
 {pango => pango2}/pango-glyph-item-private.h       |  8 +--
 {pango => pango2}/pango-glyph-item.c               |  0
 {pango => pango2}/pango-glyph-iter-private.h       |  2 +-
 {pango => pango2}/pango-glyph.h                    |  6 +--
 {pango => pango2}/pango-gravity.c                  |  0
 {pango => pango2}/pango-gravity.h                  |  5 +-
 {pango => pango2}/pango-hbface-private.h           |  0
 {pango => pango2}/pango-hbface.c                   |  0
 {pango => pango2}/pango-hbface.h                   |  4 +-
 {pango => pango2}/pango-hbfamily-private.h         |  0
 {pango => pango2}/pango-hbfamily.c                 |  0
 {pango => pango2}/pango-hbfont-private.h           |  0
 {pango => pango2}/pango-hbfont.c                   |  0
 {pango => pango2}/pango-hbfont.h                   |  6 +--
 {pango => pango2}/pango-impl-utils.h               |  2 +-
 {pango => pango2}/pango-item-private.h             |  4 +-
 {pango => pango2}/pango-item.c                     |  0
 {pango => pango2}/pango-item.h                     |  6 +--
 {pango => pango2}/pango-language-sample-table.h    |  0
 {pango => pango2}/pango-language-set-private.h     |  0
 .../pango-language-set-simple-private.h            |  0
 {pango => pango2}/pango-language-set-simple.c      |  0
 {pango => pango2}/pango-language-set.c             |  0
 {pango => pango2}/pango-language.c                 |  0
 {pango => pango2}/pango-language.h                 |  6 +--
 {pango => pango2}/pango-layout.c                   |  0
 {pango => pango2}/pango-layout.h                   |  8 +--
 {pango => pango2}/pango-line-breaker.c             |  0
 {pango => pango2}/pango-line-breaker.h             |  8 +--
 {pango => pango2}/pango-line-iter-private.h        |  0
 {pango => pango2}/pango-line-iter.c                |  0
 {pango => pango2}/pango-line-iter.h                |  4 +-
 {pango => pango2}/pango-line-private.h             |  0
 {pango => pango2}/pango-line.c                     |  0
 {pango => pango2}/pango-line.h                     |  4 +-
 {pango => pango2}/pango-lines-private.h            |  0
 {pango => pango2}/pango-lines.c                    |  0
 {pango => pango2}/pango-lines.h                    |  4 +-
 {pango => pango2}/pango-markup.c                   |  0
 {pango => pango2}/pango-markup.h                   |  2 +-
 {pango => pango2}/pango-matrix.c                   |  0
 {pango => pango2}/pango-matrix.h                   |  3 +-
 {pango => pango2}/pango-renderer.c                 |  0
 {pango => pango2}/pango-renderer.h                 |  6 +--
 {pango => pango2}/pango-run-private.h              |  0
 {pango => pango2}/pango-run.c                      |  0
 {pango => pango2}/pango-run.h                      |  6 +--
 {pango => pango2}/pango-script-lang-table.h        |  0
 {pango => pango2}/pango-script-private.h           |  0
 {pango => pango2}/pango-script.c                   |  0
 {pango => pango2}/pango-script.h                   |  4 +-
 {pango => pango2}/pango-tabs.c                     |  0
 {pango => pango2}/pango-tabs.h                     |  2 +-
 {pango => pango2}/pango-trace-private.h            |  0
 {pango => pango2}/pango-trace.c                    |  0
 {pango => pango2}/pango-types.h                    | 12 ++---
 {pango => pango2}/pango-userface-private.h         |  0
 {pango => pango2}/pango-userface.c                 |  0
 {pango => pango2}/pango-userface.h                 |  6 +--
 {pango => pango2}/pango-userfont-private.h         |  0
 {pango => pango2}/pango-userfont.c                 |  0
 {pango => pango2}/pango-userfont.h                 |  4 +-
 {pango => pango2}/pango-utils.c                    |  0
 {pango => pango2}/pango-utils.h                    |  2 +-
 {pango => pango2}/pango-version-macros.h           |  2 +-
 pango2/pango.h                                     | 61 ++++++++++++++++++++++
 {pango => pango2}/pango.rc.in                      |  0
 {pango => pango2}/pangocairo-context.c             |  0
 {pango => pango2}/pangocairo-context.h             |  2 +-
 {pango => pango2}/pangocairo-dwrite-font.cpp       |  0
 {pango => pango2}/pangocairo-font.c                |  0
 {pango => pango2}/pangocairo-font.h                |  2 +-
 {pango => pango2}/pangocairo-private.h             |  4 +-
 {pango => pango2}/pangocairo-render.c              |  0
 {pango => pango2}/pangocairo-render.h              |  2 +-
 {pango => pango2}/pangocairo.h                     |  6 +--
 {pango => pango2}/pangocoretext-fontmap.c          |  0
 {pango => pango2}/pangocoretext-fontmap.h          |  2 +-
 {pango => pango2}/pangodwrite-fontmap.cpp          |  0
 {pango => pango2}/pangodwrite-fontmap.h            |  2 +-
 {pango => pango2}/pangofc-fontmap.c                |  0
 {pango => pango2}/pangofc-fontmap.h                |  2 +-
 {pango => pango2}/pangofc-language-set-private.h   |  0
 {pango => pango2}/pangofc-language-set.c           |  0
 {pango => pango2}/serializer.c                     | 24 ++++-----
 {pango => pango2}/shape.c                          |  0
 tests/cxx-test.cpp                                 |  4 +-
 tests/dump-boundaries.c                            |  2 +-
 tests/markup-parse.c                               |  2 +-
 tests/test-bidi.c                                  |  2 +-
 tests/test-break.c                                 |  2 +-
 tests/test-common.c                                |  2 +-
 tests/test-ellipsize.c                             |  2 +-
 tests/test-font.c                                  |  6 +--
 tests/test-fontsets.c                              |  2 +-
 tests/test-harfbuzz.c                              |  2 +-
 tests/test-itemize.c                               |  6 +--
 tests/test-layout.c                                |  2 +-
 tests/test-pangocairo-threads.c                    |  3 +-
 tests/test-shape.c                                 |  2 +-
 tests/testattributes.c                             |  4 +-
 tests/testboundaries.c                             |  2 +-
 tests/testboundaries_ucd.c                         |  2 +-
 tests/testcolor.c                                  |  2 +-
 tests/testcontext.c                                |  2 +-
 tests/testhbfont.c                                 |  2 +-
 tests/testiter.c                                   |  2 +-
 tests/testlanguage.c                               |  2 +-
 tests/testmatrix.c                                 |  2 +-
 tests/testmisc.c                                   |  4 +-
 tests/testrandom.c                                 |  2 +-
 tests/testscript.c                                 |  2 +-
 tests/testserialize.c                              |  2 +-
 tests/testtabs.c                                   |  2 +-
 tests/validate-log-attrs.c                         |  2 +-
 tests/validate-log-attrs.h                         |  2 +-
 tools/gen-script-for-lang.c                        |  6 +--
 utils/pango-list.c                                 |  4 +-
 utils/pango-segmentation.c                         |  2 +-
 utils/userfont.c                                   |  2 +-
 utils/viewer-pangocairo.c                          |  4 +-
 utils/viewer-pangoxft.c                            |  2 +-
 utils/viewer-render.c                              |  2 +-
 utils/viewer-render.h                              |  2 +-
 utils/viewer-x.h                                   |  2 +-
 utils/viewer.h                                     |  2 +-
 207 files changed, 256 insertions(+), 259 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4de603d0..cd6cbf6f5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ reference:
     - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Ddocumentation=true _build
     - ninja -C _build
     - mkdir -p _reference/
-    - mv _build/docs/Pango/ _reference/
+    - mv _build/docs/Pango2/ _reference/
   artifacts:
     paths:
       - _reference
diff --git a/docs/meson.build b/docs/meson.build
index 52ab55c37..208c47b3b 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -77,7 +77,7 @@ custom_target('pango-doc',
     gidocgen,
     'generate',
     '--quiet',
-    '--add-include-path=@0@'.format(meson.current_build_dir() / '../pango'),
+    '--add-include-path=@0@'.format(meson.current_build_dir() / '../pango2'),
     '--config', pango_toml,
     '--output-dir=@OUTPUT@',
     '--no-namespace-dir',
diff --git a/examples/cairoshape.c b/examples/cairoshape.c
index ea38e95df..a778cd760 100644
--- a/examples/cairoshape.c
+++ b/examples/cairoshape.c
@@ -20,7 +20,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 #define BULLET "•"
 #define HEART "♥"
diff --git a/examples/cairosimple.c b/examples/cairosimple.c
index 26c72a3f0..75bc30b35 100644
--- a/examples/cairosimple.c
+++ b/examples/cairosimple.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 #define RADIUS 150
 #define N_WORDS 10
diff --git a/examples/cairotwisted.c b/examples/cairotwisted.c
index ee9a6119c..d809703c8 100644
--- a/examples/cairotwisted.c
+++ b/examples/cairotwisted.c
@@ -11,7 +11,7 @@
 
 #include <math.h>
 #include <stdlib.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 void fancy_cairo_stroke (cairo_t *cr);
 void fancy_cairo_stroke_preserve (cairo_t *cr);
diff --git a/examples/columns.c b/examples/columns.c
index 5288e754b..514d71dd9 100644
--- a/examples/columns.c
+++ b/examples/columns.c
@@ -1,5 +1,4 @@
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 int
 main (int argc, char *argv[])
diff --git a/examples/first-steps.c b/examples/first-steps.c
index df9f460c9..50f1ab28d 100644
--- a/examples/first-steps.c
+++ b/examples/first-steps.c
@@ -1,5 +1,5 @@
 #include <math.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 #define SIZE 150
 
diff --git a/examples/parshape.c b/examples/parshape.c
index ad6e972b9..0f3f30966 100644
--- a/examples/parshape.c
+++ b/examples/parshape.c
@@ -1,5 +1,4 @@
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 static Pango2Lines *
 format_text (const char *text)
diff --git a/examples/userfont.c b/examples/userfont.c
index c9edaee1e..930ad2cf9 100644
--- a/examples/userfont.c
+++ b/examples/userfont.c
@@ -14,7 +14,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 static Pango2FontMap *fontmap;
 
diff --git a/meson.build b/meson.build
index 01cd8fd2b..1d371b5cb 100644
--- a/meson.build
+++ b/meson.build
@@ -366,9 +366,9 @@ pkgconfig = import('pkgconfig')
 configure_file(output: 'config.h', configuration: pango_conf)
 
 root_inc = include_directories('.')
-pango_inc = include_directories('pango')
+pango_inc = include_directories('pango2')
 
-subdir('pango')
+subdir('pango2')
 subdir('utils')
 subdir('examples')
 subdir('tests')
diff --git a/pango/break-arabic.c b/pango2/break-arabic.c
similarity index 100%
rename from pango/break-arabic.c
rename to pango2/break-arabic.c
diff --git a/pango/break-indic.c b/pango2/break-indic.c
similarity index 100%
rename from pango/break-indic.c
rename to pango2/break-indic.c
diff --git a/pango/break-latin.c b/pango2/break-latin.c
similarity index 100%
rename from pango/break-latin.c
rename to pango2/break-latin.c
diff --git a/pango/break-thai.c b/pango2/break-thai.c
similarity index 100%
rename from pango/break-thai.c
rename to pango2/break-thai.c
diff --git a/pango/break.c b/pango2/break.c
similarity index 100%
rename from pango/break.c
rename to pango2/break.c
diff --git a/pango/ellipsize.c b/pango2/ellipsize.c
similarity index 100%
rename from pango/ellipsize.c
rename to pango2/ellipsize.c
diff --git a/pango/emoji_presentation_scanner.c b/pango2/emoji_presentation_scanner.c
similarity index 100%
rename from pango/emoji_presentation_scanner.c
rename to pango2/emoji_presentation_scanner.c
diff --git a/pango/emoji_presentation_scanner.rl b/pango2/emoji_presentation_scanner.rl
similarity index 100%
rename from pango/emoji_presentation_scanner.rl
rename to pango2/emoji_presentation_scanner.rl
diff --git a/pango/glyphstring.c b/pango2/glyphstring.c
similarity index 100%
rename from pango/glyphstring.c
rename to pango2/glyphstring.c
diff --git a/pango/itemize.c b/pango2/itemize.c
similarity index 100%
rename from pango/itemize.c
rename to pango2/itemize.c
diff --git a/pango/json/gtkjsonparser.c b/pango2/json/gtkjsonparser.c
similarity index 100%
rename from pango/json/gtkjsonparser.c
rename to pango2/json/gtkjsonparser.c
diff --git a/pango/json/gtkjsonparserprivate.h b/pango2/json/gtkjsonparserprivate.h
similarity index 100%
rename from pango/json/gtkjsonparserprivate.h
rename to pango2/json/gtkjsonparserprivate.h
diff --git a/pango/json/gtkjsonprinter.c b/pango2/json/gtkjsonprinter.c
similarity index 100%
rename from pango/json/gtkjsonprinter.c
rename to pango2/json/gtkjsonprinter.c
diff --git a/pango/json/gtkjsonprinterprivate.h b/pango2/json/gtkjsonprinterprivate.h
similarity index 100%
rename from pango/json/gtkjsonprinterprivate.h
rename to pango2/json/gtkjsonprinterprivate.h
diff --git a/pango/meson.build b/pango2/meson.build
similarity index 100%
rename from pango/meson.build
rename to pango2/meson.build
diff --git a/pango/pango-attr-iterator-private.h b/pango2/pango-attr-iterator-private.h
similarity index 96%
rename from pango/pango-attr-iterator-private.h
rename to pango2/pango-attr-iterator-private.h
index 30d64ede6..5fead4546 100644
--- a/pango/pango-attr-iterator-private.h
+++ b/pango2/pango-attr-iterator-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attr-iterator.h>
+#include "pango-attr-iterator.h"
 
 
 struct _Pango2AttrIterator
diff --git a/pango/pango-attr-iterator.c b/pango2/pango-attr-iterator.c
similarity index 100%
rename from pango/pango-attr-iterator.c
rename to pango2/pango-attr-iterator.c
diff --git a/pango/pango-attr-iterator.h b/pango2/pango-attr-iterator.h
similarity index 98%
rename from pango/pango-attr-iterator.h
rename to pango2/pango-attr-iterator.h
index 283b710aa..f22ba4996 100644
--- a/pango/pango-attr-iterator.h
+++ b/pango2/pango-attr-iterator.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attr-list.h>
+#include <pango2/pango-attr-list.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-attr-list-private.h b/pango2/pango-attr-list-private.h
similarity index 97%
rename from pango/pango-attr-list-private.h
rename to pango2/pango-attr-list-private.h
index fb007beb4..e010febd6 100644
--- a/pango/pango-attr-list-private.h
+++ b/pango2/pango-attr-list-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attr-list.h>
+#include "pango-attr-list.h"
 
 
 struct _Pango2AttrList
diff --git a/pango/pango-attr-list.c b/pango2/pango-attr-list.c
similarity index 100%
rename from pango/pango-attr-list.c
rename to pango2/pango-attr-list.c
diff --git a/pango/pango-attr-list.h b/pango2/pango-attr-list.h
similarity index 99%
rename from pango/pango-attr-list.h
rename to pango2/pango-attr-list.h
index faf0443d6..e51dc5ff0 100644
--- a/pango/pango-attr-list.h
+++ b/pango2/pango-attr-list.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attributes.h>
+#include <pango2/pango-attributes.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-attr-private.h b/pango2/pango-attr-private.h
similarity index 97%
rename from pango/pango-attr-private.h
rename to pango2/pango-attr-private.h
index 9e37ce409..f8152f8dd 100644
--- a/pango/pango-attr-private.h
+++ b/pango2/pango-attr-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attr.h>
+#include "pango-attr.h"
 
 struct _Pango2Attribute
 {
diff --git a/pango/pango-attr.c b/pango2/pango-attr.c
similarity index 100%
rename from pango/pango-attr.c
rename to pango2/pango-attr.c
diff --git a/pango/pango-attr.h b/pango2/pango-attr.h
similarity index 99%
rename from pango/pango-attr.h
rename to pango2/pango-attr.h
index 08fb932ba..1dda2924a 100644
--- a/pango/pango-attr.h
+++ b/pango2/pango-attr.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-font.h>
-#include <pango/pango-color.h>
+#include <pango2/pango-font.h>
+#include <pango2/pango-color.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-attributes-private.h b/pango2/pango-attributes-private.h
similarity index 100%
rename from pango/pango-attributes-private.h
rename to pango2/pango-attributes-private.h
diff --git a/pango/pango-attributes.c b/pango2/pango-attributes.c
similarity index 100%
rename from pango/pango-attributes.c
rename to pango2/pango-attributes.c
diff --git a/pango/pango-attributes.h b/pango2/pango-attributes.h
similarity index 99%
rename from pango/pango-attributes.h
rename to pango2/pango-attributes.h
index 744e1b361..98e89d7ba 100644
--- a/pango/pango-attributes.h
+++ b/pango2/pango-attributes.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-font.h>
-#include <pango/pango-color.h>
-#include <pango/pango-attr.h>
+#include <pango2/pango-font.h>
+#include <pango2/pango-color.h>
+#include <pango2/pango-attr.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-bidi-private.h b/pango2/pango-bidi-private.h
similarity index 94%
rename from pango/pango-bidi-private.h
rename to pango2/pango-bidi-private.h
index 584678bd9..3a0b1ab50 100644
--- a/pango/pango-bidi-private.h
+++ b/pango2/pango-bidi-private.h
@@ -21,8 +21,8 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <pango/pango-font.h>
-#include <pango/pango-direction.h>
+#include "pango-font.h"
+#include "pango-direction.h"
 
 guint8 *         pango2_log2vis_get_embedding_levels (const char      *text,
                                                       int              length,
diff --git a/pango/pango-bidi.c b/pango2/pango-bidi.c
similarity index 100%
rename from pango/pango-bidi.c
rename to pango2/pango-bidi.c
diff --git a/pango/pango-break-table.h b/pango2/pango-break-table.h
similarity index 100%
rename from pango/pango-break-table.h
rename to pango2/pango-break-table.h
diff --git a/pango/pango-break.h b/pango2/pango-break.h
similarity index 99%
rename from pango/pango-break.h
rename to pango2/pango-break.h
index ae1e71850..e3e479e4d 100644
--- a/pango/pango-break.h
+++ b/pango2/pango-break.h
@@ -20,7 +20,7 @@
 #pragma once
 
 #include <glib.h>
-#include <pango/pango-item.h>
+#include <pango2/pango-item.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-color-table.h b/pango2/pango-color-table.h
similarity index 100%
rename from pango/pango-color-table.h
rename to pango2/pango-color-table.h
diff --git a/pango/pango-color.c b/pango2/pango-color.c
similarity index 100%
rename from pango/pango-color.c
rename to pango2/pango-color.c
diff --git a/pango/pango-color.h b/pango2/pango-color.h
similarity index 98%
rename from pango/pango-color.h
rename to pango2/pango-color.h
index 0e9af4743..f62a3dd52 100644
--- a/pango/pango-color.h
+++ b/pango2/pango-color.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 #include <glib-object.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-context-private.h b/pango2/pango-context-private.h
similarity index 97%
rename from pango/pango-context-private.h
rename to pango2/pango-context-private.h
index 32c1e9841..07b4b506b 100644
--- a/pango/pango-context-private.h
+++ b/pango2/pango-context-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-context.h>
+#include "pango-context.h"
 
 #ifdef HAVE_CAIRO
 #include <cairo.h>
diff --git a/pango/pango-context.c b/pango2/pango-context.c
similarity index 100%
rename from pango/pango-context.c
rename to pango2/pango-context.c
diff --git a/pango/pango-context.h b/pango2/pango-context.h
similarity index 97%
rename from pango/pango-context.h
rename to pango2/pango-context.h
index 70bc03c55..902e840dc 100644
--- a/pango/pango-context.h
+++ b/pango2/pango-context.h
@@ -19,11 +19,11 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-font.h>
-#include <pango/pango-fontmap.h>
-#include <pango/pango-attributes.h>
-#include <pango/pango-direction.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-font.h>
+#include <pango2/pango-fontmap.h>
+#include <pango2/pango-attributes.h>
+#include <pango2/pango-direction.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-direction.h b/pango2/pango-direction.h
similarity index 100%
rename from pango/pango-direction.h
rename to pango2/pango-direction.h
diff --git a/pango/pango-emoji-private.h b/pango2/pango-emoji-private.h
similarity index 100%
rename from pango/pango-emoji-private.h
rename to pango2/pango-emoji-private.h
diff --git a/pango/pango-emoji-table.h b/pango2/pango-emoji-table.h
similarity index 100%
rename from pango/pango-emoji-table.h
rename to pango2/pango-emoji-table.h
diff --git a/pango/pango-emoji.c b/pango2/pango-emoji.c
similarity index 100%
rename from pango/pango-emoji.c
rename to pango2/pango-emoji.c
diff --git a/pango/pango-enum-types.c.template b/pango2/pango-enum-types.c.template
similarity index 100%
rename from pango/pango-enum-types.c.template
rename to pango2/pango-enum-types.c.template
diff --git a/pango/pango-enum-types.h.template b/pango2/pango-enum-types.h.template
similarity index 91%
rename from pango/pango-enum-types.h.template
rename to pango2/pango-enum-types.h.template
index e511f9c2c..ff369b96b 100644
--- a/pango/pango-enum-types.h.template
+++ b/pango2/pango-enum-types.h.template
@@ -3,7 +3,7 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-version-macros.h>
+#include <pango2/pango-version-macros.h>
 
 G_BEGIN_DECLS
 /*** END file-header ***/
diff --git a/pango/pango-features.h.meson b/pango2/pango-features.h.meson
similarity index 100%
rename from pango/pango-features.h.meson
rename to pango2/pango-features.h.meson
diff --git a/pango/pango-font-description-private.h b/pango2/pango-font-description-private.h
similarity index 100%
rename from pango/pango-font-description-private.h
rename to pango2/pango-font-description-private.h
diff --git a/pango/pango-font-description.c b/pango2/pango-font-description.c
similarity index 100%
rename from pango/pango-font-description.c
rename to pango2/pango-font-description.c
diff --git a/pango/pango-font-description.h b/pango2/pango-font-description.h
similarity index 99%
rename from pango/pango-font-description.h
rename to pango2/pango-font-description.h
index 414696b1e..160ee50dc 100644
--- a/pango/pango-font-description.h
+++ b/pango2/pango-font-description.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 #include <glib-object.h>
 #include <hb.h>
diff --git a/pango/pango-font-face-private.h b/pango2/pango-font-face-private.h
similarity index 97%
rename from pango/pango-font-face-private.h
rename to pango2/pango-font-face-private.h
index 6c0172a53..b7031a26b 100644
--- a/pango/pango-font-face-private.h
+++ b/pango2/pango-font-face-private.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-font-face.h>
-#include <pango/pango-font-description.h>
+#include "pango-font-face.h"
+#include "pango-font-description.h"
 
 
 struct _Pango2FontFace
diff --git a/pango/pango-font-face.c b/pango2/pango-font-face.c
similarity index 100%
rename from pango/pango-font-face.c
rename to pango2/pango-font-face.c
diff --git a/pango/pango-font-face.h b/pango2/pango-font-face.h
similarity index 98%
rename from pango/pango-font-face.h
rename to pango2/pango-font-face.h
index 37c1f18af..dea2b6dfc 100644
--- a/pango/pango-font-face.h
+++ b/pango2/pango-font-face.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 #include <glib-object.h>
 
diff --git a/pango/pango-font-family-private.h b/pango2/pango-font-family-private.h
similarity index 98%
rename from pango/pango-font-family-private.h
rename to pango2/pango-font-family-private.h
index 6875678c8..2c2c28faa 100644
--- a/pango/pango-font-family-private.h
+++ b/pango2/pango-font-family-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-font-family.h>
+#include "pango-font-family.h"
 
 
 typedef struct _Pango2FontFamilyClass Pango2FontFamilyClass;
diff --git a/pango/pango-font-family.c b/pango2/pango-font-family.c
similarity index 100%
rename from pango/pango-font-family.c
rename to pango2/pango-font-family.c
diff --git a/pango/pango-font-family.h b/pango2/pango-font-family.h
similarity index 97%
rename from pango/pango-font-family.h
rename to pango2/pango-font-family.h
index 667bb9b93..f6896530b 100644
--- a/pango/pango-font-family.h
+++ b/pango2/pango-font-family.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 #include <glib-object.h>
 
diff --git a/pango/pango-font-metrics-private.h b/pango2/pango-font-metrics-private.h
similarity index 96%
rename from pango/pango-font-metrics-private.h
rename to pango2/pango-font-metrics-private.h
index c01e295a6..3ad27a3ae 100644
--- a/pango/pango-font-metrics-private.h
+++ b/pango2/pango-font-metrics-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-font-metrics.h>
+#include "pango-font-metrics.h"
 
 struct _Pango2FontMetrics
 {
diff --git a/pango/pango-font-metrics.c b/pango2/pango-font-metrics.c
similarity index 100%
rename from pango/pango-font-metrics.c
rename to pango2/pango-font-metrics.c
diff --git a/pango/pango-font-metrics.h b/pango2/pango-font-metrics.h
similarity index 99%
rename from pango/pango-font-metrics.h
rename to pango2/pango-font-metrics.h
index 9d89a791b..e138be7dd 100644
--- a/pango/pango-font-metrics.h
+++ b/pango2/pango-font-metrics.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 #include <glib-object.h>
 
diff --git a/pango/pango-font-private.h b/pango2/pango-font-private.h
similarity index 97%
rename from pango/pango-font-private.h
rename to pango2/pango-font-private.h
index 8d5e067b6..ca8d3a775 100644
--- a/pango/pango-font-private.h
+++ b/pango2/pango-font-private.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-font-family.h>
-#include <pango/pango-font.h>
-#include <pango/pango-types.h>
+#include "pango-font-family.h"
+#include "pango-font.h"
+#include "pango-types.h"
 
 #include <glib-object.h>
 
diff --git a/pango/pango-font.c b/pango2/pango-font.c
similarity index 100%
rename from pango/pango-font.c
rename to pango2/pango-font.c
diff --git a/pango/pango-font.h b/pango2/pango-font.h
similarity index 94%
rename from pango/pango-font.h
rename to pango2/pango-font.h
index 6d144647e..63e983514 100644
--- a/pango/pango-font.h
+++ b/pango2/pango-font.h
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-font-description.h>
-#include <pango/pango-font-metrics.h>
-#include <pango/pango-font-family.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-font-description.h>
+#include <pango2/pango-font-metrics.h>
+#include <pango2/pango-font-family.h>
 
 #include <glib-object.h>
 #include <hb.h>
diff --git a/pango/pango-fontmap-private.h b/pango2/pango-fontmap-private.h
similarity index 95%
rename from pango/pango-fontmap-private.h
rename to pango2/pango-fontmap-private.h
index 4a80f00ce..b83888360 100644
--- a/pango/pango-fontmap-private.h
+++ b/pango2/pango-fontmap-private.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-fontmap.h>
-#include <pango/pango-hbfamily-private.h>
-#include <pango/pango-fontmap-private.h>
+#include "pango-fontmap.h"
+#include "pango-hbfamily-private.h"
+#include "pango-fontmap-private.h"
 
 
 G_BEGIN_DECLS
diff --git a/pango/pango-fontmap.c b/pango2/pango-fontmap.c
similarity index 100%
rename from pango/pango-fontmap.c
rename to pango2/pango-fontmap.c
diff --git a/pango/pango-fontmap.h b/pango2/pango-fontmap.h
similarity index 97%
rename from pango/pango-fontmap.h
rename to pango2/pango-fontmap.h
index 752b992e6..a8e9a778d 100644
--- a/pango/pango-fontmap.h
+++ b/pango2/pango-fontmap.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-fontset.h>
-#include <pango/pango-hbface.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-fontset.h>
+#include <pango2/pango-hbface.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-fontset-cached-private.h b/pango2/pango-fontset-cached-private.h
similarity index 95%
rename from pango/pango-fontset-cached-private.h
rename to pango2/pango-fontset-cached-private.h
index 23309bce2..95059a791 100644
--- a/pango/pango-fontset-cached-private.h
+++ b/pango2/pango-fontset-cached-private.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-fontset-private.h>
-#include <pango/pango-generic-family.h>
+#include "pango-types.h"
+#include "pango-fontset-private.h"
+#include "pango-generic-family.h"
 #include <glib-object.h>
 
 #ifdef HAVE_CAIRO
diff --git a/pango/pango-fontset-cached.c b/pango2/pango-fontset-cached.c
similarity index 100%
rename from pango/pango-fontset-cached.c
rename to pango2/pango-fontset-cached.c
diff --git a/pango/pango-fontset-private.h b/pango2/pango-fontset-private.h
similarity index 100%
rename from pango/pango-fontset-private.h
rename to pango2/pango-fontset-private.h
diff --git a/pango/pango-fontset.c b/pango2/pango-fontset.c
similarity index 100%
rename from pango/pango-fontset.c
rename to pango2/pango-fontset.c
diff --git a/pango/pango-fontset.h b/pango2/pango-fontset.h
similarity index 96%
rename from pango/pango-fontset.h
rename to pango2/pango-fontset.h
index 144c4de8c..5e6ed7163 100644
--- a/pango/pango-fontset.h
+++ b/pango2/pango-fontset.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-font-metrics.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-font-metrics.h>
 
 #include <glib-object.h>
 
diff --git a/pango/pango-generic-family-private.h b/pango2/pango-generic-family-private.h
similarity index 100%
rename from pango/pango-generic-family-private.h
rename to pango2/pango-generic-family-private.h
diff --git a/pango/pango-generic-family.c b/pango2/pango-generic-family.c
similarity index 100%
rename from pango/pango-generic-family.c
rename to pango2/pango-generic-family.c
diff --git a/pango/pango-generic-family.h b/pango2/pango-generic-family.h
similarity index 100%
rename from pango/pango-generic-family.h
rename to pango2/pango-generic-family.h
diff --git a/pango/pango-glyph-item-private.h b/pango2/pango-glyph-item-private.h
similarity index 96%
rename from pango/pango-glyph-item-private.h
rename to pango2/pango-glyph-item-private.h
index 71e07d1c7..1fa80871f 100644
--- a/pango/pango-glyph-item-private.h
+++ b/pango2/pango-glyph-item-private.h
@@ -19,10 +19,10 @@
 
 #pragma once
 
-#include <pango/pango-attributes.h>
-#include <pango/pango-break.h>
-#include <pango/pango-item.h>
-#include <pango/pango-glyph.h>
+#include "pango-attributes.h"
+#include "pango-break.h"
+#include "pango-item.h"
+#include "pango-glyph.h"
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-glyph-item.c b/pango2/pango-glyph-item.c
similarity index 100%
rename from pango/pango-glyph-item.c
rename to pango2/pango-glyph-item.c
diff --git a/pango/pango-glyph-iter-private.h b/pango2/pango-glyph-iter-private.h
similarity index 98%
rename from pango/pango-glyph-iter-private.h
rename to pango2/pango-glyph-iter-private.h
index 35c038f0a..5321b33d3 100644
--- a/pango/pango-glyph-iter-private.h
+++ b/pango2/pango-glyph-iter-private.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-glyph-item-private.h>
+#include "pango-glyph-item-private.h"
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-glyph.h b/pango2/pango-glyph.h
similarity index 99%
rename from pango/pango-glyph.h
rename to pango2/pango-glyph.h
index d2b0770b0..7cc014a29 100644
--- a/pango/pango-glyph.h
+++ b/pango2/pango-glyph.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-#include <pango/pango-break.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-item.h>
+#include <pango2/pango-break.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-gravity.c b/pango2/pango-gravity.c
similarity index 100%
rename from pango/pango-gravity.c
rename to pango2/pango-gravity.c
diff --git a/pango/pango-gravity.h b/pango2/pango-gravity.h
similarity index 98%
rename from pango/pango-gravity.h
rename to pango2/pango-gravity.h
index c12fe1da0..b3e79d3d8 100644
--- a/pango/pango-gravity.h
+++ b/pango2/pango-gravity.h
@@ -21,6 +21,7 @@
 
 #include <glib.h>
 
+
 G_BEGIN_DECLS
 
 /**
@@ -102,8 +103,8 @@ typedef enum {
 #define PANGO2_GRAVITY_IS_IMPROPER(gravity) \
         ((gravity) == PANGO2_GRAVITY_WEST || (gravity) == PANGO2_GRAVITY_NORTH)
 
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
+#include <pango2/pango-matrix.h>
+#include <pango2/pango-script.h>
 
 PANGO2_AVAILABLE_IN_ALL
 double                  pango2_gravity_to_rotation    (Pango2Gravity       gravity) G_GNUC_CONST;
diff --git a/pango/pango-hbface-private.h b/pango2/pango-hbface-private.h
similarity index 100%
rename from pango/pango-hbface-private.h
rename to pango2/pango-hbface-private.h
diff --git a/pango/pango-hbface.c b/pango2/pango-hbface.c
similarity index 100%
rename from pango/pango-hbface.c
rename to pango2/pango-hbface.c
diff --git a/pango/pango-hbface.h b/pango2/pango-hbface.h
similarity index 98%
rename from pango/pango-hbface.h
rename to pango2/pango-hbface.h
index 356db1e4d..2d4662d7a 100644
--- a/pango/pango-hbface.h
+++ b/pango2/pango-hbface.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-font-face.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-font-face.h>
 
 #include <hb.h>
 
diff --git a/pango/pango-hbfamily-private.h b/pango2/pango-hbfamily-private.h
similarity index 100%
rename from pango/pango-hbfamily-private.h
rename to pango2/pango-hbfamily-private.h
diff --git a/pango/pango-hbfamily.c b/pango2/pango-hbfamily.c
similarity index 100%
rename from pango/pango-hbfamily.c
rename to pango2/pango-hbfamily.c
diff --git a/pango/pango-hbfont-private.h b/pango2/pango-hbfont-private.h
similarity index 100%
rename from pango/pango-hbfont-private.h
rename to pango2/pango-hbfont-private.h
diff --git a/pango/pango-hbfont.c b/pango2/pango-hbfont.c
similarity index 100%
rename from pango/pango-hbfont.c
rename to pango2/pango-hbfont.c
diff --git a/pango/pango-hbfont.h b/pango2/pango-hbfont.h
similarity index 96%
rename from pango/pango-hbfont.h
rename to pango2/pango-hbfont.h
index 26fd4d432..1b98cd49f 100644
--- a/pango/pango-hbfont.h
+++ b/pango2/pango-hbfont.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-font.h>
-#include <pango/pango-hbface.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-font.h>
+#include <pango2/pango-hbface.h>
 #include <hb.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-impl-utils.h b/pango2/pango-impl-utils.h
similarity index 99%
rename from pango/pango-impl-utils.h
rename to pango2/pango-impl-utils.h
index 3723fcfba..cc21bc0ba 100644
--- a/pango/pango-impl-utils.h
+++ b/pango2/pango-impl-utils.h
@@ -21,7 +21,7 @@
 
 #include <glib.h>
 #include <glib-object.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-item-private.h b/pango2/pango-item-private.h
similarity index 98%
rename from pango/pango-item-private.h
rename to pango2/pango-item-private.h
index da7d8ae4c..13925b32b 100644
--- a/pango/pango-item-private.h
+++ b/pango2/pango-item-private.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-item.h>
-#include <pango/pango-break.h>
+#include "pango-item.h"
+#include "pango-break.h"
 
 /*< private >
  * Pango2Analysis:
diff --git a/pango/pango-item.c b/pango2/pango-item.c
similarity index 100%
rename from pango/pango-item.c
rename to pango2/pango-item.c
diff --git a/pango/pango-item.h b/pango2/pango-item.h
similarity index 97%
rename from pango/pango-item.h
rename to pango2/pango-item.h
index 09b8e76ce..c5dccfd27 100644
--- a/pango/pango-item.h
+++ b/pango2/pango-item.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-attr-list.h>
-#include <pango/pango-attr-list.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-attr-list.h>
+#include <pango2/pango-attr-list.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-language-sample-table.h b/pango2/pango-language-sample-table.h
similarity index 100%
rename from pango/pango-language-sample-table.h
rename to pango2/pango-language-sample-table.h
diff --git a/pango/pango-language-set-private.h b/pango2/pango-language-set-private.h
similarity index 100%
rename from pango/pango-language-set-private.h
rename to pango2/pango-language-set-private.h
diff --git a/pango/pango-language-set-simple-private.h b/pango2/pango-language-set-simple-private.h
similarity index 100%
rename from pango/pango-language-set-simple-private.h
rename to pango2/pango-language-set-simple-private.h
diff --git a/pango/pango-language-set-simple.c b/pango2/pango-language-set-simple.c
similarity index 100%
rename from pango/pango-language-set-simple.c
rename to pango2/pango-language-set-simple.c
diff --git a/pango/pango-language-set.c b/pango2/pango-language-set.c
similarity index 100%
rename from pango/pango-language-set.c
rename to pango2/pango-language-set.c
diff --git a/pango/pango-language.c b/pango2/pango-language.c
similarity index 100%
rename from pango/pango-language.c
rename to pango2/pango-language.c
diff --git a/pango/pango-language.h b/pango2/pango-language.h
similarity index 95%
rename from pango/pango-language.h
rename to pango2/pango-language.h
index 760b9e8e6..f4484fd97 100644
--- a/pango/pango-language.h
+++ b/pango2/pango-language.h
@@ -22,9 +22,9 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <pango/pango-types.h>
-#include <pango/pango-version-macros.h>
-#include <pango/pango-script.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-version-macros.h>
+#include <pango2/pango-script.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-layout.c b/pango2/pango-layout.c
similarity index 100%
rename from pango/pango-layout.c
rename to pango2/pango-layout.c
diff --git a/pango/pango-layout.h b/pango2/pango-layout.h
similarity index 98%
rename from pango/pango-layout.h
rename to pango2/pango-layout.h
index 38b3cd1ad..f3ad61dd2 100644
--- a/pango/pango-layout.h
+++ b/pango2/pango-layout.h
@@ -20,10 +20,10 @@
 #pragma once
 
 #include <glib-object.h>
-#include <pango/pango-types.h>
-#include <pango/pango-attributes.h>
-#include <pango/pango-lines.h>
-#include <pango/pango-tabs.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-attributes.h>
+#include <pango2/pango-lines.h>
+#include <pango2/pango-tabs.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-line-breaker.c b/pango2/pango-line-breaker.c
similarity index 100%
rename from pango/pango-line-breaker.c
rename to pango2/pango-line-breaker.c
diff --git a/pango/pango-line-breaker.h b/pango2/pango-line-breaker.h
similarity index 96%
rename from pango/pango-line-breaker.h
rename to pango2/pango-line-breaker.h
index c7e362bbd..666f67f5c 100644
--- a/pango/pango-line-breaker.h
+++ b/pango2/pango-line-breaker.h
@@ -20,10 +20,10 @@
 #pragma once
 
 #include <glib-object.h>
-#include <pango/pango-types.h>
-#include <pango/pango-break.h>
-#include <pango/pango-layout.h>
-#include <pango/pango-line.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-break.h>
+#include <pango2/pango-layout.h>
+#include <pango2/pango-line.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-line-iter-private.h b/pango2/pango-line-iter-private.h
similarity index 100%
rename from pango/pango-line-iter-private.h
rename to pango2/pango-line-iter-private.h
diff --git a/pango/pango-line-iter.c b/pango2/pango-line-iter.c
similarity index 100%
rename from pango/pango-line-iter.c
rename to pango2/pango-line-iter.c
diff --git a/pango/pango-line-iter.h b/pango2/pango-line-iter.h
similarity index 98%
rename from pango/pango-line-iter.h
rename to pango2/pango-line-iter.h
index 8923c134d..59a4f5c2b 100644
--- a/pango/pango-line-iter.h
+++ b/pango2/pango-line-iter.h
@@ -21,8 +21,8 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-types.h>
-#include <pango/pango-lines.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-lines.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-line-private.h b/pango2/pango-line-private.h
similarity index 100%
rename from pango/pango-line-private.h
rename to pango2/pango-line-private.h
diff --git a/pango/pango-line.c b/pango2/pango-line.c
similarity index 100%
rename from pango/pango-line.c
rename to pango2/pango-line.c
diff --git a/pango/pango-line.h b/pango2/pango-line.h
similarity index 98%
rename from pango/pango-line.h
rename to pango2/pango-line.h
index c2c85195f..31458d415 100644
--- a/pango/pango-line.h
+++ b/pango2/pango-line.h
@@ -21,8 +21,8 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-types.h>
-#include <pango/pango-run.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-run.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-lines-private.h b/pango2/pango-lines-private.h
similarity index 100%
rename from pango/pango-lines-private.h
rename to pango2/pango-lines-private.h
diff --git a/pango/pango-lines.c b/pango2/pango-lines.c
similarity index 100%
rename from pango/pango-lines.c
rename to pango2/pango-lines.c
diff --git a/pango/pango-lines.h b/pango2/pango-lines.h
similarity index 99%
rename from pango/pango-lines.h
rename to pango2/pango-lines.h
index 83abaa979..f2a89f437 100644
--- a/pango/pango-lines.h
+++ b/pango2/pango-lines.h
@@ -21,8 +21,8 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-types.h>
-#include <pango/pango-line.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-line.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-markup.c b/pango2/pango-markup.c
similarity index 100%
rename from pango/pango-markup.c
rename to pango2/pango-markup.c
diff --git a/pango/pango-markup.h b/pango2/pango-markup.h
similarity index 98%
rename from pango/pango-markup.h
rename to pango2/pango-markup.h
index 28ba98c0b..8bc37af7d 100644
--- a/pango/pango-markup.h
+++ b/pango2/pango-markup.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-attr-list.h>
+#include <pango2/pango-attr-list.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-matrix.c b/pango2/pango-matrix.c
similarity index 100%
rename from pango/pango-matrix.c
rename to pango2/pango-matrix.c
diff --git a/pango/pango-matrix.h b/pango2/pango-matrix.h
similarity index 98%
rename from pango/pango-matrix.h
rename to pango2/pango-matrix.h
index 800d5299c..0456a4fc3 100644
--- a/pango/pango-matrix.h
+++ b/pango2/pango-matrix.h
@@ -70,8 +70,7 @@ struct _Pango2Matrix
  */
 #define PANGO2_MATRIX_INIT { 1., 0., 0., 1., 0., 0. }
 
-/* for Pango2Rectangle */
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 PANGO2_AVAILABLE_IN_ALL
 GType                   pango2_matrix_get_type                  (void) G_GNUC_CONST;
diff --git a/pango/pango-renderer.c b/pango2/pango-renderer.c
similarity index 100%
rename from pango/pango-renderer.c
rename to pango2/pango-renderer.c
diff --git a/pango/pango-renderer.h b/pango2/pango-renderer.h
similarity index 99%
rename from pango/pango-renderer.h
rename to pango2/pango-renderer.h
index b9d361d62..e641bb3ed 100644
--- a/pango/pango-renderer.h
+++ b/pango2/pango-renderer.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-layout.h>
-#include <pango/pango-lines.h>
-#include <pango/pango-glyph.h>
+#include <pango2/pango-layout.h>
+#include <pango2/pango-lines.h>
+#include <pango2/pango-glyph.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-run-private.h b/pango2/pango-run-private.h
similarity index 100%
rename from pango/pango-run-private.h
rename to pango2/pango-run-private.h
diff --git a/pango/pango-run.c b/pango2/pango-run.c
similarity index 100%
rename from pango/pango-run.c
rename to pango2/pango-run.c
diff --git a/pango/pango-run.h b/pango2/pango-run.h
similarity index 93%
rename from pango/pango-run.h
rename to pango2/pango-run.h
index fd090ae40..26760cb3e 100644
--- a/pango/pango-run.h
+++ b/pango2/pango-run.h
@@ -20,9 +20,9 @@
 #pragma once
 
 #include <glib-object.h>
-#include <pango/pango-types.h>
-#include <pango/pango-item.h>
-#include <pango/pango-glyph.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-item.h>
+#include <pango2/pango-glyph.h>
 
 PANGO2_AVAILABLE_IN_ALL
 Pango2Item *            pango2_run_get_item     (Pango2Run         *run);
diff --git a/pango/pango-script-lang-table.h b/pango2/pango-script-lang-table.h
similarity index 100%
rename from pango/pango-script-lang-table.h
rename to pango2/pango-script-lang-table.h
diff --git a/pango/pango-script-private.h b/pango2/pango-script-private.h
similarity index 100%
rename from pango/pango-script-private.h
rename to pango2/pango-script-private.h
diff --git a/pango/pango-script.c b/pango2/pango-script.c
similarity index 100%
rename from pango/pango-script.c
rename to pango2/pango-script.c
diff --git a/pango/pango-script.h b/pango2/pango-script.h
similarity index 96%
rename from pango/pango-script.h
rename to pango2/pango-script.h
index ad4e5cbfd..abe822c86 100644
--- a/pango/pango-script.h
+++ b/pango2/pango-script.h
@@ -21,8 +21,8 @@
 
 #include <glib-object.h>
 
-#include <pango/pango-language.h>
-#include <pango/pango-version-macros.h>
+#include <pango2/pango-language.h>
+#include <pango2/pango-version-macros.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-tabs.c b/pango2/pango-tabs.c
similarity index 100%
rename from pango/pango-tabs.c
rename to pango2/pango-tabs.c
diff --git a/pango/pango-tabs.h b/pango2/pango-tabs.h
similarity index 99%
rename from pango/pango-tabs.h
rename to pango2/pango-tabs.h
index e98fdef11..b53037896 100644
--- a/pango/pango-tabs.h
+++ b/pango2/pango-tabs.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
+#include <pango2/pango-types.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-trace-private.h b/pango2/pango-trace-private.h
similarity index 100%
rename from pango/pango-trace-private.h
rename to pango2/pango-trace-private.h
diff --git a/pango/pango-trace.c b/pango2/pango-trace.c
similarity index 100%
rename from pango/pango-trace.c
rename to pango2/pango-trace.c
diff --git a/pango/pango-types.h b/pango2/pango-types.h
similarity index 98%
rename from pango/pango-types.h
rename to pango2/pango-types.h
index 373ace789..003dec8e7 100644
--- a/pango/pango-types.h
+++ b/pango2/pango-types.h
@@ -22,7 +22,7 @@
 #include <glib.h>
 #include <glib-object.h>
 
-#include <pango/pango-version-macros.h>
+#include <pango2/pango-version-macros.h>
 
 G_BEGIN_DECLS
 
@@ -227,11 +227,11 @@ void pango2_extents_to_pixels (Pango2Rectangle *inclusive,
                                Pango2Rectangle *nearest);
 
 
-#include <pango/pango-direction.h>
-#include <pango/pango-gravity.h>
-#include <pango/pango-language.h>
-#include <pango/pango-matrix.h>
-#include <pango/pango-script.h>
+#include <pango2/pango-direction.h>
+#include <pango2/pango-gravity.h>
+#include <pango2/pango-language.h>
+#include <pango2/pango-matrix.h>
+#include <pango2/pango-script.h>
 
 /**
  * Pango2Alignment:
diff --git a/pango/pango-userface-private.h b/pango2/pango-userface-private.h
similarity index 100%
rename from pango/pango-userface-private.h
rename to pango2/pango-userface-private.h
diff --git a/pango/pango-userface.c b/pango2/pango-userface.c
similarity index 100%
rename from pango/pango-userface.c
rename to pango2/pango-userface.c
diff --git a/pango/pango-userface.h b/pango2/pango-userface.h
similarity index 97%
rename from pango/pango-userface.h
rename to pango2/pango-userface.h
index 68c7079c9..359ded721 100644
--- a/pango/pango-userface.h
+++ b/pango2/pango-userface.h
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-glyph.h>
-#include <pango/pango-font-face.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-glyph.h>
+#include <pango2/pango-font-face.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-userfont-private.h b/pango2/pango-userfont-private.h
similarity index 100%
rename from pango/pango-userfont-private.h
rename to pango2/pango-userfont-private.h
diff --git a/pango/pango-userfont.c b/pango2/pango-userfont.c
similarity index 100%
rename from pango/pango-userfont.c
rename to pango2/pango-userfont.c
diff --git a/pango/pango-userfont.h b/pango2/pango-userfont.h
similarity index 96%
rename from pango/pango-userfont.h
rename to pango2/pango-userfont.h
index c3c3f9aab..47b23b017 100644
--- a/pango/pango-userfont.h
+++ b/pango2/pango-userfont.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pango-types.h>
-#include <pango/pango-userface.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-userface.h>
 #include <hb.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pango-utils.c b/pango2/pango-utils.c
similarity index 100%
rename from pango/pango-utils.c
rename to pango2/pango-utils.c
diff --git a/pango/pango-utils.h b/pango2/pango-utils.h
similarity index 99%
rename from pango/pango-utils.h
rename to pango2/pango-utils.h
index 069978c8f..f5187dc9c 100644
--- a/pango/pango-utils.h
+++ b/pango2/pango-utils.h
@@ -21,7 +21,7 @@
 
 #include <stdio.h>
 #include <glib.h>
-#include <pango/pango-font.h>
+#include <pango2/pango-font.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pango-version-macros.h b/pango2/pango-version-macros.h
similarity index 99%
rename from pango/pango-version-macros.h
rename to pango2/pango-version-macros.h
index c40f373d2..bce4e3140 100644
--- a/pango/pango-version-macros.h
+++ b/pango2/pango-version-macros.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <pango/pango-features.h>
+#include <pango2/pango-features.h>
 
 #include <glib.h>
 
diff --git a/pango2/pango.h b/pango2/pango.h
new file mode 100644
index 000000000..f3486c4d8
--- /dev/null
+++ b/pango2/pango.h
@@ -0,0 +1,61 @@
+/*
+ * 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 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 <pango2/pango-attr.h>
+#include <pango2/pango-attr-list.h>
+#include <pango2/pango-attr-iterator.h>
+#include <pango2/pango-attributes.h>
+#include <pango2/pango-break.h>
+#include <pango2/pango-color.h>
+#include <pango2/pango-context.h>
+#include <pango2/pango-direction.h>
+#include <pango2/pango-enum-types.h>
+#include <pango2/pango-features.h>
+#include <pango2/pango-font.h>
+#include <pango2/pango-font-description.h>
+#include <pango2/pango-font-face.h>
+#include <pango2/pango-font-family.h>
+#include <pango2/pango-font-metrics.h>
+#include <pango2/pango-fontmap.h>
+#include <pango2/pango-fontset.h>
+#include <pango2/pango-generic-family.h>
+#include <pango2/pango-glyph.h>
+#include <pango2/pango-gravity.h>
+#include <pango2/pango-hbface.h>
+#include <pango2/pango-hbfont.h>
+#include <pango2/pango-item.h>
+#include <pango2/pango-language.h>
+#include <pango2/pango-layout.h>
+#include <pango2/pango-line.h>
+#include <pango2/pango-line-breaker.h>
+#include <pango2/pango-line-iter.h>
+#include <pango2/pango-lines.h>
+#include <pango2/pango-markup.h>
+#include <pango2/pango-matrix.h>
+#include <pango2/pango-renderer.h>
+#include <pango2/pango-run.h>
+#include <pango2/pango-script.h>
+#include <pango2/pango-tabs.h>
+#include <pango2/pango-types.h>
+#include <pango2/pango-userface.h>
+#include <pango2/pango-userfont.h>
+#include <pango2/pango-utils.h>
+#include <pango2/pango-version-macros.h>
diff --git a/pango/pango.rc.in b/pango2/pango.rc.in
similarity index 100%
rename from pango/pango.rc.in
rename to pango2/pango.rc.in
diff --git a/pango/pangocairo-context.c b/pango2/pangocairo-context.c
similarity index 100%
rename from pango/pangocairo-context.c
rename to pango2/pangocairo-context.c
diff --git a/pango/pangocairo-context.h b/pango2/pangocairo-context.h
similarity index 98%
rename from pango/pangocairo-context.h
rename to pango2/pangocairo-context.h
index 628de27e4..5532beabe 100644
--- a/pango/pangocairo-context.h
+++ b/pango2/pangocairo-context.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <cairo.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pangocairo-dwrite-font.cpp b/pango2/pangocairo-dwrite-font.cpp
similarity index 100%
rename from pango/pangocairo-dwrite-font.cpp
rename to pango2/pangocairo-dwrite-font.cpp
diff --git a/pango/pangocairo-font.c b/pango2/pangocairo-font.c
similarity index 100%
rename from pango/pangocairo-font.c
rename to pango2/pangocairo-font.c
diff --git a/pango/pangocairo-font.h b/pango2/pangocairo-font.h
similarity index 97%
rename from pango/pangocairo-font.h
rename to pango2/pangocairo-font.h
index f6c59bdc5..9c57318d8 100644
--- a/pango/pangocairo-font.h
+++ b/pango2/pangocairo-font.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <cairo.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pangocairo-private.h b/pango2/pangocairo-private.h
similarity index 97%
rename from pango/pangocairo-private.h
rename to pango2/pangocairo-private.h
index b93981095..d3ad69941 100644
--- a/pango/pangocairo-private.h
+++ b/pango2/pangocairo-private.h
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <pango/pangocairo.h>
-#include <pango/pango-renderer.h>
+#include "pangocairo.h"
+#include "pango-renderer.h"
 
 G_BEGIN_DECLS
 
diff --git a/pango/pangocairo-render.c b/pango2/pangocairo-render.c
similarity index 100%
rename from pango/pangocairo-render.c
rename to pango2/pangocairo-render.c
diff --git a/pango/pangocairo-render.h b/pango2/pangocairo-render.h
similarity index 99%
rename from pango/pangocairo-render.h
rename to pango2/pangocairo-render.h
index fcd767f44..fb40fba90 100644
--- a/pango/pangocairo-render.h
+++ b/pango2/pangocairo-render.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <cairo.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pangocairo.h b/pango2/pangocairo.h
similarity index 87%
rename from pango/pangocairo.h
rename to pango2/pangocairo.h
index 1ffa4bbda..2291fb8e6 100644
--- a/pango/pangocairo.h
+++ b/pango2/pangocairo.h
@@ -19,6 +19,6 @@
 
 #pragma once
 
-#include <pango/pangocairo-context.h>
-#include <pango/pangocairo-font.h>
-#include <pango/pangocairo-render.h>
+#include <pango2/pangocairo-context.h>
+#include <pango2/pangocairo-font.h>
+#include <pango2/pangocairo-render.h>
diff --git a/pango/pangocoretext-fontmap.c b/pango2/pangocoretext-fontmap.c
similarity index 100%
rename from pango/pangocoretext-fontmap.c
rename to pango2/pangocoretext-fontmap.c
diff --git a/pango/pangocoretext-fontmap.h b/pango2/pangocoretext-fontmap.h
similarity index 97%
rename from pango/pangocoretext-fontmap.h
rename to pango2/pangocoretext-fontmap.h
index c7602e699..ecbe7c51c 100644
--- a/pango/pangocoretext-fontmap.h
+++ b/pango2/pangocoretext-fontmap.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pangodwrite-fontmap.cpp b/pango2/pangodwrite-fontmap.cpp
similarity index 100%
rename from pango/pangodwrite-fontmap.cpp
rename to pango2/pangodwrite-fontmap.cpp
diff --git a/pango/pangodwrite-fontmap.h b/pango2/pangodwrite-fontmap.h
similarity index 98%
rename from pango/pangodwrite-fontmap.h
rename to pango2/pangodwrite-fontmap.h
index 4cb3b2c72..c873759da 100644
--- a/pango/pangodwrite-fontmap.h
+++ b/pango2/pangodwrite-fontmap.h
@@ -21,7 +21,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 G_BEGIN_DECLS
 
diff --git a/pango/pangofc-fontmap.c b/pango2/pangofc-fontmap.c
similarity index 100%
rename from pango/pangofc-fontmap.c
rename to pango2/pangofc-fontmap.c
diff --git a/pango/pangofc-fontmap.h b/pango2/pangofc-fontmap.h
similarity index 98%
rename from pango/pangofc-fontmap.h
rename to pango2/pangofc-fontmap.h
index f11d17b30..7af8f0bba 100644
--- a/pango/pangofc-fontmap.h
+++ b/pango2/pangofc-fontmap.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <fontconfig/fontconfig.h>
 
 G_BEGIN_DECLS
diff --git a/pango/pangofc-language-set-private.h b/pango2/pangofc-language-set-private.h
similarity index 100%
rename from pango/pangofc-language-set-private.h
rename to pango2/pangofc-language-set-private.h
diff --git a/pango/pangofc-language-set.c b/pango2/pangofc-language-set.c
similarity index 100%
rename from pango/pangofc-language-set.c
rename to pango2/pangofc-language-set.c
diff --git a/pango/serializer.c b/pango2/serializer.c
similarity index 99%
rename from pango/serializer.c
rename to pango2/serializer.c
index 07e28ff90..4e7e8a39c 100644
--- a/pango/serializer.c
+++ b/pango2/serializer.c
@@ -21,20 +21,20 @@
 
 #include "config.h"
 
-#include <pango/pango-layout.h>
-#include <pango/pango-context-private.h>
-#include <pango/pango-enum-types.h>
-#include <pango/pango-font-private.h>
-#include <pango/pango-line-private.h>
-#include <pango/pango-hbface.h>
-#include <pango/pango-hbfont.h>
-#include <pango/pango-attributes.h>
-#include <pango/pango-attr-private.h>
-#include <pango/pango-item-private.h>
+#include "pango-layout.h"
+#include "pango-context-private.h"
+#include "pango-enum-types.h"
+#include "pango-font-private.h"
+#include "pango-line-private.h"
+#include "pango-hbface.h"
+#include "pango-hbfont.h"
+#include "pango-attributes.h"
+#include "pango-attr-private.h"
+#include "pango-item-private.h"
 
 #include <hb-ot.h>
-#include "pango/json/gtkjsonparserprivate.h"
-#include "pango/json/gtkjsonprinterprivate.h"
+#include "json/gtkjsonparserprivate.h"
+#include "json/gtkjsonprinterprivate.h"
 
 /* {{{ Error handling */
 
diff --git a/pango/shape.c b/pango2/shape.c
similarity index 100%
rename from pango/shape.c
rename to pango2/shape.c
diff --git a/tests/cxx-test.cpp b/tests/cxx-test.cpp
index ac72a8b3b..3fa1c20d9 100644
--- a/tests/cxx-test.cpp
+++ b/tests/cxx-test.cpp
@@ -2,10 +2,10 @@
  * and compiled in a C++ program.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #if PANGO_RENDERING_CAIRO
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #endif
 
 int
diff --git a/tests/dump-boundaries.c b/tests/dump-boundaries.c
index 467e637b0..5e98123c3 100644
--- a/tests/dump-boundaries.c
+++ b/tests/dump-boundaries.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 #include <unistd.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #define CHFORMAT "%0#6x"
 
diff --git a/tests/markup-parse.c b/tests/markup-parse.c
index a8de714dd..35ea03b25 100644
--- a/tests/markup-parse.c
+++ b/tests/markup-parse.c
@@ -30,7 +30,7 @@
 
 #include <locale.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static void
diff --git a/tests/test-bidi.c b/tests/test-bidi.c
index db1282796..11df17589 100644
--- a/tests/test-bidi.c
+++ b/tests/test-bidi.c
@@ -20,7 +20,7 @@
  */
 
 #include <locale.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static Pango2Context *context;
 
diff --git a/tests/test-break.c b/tests/test-break.c
index 23caba690..933c20cfc 100644
--- a/tests/test-break.c
+++ b/tests/test-break.c
@@ -28,7 +28,7 @@
 #endif
 
 #include "config.h"
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 #include "validate-log-attrs.h"
 
diff --git a/tests/test-common.c b/tests/test-common.c
index 84dfbef95..aa51378aa 100644
--- a/tests/test-common.c
+++ b/tests/test-common.c
@@ -32,7 +32,7 @@
 #include <unistd.h>
 #endif
 
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #include "test-common.h"
 
 #include <hb-ot.h>
diff --git a/tests/test-ellipsize.c b/tests/test-ellipsize.c
index a469cb634..b01a94414 100644
--- a/tests/test-ellipsize.c
+++ b/tests/test-ellipsize.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static Pango2Context *context;
diff --git a/tests/test-font.c b/tests/test-font.c
index e37d0a632..dd3ef1b54 100644
--- a/tests/test-font.c
+++ b/tests/test-font.c
@@ -24,9 +24,9 @@
 #include <locale.h>
 
 #include <gio/gio.h>
-#include <pango/pango.h>
-#include <pango/pango-item-private.h>
-#include <pango/pango-font-private.h>
+#include <pango2/pango.h>
+#include <pango2/pango-item-private.h>
+#include <pango2/pango-font-private.h>
 
 #include "test-common.h"
 
diff --git a/tests/test-fontsets.c b/tests/test-fontsets.c
index 339411c9d..fda49cfc6 100644
--- a/tests/test-fontsets.c
+++ b/tests/test-fontsets.c
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <locale.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 static gboolean
diff --git a/tests/test-harfbuzz.c b/tests/test-harfbuzz.c
index 4d4fd7bef..dcd7ca4bc 100644
--- a/tests/test-harfbuzz.c
+++ b/tests/test-harfbuzz.c
@@ -19,7 +19,7 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <gio/gio.h>
 #include "test-common.h"
 
diff --git a/tests/test-itemize.c b/tests/test-itemize.c
index d7b4074cb..a13ceaeed 100644
--- a/tests/test-itemize.c
+++ b/tests/test-itemize.c
@@ -29,11 +29,11 @@
 #endif
 
 #include "config.h"
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
-#include "pango/pango-attr-private.h"
-#include "pango/pango-item-private.h"
+#include "pango2/pango-attr-private.h"
+#include "pango2/pango-item-private.h"
 
 
 static Pango2Context *context;
diff --git a/tests/test-layout.c b/tests/test-layout.c
index 868806df3..5146416a7 100644
--- a/tests/test-layout.c
+++ b/tests/test-layout.c
@@ -27,7 +27,7 @@
 #include <unistd.h>
 #endif
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include "test-common.h"
 
 #include <hb-ot.h>
diff --git a/tests/test-pangocairo-threads.c b/tests/test-pangocairo-threads.c
index 4db903c2a..47a490819 100644
--- a/tests/test-pangocairo-threads.c
+++ b/tests/test-pangocairo-threads.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <string.h>
-#include <pango/pango.h>
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 
 #include "test-common.h"
 
diff --git a/tests/test-shape.c b/tests/test-shape.c
index 8f0732f68..dc4f01af9 100644
--- a/tests/test-shape.c
+++ b/tests/test-shape.c
@@ -30,7 +30,7 @@
 #endif
 
 #include "config.h"
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #include "test-common.h"
 
 
diff --git a/tests/testattributes.c b/tests/testattributes.c
index 13db3b97d..b256eb8b8 100644
--- a/tests/testattributes.c
+++ b/tests/testattributes.c
@@ -19,8 +19,8 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
-#include <pango/pango-attr-private.h>
+#include <pango2/pango.h>
+#include <pango2/pango-attr-private.h>
 
 static void
 test_copy (Pango2Attribute *attr)
diff --git a/tests/testboundaries.c b/tests/testboundaries.c
index 1deaa65d7..eb6a82071 100644
--- a/tests/testboundaries.c
+++ b/tests/testboundaries.c
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #ifndef G_OS_WIN32
 #include <unistd.h>
diff --git a/tests/testboundaries_ucd.c b/tests/testboundaries_ucd.c
index 64fa66ff3..b34f75735 100644
--- a/tests/testboundaries_ucd.c
+++ b/tests/testboundaries_ucd.c
@@ -20,10 +20,10 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#include <pango/pango.h>
 #include <stdlib.h>
 #include <string.h>
 #include <locale.h>
+#include <pango2/pango.h>
 
 static gboolean failed = FALSE;
 
diff --git a/tests/testcolor.c b/tests/testcolor.c
index 125d10234..d783844bf 100644
--- a/tests/testcolor.c
+++ b/tests/testcolor.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 typedef struct _ColorSpec {
   const char *spec;
diff --git a/tests/testcontext.c b/tests/testcontext.c
index 59517e573..05917d528 100644
--- a/tests/testcontext.c
+++ b/tests/testcontext.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_set_language (void)
diff --git a/tests/testhbfont.c b/tests/testhbfont.c
index 9f6e76ce2..88fc3ef68 100644
--- a/tests/testhbfont.c
+++ b/tests/testhbfont.c
@@ -22,7 +22,7 @@
 #include "config.h"
 #include <glib.h>
 #include <gio/gio.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #include <hb-ot.h>
 
diff --git a/tests/testiter.c b/tests/testiter.c
index b180f66f8..007608dfb 100644
--- a/tests/testiter.c
+++ b/tests/testiter.c
@@ -30,7 +30,7 @@
 
 #include <glib.h>
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void verbose (const char *format, ...) G_GNUC_PRINTF (1, 2);
 static void
diff --git a/tests/testlanguage.c b/tests/testlanguage.c
index 1a6f238a9..14329ac4e 100644
--- a/tests/testlanguage.c
+++ b/tests/testlanguage.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_language_to_string (void)
diff --git a/tests/testmatrix.c b/tests/testmatrix.c
index 0549764c5..c0b7e47d4 100644
--- a/tests/testmatrix.c
+++ b/tests/testmatrix.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <math.h>
 
 #define matrix_equal(m1, m2) \
diff --git a/tests/testmisc.c b/tests/testmisc.c
index 32efb9326..cecec9bb8 100644
--- a/tests/testmisc.c
+++ b/tests/testmisc.c
@@ -21,8 +21,8 @@
 
 #include "config.h"
 #include <glib.h>
-#include <pango/pangocairo.h>
-#include <pango/pango-item-private.h>
+#include <pango2/pangocairo.h>
+#include <pango2/pango-item-private.h>
 
 /* Test that itemizing a string with 0 characters works
  */
diff --git a/tests/testrandom.c b/tests/testrandom.c
index 8d7b19c49..5de90d083 100644
--- a/tests/testrandom.c
+++ b/tests/testrandom.c
@@ -23,7 +23,7 @@
 
 #include <locale.h>
 #include <gio/gio.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #define N_SENTENCES 20
 
diff --git a/tests/testscript.c b/tests/testscript.c
index 435c9d4e2..05d30a383 100644
--- a/tests/testscript.c
+++ b/tests/testscript.c
@@ -58,7 +58,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "pango/pango-script.h"
+#include "pango2/pango-script.h"
 
 typedef struct
 {
diff --git a/tests/testserialize.c b/tests/testserialize.c
index 60333d1fe..6ee21da87 100644
--- a/tests/testserialize.c
+++ b/tests/testserialize.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <gio/gio.h>
 
 #include "test-common.h"
diff --git a/tests/testtabs.c b/tests/testtabs.c
index 873c24276..7e33cb86b 100644
--- a/tests/testtabs.c
+++ b/tests/testtabs.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 static void
 test_tabs_basic (void)
diff --git a/tests/validate-log-attrs.c b/tests/validate-log-attrs.c
index 16c9817f7..369c7729f 100644
--- a/tests/validate-log-attrs.c
+++ b/tests/validate-log-attrs.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include "validate-log-attrs.h"
-#include "pango.h"
+#include <pango2/pango.h>
 #include <string.h>
 
 /* {{{ Validation */
diff --git a/tests/validate-log-attrs.h b/tests/validate-log-attrs.h
index dcdf0b09f..e9991d148 100644
--- a/tests/validate-log-attrs.h
+++ b/tests/validate-log-attrs.h
@@ -25,7 +25,7 @@
 
 G_BEGIN_DECLS
 
-#include <pango/pango-item.h>
+#include <pango2/pango-item.h>
 
 #define PANGO2_VALIDATE_ERROR (pango2_validate_error_quark ())
 
diff --git a/tools/gen-script-for-lang.c b/tools/gen-script-for-lang.c
index f4e83adb0..d34a93dd5 100644
--- a/tools/gen-script-for-lang.c
+++ b/tools/gen-script-for-lang.c
@@ -26,9 +26,9 @@
 #include <string.h>
 #include <time.h>
 
-#include <pango/pango-enum-types.h>
-#include <pango/pango-script.h>
-#include <pango/pango-types.h>
+#include <pango2/pango-enum-types.h>
+#include <pango2/pango-script.h>
+#include <pango2/pango-types.h>
 
 #include <fontconfig/fontconfig.h>
 
diff --git a/utils/pango-list.c b/utils/pango-list.c
index 3023bce83..5dd21313b 100644
--- a/utils/pango-list.c
+++ b/utils/pango-list.c
@@ -21,8 +21,8 @@
  */
 
 #include "config.h"
-#include <pango/pango.h>
-#include <pango/pango-hbface-private.h>
+#include <pango2/pango.h>
+#include <pango2/pango-hbface-private.h>
 #include <hb-ot.h>
 #include <glib/gstdio.h>
 #include <gio/gio.h>
diff --git a/utils/pango-segmentation.c b/utils/pango-segmentation.c
index d99852ff4..42c5d3e8d 100644
--- a/utils/pango-segmentation.c
+++ b/utils/pango-segmentation.c
@@ -20,7 +20,7 @@
  */
 
 #include <glib.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 #include <string.h>
 #include <stdlib.h>
 #include <locale.h>
diff --git a/utils/userfont.c b/utils/userfont.c
index 6d064c49d..e84455168 100644
--- a/utils/userfont.c
+++ b/utils/userfont.c
@@ -1,7 +1,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <pango/pangocairo.h>
+#include <pango2/pangocairo.h>
 #include "userfont.h"
 
 #define END_GLYPH 0
diff --git a/utils/viewer-pangocairo.c b/utils/viewer-pangocairo.c
index bd6ca9a52..df3912590 100644
--- a/utils/viewer-pangocairo.c
+++ b/utils/viewer-pangocairo.c
@@ -25,8 +25,8 @@
 #include "viewer-cairo.h"
 #include "userfont.h"
 
-#include <pango/pangocairo.h>
-#include <pango/pango-run.h>
+#include <pango2/pango.h>
+#include <pango2/pangocairo.h>
 
 #include <hb-ot.h>
 
diff --git a/utils/viewer-pangoxft.c b/utils/viewer-pangoxft.c
index 08aadb7eb..a6d4e221b 100644
--- a/utils/viewer-pangoxft.c
+++ b/utils/viewer-pangoxft.c
@@ -23,7 +23,7 @@
 #include "viewer-render.h"
 #include "viewer-x.h"
 
-#include <pango/pangoxft.h>
+#include <pango2/pangoxft.h>
 
 static void
 default_substitute (FcPattern *pattern,
diff --git a/utils/viewer-render.c b/utils/viewer-render.c
index 1cb9b4f36..4e60cbf6b 100644
--- a/utils/viewer-render.c
+++ b/utils/viewer-render.c
@@ -28,7 +28,7 @@
 
 #include <glib.h>
 #include <glib/gprintf.h>
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #include "viewer-render.h"
 
diff --git a/utils/viewer-render.h b/utils/viewer-render.h
index c57b95889..d785ab188 100644
--- a/utils/viewer-render.h
+++ b/utils/viewer-render.h
@@ -21,7 +21,7 @@
 #ifndef VIEWER_RENDER_H
 #define VIEWER_RENDER_H
 
-#include <pango/pango-layout.h>
+#include <pango2/pango.h>
 
 #include "viewer.h"
 
diff --git a/utils/viewer-x.h b/utils/viewer-x.h
index f39ed1885..af06e3e2a 100644
--- a/utils/viewer-x.h
+++ b/utils/viewer-x.h
@@ -21,7 +21,7 @@
 #ifndef VIEWER_X_H
 #define VIEWER_X_H
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
diff --git a/utils/viewer.h b/utils/viewer.h
index adcd740a2..e7e78e16c 100644
--- a/utils/viewer.h
+++ b/utils/viewer.h
@@ -21,7 +21,7 @@
 #ifndef VIEWER_H
 #define VIEWER_H
 
-#include <pango/pango.h>
+#include <pango2/pango.h>
 
 typedef struct _Pango2Viewer Pango2Viewer;