diff --git a/pan/data-impl/data-impl.cc b/pan/data-impl/data-impl.cc
index 215be61b37c93f77fef2e9ea7289deefae8d18ed..446596652536bb6c8942c88607329a1236bf1716 100644
--- a/pan/data-impl/data-impl.cc
+++ b/pan/data-impl/data-impl.cc
@@ -22,9 +22,7 @@
 **************/
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-}
+#include <glib/gi18n.h>
 #include <glib.h> // for g_build_filename
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
diff --git a/pan/data-impl/xover.cc b/pan/data-impl/xover.cc
index ff8644f1fa919266174ec0bf76c1afe649c47b94..a1995564764964e4e73125f95b8dcf239630866c 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 2b97344082bb4cde4e169f6e7b77bd5d70cef9e3..2130f2dde19fd8d69089531f0d4266e802024c9d 100644
--- a/pan/data/article-cache.cc
+++ b/pan/data/article-cache.cc
@@ -26,9 +26,9 @@ extern "C"
   #include <sys/stat.h>
   #include <unistd.h>
   #include <dirent.h>
-
-  #include <gmime/gmime.h>
 }
+
+#include <gmime/gmime.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/pan/data/encode-cache.cc b/pan/data/encode-cache.cc
index eecd1d198a14107e31c91b11b9d2ae8d0591500b..d66ec5abf6adf3a38bb4427e5541f06491a263cc 100644
--- a/pan/data/encode-cache.cc
+++ b/pan/data/encode-cache.cc
@@ -28,9 +28,9 @@ extern "C"
   #include <sys/stat.h>
   #include <unistd.h>
   #include <dirent.h>
-
-  #include <gmime/gmime.h>
 }
+
+#include <gmime/gmime.h>
 #include <glib.h>
 #include <glib/gi18n.h>
 
diff --git a/pan/general/line-reader.cc b/pan/general/line-reader.cc
index afb9be805d0a69c039f65d5940d027cb96e8e315..6b80fc48b035ad459e730fb446aeb443ff6a2c1b 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/utf8-utils.cc b/pan/general/utf8-utils.cc
index be79a13b1252595b63164d2ca4e38fc52bb19141..fea6100dadf9559642f5718cee0dff3c726f6ce5 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 520c08b04a8924a4e597de218be7a80925beec6e..453a53df04543ce407bad8a264bd7b3e00344bc9 100644
--- a/pan/gui/actions.cc
+++ b/pan/gui/actions.cc
@@ -18,10 +18,8 @@
  */
 
 #include <config.h>
-extern "C" {
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-}
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 
 #include <pan/general/macros.h>
 #include <pan/general/debug.h>
diff --git a/pan/gui/body-pane.cc b/pan/gui/body-pane.cc
index 53e9124a04be73edc9b1f8c88fefe983b3de852a..83c44eec8fb8ff8a09eaaa597f37df599238d9bf 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 <glib/gi18n.h>
+#include "gtk-compat.h"
+#include <gmime/gmime.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 cfc536d532148e1f2e52ad53ccf62220d4774353..e9f4b2dc7d447009afe415cd3f9c13a60284ae2d 100644
--- a/pan/gui/dl-headers-ui.cc
+++ b/pan/gui/dl-headers-ui.cc
@@ -20,9 +20,7 @@
 #include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-extern "C" {
-  #include "gtk-compat.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 28ad5818ea2975b7665e70bc517b5b174839e5fb..e4ac62ed81d37135974de6bb90f80d9c7dd86db6 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 <glib/gi18n.h>
+#include "gtk-compat.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 69837469333bf07ada97e639ce8ebde236250009..2ec5c8449a43b20b2a05e435b0848e4c12872884 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -20,12 +20,10 @@
 #include <config.h>
 #include <glib/gi18n.h>
 #include <glib.h>
