Gitiles
Code Review Sign In
gerrit-dev.monogon.dev / monogon / d69848409ba4f34102f709f591e1432e6b458856 / . / third_party / glib / patches / bazel_cc_fix.patch
blob: 9bbe72b14af7692eedee5f105164f67b5bf641af [file] [log] [blame]
Lorenz Brun0de18932021-03-11 00:36:48 +0100[diff] [blame]1Copyright 2020 The Monogon Project Authors.
2
3Licensed under the Apache License, Version 2.0 (the "License");
4you may not use this file except in compliance with the License.
5You may obtain a copy of the License at
6
7 http://www.apache.org/licenses/LICENSE-2.0
8
9Unless required by applicable law or agreed to in writing, software
10distributed under the License is distributed on an "AS IS" BASIS,
11WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12See the License for the specific language governing permissions and
13limitations under the License.
14
15
16From c563024e7446e73299291abc1597d6c03010ca46 Mon Sep 17 00:00:00 2001
17From: Lorenz Brun <lorenz@nexantic.com>
18Date: Tue, 9 Mar 2021 22:40:09 +0100
19Subject: [PATCH] bazel_cc_fix patch
20
21---
22 glib/deprecated/gallocator.c | 6 +-
23 glib/deprecated/gallocator.h | 2 +-
24 glib/deprecated/gcache.c | 8 +-
25 glib/deprecated/gcache.h | 2 +-
26 glib/deprecated/gcompletion.c | 8 +-
27 glib/deprecated/gcompletion.h | 2 +-
28 glib/deprecated/gmain.h | 2 +-
29 glib/deprecated/grel.c | 12 +-
30 glib/deprecated/grel.h | 2 +-
31 glib/deprecated/gthread-deprecated.c | 14 +--
32 glib/deprecated/gthread.h | 2 +-
33 glib/galloca.h | 2 +-
34 glib/garray.h | 2 +-
35 glib/gasyncqueue.c | 2 +-
36 glib/gasyncqueue.h | 2 +-
37 glib/gatomic.h | 2 +-
38 glib/gbacktrace.h | 2 +-
39 glib/gbase64.h | 2 +-
40 glib/gbitlock.c | 10 +-
41 glib/gbitlock.h | 2 +-
42 glib/gbookmarkfile.h | 4 +-
43 glib/gbsearcharray.h | 2 +-
44 glib/gbytes.c | 16 +--
45 glib/gbytes.h | 4 +-
46 glib/gcharset.c | 2 +-
47 glib/gcharset.h | 2 +-
48 glib/gchecksum.h | 4 +-
49 glib/gconvert.h | 2 +-
50 glib/gdataset.h | 2 +-
51 glib/gdatasetprivate.h | 2 +-
52 glib/gdate.h | 4 +-
53 glib/gdatetime.h | 2 +-
54 glib/gdir.c | 2 +-
55 glib/gdir.h | 2 +-
56 glib/genviron.h | 2 +-
57 glib/gerror.h | 2 +-
58 glib/gfileutils.h | 4 +-
59 glib/ggettext.h | 2 +-
60 glib/ghash.h | 4 +-
61 glib/ghmac.c | 2 +-
62 glib/ghmac.h | 2 +-
63 glib/ghook.h | 2 +-
64 glib/ghostutils.h | 2 +-
65 glib/gi18n-lib.h | 2 +-
66 glib/gi18n.h | 2 +-
67 glib/giochannel.h | 6 +-
68 glib/giounix.c | 2 +-
69 glib/gkeyfile.h | 4 +-
70 glib/glib-object.h | 32 +++---
71 glib/glib-private.h | 2 +-
72 glib/glib-unix.h | 2 +-
73 glib/glib.h | 160 +++++++++++++--------------
74 glib/glist.h | 4 +-
75 glib/gmain.h | 6 +-
76 glib/gmappedfile.h | 4 +-
77 glib/gmarkup.h | 4 +-
78 glib/gmem.h | 2 +-
79 glib/gmessages.h | 8 +-
80 glib/gnode.h | 2 +-
81 glib/goption.h | 4 +-
82 glib/gpattern.h | 2 +-
83 glib/gpoll.h | 4 +-
84 glib/gprimes.h | 2 +-
85 glib/gprintf.h | 2 +-
86 glib/gprintfint.h | 2 +-
87 glib/gqsort.h | 2 +-
88 glib/gquark.h | 2 +-
89 glib/gqueue.h | 2 +-
90 glib/grand.h | 2 +-
91 glib/grcbox.h | 2 +-
92 glib/grefcount.h | 4 +-
93 glib/gregex.c | 2 +-
94 glib/gregex.h | 4 +-
95 glib/gscanner.h | 4 +-
96 glib/gsequence.h | 2 +-
97 glib/gshell.h | 2 +-
98 glib/gslice.h | 2 +-
99 glib/gslist.h | 4 +-
100 glib/gspawn.c | 2 +-
101 glib/gspawn.h | 2 +-
102 glib/gstdio.h | 2 +-
103 glib/gstrfuncs.c | 2 +-
104 glib/gstrfuncs.h | 6 +-
105 glib/gstring.h | 8 +-
106 glib/gstringchunk.h | 2 +-
107 glib/gstrvbuilder.h | 4 +-
108 glib/gtester.c | 6 +-
109 glib/gtestutils.c | 2 +-
110 glib/gtestutils.h | 8 +-
111 glib/gthread.h | 6 +-
112 glib/gthreadpool.h | 2 +-
113 glib/gthreadprivate.h | 2 +-
114 glib/gtimer.h | 2 +-
115 glib/gtimezone.h | 4 +-
116 glib/gtranslit.c | 4 +-
117 glib/gtrashstack.h | 2 +-
118 glib/gtree.h | 2 +-
119 glib/gtypes.h | 6 +-
120 glib/gunibreak.h | 4 +-
121 glib/gunicode.h | 4 +-
122 glib/guri.h | 2 +-
123 glib/gutils.h | 2 +-
124 glib/guuid.h | 2 +-
125 glib/gvariant-core.c | 22 ++--
126 glib/gvariant-core.h | 6 +-
127 glib/gvariant-internal.h | 4 +-
128 glib/gvariant-serialiser.c | 8 +-
129 glib/gvariant.c | 14 +--
130 glib/gvariant.h | 6 +-
131 glib/gvarianttype.c | 6 +-
132 glib/gvarianttype.h | 2 +-
133 glib/gvarianttypeinfo.c | 10 +-
134 glib/gvarianttypeinfo.h | 2 +-
135 glib/gversion.h | 2 +-
136 glib/gwakeup.c | 2 +-
137 glib/gwakeup.h | 2 +-
138 glib/gwin32.h | 2 +-
139 glib/libcharset/localcharset.c | 2 +-
140 glib/pcre/pcre_byte_order.c | 2 +-
141 glib/pcre/pcre_chartables.c | 2 +-
142 glib/pcre/pcre_compile.c | 6 +-
143 glib/pcre/pcre_config.c | 2 +-
144 glib/pcre/pcre_dfa_exec.c | 2 +-
145 glib/pcre/pcre_exec.c | 2 +-
146 glib/pcre/pcre_fullinfo.c | 2 +-
147 glib/pcre/pcre_get.c | 2 +-
148 glib/pcre/pcre_globals.c | 6 +-
149 glib/pcre/pcre_jit_compile.c | 2 +-
150 glib/pcre/pcre_newline.c | 2 +-
151 glib/pcre/pcre_ord2utf8.c | 2 +-
152 glib/pcre/pcre_string_utils.c | 2 +-
153 glib/pcre/pcre_study.c | 2 +-
154 glib/pcre/pcre_tables.c | 2 +-
155 glib/pcre/pcre_valid_utf8.c | 2 +-
156 glib/pcre/pcre_version.c | 2 +-
157 glib/pcre/pcre_xclass.c | 2 +-
158 glib/pcre/ucp.h | 4 +-
159 137 files changed, 338 insertions(+), 338 deletions(-)
160
161diff --git a/glib/deprecated/gallocator.c b/glib/deprecated/gallocator.c
162index 66483b632..6598cbeed 100644
163--- a/glib/deprecated/gallocator.c
164+++ b/glib/deprecated/gallocator.c
165@@ -13,7 +13,7 @@
166 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
167 */
168
169-#include "config.h"
170+#include "glib/config.h"
171
172 /* we know we are deprecated here, no need for warnings */
173 #ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
174@@ -22,8 +22,8 @@
175
176 #include "gallocator.h"
177
178-#include <glib/gmessages.h>
179-#include <glib/gslice.h>
180+#include "glib/gmessages.h"
181+#include "glib/gslice.h"
182
183 struct _GMemChunk {
184 guint alloc_size; /* the size of an atom */
185diff --git a/glib/deprecated/gallocator.h b/glib/deprecated/gallocator.h
186index 005e92b6e..5fead4206 100644
187--- a/glib/deprecated/gallocator.h
188+++ b/glib/deprecated/gallocator.h
189@@ -20,7 +20,7 @@
190 #error "Only <glib.h> can be included directly."
191 #endif
192
193-#include <glib/gtypes.h>
194+#include "glib/gtypes.h"
195
196 G_BEGIN_DECLS
197
198diff --git a/glib/deprecated/gcache.c b/glib/deprecated/gcache.c
199index 9e04145be..c1d33bd3e 100644
200--- a/glib/deprecated/gcache.c
201+++ b/glib/deprecated/gcache.c
202@@ -26,7 +26,7 @@
203 * MT safe
204 */
205
206-#include "config.h"
207+#include "glib/config.h"
208
209 /* we know we are deprecated here, no need for warnings */
210 #ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
211@@ -35,9 +35,9 @@
212
213 #include "gcache.h"
214
215-#include "gslice.h"
216-#include "ghash.h"
217-#include "gtestutils.h"
218+#include "glib/gslice.h"
219+#include "glib/ghash.h"
220+#include "glib/gtestutils.h"
221
222 /**
223 * SECTION:caches
224diff --git a/glib/deprecated/gcache.h b/glib/deprecated/gcache.h
225index e1c1f2cde..8ebabca20 100644
226--- a/glib/deprecated/gcache.h
227+++ b/glib/deprecated/gcache.h
228@@ -29,7 +29,7 @@
229 #error "Only <glib.h> can be included directly."
230 #endif
231
232-#include <glib/glist.h>
233+#include "glib/glist.h"
234
235 G_BEGIN_DECLS
236
237diff --git a/glib/deprecated/gcompletion.c b/glib/deprecated/gcompletion.c
238index d09c1f1fa..b11aaa744 100644
239--- a/glib/deprecated/gcompletion.c
240+++ b/glib/deprecated/gcompletion.c
241@@ -26,7 +26,7 @@
242 * MT safe
243 */
244
245-#include "config.h"
246+#include "glib/config.h"
247
248 /* we know we are deprecated here, no need for warnings */
249 #ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
250@@ -35,9 +35,9 @@
251
252 #include "gcompletion.h"
253
254-#include <glib/gstrfuncs.h>
255-#include <glib/gmessages.h>
256-#include <glib/gunicode.h>
257+#include "glib/gstrfuncs.h"
258+#include "glib/gmessages.h"
259+#include "glib/gunicode.h"
260
261 #include <string.h>
262
263diff --git a/glib/deprecated/gcompletion.h b/glib/deprecated/gcompletion.h
264index 2fd1f0393..b5ff33172 100644
265--- a/glib/deprecated/gcompletion.h
266+++ b/glib/deprecated/gcompletion.h
267@@ -29,7 +29,7 @@
268 #error "Only <glib.h> can be included directly."
269 #endif
270
271-#include <glib/glist.h>
272+#include "glib/glist.h"
273
274 G_BEGIN_DECLS
275
276diff --git a/glib/deprecated/gmain.h b/glib/deprecated/gmain.h
277index 5d08eb6b4..50c177deb 100644
278--- a/glib/deprecated/gmain.h
279+++ b/glib/deprecated/gmain.h
280@@ -29,7 +29,7 @@
281 #error "Only <glib.h> can be included directly."
282 #endif
283
284-#include <glib/gmain.h>
285+#include "glib/gmain.h"
286
287 G_BEGIN_DECLS
288
289diff --git a/glib/deprecated/grel.c b/glib/deprecated/grel.c
290index b48ec1173..a42d1ba6d 100644
291--- a/glib/deprecated/grel.c
292+++ b/glib/deprecated/grel.c
293@@ -27,7 +27,7 @@
294 * MT safe
295 */
296
297-#include "config.h"
298+#include "glib/config.h"
299
300 /* we know we are deprecated here, no need for warnings */
301 #ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
302@@ -36,11 +36,11 @@
303
304 #include "grel.h"
305
306-#include <glib/gmessages.h>
307-#include <glib/gtestutils.h>
308-#include <glib/gstring.h>
309-#include <glib/gslice.h>
310-#include <glib/ghash.h>
311+#include "glib/gmessages.h"
312+#include "glib/gtestutils.h"
313+#include "glib/gstring.h"
314+#include "glib/gslice.h"
315+#include "glib/ghash.h"
316
317 #include <stdarg.h>
318 #include <string.h>
319diff --git a/glib/deprecated/grel.h b/glib/deprecated/grel.h
320index 3a65240c1..68745ee03 100644
321--- a/glib/deprecated/grel.h
322+++ b/glib/deprecated/grel.h
323@@ -29,7 +29,7 @@
324 #error "Only <glib.h> can be included directly."
325 #endif
326
327-#include <glib/gtypes.h>
328+#include "glib/gtypes.h"
329
330 G_BEGIN_DECLS
331
332diff --git a/glib/deprecated/gthread-deprecated.c b/glib/deprecated/gthread-deprecated.c
333index e7e68fbd6..fa0648ef3 100644
334--- a/glib/deprecated/gthread-deprecated.c
335+++ b/glib/deprecated/gthread-deprecated.c
336@@ -19,22 +19,22 @@
337 * License along with this library; if not, see <http://www.gnu.org/licenses/>.
338 */
339
340-#include "config.h"
341+#include "glib/config.h"
342
343 /* we know we are deprecated here, no need for warnings */
344 #ifndef GLIB_DISABLE_DEPRECATION_WARNINGS
345 #define GLIB_DISABLE_DEPRECATION_WARNINGS
346 #endif
347
348-#include "gmessages.h"
349-#include "gslice.h"
350+#include "glib/gmessages.h"
351+#include "glib/gslice.h"
352 #include "gmain.h"
353 #include "gthread.h"
354-#include "gthreadprivate.h"
355-#include "deprecated/gthread.h"
356-#include "garray.h"
357+#include "glib/gthreadprivate.h"
358+#include "gthread.h"
359+#include "glib/garray.h"
360
361-#include "gutils.h"
362+#include "glib/gutils.h"
363
364 /* {{{1 Documentation */
365
366diff --git a/glib/deprecated/gthread.h b/glib/deprecated/gthread.h
367index 33b422240..380444f01 100644
368--- a/glib/deprecated/gthread.h
369+++ b/glib/deprecated/gthread.h
370@@ -29,7 +29,7 @@
371 #error "Only <glib.h> can be included directly."
372 #endif
373
374-#include <glib/gthread.h>
375+#include "glib/gthread.h"
376
377 G_BEGIN_DECLS
378
379diff --git a/glib/galloca.h b/glib/galloca.h
380index 47151ee8b..35c31fba9 100644
381--- a/glib/galloca.h
382+++ b/glib/galloca.h
383@@ -29,7 +29,7 @@
384 #error "Only <glib.h> can be included directly."
385 #endif
386
387-#include <glib/gtypes.h>
388+#include "gtypes.h"
389
390 #if defined(__BIONIC__) && defined (GLIB_HAVE_ALLOCA_H)
391 # include <alloca.h>
392diff --git a/glib/garray.h b/glib/garray.h
393index 67131b5b3..52775a281 100644
394--- a/glib/garray.h
395+++ b/glib/garray.h
396@@ -29,7 +29,7 @@
397 #error "Only <glib.h> can be included directly."
398 #endif
399
400-#include <glib/gtypes.h>
401+#include "gtypes.h"
402
403 G_BEGIN_DECLS
404
405diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
406index a452617fd..2a990ef8d 100644
407--- a/glib/gasyncqueue.c
408+++ b/glib/gasyncqueue.c
409@@ -33,7 +33,7 @@
410 #include "gtestutils.h"
411 #include "gtimer.h"
412 #include "gthread.h"
413-#include "deprecated/gthread.h"
414+#include "glib/deprecated/gthread.h"
415
416
417 /**
418diff --git a/glib/gasyncqueue.h b/glib/gasyncqueue.h
419index 73e537b07..30587f511 100644
420--- a/glib/gasyncqueue.h
421+++ b/glib/gasyncqueue.h
422@@ -29,7 +29,7 @@
423 #error "Only <glib.h> can be included directly."
424 #endif
425
426-#include <glib/gthread.h>
427+#include "gthread.h"
428
429 G_BEGIN_DECLS
430
431diff --git a/glib/gatomic.h b/glib/gatomic.h
432index 2ad648aad..da65a6029 100644
433--- a/glib/gatomic.h
434+++ b/glib/gatomic.h
435@@ -24,7 +24,7 @@
436 #error "Only <glib.h> can be included directly."
437 #endif
438
439-#include <glib/gtypes.h>
440+#include "gtypes.h"
441
442 #if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
443 /* for glib_typeof */
444diff --git a/glib/gbacktrace.h b/glib/gbacktrace.h
445index 09b8ccbd3..30894769a 100644
446--- a/glib/gbacktrace.h
447+++ b/glib/gbacktrace.h
448@@ -29,7 +29,7 @@
449 #error "Only <glib.h> can be included directly."
450 #endif
451
452-#include <glib/gtypes.h>
453+#include "gtypes.h"
454 #ifdef __sun__
455 #include <sys/select.h>
456 #endif
457diff --git a/glib/gbase64.h b/glib/gbase64.h
458index 662c597ff..26b0607dc 100644
459--- a/glib/gbase64.h
460+++ b/glib/gbase64.h
461@@ -23,7 +23,7 @@
462 #error "Only <glib.h> can be included directly."
463 #endif
464
465-#include <glib/gtypes.h>
466+#include "gtypes.h"
467
468 G_BEGIN_DECLS
469
470diff --git a/glib/gbitlock.c b/glib/gbitlock.c
471index c08a6f934..e586b1548 100644
472--- a/glib/gbitlock.c
473+++ b/glib/gbitlock.c
474@@ -22,11 +22,11 @@
475
476 #include "gbitlock.h"
477
478-#include <glib/gmessages.h>
479-#include <glib/gatomic.h>
480-#include <glib/gslist.h>
481-#include <glib/gthread.h>
482-#include <glib/gslice.h>
483+#include "gmessages.h"
484+#include "gatomic.h"
485+#include "gslist.h"
486+#include "gthread.h"
487+#include "gslice.h"
488
489 #include "gthreadprivate.h"
490
491diff --git a/glib/gbitlock.h b/glib/gbitlock.h
492index 8054bc8ae..6a0c69194 100644
493--- a/glib/gbitlock.h
494+++ b/glib/gbitlock.h
495@@ -21,7 +21,7 @@
496 #ifndef __G_BITLOCK_H__
497 #define __G_BITLOCK_H__
498
499-#include <glib/gtypes.h>
500+#include "gtypes.h"
501
502 #if !defined (__GLIB_H_INSIDE__) && !defined (GLIB_COMPILATION)
503 #error "Only <glib.h> can be included directly."
504diff --git a/glib/gbookmarkfile.h b/glib/gbookmarkfile.h
505index e9cfbf12b..9355aa074 100644
506--- a/glib/gbookmarkfile.h
507+++ b/glib/gbookmarkfile.h
508@@ -23,8 +23,8 @@
509 #error "Only <glib.h> can be included directly."
510 #endif
511
512-#include <glib/gdatetime.h>
513-#include <glib/gerror.h>
514+#include "gdatetime.h"
515+#include "gerror.h"
516 #include <time.h>
517
518 G_BEGIN_DECLS
519diff --git a/glib/gbsearcharray.h b/glib/gbsearcharray.h
520index 39afa3f79..e44ff0f8e 100644
521--- a/glib/gbsearcharray.h
522+++ b/glib/gbsearcharray.h
523@@ -19,7 +19,7 @@
524 #ifndef __G_BSEARCH_ARRAY_H__
525 #define __G_BSEARCH_ARRAY_H__
526
527-#include <glib.h>
528+#include "glib/glib.h"
529 #include <string.h>
530
531
532diff --git a/glib/gbytes.c b/glib/gbytes.c
533index aaadf451b..3fd73911f 100644
534--- a/glib/gbytes.c
535+++ b/glib/gbytes.c
536@@ -23,14 +23,14 @@
537
538 #include "gbytes.h"
539
540-#include <glib/garray.h>
541-#include <glib/gstrfuncs.h>
542-#include <glib/gatomic.h>
543-#include <glib/gslice.h>
544-#include <glib/gtestutils.h>
545-#include <glib/gmem.h>
546-#include <glib/gmessages.h>
547-#include <glib/grefcount.h>
548+#include "garray.h"
549+#include "gstrfuncs.h"
550+#include "gatomic.h"
551+#include "gslice.h"
552+#include "gtestutils.h"
553+#include "gmem.h"
554+#include "gmessages.h"
555+#include "grefcount.h"
556
557 #include <string.h>
558
559diff --git a/glib/gbytes.h b/glib/gbytes.h
560index 0bb1517b9..13c818de3 100644
561--- a/glib/gbytes.h
562+++ b/glib/gbytes.h
563@@ -26,8 +26,8 @@
564 #error "Only <glib.h> can be included directly."
565 #endif
566
567-#include <glib/gtypes.h>
568-#include <glib/garray.h>
569+#include "gtypes.h"
570+#include "garray.h"
571
572 G_BEGIN_DECLS
573
574diff --git a/glib/gcharset.c b/glib/gcharset.c
575index bb775bda4..f81ee1346 100644
576--- a/glib/gcharset.c
577+++ b/glib/gcharset.c
578@@ -32,7 +32,7 @@
579 #include "gwin32.h"
580 #endif
581
582-#include "libcharset/libcharset.h"
583+#include "glib/libcharset/libcharset.h"
584
585 #include <string.h>
586 #include <stdio.h>
587diff --git a/glib/gcharset.h b/glib/gcharset.h
588index 82020f604..4dbcb0948 100644
589--- a/glib/gcharset.h
590+++ b/glib/gcharset.h
591@@ -23,7 +23,7 @@
592 #error "Only <glib.h> can be included directly."
593 #endif
594
595-#include <glib/gtypes.h>
596+#include "gtypes.h"
597
598 G_BEGIN_DECLS
599
600diff --git a/glib/gchecksum.h b/glib/gchecksum.h
601index 599f439c1..dce60f026 100644
602--- a/glib/gchecksum.h
603+++ b/glib/gchecksum.h
604@@ -23,8 +23,8 @@
605 #error "Only <glib.h> can be included directly."
606 #endif
607
608-#include <glib/gtypes.h>
609-#include <glib/gbytes.h>
610+#include "gtypes.h"
611+#include "gbytes.h"
612
613 G_BEGIN_DECLS
614
615diff --git a/glib/gconvert.h b/glib/gconvert.h
616index be58ecfbe..d8b0e7947 100644
617--- a/glib/gconvert.h
618+++ b/glib/gconvert.h
619@@ -29,7 +29,7 @@
620 #error "Only <glib.h> can be included directly."
621 #endif
622
623-#include <glib/gerror.h>
624+#include "gerror.h"
625
626 G_BEGIN_DECLS
627
628diff --git a/glib/gdataset.h b/glib/gdataset.h
629index 89a34c71a..d95f1d579 100644
630--- a/glib/gdataset.h
631+++ b/glib/gdataset.h
632@@ -29,7 +29,7 @@
633 #error "Only <glib.h> can be included directly."
634 #endif
635
636-#include <glib/gquark.h>
637+#include "gquark.h"
638
639 G_BEGIN_DECLS
640
641diff --git a/glib/gdatasetprivate.h b/glib/gdatasetprivate.h
642index eb95278f1..21233cd22 100644
643--- a/glib/gdatasetprivate.h
644+++ b/glib/gdatasetprivate.h
645@@ -26,7 +26,7 @@
646 #ifndef __G_DATASETPRIVATE_H__
647 #define __G_DATASETPRIVATE_H__
648
649-#include <gatomic.h>
650+#include "gatomic.h"
651
652 G_BEGIN_DECLS
653
654diff --git a/glib/gdate.h b/glib/gdate.h
655index 65fe811fa..8a52559e7 100644
656--- a/glib/gdate.h
657+++ b/glib/gdate.h
658@@ -31,8 +31,8 @@
659
660 #include <time.h>
661
662-#include <glib/gtypes.h>
663-#include <glib/gquark.h>
664+#include "gtypes.h"
665+#include "gquark.h"
666
667 G_BEGIN_DECLS
668
669diff --git a/glib/gdatetime.h b/glib/gdatetime.h
670index fa43d8531..ee83e72ec 100644
671--- a/glib/gdatetime.h
672+++ b/glib/gdatetime.h
673@@ -28,7 +28,7 @@
674 #error "Only <glib.h> can be included directly."
675 #endif
676
677-#include <glib/gtimezone.h>
678+#include "gtimezone.h"
679
680 G_BEGIN_DECLS
681
682diff --git a/glib/gdir.c b/glib/gdir.c
683index c26edc1dc..7f643ab51 100644
684--- a/glib/gdir.c
685+++ b/glib/gdir.c
686@@ -41,7 +41,7 @@
687 #include "glibintl.h"
688
689 #if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
690-#include "dirent/dirent.h"
691+#include "glib/dirent/dirent.h"
692 #endif
693
694 #include "glib-private.h" /* g_dir_open_with_errno, g_dir_new_from_dirp */
695diff --git a/glib/gdir.h b/glib/gdir.h
696index 8f9d6bd7c..4bac1df5e 100644
697--- a/glib/gdir.h
698+++ b/glib/gdir.h
699@@ -26,7 +26,7 @@
700 #error "Only <glib.h> can be included directly."
701 #endif
702
703-#include <glib/gerror.h>
704+#include "gerror.h"
705
706 #ifdef G_OS_UNIX
707 #include <dirent.h>
708diff --git a/glib/genviron.h b/glib/genviron.h
709index c4bf01a5a..8624e2eda 100644
710--- a/glib/genviron.h
711+++ b/glib/genviron.h
712@@ -29,7 +29,7 @@
713 #error "Only <glib.h> can be included directly."
714 #endif
715
716-#include <glib/gtypes.h>
717+#include "gtypes.h"
718
719 G_BEGIN_DECLS
720
721diff --git a/glib/gerror.h b/glib/gerror.h
722index 6431d5b6c..ae3bf4378 100644
723--- a/glib/gerror.h
724+++ b/glib/gerror.h
725@@ -25,7 +25,7 @@
726
727 #include <stdarg.h>
728
729-#include <glib/gquark.h>
730+#include "gquark.h"
731
732 G_BEGIN_DECLS
733
734diff --git a/glib/gfileutils.h b/glib/gfileutils.h
735index d6b1d9eec..16cb7f481 100644
736--- a/glib/gfileutils.h
737+++ b/glib/gfileutils.h
738@@ -23,8 +23,8 @@
739 #error "Only <glib.h> can be included directly."
740 #endif
741
742-#include <glibconfig.h>
743-#include <glib/gerror.h>
744+#include "glib/glibconfig.h"
745+#include "gerror.h"
746
747 G_BEGIN_DECLS
748
749diff --git a/glib/ggettext.h b/glib/ggettext.h
750index 036f9d534..7a2844131 100644
751--- a/glib/ggettext.h
752+++ b/glib/ggettext.h
753@@ -29,7 +29,7 @@
754 #error "Only <glib.h> can be included directly."
755 #endif
756
757-#include <glib/gtypes.h>
758+#include "gtypes.h"
759
760 G_BEGIN_DECLS
761
762diff --git a/glib/ghash.h b/glib/ghash.h
763index e9ce64505..9bf818507 100644
764--- a/glib/ghash.h
765+++ b/glib/ghash.h
766@@ -29,8 +29,8 @@
767 #error "Only <glib.h> can be included directly."
768 #endif
769
770-#include <glib/gtypes.h>
771-#include <glib/glist.h>
772+#include "gtypes.h"
773+#include "glist.h"
774
775 G_BEGIN_DECLS
776
777diff --git a/glib/ghmac.c b/glib/ghmac.c
778index 49fd272f0..91689754a 100644
779--- a/glib/ghmac.c
780+++ b/glib/ghmac.c
781@@ -24,7 +24,7 @@
782
783 #include "ghmac.h"
784
785-#include "glib/galloca.h"
786+#include "galloca.h"
787 #include "gatomic.h"
788 #include "gslice.h"
789 #include "gmem.h"
790diff --git a/glib/ghmac.h b/glib/ghmac.h
791index 36e24eb29..843b202bb 100644
792--- a/glib/ghmac.h
793+++ b/glib/ghmac.h
794@@ -23,7 +23,7 @@
795 #error "Only <glib.h> can be included directly."
796 #endif
797
798-#include <glib/gtypes.h>
799+#include "gtypes.h"
800 #include "gchecksum.h"
801
802 G_BEGIN_DECLS
803diff --git a/glib/ghook.h b/glib/ghook.h
804index 83ad1bdef..f377245da 100644
805--- a/glib/ghook.h
806+++ b/glib/ghook.h
807@@ -29,7 +29,7 @@
808 #error "Only <glib.h> can be included directly."
809 #endif
810
811-#include <glib/gmem.h>
812+#include "gmem.h"
813
814 G_BEGIN_DECLS
815
816diff --git a/glib/ghostutils.h b/glib/ghostutils.h
817index 59d2d41ed..37f8ed916 100644
818--- a/glib/ghostutils.h
819+++ b/glib/ghostutils.h
820@@ -22,7 +22,7 @@
821 #error "Only <glib.h> can be included directly."
822 #endif
823
824-#include <glib/gtypes.h>
825+#include "gtypes.h"
826
827 G_BEGIN_DECLS
828
829diff --git a/glib/gi18n-lib.h b/glib/gi18n-lib.h
830index 74e50a3a8..52e0e2201 100644
831--- a/glib/gi18n-lib.h
832+++ b/glib/gi18n-lib.h
833@@ -18,7 +18,7 @@
834 #ifndef __G_I18N_LIB_H__
835 #define __G_I18N_LIB_H__
836
837-#include <glib.h>
838+#include "glib/glib.h"
839
840 #include <libintl.h>
841 #include <string.h>
842diff --git a/glib/gi18n.h b/glib/gi18n.h
843index 5f996d24e..39a035c1b 100644
844--- a/glib/gi18n.h
845+++ b/glib/gi18n.h
846@@ -18,7 +18,7 @@
847 #ifndef __G_I18N_H__
848 #define __G_I18N_H__
849
850-#include <glib.h>
851+#include "glib/glib.h"
852
853 #include <libintl.h>
854 #include <string.h>
855diff --git a/glib/giochannel.h b/glib/giochannel.h
856index 82743602a..ecb748937 100644
857--- a/glib/giochannel.h
858+++ b/glib/giochannel.h
859@@ -29,9 +29,9 @@
860 #error "Only <glib.h> can be included directly."
861 #endif
862
863-#include <glib/gconvert.h>
864-#include <glib/gmain.h>
865-#include <glib/gstring.h>
866+#include "gconvert.h"
867+#include "gmain.h"
868+#include "gstring.h"
869
870 G_BEGIN_DECLS
871
872diff --git a/glib/giounix.c b/glib/giounix.c
873index b86d79db7..3ac2c5134 100644
874--- a/glib/giounix.c
875+++ b/glib/giounix.c
876@@ -40,7 +40,7 @@
877 #include <errno.h>
878 #include <string.h>
879 #include <fcntl.h>
880-#include <glib/gstdio.h>
881+#include "gstdio.h"
882
883 #include "giochannel.h"
884
885diff --git a/glib/gkeyfile.h b/glib/gkeyfile.h
886index 7a1004841..6d30fa378 100644
887--- a/glib/gkeyfile.h
888+++ b/glib/gkeyfile.h
889@@ -25,8 +25,8 @@
890 #error "Only <glib.h> can be included directly."
891 #endif
892
893-#include <glib/gbytes.h>
894-#include <glib/gerror.h>
895+#include "gbytes.h"
896+#include "gerror.h"
897
898 G_BEGIN_DECLS
899
900diff --git a/glib/glib-object.h b/glib/glib-object.h
901index fa824f3bb..ca0043ca0 100644
902--- a/glib/glib-object.h
903+++ b/glib/glib-object.h
904@@ -19,23 +19,23 @@
905
906 #define __GLIB_GOBJECT_H_INSIDE__
907
908-#include <gobject/gbinding.h>
909-#include <gobject/gboxed.h>
910-#include <gobject/genums.h>
911-#include <gobject/glib-enumtypes.h>
912-#include <gobject/gobject.h>
913-#include <gobject/gparam.h>
914-#include <gobject/gparamspecs.h>
915-#include <gobject/gsignal.h>
916-#include <gobject/gsourceclosure.h>
917-#include <gobject/gtype.h>
918-#include <gobject/gtypemodule.h>
919-#include <gobject/gtypeplugin.h>
920-#include <gobject/gvaluearray.h>
921-#include <gobject/gvalue.h>
922-#include <gobject/gvaluetypes.h>
923+#include "gobject/gbinding.h"
924+#include "gobject/gboxed.h"
925+#include "gobject/genums.h"
926+#include "build/gobject/glib-enumtypes.h"
927+#include "gobject/gobject.h"
928+#include "gobject/gparam.h"
929+#include "gobject/gparamspecs.h"
930+#include "gobject/gsignal.h"
931+#include "gobject/gsourceclosure.h"
932+#include "gobject/gtype.h"
933+#include "gobject/gtypemodule.h"
934+#include "gobject/gtypeplugin.h"
935+#include "gobject/gvaluearray.h"
936+#include "gobject/gvalue.h"
937+#include "gobject/gvaluetypes.h"
938
939-#include <gobject/gobject-autocleanups.h>
940+#include "gobject/gobject-autocleanups.h"
941
942 #undef __GLIB_GOBJECT_H_INSIDE__
943
944diff --git a/glib/glib-private.h b/glib/glib-private.h
945index 8de380d12..b0a1370cd 100644
946--- a/glib/glib-private.h
947+++ b/glib/glib-private.h
948@@ -18,7 +18,7 @@
949 #ifndef __GLIB_PRIVATE_H__
950 #define __GLIB_PRIVATE_H__
951
952-#include <glib.h>
953+#include "glib/glib.h"
954 #include "gwakeup.h"
955 #include "gstdioprivate.h"
956
957diff --git a/glib/glib-unix.h b/glib/glib-unix.h
958index a5ea9a1c5..b87708312 100644
959--- a/glib/glib-unix.h
960+++ b/glib/glib-unix.h
961@@ -30,7 +30,7 @@
962 #include <stdlib.h>
963 #include <fcntl.h>
964
965-#include <glib.h>
966+#include "glib/glib.h"
967
968 #ifndef G_OS_UNIX
969 #error "This header may only be used on UNIX"
970diff --git a/glib/glib.h b/glib/glib.h
971index a4d43a9bf..db3c0bf14 100644
972--- a/glib/glib.h
973+++ b/glib/glib.h
974@@ -27,91 +27,91 @@
975
976 #define __GLIB_H_INSIDE__
977
978-#include <glib/galloca.h>
979-#include <glib/garray.h>
980-#include <glib/gasyncqueue.h>
981-#include <glib/gatomic.h>
982-#include <glib/gbacktrace.h>
983-#include <glib/gbase64.h>
984-#include <glib/gbitlock.h>
985-#include <glib/gbookmarkfile.h>
986-#include <glib/gbytes.h>
987-#include <glib/gcharset.h>
988-#include <glib/gchecksum.h>
989-#include <glib/gconvert.h>
990-#include <glib/gdataset.h>
991-#include <glib/gdate.h>
992-#include <glib/gdatetime.h>
993-#include <glib/gdir.h>
994-#include <glib/genviron.h>
995-#include <glib/gerror.h>
996-#include <glib/gfileutils.h>
997-#include <glib/ggettext.h>
998-#include <glib/ghash.h>
999-#include <glib/ghmac.h>
1000-#include <glib/ghook.h>
1001-#include <glib/ghostutils.h>
1002-#include <glib/giochannel.h>
1003-#include <glib/gkeyfile.h>
1004-#include <glib/glist.h>
1005-#include <glib/gmacros.h>
1006-#include <glib/gmain.h>
1007-#include <glib/gmappedfile.h>
1008-#include <glib/gmarkup.h>
1009-#include <glib/gmem.h>
1010-#include <glib/gmessages.h>
1011-#include <glib/gnode.h>
1012-#include <glib/goption.h>
1013-#include <glib/gpattern.h>
1014-#include <glib/gpoll.h>
1015-#include <glib/gprimes.h>
1016-#include <glib/gqsort.h>
1017-#include <glib/gquark.h>
1018-#include <glib/gqueue.h>
1019-#include <glib/grand.h>
1020-#include <glib/grcbox.h>
1021-#include <glib/grefcount.h>
1022-#include <glib/grefstring.h>
1023-#include <glib/gregex.h>
1024-#include <glib/gscanner.h>
1025-#include <glib/gsequence.h>
1026-#include <glib/gshell.h>
1027-#include <glib/gslice.h>
1028-#include <glib/gslist.h>
1029-#include <glib/gspawn.h>
1030-#include <glib/gstrfuncs.h>
1031-#include <glib/gstringchunk.h>
1032-#include <glib/gstring.h>
1033-#include <glib/gstrvbuilder.h>
1034-#include <glib/gtestutils.h>
1035-#include <glib/gthread.h>
1036-#include <glib/gthreadpool.h>
1037-#include <glib/gtimer.h>
1038-#include <glib/gtimezone.h>
1039-#include <glib/gtrashstack.h>
1040-#include <glib/gtree.h>
1041-#include <glib/gtypes.h>
1042-#include <glib/gunicode.h>
1043-#include <glib/guri.h>
1044-#include <glib/gutils.h>
1045-#include <glib/guuid.h>
1046-#include <glib/gvariant.h>
1047-#include <glib/gvarianttype.h>
1048-#include <glib/gversion.h>
1049-#include <glib/gversionmacros.h>
1050+#include "galloca.h"
1051+#include "garray.h"
1052+#include "gasyncqueue.h"
1053+#include "gatomic.h"
1054+#include "gbacktrace.h"
1055+#include "gbase64.h"
1056+#include "gbitlock.h"
1057+#include "gbookmarkfile.h"
1058+#include "gbytes.h"
1059+#include "gcharset.h"
1060+#include "gchecksum.h"
1061+#include "gconvert.h"
1062+#include "gdataset.h"
1063+#include "gdate.h"
1064+#include "gdatetime.h"
1065+#include "gdir.h"
1066+#include "genviron.h"
1067+#include "gerror.h"
1068+#include "gfileutils.h"
1069+#include "ggettext.h"
1070+#include "ghash.h"
1071+#include "ghmac.h"
1072+#include "ghook.h"
1073+#include "ghostutils.h"
1074+#include "giochannel.h"
1075+#include "gkeyfile.h"
1076+#include "glist.h"
1077+#include "gmacros.h"
1078+#include "gmain.h"
1079+#include "gmappedfile.h"
1080+#include "gmarkup.h"
1081+#include "gmem.h"
1082+#include "gmessages.h"
1083+#include "gnode.h"
1084+#include "goption.h"
1085+#include "gpattern.h"
1086+#include "gpoll.h"
1087+#include "gprimes.h"
1088+#include "gqsort.h"
1089+#include "gquark.h"
1090+#include "gqueue.h"
1091+#include "grand.h"
1092+#include "grcbox.h"
1093+#include "grefcount.h"
1094+#include "grefstring.h"
1095+#include "gregex.h"
1096+#include "gscanner.h"
1097+#include "gsequence.h"
1098+#include "gshell.h"
1099+#include "gslice.h"
1100+#include "gslist.h"
1101+#include "gspawn.h"
1102+#include "gstrfuncs.h"
1103+#include "gstringchunk.h"
1104+#include "gstring.h"
1105+#include "gstrvbuilder.h"
1106+#include "gtestutils.h"
1107+#include "gthread.h"
1108+#include "gthreadpool.h"
1109+#include "gtimer.h"
1110+#include "gtimezone.h"
1111+#include "gtrashstack.h"
1112+#include "gtree.h"
1113+#include "gtypes.h"
1114+#include "gunicode.h"
1115+#include "guri.h"
1116+#include "gutils.h"
1117+#include "guuid.h"
1118+#include "gvariant.h"
1119+#include "gvarianttype.h"
1120+#include "gversion.h"
1121+#include "gversionmacros.h"
1122
1123 #ifdef G_PLATFORM_WIN32
1124-#include <glib/gwin32.h>
1125+#include "gwin32.h"
1126 #endif
1127
1128-#include <glib/deprecated/gallocator.h>
1129-#include <glib/deprecated/gcache.h>
1130-#include <glib/deprecated/gcompletion.h>
1131-#include <glib/deprecated/gmain.h>
1132-#include <glib/deprecated/grel.h>
1133-#include <glib/deprecated/gthread.h>
1134+#include "glib/deprecated/gallocator.h"
1135+#include "glib/deprecated/gcache.h"
1136+#include "glib/deprecated/gcompletion.h"
1137+#include "glib/deprecated/gmain.h"
1138+#include "glib/deprecated/grel.h"
1139+#include "glib/deprecated/gthread.h"
1140
1141-#include <glib/glib-autocleanups.h>
1142+#include "glib-autocleanups.h"
1143
1144 #undef __GLIB_H_INSIDE__
1145
1146diff --git a/glib/glist.h b/glib/glist.h
1147index ddea3cf35..fc822fa5c 100644
1148--- a/glib/glist.h
1149+++ b/glib/glist.h
1150@@ -29,8 +29,8 @@
1151 #error "Only <glib.h> can be included directly."
1152 #endif
1153
1154-#include <glib/gmem.h>
1155-#include <glib/gnode.h>
1156+#include "gmem.h"
1157+#include "gnode.h"
1158
1159 G_BEGIN_DECLS
1160
1161diff --git a/glib/gmain.h b/glib/gmain.h
1162index 5c0e524cc..12504f6e3 100644
1163--- a/glib/gmain.h
1164+++ b/glib/gmain.h
1165@@ -22,9 +22,9 @@
1166 #error "Only <glib.h> can be included directly."
1167 #endif
1168
1169-#include <glib/gpoll.h>
1170-#include <glib/gslist.h>
1171-#include <glib/gthread.h>
1172+#include "gpoll.h"
1173+#include "gslist.h"
1174+#include "gthread.h"
1175
1176 G_BEGIN_DECLS
1177
1178diff --git a/glib/gmappedfile.h b/glib/gmappedfile.h
1179index 8256811e6..aeb80e3c0 100644
1180--- a/glib/gmappedfile.h
1181+++ b/glib/gmappedfile.h
1182@@ -24,8 +24,8 @@
1183 #error "Only <glib.h> can be included directly."
1184 #endif
1185
1186-#include <glib/gbytes.h>
1187-#include <glib/gerror.h>
1188+#include "gbytes.h"
1189+#include "gerror.h"
1190
1191 G_BEGIN_DECLS
1192
1193diff --git a/glib/gmarkup.h b/glib/gmarkup.h
1194index 96375b55a..b7c65f6b4 100644
1195--- a/glib/gmarkup.h
1196+++ b/glib/gmarkup.h
1197@@ -25,8 +25,8 @@
1198
1199 #include <stdarg.h>
1200
1201-#include <glib/gerror.h>
1202-#include <glib/gslist.h>
1203+#include "gerror.h"
1204+#include "gslist.h"
1205
1206 G_BEGIN_DECLS
1207
1208diff --git a/glib/gmem.h b/glib/gmem.h
1209index ccf477843..8b1822bd3 100644
1210--- a/glib/gmem.h
1211+++ b/glib/gmem.h
1212@@ -29,7 +29,7 @@
1213 #error "Only <glib.h> can be included directly."
1214 #endif
1215
1216-#include <glib/gutils.h>
1217+#include "gutils.h"
1218
1219 #if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
1220 /* for glib_typeof */
1221diff --git a/glib/gmessages.h b/glib/gmessages.h
1222index 43c6d67b9..f4ece7894 100644
1223--- a/glib/gmessages.h
1224+++ b/glib/gmessages.h
1225@@ -30,10 +30,10 @@
1226 #endif
1227
1228 #include <stdarg.h>
1229-#include <glib/gatomic.h>
1230-#include <glib/gtypes.h>
1231-#include <glib/gmacros.h>
1232-#include <glib/gvariant.h>
1233+#include "gatomic.h"
1234+#include "gtypes.h"
1235+#include "gmacros.h"
1236+#include "gvariant.h"
1237
1238 G_BEGIN_DECLS
1239
1240diff --git a/glib/gnode.h b/glib/gnode.h
1241index 693e6154d..217084cf7 100644
1242--- a/glib/gnode.h
1243+++ b/glib/gnode.h
1244@@ -29,7 +29,7 @@
1245 #error "Only <glib.h> can be included directly."
1246 #endif
1247
1248-#include <glib/gmem.h>
1249+#include "gmem.h"
1250
1251 G_BEGIN_DECLS
1252
1253diff --git a/glib/goption.h b/glib/goption.h
1254index 63552fb0d..4b75b74cb 100644
1255--- a/glib/goption.h
1256+++ b/glib/goption.h
1257@@ -23,8 +23,8 @@
1258 #error "Only <glib.h> can be included directly."
1259 #endif
1260
1261-#include <glib/gerror.h>
1262-#include <glib/gquark.h>
1263+#include "gerror.h"
1264+#include "gquark.h"
1265
1266 G_BEGIN_DECLS
1267
1268diff --git a/glib/gpattern.h b/glib/gpattern.h
1269index bd9e4a7af..5a8b5d53a 100644
1270--- a/glib/gpattern.h
1271+++ b/glib/gpattern.h
1272@@ -22,7 +22,7 @@
1273 #error "Only <glib.h> can be included directly."
1274 #endif
1275
1276-#include <glib/gtypes.h>
1277+#include "gtypes.h"
1278
1279 G_BEGIN_DECLS
1280
1281diff --git a/glib/gpoll.h b/glib/gpoll.h
1282index 2cbd69729..306a48069 100644
1283--- a/glib/gpoll.h
1284+++ b/glib/gpoll.h
1285@@ -22,8 +22,8 @@
1286 #error "Only <glib.h> can be included directly."
1287 #endif
1288
1289-#include <glibconfig.h>
1290-#include <glib/gtypes.h>
1291+#include "glib/glibconfig.h"
1292+#include "gtypes.h"
1293
1294 G_BEGIN_DECLS
1295
1296diff --git a/glib/gprimes.h b/glib/gprimes.h
1297index 0b6ea850d..634bdddc3 100644
1298--- a/glib/gprimes.h
1299+++ b/glib/gprimes.h
1300@@ -29,7 +29,7 @@
1301 #error "Only <glib.h> can be included directly."
1302 #endif
1303
1304-#include <glib/gtypes.h>
1305+#include "gtypes.h"
1306
1307 G_BEGIN_DECLS
1308
1309diff --git a/glib/gprintf.h b/glib/gprintf.h
1310index 429de7a24..2a224e3a4 100644
1311--- a/glib/gprintf.h
1312+++ b/glib/gprintf.h
1313@@ -18,7 +18,7 @@
1314 #ifndef __G_PRINTF_H__
1315 #define __G_PRINTF_H__
1316
1317-#include <glib.h>
1318+#include "glib/glib.h"
1319 #include <stdio.h>
1320 #include <stdarg.h>
1321
1322diff --git a/glib/gprintfint.h b/glib/gprintfint.h
1323index 9ccf2eb47..e8cffcd58 100644
1324--- a/glib/gprintfint.h
1325+++ b/glib/gprintfint.h
1326@@ -39,7 +39,7 @@
1327
1328 #else
1329
1330-#include "gnulib/printf.h"
1331+#include "glib/gnulib/printf.h"
1332
1333 #define _g_printf _g_gnulib_printf
1334 #define _g_fprintf _g_gnulib_fprintf
1335diff --git a/glib/gqsort.h b/glib/gqsort.h
1336index 2ecd75fae..63ca144ca 100644
1337--- a/glib/gqsort.h
1338+++ b/glib/gqsort.h
1339@@ -29,7 +29,7 @@
1340 #error "Only <glib.h> can be included directly."
1341 #endif
1342
1343-#include <glib/gtypes.h>
1344+#include "gtypes.h"
1345
1346 G_BEGIN_DECLS
1347
1348diff --git a/glib/gquark.h b/glib/gquark.h
1349index 1822c4bf7..5badfd45c 100644
1350--- a/glib/gquark.h
1351+++ b/glib/gquark.h
1352@@ -29,7 +29,7 @@
1353 #error "Only <glib.h> can be included directly."
1354 #endif
1355
1356-#include <glib/gtypes.h>
1357+#include "gtypes.h"
1358
1359 G_BEGIN_DECLS
1360
1361diff --git a/glib/gqueue.h b/glib/gqueue.h
1362index 65d609f1a..c38219d53 100644
1363--- a/glib/gqueue.h
1364+++ b/glib/gqueue.h
1365@@ -29,7 +29,7 @@
1366 #error "Only <glib.h> can be included directly."
1367 #endif
1368
1369-#include <glib/glist.h>
1370+#include "glist.h"
1371
1372 G_BEGIN_DECLS
1373
1374diff --git a/glib/grand.h b/glib/grand.h
1375index d64e50253..bdf82a6fe 100644
1376--- a/glib/grand.h
1377+++ b/glib/grand.h
1378@@ -29,7 +29,7 @@
1379 #error "Only <glib.h> can be included directly."
1380 #endif
1381
1382-#include <glib/gtypes.h>
1383+#include "gtypes.h"
1384
1385 G_BEGIN_DECLS
1386
1387diff --git a/glib/grcbox.h b/glib/grcbox.h
1388index 47dfd488b..a87629588 100644
1389--- a/glib/grcbox.h
1390+++ b/glib/grcbox.h
1391@@ -22,7 +22,7 @@
1392 #error "Only <glib.h> can be included directly."
1393 #endif
1394
1395-#include <glib/gmem.h>
1396+#include "gmem.h"
1397
1398 #if defined(glib_typeof_2_68) && GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_68
1399 /* for glib_typeof */
1400diff --git a/glib/grefcount.h b/glib/grefcount.h
1401index 599dac978..f46364db5 100644
1402--- a/glib/grefcount.h
1403+++ b/glib/grefcount.h
1404@@ -23,8 +23,8 @@
1405 #error "Only <glib.h> can be included directly."
1406 #endif
1407
1408-#include <glib/gatomic.h>
1409-#include <glib/gtypes.h>
1410+#include "gatomic.h"
1411+#include "gtypes.h"
1412
1413 G_BEGIN_DECLS
1414
1415diff --git a/glib/gregex.c b/glib/gregex.c
1416index 5e6ddfb46..a89bfe779 100644
1417--- a/glib/gregex.c
1418+++ b/glib/gregex.c
1419@@ -25,7 +25,7 @@
1420 #ifdef USE_SYSTEM_PCRE
1421 #include <pcre.h>
1422 #else
1423-#include "pcre/pcre.h"
1424+#include "glib/pcre/pcre.h"
1425 #endif
1426
1427 #include "gtypes.h"
1428diff --git a/glib/gregex.h b/glib/gregex.h
1429index 45e198df6..b765bc17c 100644
1430--- a/glib/gregex.h
1431+++ b/glib/gregex.h
1432@@ -25,8 +25,8 @@
1433 #error "Only <glib.h> can be included directly."
1434 #endif
1435
1436-#include <glib/gerror.h>
1437-#include <glib/gstring.h>
1438+#include "gerror.h"
1439+#include "gstring.h"
1440
1441 G_BEGIN_DECLS
1442
1443diff --git a/glib/gscanner.h b/glib/gscanner.h
1444index d87b4533e..837891caf 100644
1445--- a/glib/gscanner.h
1446+++ b/glib/gscanner.h
1447@@ -29,8 +29,8 @@
1448 #error "Only <glib.h> can be included directly."
1449 #endif
1450
1451-#include <glib/gdataset.h>
1452-#include <glib/ghash.h>
1453+#include "gdataset.h"
1454+#include "ghash.h"
1455
1456 G_BEGIN_DECLS
1457
1458diff --git a/glib/gsequence.h b/glib/gsequence.h
1459index 6dce2f4fb..ad69d34f3 100644
1460--- a/glib/gsequence.h
1461+++ b/glib/gsequence.h
1462@@ -23,7 +23,7 @@
1463 #error "Only <glib.h> can be included directly."
1464 #endif
1465
1466-#include <glib/gtypes.h>
1467+#include "gtypes.h"
1468
1469 G_BEGIN_DECLS
1470
1471diff --git a/glib/gshell.h b/glib/gshell.h
1472index 798dd7808..77d081f43 100644
1473--- a/glib/gshell.h
1474+++ b/glib/gshell.h
1475@@ -23,7 +23,7 @@
1476 #error "Only <glib.h> can be included directly."
1477 #endif
1478
1479-#include <glib/gerror.h>
1480+#include "gerror.h"
1481
1482 G_BEGIN_DECLS
1483
1484diff --git a/glib/gslice.h b/glib/gslice.h
1485index 002410635..5da19645d 100644
1486--- a/glib/gslice.h
1487+++ b/glib/gslice.h
1488@@ -22,7 +22,7 @@
1489 #error "Only <glib.h> can be included directly."
1490 #endif
1491
1492-#include <glib/gtypes.h>
1493+#include "gtypes.h"
1494 #include <string.h>
1495
1496 G_BEGIN_DECLS
1497diff --git a/glib/gslist.h b/glib/gslist.h
1498index 249417986..954fa70e8 100644
1499--- a/glib/gslist.h
1500+++ b/glib/gslist.h
1501@@ -29,8 +29,8 @@
1502 #error "Only <glib.h> can be included directly."
1503 #endif
1504
1505-#include <glib/gmem.h>
1506-#include <glib/gnode.h>
1507+#include "gmem.h"
1508+#include "gnode.h"
1509
1510 G_BEGIN_DECLS
1511
1512diff --git a/glib/gspawn.c b/glib/gspawn.c
1513index 95f5b868e..62505ebda 100644
1514--- a/glib/gspawn.c
1515+++ b/glib/gspawn.c
1516@@ -55,7 +55,7 @@
1517 #include "gspawn-private.h"
1518 #include "gthread.h"
1519 #include "gtrace-private.h"
1520-#include "glib/gstdio.h"
1521+#include "gstdio.h"
1522
1523 #include "genviron.h"
1524 #include "gmem.h"
1525diff --git a/glib/gspawn.h b/glib/gspawn.h
1526index e09dc2aec..ca0a34f42 100644
1527--- a/glib/gspawn.h
1528+++ b/glib/gspawn.h
1529@@ -23,7 +23,7 @@
1530 #error "Only <glib.h> can be included directly."
1531 #endif
1532
1533-#include <glib/gerror.h>
1534+#include "gerror.h"
1535
1536 G_BEGIN_DECLS
1537
1538diff --git a/glib/gstdio.h b/glib/gstdio.h
1539index 7ed9c5dfa..ce94a8c1a 100644
1540--- a/glib/gstdio.h
1541+++ b/glib/gstdio.h
1542@@ -19,7 +19,7 @@
1543 #ifndef __G_STDIO_H__
1544 #define __G_STDIO_H__
1545
1546-#include <glib/gprintf.h>
1547+#include "gprintf.h"
1548
1549 #include <sys/stat.h>
1550
1551diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
1552index b6ff60f51..95381d682 100644
1553--- a/glib/gstrfuncs.c
1554+++ b/glib/gstrfuncs.c
1555@@ -35,7 +35,7 @@
1556 #include <string.h>
1557 #include <locale.h>
1558 #include <errno.h>
1559-#include <garray.h>
1560+#include "garray.h"
1561 #include <ctype.h> /* For tolower() */
1562
1563 #ifdef HAVE_XLOCALE_H
1564diff --git a/glib/gstrfuncs.h b/glib/gstrfuncs.h
1565index 2b44c9a55..57d6ba7af 100644
1566--- a/glib/gstrfuncs.h
1567+++ b/glib/gstrfuncs.h
1568@@ -30,9 +30,9 @@
1569 #endif
1570
1571 #include <stdarg.h>
1572-#include <glib/gmacros.h>
1573-#include <glib/gtypes.h>
1574-#include <glib/gerror.h>
1575+#include "gmacros.h"
1576+#include "gtypes.h"
1577+#include "gerror.h"
1578
1579 G_BEGIN_DECLS
1580
1581diff --git a/glib/gstring.h b/glib/gstring.h
1582index eec4c138f..a851e1f72 100644
1583--- a/glib/gstring.h
1584+++ b/glib/gstring.h
1585@@ -29,10 +29,10 @@
1586 #error "Only <glib.h> can be included directly."
1587 #endif
1588
1589-#include <glib/gtypes.h>
1590-#include <glib/gunicode.h>
1591-#include <glib/gbytes.h>
1592-#include <glib/gutils.h> /* for G_CAN_INLINE */
1593+#include "gtypes.h"
1594+#include "gunicode.h"
1595+#include "gbytes.h"
1596+#include "gutils.h" /* for G_CAN_INLINE */
1597
1598 G_BEGIN_DECLS
1599
1600diff --git a/glib/gstringchunk.h b/glib/gstringchunk.h
1601index 8d445e349..17797883a 100644
1602--- a/glib/gstringchunk.h
1603+++ b/glib/gstringchunk.h
1604@@ -29,7 +29,7 @@
1605 #error "Only <glib.h> can be included directly."
1606 #endif
1607
1608-#include <glib/gtypes.h>
1609+#include "gtypes.h"
1610
1611 G_BEGIN_DECLS
1612
1613diff --git a/glib/gstrvbuilder.h b/glib/gstrvbuilder.h
1614index 395bcfbbe..82b2434cc 100644
1615--- a/glib/gstrvbuilder.h
1616+++ b/glib/gstrvbuilder.h
1617@@ -22,8 +22,8 @@
1618 #error "Only <glib.h> can be included directly."
1619 #endif
1620
1621-#include <glib/gstrfuncs.h>
1622-#include <glib/gtypes.h>
1623+#include "gstrfuncs.h"
1624+#include "gtypes.h"
1625
1626 G_BEGIN_DECLS
1627
1628diff --git a/glib/gtester.c b/glib/gtester.c
1629index fdcdaca10..e2f2550e4 100644
1630--- a/glib/gtester.c
1631+++ b/glib/gtester.c
1632@@ -17,9 +17,9 @@
1633 */
1634 #include "config.h"
1635
1636-#include <glib.h>
1637-#include <glib-unix.h>
1638-#include <gstdio.h>
1639+#include "glib/glib.h"
1640+#include "glib-unix.h"
1641+#include "gstdio.h"
1642 #include <string.h>
1643 #include <stdlib.h>
1644 #include <unistd.h>
1645diff --git a/glib/gtestutils.c b/glib/gtestutils.c
1646index d24c6e186..3ef845796 100644
1647--- a/glib/gtestutils.c
1648+++ b/glib/gtestutils.c
1649@@ -43,7 +43,7 @@
1650 #ifdef HAVE_SYS_SELECT_H
1651 #include <sys/select.h>
1652 #endif /* HAVE_SYS_SELECT_H */
1653-#include <glib/gstdio.h>
1654+#include "gstdio.h"
1655
1656 #include "gmain.h"
1657 #include "gpattern.h"
1658diff --git a/glib/gtestutils.h b/glib/gtestutils.h
1659index 041143936..420624249 100644
1660--- a/glib/gtestutils.h
1661+++ b/glib/gtestutils.h
1662@@ -23,10 +23,10 @@
1663 #error "Only <glib.h> can be included directly."
1664 #endif
1665
1666-#include <glib/gmessages.h>
1667-#include <glib/gstring.h>
1668-#include <glib/gerror.h>
1669-#include <glib/gslist.h>
1670+#include "gmessages.h"
1671+#include "gstring.h"
1672+#include "gerror.h"
1673+#include "gslist.h"
1674 #include <errno.h>
1675 #include <string.h>
1676
1677diff --git a/glib/gthread.h b/glib/gthread.h
1678index a30815eb8..0ab54dd66 100644
1679--- a/glib/gthread.h
1680+++ b/glib/gthread.h
1681@@ -29,9 +29,9 @@
1682 #error "Only <glib.h> can be included directly."
1683 #endif
1684
1685-#include <glib/gatomic.h>
1686-#include <glib/gerror.h>
1687-#include <glib/gutils.h>
1688+#include "gatomic.h"
1689+#include "gerror.h"
1690+#include "gutils.h"
1691
1692 G_BEGIN_DECLS
1693
1694diff --git a/glib/gthreadpool.h b/glib/gthreadpool.h
1695index 11c3d1d16..44b5c6b06 100644
1696--- a/glib/gthreadpool.h
1697+++ b/glib/gthreadpool.h
1698@@ -29,7 +29,7 @@
1699 #error "Only <glib.h> can be included directly."
1700 #endif
1701
1702-#include <glib/gthread.h>
1703+#include "gthread.h"
1704
1705 G_BEGIN_DECLS
1706
1707diff --git a/glib/gthreadprivate.h b/glib/gthreadprivate.h
1708index 34ba6126b..bd5edd104 100644
1709--- a/glib/gthreadprivate.h
1710+++ b/glib/gthreadprivate.h
1711@@ -23,7 +23,7 @@
1712
1713 #include "config.h"
1714
1715-#include "deprecated/gthread.h"
1716+#include "glib/deprecated/gthread.h"
1717
1718 typedef struct _GRealThread GRealThread;
1719 struct _GRealThread
1720diff --git a/glib/gtimer.h b/glib/gtimer.h
1721index 28794d167..b0749b97d 100644
1722--- a/glib/gtimer.h
1723+++ b/glib/gtimer.h
1724@@ -29,7 +29,7 @@
1725 #error "Only <glib.h> can be included directly."
1726 #endif
1727
1728-#include <glib/gtypes.h>
1729+#include "gtypes.h"
1730
1731 G_BEGIN_DECLS
1732
1733diff --git a/glib/gtimezone.h b/glib/gtimezone.h
1734index d68a76d3e..67bb9242b 100644
1735--- a/glib/gtimezone.h
1736+++ b/glib/gtimezone.h
1737@@ -24,8 +24,8 @@
1738 #error "Only <glib.h> can be included directly."
1739 #endif
1740
1741-#include <glib/gerror.h>
1742-#include <glib/gtypes.h>
1743+#include "gerror.h"
1744+#include "gtypes.h"
1745
1746 G_BEGIN_DECLS
1747
1748diff --git a/glib/gtranslit.c b/glib/gtranslit.c
1749index 3cffe1d2d..7b6671e73 100644
1750--- a/glib/gtranslit.c
1751+++ b/glib/gtranslit.c
1752@@ -17,11 +17,11 @@
1753 * Author: Ryan Lortie <desrt@desrt.ca>
1754 */
1755
1756-#include <config.h>
1757+#include "config.h"
1758
1759 #include "gstrfuncs.h"
1760
1761-#include <glib.h>
1762+#include "glib/glib.h"
1763 #include <locale.h>
1764 #include <stdlib.h>
1765 #include <string.h>
1766diff --git a/glib/gtrashstack.h b/glib/gtrashstack.h
1767index 0730ec296..7585e9907 100644
1768--- a/glib/gtrashstack.h
1769+++ b/glib/gtrashstack.h
1770@@ -29,7 +29,7 @@
1771 #error "Only <glib.h> can be included directly."
1772 #endif
1773
1774-#include <glib/gutils.h>
1775+#include "gutils.h"
1776
1777 G_BEGIN_DECLS
1778
1779diff --git a/glib/gtree.h b/glib/gtree.h
1780index 19f9f7ea1..8164efff8 100644
1781--- a/glib/gtree.h
1782+++ b/glib/gtree.h
1783@@ -29,7 +29,7 @@
1784 #error "Only <glib.h> can be included directly."
1785 #endif
1786
1787-#include <glib/gnode.h>
1788+#include "gnode.h"
1789
1790 G_BEGIN_DECLS
1791
1792diff --git a/glib/gtypes.h b/glib/gtypes.h
1793index 2c4825582..34cae584f 100644
1794--- a/glib/gtypes.h
1795+++ b/glib/gtypes.h
1796@@ -29,9 +29,9 @@
1797 #error "Only <glib.h> can be included directly."
1798 #endif
1799
1800-#include <glibconfig.h>
1801-#include <glib/gmacros.h>
1802-#include <glib/gversionmacros.h>
1803+#include "glib/glibconfig.h"
1804+#include "gmacros.h"
1805+#include "gversionmacros.h"
1806 #include <time.h>
1807
1808 G_BEGIN_DECLS
1809diff --git a/glib/gunibreak.h b/glib/gunibreak.h
1810index d2d38a100..c69e86c77 100644
1811--- a/glib/gunibreak.h
1812+++ b/glib/gunibreak.h
1813@@ -4,8 +4,8 @@
1814 #ifndef BREAKTABLES_H
1815 #define BREAKTABLES_H
1816
1817-#include <glib/gtypes.h>
1818-#include <glib/gunicode.h>
1819+#include "gtypes.h"
1820+#include "gunicode.h"
1821
1822 #define G_UNICODE_DATA_VERSION "13.0.0"
1823
1824diff --git a/glib/gunicode.h b/glib/gunicode.h
1825index d72980380..edc033624 100644
1826--- a/glib/gunicode.h
1827+++ b/glib/gunicode.h
1828@@ -24,8 +24,8 @@
1829 #error "Only <glib.h> can be included directly."
1830 #endif
1831
1832-#include <glib/gerror.h>
1833-#include <glib/gtypes.h>
1834+#include "gerror.h"
1835+#include "gtypes.h"
1836
1837 G_BEGIN_DECLS
1838
1839diff --git a/glib/guri.h b/glib/guri.h
1840index b6a4fd033..4948815bd 100644
1841--- a/glib/guri.h
1842+++ b/glib/guri.h
1843@@ -22,7 +22,7 @@
1844 #error "Only <glib.h> can be included directly."
1845 #endif
1846
1847-#include <glib/gtypes.h>
1848+#include "gtypes.h"
1849
1850 G_BEGIN_DECLS
1851
1852diff --git a/glib/gutils.h b/glib/gutils.h
1853index f8a6049ff..e47c0d03e 100644
1854--- a/glib/gutils.h
1855+++ b/glib/gutils.h
1856@@ -29,7 +29,7 @@
1857 #error "Only <glib.h> can be included directly."
1858 #endif
1859
1860-#include <glib/gtypes.h>
1861+#include "gtypes.h"
1862 #include <stdarg.h>
1863
1864 G_BEGIN_DECLS
1865diff --git a/glib/guuid.h b/glib/guuid.h
1866index c653188a0..c5f5eeaee 100644
1867--- a/glib/guuid.h
1868+++ b/glib/guuid.h
1869@@ -27,7 +27,7 @@
1870 #error "Only <glib.h> can be included directly."
1871 #endif
1872
1873-#include <glib/gtypes.h>
1874+#include "gtypes.h"
1875
1876 G_BEGIN_DECLS
1877
1878diff --git a/glib/gvariant-core.c b/glib/gvariant-core.c
1879index b34ba8d8e..bb992ff0d 100644
1880--- a/glib/gvariant-core.c
1881+++ b/glib/gvariant-core.c
1882@@ -18,17 +18,17 @@
1883
1884 #include "config.h"
1885
1886-#include <glib/gvariant-core.h>
1887-
1888-#include <glib/gvariant-internal.h>
1889-#include <glib/gvariant-serialiser.h>
1890-#include <glib/gtestutils.h>
1891-#include <glib/gbitlock.h>
1892-#include <glib/gatomic.h>
1893-#include <glib/gbytes.h>
1894-#include <glib/gslice.h>
1895-#include <glib/gmem.h>
1896-#include <glib/grefcount.h>
1897+#include "gvariant-core.h"
1898+
1899+#include "gvariant-internal.h"
1900+#include "gvariant-serialiser.h"
1901+#include "gtestutils.h"
1902+#include "gbitlock.h"
1903+#include "gatomic.h"
1904+#include "gbytes.h"
1905+#include "gslice.h"
1906+#include "gmem.h"
1907+#include "grefcount.h"
1908 #include <string.h>
1909
1910
1911diff --git a/glib/gvariant-core.h b/glib/gvariant-core.h
1912index fc04711ac..e83af4fcf 100644
1913--- a/glib/gvariant-core.h
1914+++ b/glib/gvariant-core.h
1915@@ -19,9 +19,9 @@
1916 #ifndef __G_VARIANT_CORE_H__
1917 #define __G_VARIANT_CORE_H__
1918
1919-#include <glib/gvarianttypeinfo.h>
1920-#include <glib/gvariant.h>
1921-#include <glib/gbytes.h>
1922+#include "gvarianttypeinfo.h"
1923+#include "gvariant.h"
1924+#include "gbytes.h"
1925
1926 /* gvariant-core.c */
1927
1928diff --git a/glib/gvariant-internal.h b/glib/gvariant-internal.h
1929index f7536da71..3952cc3db 100644
1930--- a/glib/gvariant-internal.h
1931+++ b/glib/gvariant-internal.h
1932@@ -29,8 +29,8 @@
1933 /* Hack */
1934 #define __GLIB_H_INSIDE__
1935
1936-#include <glib/gvarianttype.h>
1937-#include <glib/gtypes.h>
1938+#include "gvarianttype.h"
1939+#include "gtypes.h"
1940
1941 #include "gvariant-serialiser.h"
1942 #include "gvarianttypeinfo.h"
1943diff --git a/glib/gvariant-serialiser.c b/glib/gvariant-serialiser.c
1944index 06f419fe4..6e958bb69 100644
1945--- a/glib/gvariant-serialiser.c
1946+++ b/glib/gvariant-serialiser.c
1947@@ -23,10 +23,10 @@
1948
1949 #include "gvariant-serialiser.h"
1950
1951-#include <glib/gvariant-internal.h>
1952-#include <glib/gtestutils.h>
1953-#include <glib/gstrfuncs.h>
1954-#include <glib/gtypes.h>
1955+#include "gvariant-internal.h"
1956+#include "gtestutils.h"
1957+#include "gstrfuncs.h"
1958+#include "gtypes.h"
1959
1960 #include <string.h>
1961
1962diff --git a/glib/gvariant.c b/glib/gvariant.c
1963index e48dec1ad..2bd0e6ba6 100644
1964--- a/glib/gvariant.c
1965+++ b/glib/gvariant.c
1966@@ -22,14 +22,14 @@
1967
1968 #include "config.h"
1969
1970-#include <glib/gvariant-serialiser.h>
1971+#include "gvariant-serialiser.h"
1972 #include "gvariant-internal.h"
1973-#include <glib/gvariant-core.h>
1974-#include <glib/gtestutils.h>
1975-#include <glib/gstrfuncs.h>
1976-#include <glib/gslice.h>
1977-#include <glib/ghash.h>
1978-#include <glib/gmem.h>
1979+#include "gvariant-core.h"
1980+#include "gtestutils.h"
1981+#include "gstrfuncs.h"
1982+#include "gslice.h"
1983+#include "ghash.h"
1984+#include "gmem.h"
1985
1986 #include <string.h>
1987
1988diff --git a/glib/gvariant.h b/glib/gvariant.h
1989index c0587a887..15fe73e84 100644
1990--- a/glib/gvariant.h
1991+++ b/glib/gvariant.h
1992@@ -25,9 +25,9 @@
1993 #error "Only <glib.h> can be included directly."
1994 #endif
1995
1996-#include <glib/gvarianttype.h>
1997-#include <glib/gstring.h>
1998-#include <glib/gbytes.h>
1999+#include "gvarianttype.h"
2000+#include "gstring.h"
2001+#include "gbytes.h"
2002
2003 G_BEGIN_DECLS
2004
2005diff --git a/glib/gvarianttype.c b/glib/gvarianttype.c
2006index cc97235f3..8125cac1b 100644
2007--- a/glib/gvarianttype.c
2008+++ b/glib/gvarianttype.c
2009@@ -22,9 +22,9 @@
2010
2011 #include "gvarianttype.h"
2012
2013-#include <glib/gtestutils.h>
2014-#include <glib/gstrfuncs.h>
2015-#include <glib/gvariant-internal.h>
2016+#include "gtestutils.h"
2017+#include "gstrfuncs.h"
2018+#include "gvariant-internal.h"
2019
2020 #include <string.h>
2021
2022diff --git a/glib/gvarianttype.h b/glib/gvarianttype.h
2023index fdc364166..dc705cc3a 100644
2024--- a/glib/gvarianttype.h
2025+++ b/glib/gvarianttype.h
2026@@ -25,7 +25,7 @@
2027 #error "Only <glib.h> can be included directly."
2028 #endif
2029
2030-#include <glib/gtypes.h>
2031+#include "gtypes.h"
2032
2033 G_BEGIN_DECLS
2034
2035diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c
2036index 087294a09..31b8820b5 100644
2037--- a/glib/gvarianttypeinfo.c
2038+++ b/glib/gvarianttypeinfo.c
2039@@ -22,11 +22,11 @@
2040
2041 #include "gvarianttypeinfo.h"
2042
2043-#include <glib/gtestutils.h>
2044-#include <glib/gthread.h>
2045-#include <glib/gslice.h>
2046-#include <glib/ghash.h>
2047-#include <glib/grefcount.h>
2048+#include "gtestutils.h"
2049+#include "gthread.h"
2050+#include "gslice.h"
2051+#include "ghash.h"
2052+#include "grefcount.h"
2053
2054 /* < private >
2055 * GVariantTypeInfo:
2056diff --git a/glib/gvarianttypeinfo.h b/glib/gvarianttypeinfo.h
2057index 8663e2090..b7e926c53 100644
2058--- a/glib/gvarianttypeinfo.h
2059+++ b/glib/gvarianttypeinfo.h
2060@@ -21,7 +21,7 @@
2061 #ifndef __G_VARIANT_TYPE_INFO_H__
2062 #define __G_VARIANT_TYPE_INFO_H__
2063
2064-#include <glib/gvarianttype.h>
2065+#include "gvarianttype.h"
2066
2067 #define G_VARIANT_TYPE_INFO_CHAR_MAYBE 'm'
2068 #define G_VARIANT_TYPE_INFO_CHAR_ARRAY 'a'
2069diff --git a/glib/gversion.h b/glib/gversion.h
2070index 68343f727..f3c8c907a 100644
2071--- a/glib/gversion.h
2072+++ b/glib/gversion.h
2073@@ -29,7 +29,7 @@
2074 #error "Only <glib.h> can be included directly."
2075 #endif
2076
2077-#include <glib/gtypes.h>
2078+#include "gtypes.h"
2079
2080 G_BEGIN_DECLS
2081
2082diff --git a/glib/gwakeup.c b/glib/gwakeup.c
2083index f1062489c..93776f907 100644
2084--- a/glib/gwakeup.c
2085+++ b/glib/gwakeup.c
2086@@ -29,7 +29,7 @@
2087 #include "gtypes.h"
2088 #include "gpoll.h"
2089 #else
2090-#include <glib.h>
2091+#include "glib/glib.h"
2092 #endif
2093
2094 #include "gwakeup.h"
2095diff --git a/glib/gwakeup.h b/glib/gwakeup.h
2096index 64db2bf86..e11d1020e 100644
2097--- a/glib/gwakeup.h
2098+++ b/glib/gwakeup.h
2099@@ -20,7 +20,7 @@
2100 #ifndef __G_WAKEUP_H__
2101 #define __G_WAKEUP_H__
2102
2103-#include <glib/gpoll.h>
2104+#include "gpoll.h"
2105
2106 typedef struct _GWakeup GWakeup;
2107
2108diff --git a/glib/gwin32.h b/glib/gwin32.h
2109index 6696afa9a..3d6d4e608 100644
2110--- a/glib/gwin32.h
2111+++ b/glib/gwin32.h
2112@@ -29,7 +29,7 @@
2113 #error "Only <glib.h> can be included directly."
2114 #endif
2115
2116-#include <glib/gtypes.h>
2117+#include "gtypes.h"
2118
2119 #ifdef G_PLATFORM_WIN32
2120
2121diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c
2122index ab3a2678d..9a394f333 100644
2123--- a/glib/libcharset/localcharset.c
2124+++ b/glib/libcharset/localcharset.c
2125@@ -19,7 +19,7 @@
2126
2127 /* Written by Bruno Haible <bruno@clisp.org>. */
2128
2129-#include "config.h"
2130+#include "glib/config.h"
2131
2132 /* Specification. */
2133 #include "localcharset.h"
2134diff --git a/glib/pcre/pcre_byte_order.c b/glib/pcre/pcre_byte_order.c
2135index 4f21433c1..ae02364e9 100644
2136--- a/glib/pcre/pcre_byte_order.c
2137+++ b/glib/pcre/pcre_byte_order.c
2138@@ -43,7 +43,7 @@ see if it was compiled with the opposite endianness. If so, it uses an
2139 auxiliary local function to flip the appropriate bytes. */
2140
2141
2142-#include "config.h"
2143+#include "glib/config.h"
2144
2145 #include "pcre_internal.h"
2146
2147diff --git a/glib/pcre/pcre_chartables.c b/glib/pcre/pcre_chartables.c
2148index 293b16b32..d6f2bac30 100644
2149--- a/glib/pcre/pcre_chartables.c
2150+++ b/glib/pcre/pcre_chartables.c
2151@@ -20,7 +20,7 @@ and dead code stripping is activated. This leads to link errors. Pulling in the
2152 header ensures that the array gets flagged as "someone outside this compilation
2153 unit might reference this" and so it will always be supplied to the linker. */
2154
2155-#include "config.h"
2156+#include "glib/config.h"
2157
2158 #include "pcre_internal.h"
2159
2160diff --git a/glib/pcre/pcre_compile.c b/glib/pcre/pcre_compile.c
2161index 12e09c4ef..e143ab55f 100644
2162--- a/glib/pcre/pcre_compile.c
2163+++ b/glib/pcre/pcre_compile.c
2164@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2165 supporting internal functions that are not used by other modules. */
2166
2167
2168-#include "config.h"
2169+#include "glib/config.h"
2170
2171 #define NLBLOCK cd /* Block containing newline information */
2172 #define PSSTART start_pattern /* Field containing processed string start */
2173@@ -51,9 +51,9 @@ supporting internal functions that are not used by other modules. */
2174 #include "pcre_internal.h"
2175
2176 #ifdef GLIB_COMPILATION
2177-#include "gstrfuncs.h"
2178+#include "glib/gstrfuncs.h"
2179 #else
2180-#include <glib.h>
2181+#include "glib/glib.h"
2182 #endif
2183
2184 /* When PCRE_DEBUG is defined, we need the pcre(16)_printint() function, which
2185diff --git a/glib/pcre/pcre_config.c b/glib/pcre/pcre_config.c
2186index 34719591f..2d854b3ad 100644
2187--- a/glib/pcre/pcre_config.c
2188+++ b/glib/pcre/pcre_config.c
2189@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
2190 /* This module contains the external function pcre_config(). */
2191
2192
2193-#include "config.h"
2194+#include "glib/config.h"
2195
2196 /* Keep the original link size. */
2197 static int real_link_size = LINK_SIZE;
2198diff --git a/glib/pcre/pcre_dfa_exec.c b/glib/pcre/pcre_dfa_exec.c
2199index 9cc82323d..742aa2123 100644
2200--- a/glib/pcre/pcre_dfa_exec.c
2201+++ b/glib/pcre/pcre_dfa_exec.c
2202@@ -72,7 +72,7 @@ in others, so I abandoned this code. */
2203
2204
2205
2206-#include "config.h"
2207+#include "glib/config.h"
2208
2209 #define NLBLOCK md /* Block containing newline information */
2210 #define PSSTART start_subject /* Field containing processed string start */
2211diff --git a/glib/pcre/pcre_exec.c b/glib/pcre/pcre_exec.c
2212index 4ba3eda01..82166131a 100644
2213--- a/glib/pcre/pcre_exec.c
2214+++ b/glib/pcre/pcre_exec.c
2215@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
2216 pattern matching using an NFA algorithm, trying to mimic Perl as closely as
2217 possible. There are also some static supporting functions. */
2218
2219-#include "config.h"
2220+#include "glib/config.h"
2221
2222 #define NLBLOCK md /* Block containing newline information */
2223 #define PSSTART start_subject /* Field containing processed string start */
2224diff --git a/glib/pcre/pcre_fullinfo.c b/glib/pcre/pcre_fullinfo.c
2225index 2fe785a13..6eb69443c 100644
2226--- a/glib/pcre/pcre_fullinfo.c
2227+++ b/glib/pcre/pcre_fullinfo.c
2228@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2229 information about a compiled pattern. */
2230
2231
2232-#include "config.h"
2233+#include "glib/config.h"
2234
2235 #include "pcre_internal.h"
2236
2237diff --git a/glib/pcre/pcre_get.c b/glib/pcre/pcre_get.c
2238index 61147efe8..63991f648 100644
2239--- a/glib/pcre/pcre_get.c
2240+++ b/glib/pcre/pcre_get.c
2241@@ -43,7 +43,7 @@ from the subject string after a regex match has succeeded. The original idea
2242 for these functions came from Scott Wimer. */
2243
2244
2245-#include "config.h"
2246+#include "glib/config.h"
2247
2248 #include "pcre_internal.h"
2249
2250diff --git a/glib/pcre/pcre_globals.c b/glib/pcre/pcre_globals.c
2251index 383ec7311..7c8273822 100644
2252--- a/glib/pcre/pcre_globals.c
2253+++ b/glib/pcre/pcre_globals.c
2254@@ -52,14 +52,14 @@ a local function is used.
2255 Also, when compiling for Virtual Pascal, things are done differently, and
2256 global variables are not used. */
2257
2258-#include "config.h"
2259+#include "glib/config.h"
2260
2261 #include "pcre_internal.h"
2262
2263 #ifdef GLIB_COMPILATION
2264-#include "gmem.h"
2265+#include "glib/gmem.h"
2266 #else
2267-#include <glib.h>
2268+#include "glib/glib.h"
2269 #endif /* GLIB_COMPILATION */
2270
2271 #if defined _MSC_VER || defined __SYMBIAN32__
2272diff --git a/glib/pcre/pcre_jit_compile.c b/glib/pcre/pcre_jit_compile.c
2273index d7233832f..b253cf745 100644
2274--- a/glib/pcre/pcre_jit_compile.c
2275+++ b/glib/pcre/pcre_jit_compile.c
2276@@ -40,7 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
2277 -----------------------------------------------------------------------------
2278 */
2279
2280-#include "config.h"
2281+#include "glib/config.h"
2282
2283 #include "pcre_internal.h"
2284
2285diff --git a/glib/pcre/pcre_newline.c b/glib/pcre/pcre_newline.c
2286index ddd7708fa..a6487f0b2 100644
2287--- a/glib/pcre/pcre_newline.c
2288+++ b/glib/pcre/pcre_newline.c
2289@@ -47,7 +47,7 @@ and NLTYPE_ANY. The full list of Unicode newline characters is taken from
2290 http://unicode.org/unicode/reports/tr18/. */
2291
2292
2293-#include "config.h"
2294+#include "glib/config.h"
2295
2296 #include "pcre_internal.h"
2297
2298diff --git a/glib/pcre/pcre_ord2utf8.c b/glib/pcre/pcre_ord2utf8.c
2299index 71fd587e0..f45e60901 100644
2300--- a/glib/pcre/pcre_ord2utf8.c
2301+++ b/glib/pcre/pcre_ord2utf8.c
2302@@ -41,7 +41,7 @@ POSSIBILITY OF SUCH DAMAGE.
2303 /* This file contains a private PCRE function that converts an ordinal
2304 character value into a UTF8 string. */
2305
2306-#include "config.h"
2307+#include "glib/config.h"
2308
2309 #include "pcre_internal.h"
2310
2311diff --git a/glib/pcre/pcre_string_utils.c b/glib/pcre/pcre_string_utils.c
2312index 38cc2f958..ee01cdc47 100644
2313--- a/glib/pcre/pcre_string_utils.c
2314+++ b/glib/pcre/pcre_string_utils.c
2315@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2316 class. It is used by both pcre_exec() and pcre_def_exec(). */
2317
2318
2319-#include "config.h"
2320+#include "glib/config.h"
2321
2322 #include "pcre_internal.h"
2323
2324diff --git a/glib/pcre/pcre_study.c b/glib/pcre/pcre_study.c
2325index ee0930718..3e239c755 100644
2326--- a/glib/pcre/pcre_study.c
2327+++ b/glib/pcre/pcre_study.c
2328@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2329 supporting functions. */
2330
2331
2332-#include "config.h"
2333+#include "glib/config.h"
2334
2335 #include "pcre_internal.h"
2336
2337diff --git a/glib/pcre/pcre_tables.c b/glib/pcre/pcre_tables.c
2338index abcc96ef4..3a4ed3e35 100644
2339--- a/glib/pcre/pcre_tables.c
2340+++ b/glib/pcre/pcre_tables.c
2341@@ -45,7 +45,7 @@ uses macros to change their names from _pcre_xxx to xxxx, thereby avoiding name
2342 clashes with the library. */
2343
2344
2345-#include "config.h"
2346+#include "glib/config.h"
2347
2348 #include "pcre_internal.h"
2349
2350diff --git a/glib/pcre/pcre_valid_utf8.c b/glib/pcre/pcre_valid_utf8.c
2351index cecaf347f..a837ce5c0 100644
2352--- a/glib/pcre/pcre_valid_utf8.c
2353+++ b/glib/pcre/pcre_valid_utf8.c
2354@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2355 strings. */
2356
2357
2358-#include "config.h"
2359+#include "glib/config.h"
2360
2361 #include "pcre_internal.h"
2362
2363diff --git a/glib/pcre/pcre_version.c b/glib/pcre/pcre_version.c
2364index 3dd60a5bc..fb715c47a 100644
2365--- a/glib/pcre/pcre_version.c
2366+++ b/glib/pcre/pcre_version.c
2367@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2368 string that identifies the PCRE version that is in use. */
2369
2370
2371-#include "config.h"
2372+#include "glib/config.h"
2373
2374 #include "pcre_internal.h"
2375
2376diff --git a/glib/pcre/pcre_xclass.c b/glib/pcre/pcre_xclass.c
2377index 89ad09f54..f09e4d1b1 100644
2378--- a/glib/pcre/pcre_xclass.c
2379+++ b/glib/pcre/pcre_xclass.c
2380@@ -42,7 +42,7 @@ POSSIBILITY OF SUCH DAMAGE.
2381 class. It is used by both pcre_exec() and pcre_def_exec(). */
2382
2383
2384-#include "config.h"
2385+#include "glib/config.h"
2386
2387 #include "pcre_internal.h"
2388
2389diff --git a/glib/pcre/ucp.h b/glib/pcre/ucp.h
2390index f1c14be5d..850049e27 100644
2391--- a/glib/pcre/ucp.h
2392+++ b/glib/pcre/ucp.h
2393@@ -11,9 +11,9 @@ should always be at the end of each enum, for backwards compatibility. */
2394
2395 /* These are the general character categories. */
2396 #ifdef GLIB_COMPILATION
2397-#include "gunicode.h"
2398+#include "glib/gunicode.h"
2399 #else
2400-#include <glib.h>
2401+#include "glib/glib.h"
2402 #endif
2403
2404 enum {
2405--
24062.25.1
2407