1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
|
diff --git a/pan/data-impl/article-filter.cc b/pan/data-impl/article-filter.cc
index b06d0c2..f424738 100644
--- a/pan/data-impl/article-filter.cc
+++ b/pan/data-impl/article-filter.cc
@@ -25,10 +25,7 @@
#include <gmime/gmime.h>
//#include <glib/gprintf.h>
-extern "C"
-{
- #include <glib.h>
-}
+#include <glib.h>
#include "article-filter.h"
diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 88012cc..4465966 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -22,10 +22,8 @@
**************/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include <glib.h> // for g_build_filename
-}
+#include <glib/gi18n.h>
+#include <glib.h> // for g_build_filename
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
diff --git a/pan/data-impl/data-io.cc b/pan/data-impl/data-io.cc
index bea1a90..d938634 100644
--- a/pan/data-impl/data-io.cc
+++ b/pan/data-impl/data-io.cc
@@ -27,9 +27,9 @@ extern "C" {
#include <sys/types.h> // for chmod
#include <sys/stat.h> // for chmod
#include <unistd.h>
- #include <glib.h>
- #include <glib/gi18n.h>
}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/line-reader.h>
diff --git a/pan/data-impl/groups.cc b/pan/data-impl/groups.cc
index 244feb9..da0183a 100644
--- a/pan/data-impl/groups.cc
+++ b/pan/data-impl/groups.cc
@@ -29,9 +29,9 @@
#include <vector>
#include <glib.h>
+#include <glib/gi18n.h>
extern "C" {
#include <unistd.h>
- #include <glib/gi18n.h>
}
#include <pan/general/debug.h>
diff --git a/pan/data-impl/headers.cc b/pan/data-impl/headers.cc
index f8c4466..16d5672 100644
--- a/pan/data-impl/headers.cc
+++ b/pan/data-impl/headers.cc
@@ -25,10 +25,10 @@
#include <string>
#include <cmath>
#include <glib.h>
+#include <glib/gi18n.h>
extern "C" {
#include <sys/types.h> // for chmod
#include <sys/stat.h> // for chmod
- #include <glib/gi18n.h>
}
#include <pan/general/debug.h>
#include <pan/general/log.h>
diff --git a/pan/data-impl/profiles.cc b/pan/data-impl/profiles.cc
index e999fda..a6e6bb5 100644
--- a/pan/data-impl/profiles.cc
+++ b/pan/data-impl/profiles.cc
@@ -26,9 +26,9 @@
extern "C" {
#include <sys/types.h> // for chmod
#include <sys/stat.h> // for chmod
- #include <glib.h>
- #include <glib/gi18n.h>
}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/string-view.h>
#include <pan/general/file-util.h>
diff --git a/pan/data-impl/server.cc b/pan/data-impl/server.cc
index 9ea55d4..b23782f 100644
--- a/pan/data-impl/server.cc
+++ b/pan/data-impl/server.cc
@@ -25,10 +25,8 @@
#include <map>
#include <set>
#include <vector>
-extern "C" {
- #include <glib.h> // for GMarkup
- #include <glib/gi18n.h>
-}
+#include <glib.h> // for GMarkup
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc
index ff8644f..a199556 100644
--- a/pan/data-impl/xover.cc
+++ b/pan/data-impl/xover.cc
@@ -20,10 +20,8 @@
#include <config.h>
#include <cmath>
#include <fstream>
-extern "C" {
- #include <glib/gi18n.h>
- #include <gmime/gmime.h>
-}
+#include <glib/gi18n.h>
+#include <gmime/gmime.h>
#include <pan/general/debug.h>
#include <pan/general/log.h>
#include <pan/general/macros.h>
diff --git a/pan/data/article-cache.cc b/pan/data/article-cache.cc
index 1855153..30fa0f9 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -26,11 +26,10 @@ extern "C"
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gmime/gmime.h>
}
+#include <glib.h>
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/data/article-cache.h b/pan/data/article-cache.h
index 2ac722b..1304bfe 100644
--- a/pan/data/article-cache.h
+++ b/pan/data/article-cache.h
@@ -22,9 +22,7 @@
#include <map>
#include <vector>
-extern "C" {
- #include <glib.h> // for guint64
-}
+#include <glib.h> // for guint64
#include <pan/general/string-view.h>
#include <pan/general/quark.h>
diff --git a/pan/data/cert-store.cc b/pan/data/cert-store.cc
index 340fc8b..f6cd46e 100644
--- a/pan/data/cert-store.cc
+++ b/pan/data/cert-store.cc
@@ -34,10 +34,8 @@
#include <iostream>
#include <string>
-extern "C" {
#include <glib/gi18n.h>
#include <glib.h>
-}
#include <pan/general/debug.h>
#include <pan/general/e-util.h>
diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc
index 3a82ea9..61c67a2 100644
--- a/pan/data/encode-cache.cc
+++ b/pan/data/encode-cache.cc
@@ -28,11 +28,10 @@ extern "C"
#include <sys/stat.h>
#include <unistd.h>
#include <dirent.h>
-
- #include <glib.h>
- #include <glib/gi18n.h>
- #include <gmime/gmime.h>
}
+#include <gmime/gmime.h>
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/data/encode-cache.h b/pan/data/encode-cache.h
index 8bbd530..1affc0c 100644
--- a/pan/data/encode-cache.h
+++ b/pan/data/encode-cache.h
@@ -22,9 +22,7 @@
#include <map>
#include <vector>
-extern "C" {
- #include <glib.h> // for guint64
-}
+#include <glib.h> // for guint64
#include <pan/general/string-view.h>
#include <pan/general/quark.h>
diff --git a/pan/general/e-util.cc b/pan/general/e-util.cc
index af5ccd0..62879ee 100644
--- a/pan/general/e-util.cc
+++ b/pan/general/e-util.cc
@@ -26,9 +26,9 @@
#include <ctime>
extern "C" {
#include <ctype.h>
- #include <glib.h>
- #include <glib/gi18n.h>
}
+#include <glib.h>
+#include <glib/gi18n.h>
#include "debug.h"
#include "e-util.h"
diff --git a/pan/general/file-util.cc b/pan/general/file-util.cc
index 02e9ed1..9efa269 100644
--- a/pan/general/file-util.cc
+++ b/pan/general/file-util.cc
@@ -27,12 +27,12 @@ extern "C"
#include <unistd.h>
#include <sys/stat.h>
#include <sys/types.h>
- #include <glib.h>
- #include <glib/gi18n.h>
#ifndef G_OS_WIN32
#include <pwd.h>
#endif
}
+#include <glib.h>
+#include <glib/gi18n.h>
#include "debug.h"
#include "log.h"
diff --git a/pan/general/file-util.h b/pan/general/file-util.h
index c125c8d..8c67639 100644
--- a/pan/general/file-util.h
+++ b/pan/general/file-util.h
@@ -25,9 +25,9 @@
extern "C" {
#include <stddef.h>
#include <stdio.h>
- #include <glib.h>
- #include <glib/gstdio.h>
}
+#include <glib.h>
+#include <glib/gstdio.h>
#include <pan/general/string-view.h>
#define g_freopen freopen
diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc
index afb9be8..6b80fc4 100644
--- a/pan/general/line-reader.cc
+++ b/pan/general/line-reader.cc
@@ -1,9 +1,7 @@
#include <config.h>
#include <cstdio>
#include <cstdlib>
-extern "C"{
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
#include <cerrno>
#include "file-util.h"
#include "line-reader.h"
diff --git a/pan/general/macros.h b/pan/general/macros.h
index 6dcf908..b16230f 100644
--- a/pan/general/macros.h
+++ b/pan/general/macros.h
@@ -63,9 +63,6 @@
*** g_assert
**/
-extern "C"
-{
- #include <glib.h>
-}
+#include <glib.h>
#endif
diff --git a/pan/general/text-match.cc b/pan/general/text-match.cc
index fcacbe2..d390de0 100644
--- a/pan/general/text-match.cc
+++ b/pan/general/text-match.cc
@@ -20,9 +20,9 @@
#include <config.h>
extern "C" {
#include <ctype.h>
- #include <glib.h>
- #include <glib/gi18n.h>
}
+#include <glib.h>
+#include <glib/gi18n.h>
#include "debug.h"
#include "log.h"
#include "text-match.h"
diff --git a/pan/general/utf8-utils.cc b/pan/general/utf8-utils.cc
index be79a13..fea6100 100644
--- a/pan/general/utf8-utils.cc
+++ b/pan/general/utf8-utils.cc
@@ -21,9 +21,7 @@
#include <string>
#include <vector>
#include <string.h>
-extern "C" {
#include <glib/gi18n.h>
-}
#include <locale.h>
#include <gmime/gmime.h>
#include <pan/general/debug.h>
diff --git a/pan/gui/actions.cc b/pan/gui/actions.cc
index 520c08b..5ec397c 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -18,11 +18,9 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/macros.h>
#include <pan/general/debug.h>
#include <pan/data-impl/data-impl.h>
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 53e9124..e9841e2 100644
--- a/pan/gui/body-pane.cc
+++ b/pan/gui/body-pane.cc
@@ -22,11 +22,9 @@
#include <cmath>
#include <iostream>
#include <sstream>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
- #include <gmime/gmime.h>
-}
+#include "gtk-compat.h"
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <pan/general/debug.h>
#include <pan/general/log.h>
diff --git a/pan/gui/dl-headers-ui.cc b/pan/gui/dl-headers-ui.cc
index 5841651..e9f4b2d 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -18,11 +18,9 @@
*/
#include <config.h>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include <glib.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
#include <pan/general/macros.h>
#include <pan/tasks/queue.h>
#include <pan/tasks/task-xover.h>
diff --git a/pan/gui/group-pane.cc b/pan/gui/group-pane.cc
index 28ad581..3ff103e 100644
--- a/pan/gui/group-pane.cc
+++ b/pan/gui/group-pane.cc
@@ -20,10 +20,8 @@
#include <config.h>
#include <cassert>
#include <deque>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
//#include <pan/general/gdk-threads.h>
#include <pan/general/log.h>
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 677b07a..0d7df8b 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -18,14 +18,14 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include <glib.h>
- #include "gtk-compat.h"
+#include <glib/gi18n.h>
+#include <glib.h>
#ifdef HAVE_GTKSPELL
+extern "C" {
#include <enchant/enchant.h>
-#endif
}
+#endif
+#include "gtk-compat.h"
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/data/data.h>
diff --git a/pan/gui/group-prefs.cc b/pan/gui/group-prefs.cc
index 3e9851b..b06a949 100644
--- a/pan/gui/group-prefs.cc
+++ b/pan/gui/group-prefs.cc
@@ -21,8 +21,8 @@ extern "C" {
#include <config.h>
#include <sys/types.h> // chmod
#include <sys/stat.h> // chmod
- #include <glib.h>
}
+#include <glib.h>
#include <iostream>
#include <fstream>
#include <pan/general/file-util.h>
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index f79aa1e..9f8787e 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -25,9 +25,9 @@
extern "C" {
#include <sys/types.h> // for chmod
#include <sys/stat.h> // for chmod
- #include <glib/gi18n.h>
#include <dirent.h>
}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/e-util.h>
#include <pan/general/file-util.h>
diff --git a/pan/gui/header-pane.cc b/pan/gui/header-pane.cc
index dc65a77..a4a9952 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -19,10 +19,9 @@
extern "C" {
#include <config.h>
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
- #include "gtk-compat.h"
}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <cctype>
#include <cmath>
#include <algorithm>
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 7b11493..b204298 100644
--- a/pan/gui/log-ui.cc
+++ b/pan/gui/log-ui.cc
@@ -21,10 +21,8 @@
#include <ostream>
#include <fstream>
#include <iostream>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/log.h>
#include <pan/general/macros.h>
#include <pan/general/string-view.h>
diff --git a/pan/gui/pan-file-entry.cc b/pan/gui/pan-file-entry.cc
index 705fc91..c67acf8 100644
--- a/pan/gui/pan-file-entry.cc
+++ b/pan/gui/pan-file-entry.cc
@@ -19,10 +19,8 @@
#include <config.h>
#include <string>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/file-util.h>
#include "pad.h"
#include "pan-file-entry.h"
diff --git a/pan/gui/pan.cc b/pan/gui/pan.cc
index fb3a696..46c1a5d 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -24,9 +24,6 @@
#include <signal.h>
extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
- #include <gmime/gmime.h>
#include <gio/gio.h>
#include <sys/types.h>
#include <sys/stat.h>
@@ -34,6 +31,9 @@ extern "C" {
#include <uulib/crc32.h>
}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
+#include <gmime/gmime.h>
#ifdef G_OS_WIN32
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0501
diff --git a/pan/gui/post-ui.cc b/pan/gui/post-ui.cc
index 8769ec5..92c757d 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -23,14 +23,14 @@
#include <sstream>
#include <unistd.h>
extern "C" {
- #include <gmime/gmime.h>
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
#include <sys/time.h>
#ifdef HAVE_GTKSPELL
#include <gtkspell/gtkspell.h>
#endif
}
+#include "gtk-compat.h"
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
#include <pan/data/data.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/gui/prefs-file.cc b/pan/gui/prefs-file.cc
index bde7ef3..64c540f 100644
--- a/pan/gui/prefs-file.cc
+++ b/pan/gui/prefs-file.cc
@@ -24,8 +24,8 @@
extern "C" {
#include <sys/types.h> // for chmod
#include <sys/stat.h> // for chmod
- #include <glib.h>
}
+#include <glib.h>
#include <pan/general/file-util.h>
#include "prefs-file.h"
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index f7dc0f0..aac9ec1 100644
--- a/pan/gui/prefs-ui.cc
+++ b/pan/gui/prefs-ui.cc
@@ -18,10 +18,8 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/general/file-util.h>
diff --git a/pan/gui/prefs.cc b/pan/gui/prefs.cc
index fdbd908..64dd8da 100644
--- a/pan/gui/prefs.cc
+++ b/pan/gui/prefs.cc
@@ -23,10 +23,8 @@
#include <iostream>
#include <sstream>
#include <string>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/log.h>
#include <pan/general/macros.h>
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 26ff029..cf8bd44 100644
--- a/pan/gui/profiles-dialog.cc
+++ b/pan/gui/profiles-dialog.cc
@@ -23,10 +23,8 @@
#include <config.h>
#include <iostream>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/usenet-utils/gnksa.h>
diff --git a/pan/gui/progress-view.cc b/pan/gui/progress-view.cc
index 241ad1c..43ef4f2 100644
--- a/pan/gui/progress-view.cc
+++ b/pan/gui/progress-view.cc
@@ -18,9 +18,7 @@
*/
#include <config.h>
-extern "C" {
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
#include <pan/general/string-view.h>
#include <pan/usenet-utils/mime-utils.h>
#include "progress-view.h"
diff --git a/pan/gui/save-attach-ui.cc b/pan/gui/save-attach-ui.cc
index 0b08b6f..0e86a1b 100644
--- a/pan/gui/save-attach-ui.cc
+++ b/pan/gui/save-attach-ui.cc
@@ -18,10 +18,8 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/save-ui.cc b/pan/gui/save-ui.cc
index 0f034e5..1df0cfb 100644
--- a/pan/gui/save-ui.cc
+++ b/pan/gui/save-ui.cc
@@ -18,10 +18,8 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/icons/pan-pixbufs.h>
diff --git a/pan/gui/score-add-ui.cc b/pan/gui/score-add-ui.cc
index e72bdb5..3b81167 100644
--- a/pan/gui/score-add-ui.cc
+++ b/pan/gui/score-add-ui.cc
@@ -20,9 +20,7 @@
#include <config.h>
#include <cassert>
#include <climits>
-extern "C" {
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/text-match.h>
#include "hig.h"
diff --git a/pan/gui/score-view-ui.cc b/pan/gui/score-view-ui.cc
index d6c81c1..1327426 100644
--- a/pan/gui/score-view-ui.cc
+++ b/pan/gui/score-view-ui.cc
@@ -18,10 +18,8 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include "gtk-compat.h"
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include "pad.h"
#include "score-add-ui.h"
diff --git a/pan/gui/server-ui.cc b/pan/gui/server-ui.cc
index b42bc18..268114b 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -21,11 +21,9 @@
#include <cstdlib>
#include <cstring>
#include <climits>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include <glib.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
#include <pan/icons/pan-pixbufs.h>
#include <pan/general/file-util.h>
diff --git a/pan/gui/task-pane.cc b/pan/gui/task-pane.cc
index 4f77922..18a8f74 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -18,11 +18,9 @@
*/
#include <config.h>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
- #include "gtk-compat.h"
-}
+#include <glib.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
#include <pan/general/e-util.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/gui/url.cc b/pan/gui/url.cc
index e1173ae..94ffb52 100644
--- a/pan/gui/url.cc
+++ b/pan/gui/url.cc
@@ -20,10 +20,8 @@
#include <config.h>
#include <iostream>
#include <string>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
-};
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/log.h>
#include "url.h"
diff --git a/pan/tasks/decoder.cc b/pan/tasks/decoder.cc
index b4c21ae..f8cb6db 100644
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@ -28,8 +28,8 @@
extern "C" {
# define PROTOTYPES
# include <uulib/uudeview.h>
-# include <glib/gi18n.h>
};
+#include <glib/gi18n.h>
#include <pan/general/worker-pool.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 7960b84..5989059 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -31,10 +31,10 @@
extern "C" {
#define PROTOTYPES
#include <uulib/uudeview.h>
-#include <glib/gi18n.h>
#include <sys/time.h>
};
+#include <glib/gi18n.h>
#include <pan/general/worker-pool.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
diff --git a/pan/tasks/nntp.cc b/pan/tasks/nntp.cc
index ceb1574..71c5cf1 100644
--- a/pan/tasks/nntp.cc
+++ b/pan/tasks/nntp.cc
@@ -22,10 +22,8 @@
#include <cstdarg>
#include <cstdlib> // abort, atoi, strtoul
#include <cstdio> // snprintf
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/log.h>
#include <pan/general/messages.h>
diff --git a/pan/tasks/nzb.cc b/pan/tasks/nzb.cc
index af890e5..14df6f6 100644
--- a/pan/tasks/nzb.cc
+++ b/pan/tasks/nzb.cc
@@ -24,9 +24,7 @@
#include <sstream>
#include <string>
#include <map>
-extern "C" {
- #include <glib.h>
-}
+#include <glib.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index d3339dd..7dc2ec1 100644
--- a/pan/tasks/socket-impl-gio.cc
+++ b/pan/tasks/socket-impl-gio.cc
@@ -31,9 +31,9 @@
extern "C" {
#include <unistd.h>
- #include <glib/gi18n.h>
}
+#include <glib/gi18n.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
#include <pan/general/macros.h>
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index c33edfd..688183c 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -30,10 +30,7 @@
//#include <glib/giochannel.h>
//#include <glib/gstring.h>
-extern "C"
-{
- #include <glib.h>
-}
+#include <glib.h>
#include <pan/tasks/socket.h>
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index b58e074..5b1b0b0 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -34,13 +34,14 @@
extern "C" {
#include <unistd.h>
- #include <glib/gi18n.h>
#include <errno.h>
#include <fcntl.h>
#include <sys/time.h>
#include <sys/types.h>
}
+#include <glib/gi18n.h>
+
#include <pan/usenet-utils/ssl-utils.h>
#include <pan/general/file-util.h>
#include <pan/general/log.h>
diff --git a/pan/tasks/socket-impl-openssl.h b/pan/tasks/socket-impl-openssl.h
index e48cbae..eea41d4 100644
--- a/pan/tasks/socket-impl-openssl.h
+++ b/pan/tasks/socket-impl-openssl.h
@@ -27,10 +27,7 @@
#include <string>
//#include <glib/giochannel.h>
//#include <glib/gstring.h>
-extern "C"
-{
- #include <glib.h>
-}
+#include <glib.h>
#include <pan/general/debug.h>
#include <pan/general/quark.h>
diff --git a/pan/tasks/socket.cc b/pan/tasks/socket.cc
index 78d53fb..2c7a28d 100644
--- a/pan/tasks/socket.cc
+++ b/pan/tasks/socket.cc
@@ -21,9 +21,7 @@
#include <cstdarg>
#include <ctime>
#include <cmath>
-extern "C" {
- #include <glib.h>
-}
+#include <glib.h>
#include <pan/general/debug.h>
#include <pan/general/string-view.h>
#include "socket.h"
diff --git a/pan/tasks/task-article.cc b/pan/tasks/task-article.cc
index 9c96b7d..1dc17ba 100644
--- a/pan/tasks/task-article.cc
+++ b/pan/tasks/task-article.cc
@@ -24,10 +24,7 @@
#include <config.h>
#include <algorithm>
#include <cassert>
-extern "C"
-{
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/file-util.h>
#include <pan/general/utf8-utils.h>
diff --git a/pan/tasks/task-groups.cc b/pan/tasks/task-groups.cc
index b8618d6..9b72369 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -20,9 +20,9 @@
#include <config.h>
#include <cassert>
extern "C" {
- #include <glib/gi18n.h>
#include <stdlib.h>
}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/general/messages.h>
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index bb80fb9..4ab9c2f 100644
--- a/pan/tasks/task-post.cc
+++ b/pan/tasks/task-post.cc
@@ -18,9 +18,7 @@
*/
#include <config.h>
-extern "C" {
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
#include "task-post.h"
#include <pan/general/debug.h>
#include <pan/general/log.h>
diff --git a/pan/tasks/task-upload.h b/pan/tasks/task-upload.h
index 7bd4fe0..e5377c6 100644
--- a/pan/tasks/task-upload.h
+++ b/pan/tasks/task-upload.h
@@ -37,10 +37,10 @@
extern "C" {
#define PROTOTYPES
#include <uulib/uudeview.h>
- #include <gmime/gmime.h>
- #include <glib/gi18n.h>
};
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
#include <set>
namespace pan
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index c3c8260..64b41a4 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -26,10 +26,10 @@ extern "C"
#define PROTOTYPES
#include <stdio.h>
#include <uulib/uudeview.h>
-#include <glib/gi18n.h>
-#include <gmime/gmime-utils.h>
}
+#include <gmime/gmime-utils.h>
+#include <glib/gi18n.h>
#include <fstream>
#include <iostream>
#include <pan/general/debug.h>
diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc
index c598bf8..9a9e488 100644
--- a/pan/tasks/task-xoverinfo.cc
+++ b/pan/tasks/task-xoverinfo.cc
@@ -24,10 +24,10 @@ extern "C" {
#define PROTOTYPES
#include <stdio.h>
#include <uulib/uudeview.h>
- #include <glib/gi18n.h>
- #include <gmime/gmime-utils.h>
#include <zlib.h>
}
+#include <glib/gi18n.h>
+#include <gmime/gmime-utils.h>
#include <fstream>
#include <iostream>
#include <pan/general/debug.h>
diff --git a/pan/usenet-utils/filter-info.cc b/pan/usenet-utils/filter-info.cc
index f464428..6b1a5c9 100644
--- a/pan/usenet-utils/filter-info.cc
+++ b/pan/usenet-utils/filter-info.cc
@@ -18,10 +18,8 @@
*/
#include <config.h>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/macros.h>
#include "filter-info.h"
diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc
index db1f2c4..fb888d5 100644
--- a/pan/usenet-utils/gnksa.cc
+++ b/pan/usenet-utils/gnksa.cc
@@ -37,10 +37,10 @@ extern "C"
{
#include <ctype.h>
#include <unistd.h>
- #include <glib/gi18n.h>
#include <sys/time.h>
}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/general/log.h>
diff --git a/pan/usenet-utils/gpg.cc b/pan/usenet-utils/gpg.cc
index 4df4525..8755777 100644
--- a/pan/usenet-utils/gpg.cc
+++ b/pan/usenet-utils/gpg.cc
@@ -28,9 +28,9 @@ extern "C" {
#include <stdlib.h>
#include <unistd.h>
#include <string.h>
- #include <glib/gi18n.h>
- #include <gmime/gmime.h>
}
+#include <glib/gi18n.h>
+#include <gmime/gmime.h>
#ifdef HAVE_GMIME_CRYPTO
diff --git a/pan/usenet-utils/message-check.cc b/pan/usenet-utils/message-check.cc
index a511556..461ce86 100644
--- a/pan/usenet-utils/message-check.cc
+++ b/pan/usenet-utils/message-check.cc
@@ -21,9 +21,7 @@
#include <ctype.h>
#include <string.h>
#include <glib.h>
-extern "C" {
#include <glib/gi18n.h>
-}
#include <pan/general/debug.h>
#include <pan/general/macros.h>
#include <pan/general/string-view.h>
diff --git a/pan/usenet-utils/rules-info.cc b/pan/usenet-utils/rules-info.cc
index 1c03adc..91e78be 100644
--- a/pan/usenet-utils/rules-info.cc
+++ b/pan/usenet-utils/rules-info.cc
@@ -22,10 +22,8 @@
#include <config.h>
-extern "C" {
- #include <glib.h>
- #include <glib/gi18n.h>
-}
+#include <glib.h>
+#include <glib/gi18n.h>
#include <pan/general/macros.h>
#include "rules-info.h"
diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc
index 8b56a2a..4b151f0 100644
--- a/pan/usenet-utils/scorefile.cc
+++ b/pan/usenet-utils/scorefile.cc
@@ -23,9 +23,7 @@
#include <iostream>
#include <sstream>
#include <string>
-extern "C" {
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
#include <pan/general/debug.h>
#include <pan/general/log.h>
#include <pan/general/macros.h>
diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h
index 2286250..0beb32f 100644
--- a/pan/usenet-utils/ssl-utils.h
+++ b/pan/usenet-utils/ssl-utils.h
@@ -43,9 +43,7 @@
#include <map>
#include <sstream>
#include <iostream>
-extern "C" {
- #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
namespace pan
{
diff --git a/pan/usenet-utils/text-massager.cc b/pan/usenet-utils/text-massager.cc
index 4fcd8d5..15a818b 100644
--- a/pan/usenet-utils/text-massager.cc
+++ b/pan/usenet-utils/text-massager.cc
@@ -22,9 +22,7 @@
#include <map>
#include <cstring>
#include <glib.h>
-extern "C" {
#include <glib/gi18n.h>
-}
#include "text-massager.h"
#include <pan/general/log.h>
#include <pan/general/e-util.h>
|