Get some of the last remaining C files into C++

They still need to be fixed up, but they now build with C++.
2025-08-23 02:09:47 -04:00
parent e4f1102e32
commit f283391b46
78 changed files with 172 additions and 144 deletions
--- a/dlib/Makefile.am
+++ b/dlib/Makefile.am
@ -4,5 +4,5 @@ AM_CPPFLAGS = \
 noinst_LIBRARIES = libDlib.a

 libDlib_a_SOURCES = \
-	dlib.h \
+	dlib.hh \
 	dlib.cc
--- a/dlib/dlib.cc
+++ b/dlib/dlib.cc
@ -27,7 +27,7 @@
 #include <ctype.h>
 #include <time.h>

-#include "dlib.h"
+#include "dlib.hh"

 static bool dLib_show_msg = TRUE;

@ -962,6 +962,27 @@ char *dGetline (FILE *stream)
   return line;
 }

+std::optional< std::string >
+dGetline_string (FILE *stream)
+{
+   int ch;
+   Dstr *dstr;
+
+   if( stream == nullptr ) return std::nullopt;
+
+   dstr = dStr_sized_new(64);
+   while ((ch = fgetc(stream)) != EOF) {
+      dStr_append_c(dstr, ch);
+      if (ch == '\n')
+         break;
+   }
+
+   std::optional< std::string > line;
+   if(dstr->len) line= dstr->str;
+   dStr_free(dstr, 1);
+   return line;
+}
+
 /**
 * Close a FD handling EINTR.
 */
--- a/dlib/dlib.hh
+++ b/dlib/dlib.hh
@ -6,7 +6,8 @@
 #include <stdarg.h>    /* for va_list */
 #include <string.h>    /* for strerror */

-#include <stdbool.h>
+#include <string>
+#include <optional>

 #include "d_size.h"

@ -184,6 +185,7 @@ void dLib_show_messages(bool show);
 */
 char *dGetcwd(void);
 char *dGethomedir(void);
+std::optional< std::string > dGetline_string(FILE *stream);
 char *dGetline(FILE *stream);
 int dClose(int fd);
 int dUsleep(unsigned long us);
--- a/dpi/bookmarks.cc
+++ b/dpi/bookmarks.cc
@ -35,7 +35,7 @@
 #include <netdb.h>
 #include <fcntl.h>
 #include <signal.h>
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"


--- a/dpi/cookies.cc
+++ b/dpi/cookies.cc
@ -49,7 +49,7 @@ int main(void)
 #include <netdb.h>
 #include <signal.h>
 #include "dpiutil.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"


 /*
--- a/dpi/datauri.cc
+++ b/dpi/datauri.cc
@ -18,7 +18,7 @@
 #include <ctype.h>
 #include <errno.h>

-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"
 #include "../src/misc.hh"

--- a/dpi/downloads.cc
+++ b/dpi/downloads.cc
@ -49,7 +49,7 @@

 #include "config.h"
 #include "dpiutil.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"

 /*
 * Debugging macros
--- a/dpi/dpiutil.hh
+++ b/dpi/dpiutil.hh
@ -20,7 +20,7 @@

 #include <stdio.h>
 #include "d_size.h"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"


 #ifdef __cplusplus
--- a/dpi/file.cc
+++ b/dpi/file.cc
@ -34,7 +34,7 @@
 #include <signal.h>
 #include <netinet/in.h>

-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"
 #include "d_size.h"

--- a/dpi/ftp.cc
+++ b/dpi/ftp.cc
@ -41,7 +41,7 @@
 #include <sys/time.h>
 #include <ctype.h>

-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"
 #include "d_size.h"

--- a/dpi/hello.cc
+++ b/dpi/hello.cc
@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"

 /*
--- a/dpi/vsource.cc
+++ b/dpi/vsource.cc
@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "dpiutil.hh"

 /*
--- a/dpid/Makefile.am
+++ b/dpid/Makefile.am
@ -14,17 +14,17 @@ dpidc_LDADD = \
 EXTRA_DIST = dpidrc.in

 dpid_SOURCES = \
-	dpi.h \
-	dpi_socket_dir.h \
-	dpid.h \
-	dpid_common.h \
-	misc_new.h \
+	dpi.hh \
+	dpi_socket_dir.hh \
+	dpid.hh \
+	dpid_common.hh \
+	misc_new.hh \
 	dpi.cc \
-	dpi_socket_dir.c \
+	dpi_socket_dir.cc \
 	dpid.cc \
-	dpid_common.c \
-	main.c \
-	misc_new.c
+	dpid_common.cc \
+	main.cc \
+	misc_new.cc

 dpidc_SOURCES = dpidc.cc

--- a/dpid/dpi.cc
+++ b/dpid/dpi.cc
@ -23,9 +23,9 @@

 #include <errno.h>
 #include <stdlib.h>  /* for exit */