-extern "C" {
-  #include "gtk-compat.h"
+#include "gtk-compat.h"
 #ifdef HAVE_GTKSPELL
-  #include <enchant/enchant.h>
+#include <enchant/enchant.h>
 #endif
-}
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/data/data.h>
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index f79aa1ea71adebab36ef4aa6886903c7f21c7c6c..9f8787e37e65af3f4b1931e697b1b3a0e2c227ac 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 dc65a77beca701929b081397f232fd4dc73e53d5..f9a4cb04e69e8423ab5305cab2ad338194fbdb54 100644
--- a/pan/gui/header-pane.cc
+++ b/pan/gui/header-pane.cc
@@ -17,12 +17,9 @@
  *
  */
 
-extern "C" {
-  #include <config.h>
-  #include <glib/gi18n.h>
-  #include "gtk-compat.h"
-  #include "gtk-compat.h"
-}
+#include <config.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <cctype>
 #include <cmath>
 #include <algorithm>
diff --git a/pan/gui/log-ui.cc b/pan/gui/log-ui.cc
index 7b114937f8234bc66fbe808fce15fc5b9905038b..8846e1d9c8d37e9bd29c55391967345cc9d0958e 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 <glib/gi18n.h>
+#include "gtk-compat.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 705fc91335ba4f679294cd5a26bd8f3acc6407b9..f86c845051250822f1a18b79c5993b60cb2a487e 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 <glib/gi18n.h>
+#include "gtk-compat.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 fb3a6968ba3ce7c1f340b7756ea3e9cea718d364..3eb4214f2ea094d8a849e2eb33dc44e4f0ee8e0b 100644
--- a/pan/gui/pan.cc
+++ b/pan/gui/pan.cc
@@ -22,18 +22,19 @@
 #include <fstream>
 #include <config.h>
 #include <signal.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.h"
+#include <gmime/gmime.h>
+#include <gio/gio.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>
   #include <unistd.h>
-  #include <uulib/crc32.h>
 }
 
+#include <uulib/crc32.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 8769ec54815132c40d9c5908eb6c801c6368c07d..060f7227fd31e88633ce556845711944eea94fc7 100644
--- a/pan/gui/post-ui.cc
+++ b/pan/gui/post-ui.cc
@@ -22,15 +22,15 @@
 #include <iostream>
 #include <sstream>
 #include <unistd.h>
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
+#include "gtk-compat.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 <pan/data/data.h>
 #include <pan/general/debug.h>
 #include <pan/general/file-util.h>
diff --git a/pan/gui/prefs-ui.cc b/pan/gui/prefs-ui.cc
index f7dc0f08a53bd8bd0d7010483801d01d2679f198..da0a013bf4597bb8be81aabb8cadc2ea9f757436 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 <glib/gi18n.h>
+#include "gtk-compat.h"
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/file-util.h>
diff --git a/pan/gui/profiles-dialog.cc b/pan/gui/profiles-dialog.cc
index 26ff029ea36876f2128fccadb45bb5379846c48b..cf946955b0cbe16f61ddecc6f7bc6648ca6f1a89 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 <glib/gi18n.h>
+#include "gtk-compat.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 241ad1cbbeb37e39b6957d0aee094cf444a5ad2e..43ef4f20d84737608b02b264b9c3c38c37026227 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 0b08b6f1d7e8df9a27af4ccd821d0166b291318b..7082ab81759042d782129d915b2de987704aaf80 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 <glib/gi18n.h>
+#include "gtk-compat.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 0f034e5c72e6f51610f4174c16f75a22c0889e41..ffa4adb8fdd61f82864255aa5e309c14ea388c88 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 <glib/gi18n.h>
+#include "gtk-compat.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 e72bdb5ca84361bb9bcc35f763880e4b01894ec2..3b8116723fad4484926de126db5d9f9c109b617c 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 d6c81c1220e3de8b3673298a3a2232fe85044ac1..4c8b768951f217842d4b2e584fc7c6b9336f6a5e 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 <glib/gi18n.h>
+#include "gtk-compat.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 684ea0c49d103ff83c8e692917aefb2c792049eb..268114b4a233e71222361eb0dde74c0bd6641255 100644
--- a/pan/gui/server-ui.cc
+++ b/pan/gui/server-ui.cc
@@ -23,9 +23,7 @@
 #include <climits>
 #include <glib.h>
 #include <glib/gi18n.h>
-extern "C" {
-  #include "gtk-compat.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 1c302f92b2c8952b6d6983911d80a987c7502f96..18a8f74d3806f957cc31c6b751580e0dba8bbe37 100644
--- a/pan/gui/task-pane.cc
+++ b/pan/gui/task-pane.cc
@@ -20,9 +20,7 @@
 #include <config.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-extern "C" {
-  #include "gtk-compat.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/tasks/decoder.cc b/pan/tasks/decoder.cc
index b4c21ae02431ec335fbbea5d0166700598be9acb..bdfe7cc7f9fe4ee1682c83e978e9e762b9288cae 100644
--- a/pan/tasks/decoder.cc
+++ b/pan/tasks/decoder.cc
@@ -25,11 +25,9 @@
 #include <cerrno>
 #include <ostream>
 #include <fstream>
-extern "C" {
-#  define PROTOTYPES
-#  include <uulib/uudeview.h>
-#  include <glib/gi18n.h>
-};
+#define PROTOTYPES
+#include <uulib/uudeview.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/decoder.h b/pan/tasks/decoder.h
index 74403c16a55f3a62b41561ce14aa512835e2f63c..c5653e46c31ee240a781eb268dcd30551056be63 100644
--- a/pan/tasks/decoder.h
+++ b/pan/tasks/decoder.h
@@ -30,10 +30,8 @@
 #include <pan/general/locking.h>
 #include <pan/general/worker-pool.h>
 #include <pan/tasks/task-article.h>
-extern "C" {
-#  define PROTOTYPES
-#  include <uulib/uudeview.h>
-};
+#define PROTOTYPES
+#include <uulib/uudeview.h>
 
 namespace pan
 {
diff --git a/pan/tasks/encoder.cc b/pan/tasks/encoder.cc
index 7960b849ed8e61bca51f66079c09776f31345f14..fad9a632581079ddadc58b779d4bc6ab86313f30 100644
--- a/pan/tasks/encoder.cc
+++ b/pan/tasks/encoder.cc
@@ -28,10 +28,10 @@
 #include <fstream>
 #include <sstream>
 
-extern "C" {
 #define PROTOTYPES
 #include <uulib/uudeview.h>
 #include <glib/gi18n.h>
+extern "C" {
 #include <sys/time.h>
 };
 
diff --git a/pan/tasks/encoder.h b/pan/tasks/encoder.h
index a547ffe019dfda375b15831e14b91809758475f5..12d2a8ce898e723894a2fbefbe948df89349ce4f 100644
--- a/pan/tasks/encoder.h
+++ b/pan/tasks/encoder.h
@@ -32,11 +32,9 @@
 #include <pan/general/worker-pool.h>
 #include <pan/tasks/task-upload.h>
 
-extern "C" {
-#  define PROTOTYPES
-#  include <uulib/uudeview.h>
-#  include <uulib/crc32.h>
-};
+#define PROTOTYPES
+#include <uulib/uudeview.h>
+#include <uulib/crc32.h>
 
 namespace pan
 {
diff --git a/pan/tasks/socket-impl-gio.cc b/pan/tasks/socket-impl-gio.cc
index d3339dd22b3a1038b170eb8fab727120ce4590f7..7dc2ec1ac7569e1be8ced97b71255be1cc263b53 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-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index b58e0749a3c16c7d509421efb1117ed20e2c3a3a..d08b9520db68640e74795200fc4b80b20d39ac86 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -34,13 +34,13 @@
 
 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/task-article.cc b/pan/tasks/task-article.cc
index 9c96b7d10401aa4b898764a26c5527608d5504bf..1dc17baab02c30c8915d40f8cfe5818cbdacaf38 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 b8618d678ce102a32f46a3df47af0ee38f259bd3..c455808eba13e8f8a28d9d8b1b52fccc1ba4422f 100644
--- a/pan/tasks/task-groups.cc
+++ b/pan/tasks/task-groups.cc
@@ -19,8 +19,8 @@
 
 #include <config.h>
 #include <cassert>
+#include <glib/gi18n.h>
 extern "C" {
-  #include <glib/gi18n.h>
   #include <stdlib.h>
 }
 #include <pan/general/debug.h>
diff --git a/pan/tasks/task-post.cc b/pan/tasks/task-post.cc
index bb80fb9606368eb1c207ff9520577bdb31433615..4ab9c2f49ab0f80688200d1937143a7dc856bab2 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 7bd4fe02373caf1b751433d3c20f57c685655513..f68031668357351ee66e53d039315b62352e1521 100644
--- a/pan/tasks/task-upload.h
+++ b/pan/tasks/task-upload.h
@@ -34,12 +34,10 @@
 #include <pan/tasks/nntp.h>
 #include <pan/tasks/task.h>
 
-extern "C" {
-  #define PROTOTYPES
-  #include <uulib/uudeview.h>
-  #include <gmime/gmime.h>
-  #include <glib/gi18n.h>
-};
+#define PROTOTYPES
+#include <uulib/uudeview.h>
+#include <gmime/gmime.h>
+#include <glib/gi18n.h>
 
 #include <set>
 
diff --git a/pan/tasks/task-xover.cc b/pan/tasks/task-xover.cc
index c3c82608bf170b576d69251da0ea116441424fb7..8835503a3bef355876e2a9b9e08e1b64f62319ca 100644
--- a/pan/tasks/task-xover.cc
+++ b/pan/tasks/task-xover.cc
@@ -21,14 +21,13 @@
 #include <cassert>
 #include <cerrno>
 
-extern "C"
-{
-#define PROTOTYPES
+extern "C" {
 #include <stdio.h>
+}
+#define PROTOTYPES
 #include <uulib/uudeview.h>
 #include <glib/gi18n.h>
 #include <gmime/gmime-utils.h>
-}
 
 #include <fstream>
 #include <iostream>
diff --git a/pan/tasks/task-xoverinfo.cc b/pan/tasks/task-xoverinfo.cc
index c598bf8d2a343f61b865313ade987f190b6e289e..210b9bd51614d92b5e226086ee425397f55d7ab7 100644
--- a/pan/tasks/task-xoverinfo.cc
+++ b/pan/tasks/task-xoverinfo.cc
@@ -21,13 +21,13 @@
 #include <cassert>
 #include <cerrno>
 extern "C" {
-  #define PROTOTYPES
   #include <stdio.h>
-  #include <uulib/uudeview.h>
-  #include <glib/gi18n.h>
-  #include <gmime/gmime-utils.h>
-  #include <zlib.h>
 }
+#define PROTOTYPES
+#include <uulib/uudeview.h>
+#include <glib/gi18n.h>
+#include <gmime/gmime-utils.h>
+#include <zlib.h>
 #include <fstream>
 #include <iostream>
 #include <pan/general/debug.h>
diff --git a/pan/usenet-utils/gnksa.cc b/pan/usenet-utils/gnksa.cc
index db1f2c4430b3bd561a7356912b2db21375d954b3..fb888d5d451b41e2dcdbb80612b1e531565a3215 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 4df4525f186b86407440263ac97e72378e907fa3..0c3ae14557ab701d886ccbad1371c45f307a81b3 100644
--- a/pan/usenet-utils/gpg.cc
+++ b/pan/usenet-utils/gpg.cc
@@ -28,10 +28,11 @@ 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
 
 namespace pan
diff --git a/pan/usenet-utils/mime-utils.cc b/pan/usenet-utils/mime-utils.cc
index 881df7b45e84c2c8040b655e09d8d9d32c444546..5e185dbd9549caacf7d1ec0563c37ea71e1b39c4 100644
--- a/pan/usenet-utils/mime-utils.cc
+++ b/pan/usenet-utils/mime-utils.cc
@@ -26,8 +26,8 @@
 extern "C"
 {
   #include <unistd.h>
-  #include <gmime/gmime.h>
 }
+#include <gmime/gmime.h>
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>
 #include <pan/general/messages.h>
diff --git a/pan/usenet-utils/scorefile.cc b/pan/usenet-utils/scorefile.cc
index 8b56a2a9bcf326e3685a667b78c00bfb589bc762..4b151f0cea294ca062a77af6cc925b94b88564f8 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 2286250f202be6dfcd77eaa74a82f520d9c88235..0beb32f2b9f2ba687e5bff9fbd145d1ac88c35c6 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
 {