-#include "dpid_common.h"
-#include "dpi.h"
-#include "misc_new.h"
+#include "dpid_common.hh"
+#include "dpi.hh"
+#include "misc_new.hh"

 /*! \Return
 * Returns path to the dpi_socket_dir file
--- a/dpid/dpi.hh
+++ b/dpid/dpi.hh
--- a/dpid/dpi_socket_dir.cc
+++ b/dpid/dpi_socket_dir.cc
@ -21,10 +21,10 @@

 #include <errno.h>
 #include <stdlib.h>
-#include "dpid_common.h"
-#include "dpi.h"
-#include "misc_new.h"
-#include "dpi_socket_dir.h" /* for function prototypes */
+#include "dpid_common.hh"
+#include "dpi.hh"
+#include "misc_new.hh"
+#include "dpi_socket_dir.hh" /* for function prototypes */

 /*! Save socket directory name in ~/.dillo/dpi_socket_dir
 * \Return
@ -76,17 +76,18 @@ int tst_dir(char *dir)
 */
 char *mk_sockdir(void)
 {
-   char *template, *logname;
+   char *template_;
+   const char *logname;

   logname = getenv("LOGNAME") ? getenv("LOGNAME") : "flenser";
-   template = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
-   if (a_Misc_mkdtemp(template) == NULL) {
+   template_ = dStrconcat("/tmp/", logname, "-", "XXXXXX", NULL);
+   if (a_Misc_mkdtemp(template_) == NULL) {
      ERRMSG("mk_sockdir", "a_Misc_mkdtemp", 0);
-      MSG_ERR(" - %s\n", template);
-      dFree(template);
+      MSG_ERR(" - %s\n", template_);
+      dFree(template_);
      return (NULL);
   }
-   return template;
+   return template_;
 }

 /*! Create socket directory if it does not exist and save its name in
--- a/dpid/dpi_socket_dir.hh
+++ b/dpid/dpi_socket_dir.hh
--- a/dpid/dpid.cc
+++ b/dpid/dpid.cc
@ -31,13 +31,13 @@
 #include <arpa/inet.h>

 #include <unistd.h>
-#include "dpid_common.h"
-#include "dpid.h"
-#include "dpi.h"
-#include "dpi_socket_dir.h"
-#include "misc_new.h"
+#include "dpid_common.hh"
+#include "dpid.hh"
+#include "dpi.hh"
+#include "dpi_socket_dir.hh"
+#include "misc_new.hh"

-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"

 using namespace std::literals::string_literals;

--- a/dpid/dpid.hh
+++ b/dpid/dpid.hh
--- a/dpid/dpid_common.cc
+++ b/dpid/dpid_common.cc
@ -12,7 +12,7 @@
 #include <errno.h>
 #include <stdio.h>
 #include <unistd.h>
-#include "dpid_common.h"
+#include "dpid_common.hh"

 /*
 * Send a verbose error message.
--- a/dpid/dpid_common.hh
+++ b/dpid/dpid_common.hh
@ -9,16 +9,17 @@
 * the next patch
 */

-#ifdef __cplusplus
-extern "C"
-{
-#endif

 #include <dirent.h>
 #include <stddef.h> /* size_t */
 #include <sys/types.h> /* ssize_t */

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif

 /*
 * Debugging macros
--- a/dpid/dpidc.cc
+++ b/dpid/dpidc.cc
@ -20,8 +20,8 @@
 #include <netdb.h>
 #include <errno.h>

-#include "../dlib/dlib.h"
-#include "../dpip/dpip.h"
+#include "../dlib/dlib.hh"
+#include "../dpip/dpip.hh"

 #define MSG_ERR(...) printf("** ERROR **: " __VA_ARGS__);

--- a/dpid/main.cc
+++ b/dpid/main.cc
@ -24,14 +24,14 @@
 #include <assert.h>      /* for assert */
 #include <sys/stat.h>    /* for umask */

-#include "dpid_common.h"
-#include "dpid.h"
-#include "dpi.h"
-#include "dpi_socket_dir.h"
-#include "misc_new.h"
+#include "dpid_common.hh"
+#include "dpid.hh"
+#include "dpi.hh"
+#include "dpi_socket_dir.hh"
+#include "misc_new.hh"

-#include "../dlib/dlib.h"
-#include "../dpip/dpip.h"
+#include "../dlib/dlib.hh"
+#include "../dpip/dpip.hh"

 sigset_t mask_sigchld;

--- a/dpid/misc_new.cc
+++ b/dpid/misc_new.cc
@ -15,9 +15,9 @@
 #include <sys/stat.h>   /* stat */
 #include <stdlib.h>     /* rand, srand */

-#include "../dlib/dlib.h"
-#include "dpid_common.h"
-#include "misc_new.h"   /* for function prototypes */
+#include "../dlib/dlib.hh"
+#include "dpid_common.hh"
+#include "misc_new.hh"   /* for function prototypes */

 /*! Reads a dpi tag from a socket
 * \li Continues after a signal interrupt
@ -128,30 +128,30 @@ int a_Misc_nohang_rdtag(int socket, int timeout, Dstr **tag)
 * Alternative to mkdtemp().
 * Not as strong as mkdtemp, but enough for creating a directory.
 */
-char *a_Misc_mkdtemp(char *template)
+char *a_Misc_mkdtemp(char *template_)
 {
   for (;;) {
-      if (a_Misc_mkfname(template) && mkdir(template, 0700) == 0)
+      if (a_Misc_mkfname(template_) && mkdir(template_, 0700) == 0)
         break;
      if (errno == EEXIST)
         continue;
      return 0;
   }
-   return template;
+   return template_;
 }

 /**
 * Return a new, nonexistent file name from a template.
 * (adapted from dietlibc; alternative to mkdtemp())
 */
-char *a_Misc_mkfname(char *template)
+char *a_Misc_mkfname(char *template_)
 {
-   char *tmp = template + strlen(template) - 6;
+   char *tmp = template_ + strlen(template_) - 6;
   int i;
   uint_t random;
   struct stat stat_buf;

-   if (tmp < template)
+   if (tmp < template_)
      goto error;
   for (i = 0; i < 6; ++i)
      if (tmp[i] != 'X') {
@ -168,10 +168,10 @@ char *a_Misc_mkfname(char *template)

         tmp[i] = hexdigit > 9 ? hexdigit + 'a' - 10 : hexdigit + '0';
      }
-      if (stat(template, &stat_buf) == -1 && errno == ENOENT)
-         return template;
+      if (stat(template_, &stat_buf) == -1 && errno == ENOENT)
+         return template_;

-      MSG_ERR("a_Misc_mkfname: another round for %s \n", template);
+      MSG_ERR("a_Misc_mkfname: another round for %s \n", template_);
   }
 }

--- a/dpid/misc_new.hh
+++ b/dpid/misc_new.hh
--- a/dpip/Makefile.am
+++ b/dpip/Makefile.am
@ -4,5 +4,5 @@ AM_CPPFLAGS = \
 noinst_LIBRARIES = libDpip.a

 libDpip_a_SOURCES = \
-       dpip.h \
-       dpip.c
+       dpip.hh \
+       dpip.cc
--- a/dpip/dpip.cc
+++ b/dpip/dpip.cc
@ -19,7 +19,7 @@
 #include <unistd.h>   /* for close */
 #include <fcntl.h>    /* for fcntl */

-#include "dpip.h"
+#include "dpip.hh"
 #include "d_size.h"

 #define RBUF_SZ 16*1024
--- a/dpip/dpip.hh
+++ b/dpip/dpip.hh
@ -5,12 +5,12 @@
 #ifndef __DPIP_H__
 #define __DPIP_H__

+#include "../dlib/dlib.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "../dlib/dlib.h"
-
 /*
 * Communication mode flags
 */
--- a/dw/findtext.cc
+++ b/dw/findtext.cc
@ -20,7 +20,7 @@


 #include "core.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/debug.hh"
 #include "../lout/msg.h"

--- a/dw/fltkplatform.cc
+++ b/dw/fltkplatform.cc
@ -19,7 +19,7 @@

 #include <stdio.h>

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/msg.h"
 #include "../lout/debug.hh"
 #include "fltkcore.hh"
--- a/dw/fltkui.cc
+++ b/dw/fltkui.cc
@ -25,7 +25,7 @@
 #include "fltkcore.hh"
 #include "fltkflatview.hh"
 #include "fltkcomplexbutton.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/msg.h"
 #include "../lout/misc.hh"

--- a/dw/hyphenator.cc
+++ b/dw/hyphenator.cc
@ -21,7 +21,7 @@

 #include "hyphenator.hh"

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/misc.hh"
 #include "../lout/unicode.hh"
 #include <limits.h>
--- a/dw/image.cc
+++ b/dw/image.cc
@ -22,7 +22,7 @@

 //#define DEBUG_LEVEL 1
 #include "image.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/msg.h"
 #include "../lout/misc.hh"
 #include "../lout/debug.hh"
--- a/dw/layout.cc
+++ b/dw/layout.cc
@ -22,7 +22,7 @@

 #include "core.hh"

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "../lout/msg.h"
 #include "../lout/debug.hh"
 #include "../lout/misc.hh"
--- a/dw/style.cc
+++ b/dw/style.cc
@ -26,7 +26,7 @@ static_assert( __cplusplus > 2020'02 );

 #include <algorithm>

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "core.hh"
 #include "../lout/msg.h"

--- a/lout/misc.hh
+++ b/lout/misc.hh
@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 namespace lout {

--- a/lout/object.cc
+++ b/lout/object.cc
@ -20,7 +20,7 @@


 #include "object.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include <stdio.h>
 #include <stdint.h>
 #include <config.h>
--- a/src/IO/IO.cc
+++ b/src/IO/IO.cc
@ -18,7 +18,7 @@
 #include <unistd.h>
 #include "../msg.hh"
 #include "../chain.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "IO.hh"
 #include "iowatch.hh"
 #include "tls.hh"
--- a/src/IO/IO.hh
+++ b/src/IO/IO.hh
@ -4,7 +4,7 @@
 #include <string_view>

 #include "d_size.h"
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"
 #include "../chain.hh"

 /*
--- a/src/IO/Url.h
+++ b/src/IO/Url.h
@ -3,7 +3,7 @@

 #include "../chain.hh"
 #include "../url.hh"
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/IO/dpi.cc
+++ b/src/IO/dpi.cc
@ -36,11 +36,11 @@
 #include <netdb.h>

 #include "../msg.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "IO.hh"
 #include "Url.h"
-#include "../../dpip/dpip.h"
-#include "dlib/dlib.h"
+#include "../../dpip/dpip.hh"
+#include "dlib/dlib.hh"

 /* This one is tricky, some sources state it should include the byte
 * for the terminating NULL, and others say it shouldn't. */
--- a/src/IO/http.cc
+++ b/src/IO/http.cc
@ -32,7 +32,7 @@
 #include "tls.hh"
 #include "Url.h"
 #include "../msg.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "../dns.hh"
 #include "../web.hh"
 #include "../cookies.hh"
--- a/src/IO/mime.hh
+++ b/src/IO/mime.hh
@ -14,13 +14,13 @@

 #include <config.h>

+#include "../cache.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */


-#include "../cache.hh"
-
 typedef void* (*Viewer_t) (const char*, void*, CA_Callback_t*, void**);

 /**
--- a/src/IO/tls_openssl.cc
+++ b/src/IO/tls_openssl.cc
@ -45,9 +45,9 @@
 #include <ctype.h>            /* tolower for wget stuff */
 #include <stdio.h>
 #include <errno.h>
-#include "../../dlib/dlib.h"
+#include "../../dlib/dlib.hh"
 #include "../dialog.hh"
-#include "../klist.h"
+#include "../klist.hh"
 #include "iowatch.hh"
 #include "tls.hh"
 #include "Url.h"
--- a/src/IO/tls_openssl.hh
+++ b/src/IO/tls_openssl.hh
@ -25,12 +25,12 @@
 #ifndef __TLS_OPENSSL_H__
 #define __TLS_OPENSSL_H__

+#include "../url.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

-#include "../url.hh"
-
 const char *a_Tls_openssl_version(char *buf, int n);
 void a_Tls_openssl_init(void);
 int a_Tls_openssl_certificate_is_clean(const DilloUrl *url);
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -68,8 +68,8 @@ flenser_SOURCES = \
 	url.hh \
 	bitvec.cc \
 	bitvec.hh \
-	klist.c \
-	klist.h \
+	klist.cc \
+	klist.hh \
 	chain.cc \
 	chain.hh \
 	utf8.cc \
--- a/src/actions.cc
+++ b/src/actions.cc
@ -11,7 +11,7 @@

 #include "actions.hh"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include <errno.h>

 static Dlist *link_actions = NULL;
--- a/src/actions.hh
+++ b/src/actions.hh
@ -12,12 +12,12 @@
 #ifndef ACTIONS_H
 #define ACTIONS_H

+#include "dlib/dlib.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "dlib/dlib.h"
-
 typedef struct {
   char *label;
   char *cmd;
--- a/src/auth.cc
+++ b/src/auth.cc
@ -23,7 +23,7 @@
 #include "misc.hh"
 #include "dialog.hh"
 #include "digest.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 typedef struct {
   int ok;
--- a/src/bitvec.cc
+++ b/src/bitvec.cc
@ -13,7 +13,7 @@
 * A simple ADT for bit arrays
 */

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "bitvec.hh"

 extern "C" {
--- a/src/bookmark.cc
+++ b/src/bookmark.cc
@ -15,7 +15,7 @@
 #include "history.hh"
 #include "capi.hh"
 #include "bookmark.hh"  /* for prototypes */
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"



--- a/src/cache.hh
+++ b/src/cache.hh
@ -1,14 +1,15 @@
 #ifndef __CACHE_H__
 #define __CACHE_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-

 #include "chain.hh"
 #include "url.hh"

+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*
 * Cache Op codes
 */
--- a/src/capi.cc
+++ b/src/capi.cc
@ -31,7 +31,7 @@
 #include "dpiapi.hh"
 #include "uicmd.hh"
 #include "domain.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"
 #include "prefs.hh"

 /* for testing dpi chat */
--- a/src/chain.cc
+++ b/src/chain.cc
@ -15,7 +15,7 @@

 #include "msg.hh"
 #include "chain.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #define VERBOSE 0

--- a/src/cookies.cc
+++ b/src/cookies.cc
@ -43,7 +43,7 @@ void a_Cookies_init(void)
 #include "list.h"
 #include "cookies.hh"
 #include "capi.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"


 /** The maximum length of a line in the cookie file */
--- a/src/css.cc
+++ b/src/css.cc
@ -10,7 +10,7 @@
 */

 #include <stdio.h>
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "html_common.hh"
 #include "css.hh"
--- a/src/decode.hh
+++ b/src/decode.hh
@ -1,7 +1,7 @@
 #ifndef __DECODE_H__
 #define __DECODE_H__

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/dgif.hh
+++ b/src/dgif.hh
@ -1,13 +1,13 @@
 #ifndef __GIF_H__
 #define __GIF_H__

+#include "url.hh"
+#include "image.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-
 struct DilloGif;

 DilloGif *a_Gif_new(DilloImage *Image, DilloUrl *url, int version);
--- a/src/dialog.cc
+++ b/src/dialog.cc
@ -37,7 +37,7 @@
 #include "dialog.hh"
 #include "misc.hh"
 #include "prefs.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 /*
 * Local Data
--- a/src/digest.cc
+++ b/src/digest.cc
@ -13,7 +13,7 @@
 #include "digest.hh"
 #include "md5.h"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #include <string_view>

--- a/src/digest.hh
+++ b/src/digest.hh
@ -2,7 +2,7 @@
 #define __DIGEST_H__

 #include "auth.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 #ifdef __cplusplus
 extern "C" {
--- a/src/djpeg.hh
+++ b/src/djpeg.hh
@ -1,13 +1,14 @@
 #ifndef __JPEG_H__
 #define __JPEG_H__

+#include "url.hh"
+#include "image.hh"
+
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-

 void *a_Jpeg_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Jpeg_callback(int Op, void *data);
--- a/src/domain.cc
+++ b/src/domain.cc
@ -12,7 +12,7 @@
 #include <vector>
 #include <string>

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "list.h"
 #include "domain.hh"
--- a/src/dpiapi.cc
+++ b/src/dpiapi.cc
@ -18,7 +18,7 @@
 #include "capi.hh"
 #include "dpiapi.hh"  /* for prototypes */
 #include "dialog.hh"
-#include "../dpip/dpip.h"
+#include "../dpip/dpip.hh"


 //----------------------------------------------------------------------------
--- a/src/dpng.hh
+++ b/src/dpng.hh
@ -1,16 +1,16 @@
 #ifndef __PNG_H__
 #define __PNG_H__

+#include "url.hh"
+#include "image.hh"
+#include "cache.hh"
+
 #ifdef __cplusplus
 extern "C" {
 #else
 #error PNG header is now C++ only
 #endif /* __cplusplus */

-#include "url.hh"
-#include "image.hh"
-#include "cache.hh"
-
 struct DilloPng;

 DilloPng *a_Png_new(DilloImage *Image, DilloUrl *url, int version);
--- a/src/dsvg.hh
+++ b/src/dsvg.hh
@ -1,14 +1,14 @@
 #ifndef __SVG_H__
 #define __SVG_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include "url.hh"
 #include "image.hh"
 #include "cache.hh"

+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+

 void *a_Svg_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Svg_callback(int Op, CacheClient_t *Client);
--- a/src/dwebp.hh
+++ b/src/dwebp.hh
@ -1,14 +1,15 @@
 #ifndef __WEBP_H__
 #define __WEBP_H__

-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */

 #include "url.hh"
 #include "image.hh"


+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 void *a_Webp_new(DilloImage *Image, DilloUrl *url, int version);
 void a_Webp_callback(int Op, void *data);
 const char *a_Webp_version(char *buf, int n);
--- a/src/form.cc
+++ b/src/form.cc
@ -20,7 +20,7 @@
 #include "dw/core.hh"
 #include "dw/textblock.hh"

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "misc.hh"
 #include "msg.hh"
 #include "prefs.hh"
--- a/src/hsts.cc
+++ b/src/hsts.cc
@ -31,7 +31,7 @@

 #include "hsts.hh"
 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "IO/tls.hh"

 #include <string>
--- a/src/keys.cc
+++ b/src/keys.cc
@ -16,7 +16,7 @@
 #include <string.h>
 #include <ctype.h>

-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"
 #include "keys.hh"
 #include "utf8.hh"
 #include "msg.hh"
--- a/src/klist.cc
+++ b/src/klist.cc
@ -18,7 +18,7 @@
 * remains with the caller.
 */

-#include "klist.h"
+#include "klist.hh"


 /**
--- a/src/klist.hh
+++ b/src/klist.hh
@ -1,7 +1,7 @@
 #ifndef __KLIST_H__
 #define __KLIST_H__

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"


 #ifdef __cplusplus
--- a/src/paths.cc
+++ b/src/paths.cc
@ -14,7 +14,7 @@
 #include <sys/stat.h>

 #include "msg.hh"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "paths.hh"

 /*
--- a/src/styleengine.cc
+++ b/src/styleengine.cc
@ -10,7 +10,7 @@
 * (at your option) any later version.
 */

-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"
 #include "msg.hh"
 #include "prefs.hh"
 #include "misc.hh"
--- a/src/tipwin.cc
+++ b/src/tipwin.cc
@ -27,7 +27,7 @@

 #include "prefs.hh"
 #include "tipwin.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 /*
 * Forward declarations
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@ -46,7 +46,7 @@
 #include "msg.hh"
 #include "prefs.hh"
 #include "misc.hh"
-#include "dlib/dlib.h"
+#include "dlib/dlib.hh"

 #include "dw/fltkviewport.hh"

--- a/src/url.hh
+++ b/src/url.hh
@ -13,7 +13,7 @@
 #define __URL_H__

 #include "d_size.h"
-#include "../dlib/dlib.h"
+#include "../dlib/dlib.hh"

 extern "C++"
 {
--- a/src/utf8.cc
+++ b/src/utf8.cc
@ -11,7 +11,7 @@

 #include <FL/fl_utf8.h>

-#include "../dlib/dlib.h"    /* TRUE/FALSE */
+#include "../dlib/dlib.hh"    /* TRUE/FALSE */
 #include "utf8.hh"

 // C++ functions with C linkage ----------------------------------------------