From 5b673efa121320d1575e126243fa2c7ec460952d Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 16 Feb 2016 13:31:41 +0100
Subject: Renamed config->read_file to config->load_file

- The return value is now consistent with the libconfig standard
  (CONFIG_TRUE/CONFIG_FALSE).
- Removed some redundant error messages.

Signed-off-by: Haru <haru@dotalux.com>
---
 src/map/clif.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/src/map/clif.c b/src/map/clif.c
index 3b2f255ef..5b9e9c99e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17317,10 +17317,8 @@ void clif_cashshop_db(void) {
 		clif->cs.item_count[i] = 0;
 	}
 
-	if (libconfig->read_file(&cashshop_conf, config_filename)) {
-		ShowError("can't read %s\n", config_filename);
+	if (!libconfig->load_file(&cashshop_conf, config_filename))
 		return;
-	}
 
 	cashshop = libconfig->lookup(&cashshop_conf, "cash_shop");
 
@@ -18377,10 +18375,8 @@ bool clif_parse_roulette_db(void) {
 		clif->rd.items[i] = 0;
 	}
 
-	if (libconfig->read_file(&roulette_conf, config_filename)) {
-		ShowError("can't read %s\n", config_filename);
+	if (!libconfig->load_file(&roulette_conf, config_filename))
 		return false;
-	}
 	roulette = libconfig->lookup(&roulette_conf, "roulette");
 
 	if( roulette != NULL && (levels = libconfig->setting_get_elem(roulette, 0)) != NULL ) {
-- 
cgit v1.2.3-60-g2f50


From 03a5c603be2cf6d5feea9012029f8899c624557a Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 16 Feb 2016 18:07:52 +0100
Subject: Removed unnecessary typedefs from libconfig

Signed-off-by: Haru <haru@dotalux.com>
---
 3rdparty/libconfig/extra/gen/grammar.y |  18 +--
 3rdparty/libconfig/grammar.c           |  18 +--
 3rdparty/libconfig/libconfig.c         | 242 ++++++++++++++++-----------------
 3rdparty/libconfig/libconfig.h         | 210 ++++++++++++++--------------
 3rdparty/libconfig/parsectx.h          |   6 +-
 3rdparty/libconfig/scanctx.h           |   2 +-
 src/common/HPM.c                       |   6 +-
 src/common/conf.c                      |  55 ++++----
 src/common/conf.h                      | 164 +++++++++++-----------
 src/common/showmsg.c                   |   4 +-
 src/common/showmsg.h                   |   2 +-
 src/common/socket.c                    |   4 +-
 src/common/socket.h                    |   2 +-
 src/map/atcommand.c                    |  18 +--
 src/map/atcommand.h                    |   2 +-
 src/map/battleground.c                 |  12 +-
 src/map/channel.c                      |  14 +-
 src/map/clif.c                         |  16 +--
 src/map/itemdb.c                       |  30 ++--
 src/map/itemdb.h                       |   6 +-
 src/map/map.c                          |  44 +++---
 src/map/mob.c                          |  30 ++--
 src/map/mob.h                          |  16 +--
 src/map/pc.c                           |  10 +-
 src/map/pc_groups.c                    |  24 ++--
 src/map/pc_groups.h                    |   8 +-
 src/map/quest.c                        |  12 +-
 src/map/quest.h                        |   2 +-
 src/map/script.c                       |  10 +-
 src/map/status.c                       |  24 ++--
 src/map/status.h                       |   4 +-
 src/plugins/db2sql.c                   |  10 +-
 src/test/test_libconfig.c              |  86 ++++++------
 33 files changed, 557 insertions(+), 554 deletions(-)

(limited to 'src/map/clif.c')

diff --git a/3rdparty/libconfig/extra/gen/grammar.y b/3rdparty/libconfig/extra/gen/grammar.y
index 2e4cfa45f..ef8ed4f18 100644
--- a/3rdparty/libconfig/extra/gen/grammar.y
+++ b/3rdparty/libconfig/extra/gen/grammar.y
@@ -63,7 +63,7 @@ static const char *err_duplicate_setting = "duplicate setting name";
   (ctx->parent && (ctx->parent->type == CONFIG_TYPE_LIST))
 
 static void capture_parse_pos(void *scanner, struct scan_context *scan_ctx,
-                              config_setting_t *setting)
+                              struct config_setting_t *setting)
 {
   setting->line = (unsigned int)libconfig_yyget_lineno(scanner);
   setting->file = scanctx_current_filename(scan_ctx);
@@ -206,8 +206,8 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
-                                                         (int)$1);
+      struct config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
+                                                                (int)$1);
 
       if(! e)
       {
@@ -226,7 +226,7 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
+      struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -248,7 +248,7 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
+      struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -270,7 +270,7 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
+      struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, $1);
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -292,7 +292,7 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
+      struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, $1);
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -314,7 +314,7 @@ simple_value:
   {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, $1);
+      struct config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, $1);
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -333,7 +333,7 @@ simple_value:
     if(IN_ARRAY() || IN_LIST())
     {
       const char *s = parsectx_take_string(ctx);
-      config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
+      struct config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
       _delete(s);
 
       if(! e)
diff --git a/3rdparty/libconfig/grammar.c b/3rdparty/libconfig/grammar.c
index ee1da702e..7d5757b2f 100644
--- a/3rdparty/libconfig/grammar.c
+++ b/3rdparty/libconfig/grammar.c
@@ -104,7 +104,7 @@ static const char *err_duplicate_setting = "duplicate setting name";
   (ctx->parent && (ctx->parent->type == CONFIG_TYPE_LIST))
 
 static void capture_parse_pos(void *scanner, struct scan_context *scan_ctx,
-                              config_setting_t *setting)
+                              struct config_setting_t *setting)
 {
   setting->line = (unsigned int)libconfig_yyget_lineno(scanner);
   setting->file = scanctx_current_filename(scan_ctx);
@@ -1601,8 +1601,8 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
-                                                         (int)(yyvsp[(1) - (1)].ival));
+      struct config_setting_t *e = config_setting_set_bool_elem(ctx->parent, -1,
+                                                                (int)(yyvsp[(1) - (1)].ival));
 
       if(! e)
       {
@@ -1625,7 +1625,7 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
+      struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1651,7 +1651,7 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
+      struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1677,7 +1677,7 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
+      struct config_setting_t *e = config_setting_set_int_elem(ctx->parent, -1, (yyvsp[(1) - (1)].ival));
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1703,7 +1703,7 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
+      struct config_setting_t *e = config_setting_set_int64_elem(ctx->parent, -1, (yyvsp[(1) - (1)].llval));
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1729,7 +1729,7 @@ yyreduce:
     {
     if(IN_ARRAY() || IN_LIST())
     {
-      config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, (yyvsp[(1) - (1)].fval));
+      struct config_setting_t *e = config_setting_set_float_elem(ctx->parent, -1, (yyvsp[(1) - (1)].fval));
       if(! e)
       {
         libconfig_yyerror(scanner, ctx, scan_ctx, err_array_elem_type);
@@ -1752,7 +1752,7 @@ yyreduce:
     if(IN_ARRAY() || IN_LIST())
     {
       const char *s = parsectx_take_string(ctx);
-      config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
+      struct config_setting_t *e = config_setting_set_string_elem(ctx->parent, -1, s);
       _delete(s);
 
       if(! e)
diff --git a/3rdparty/libconfig/libconfig.c b/3rdparty/libconfig/libconfig.c
index 72520e7c5..0942241c2 100644
--- a/3rdparty/libconfig/libconfig.c
+++ b/3rdparty/libconfig/libconfig.c
@@ -70,9 +70,9 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 
 static const char *__io_error = "file I/O error";
 
-static void __config_list_destroy(config_list_t *list);
-static void __config_write_setting(const config_t *config,
-                                   const config_setting_t *setting,
+static void __config_list_destroy(struct config_list_t *list);
+static void __config_write_setting(const struct config_t *config,
+                                   const struct config_setting_t *setting,
                                    FILE *stream, int depth);
 
 /* ------------------------------------------------------------------------- */
@@ -174,8 +174,8 @@ static void __config_indent(FILE *stream, int depth, unsigned short w)
 
 /* ------------------------------------------------------------------------- */
 
-static void __config_write_value(const config_t *config,
-                                 const config_value_t *value, int type,
+static void __config_write_value(const struct config_t *config,
+                                 const union config_value_t *value, int type,
                                  int format, int depth, FILE *stream)
 {
   char fbuf[64];
@@ -302,14 +302,14 @@ static void __config_write_value(const config_t *config,
     /* list */
     case CONFIG_TYPE_LIST:
     {
-      config_list_t *list = value->list;
+      struct config_list_t *list = value->list;
 
       fprintf(stream, "( ");
 
       if(list)
       {
         int len = list->length;
-        config_setting_t **s;
+        struct config_setting_t **s;
 
         for(s = list->elements; len--; s++)
         {
@@ -331,14 +331,14 @@ static void __config_write_value(const config_t *config,
     /* array */
     case CONFIG_TYPE_ARRAY:
     {
-      config_list_t *list = value->list;
+      struct config_list_t *list = value->list;
 
       fprintf(stream, "[ ");
 
       if(list)
       {
         int len = list->length;
-        config_setting_t **s;
+        struct config_setting_t **s;
 
         for(s = list->elements; len--; s++)
         {
@@ -360,7 +360,7 @@ static void __config_write_value(const config_t *config,
     /* group */
     case CONFIG_TYPE_GROUP:
     {
-      config_list_t *list = value->list;
+      struct config_list_t *list = value->list;
 
       if(depth > 0)
       {
@@ -378,7 +378,7 @@ static void __config_write_value(const config_t *config,
       if(list)
       {
         int len = list->length;
-        config_setting_t **s;
+        struct config_setting_t **s;
 
         for(s = list->elements; len--; s++)
           __config_write_setting(config, *s, stream, depth + 1);
@@ -402,13 +402,13 @@ static void __config_write_value(const config_t *config,
 
 /* ------------------------------------------------------------------------- */
 
-static void __config_list_add(config_list_t *list, config_setting_t *setting)
+static void __config_list_add(struct config_list_t *list, struct config_setting_t *setting)
 {
   if((list->length % CHUNK_SIZE) == 0)
   {
-    list->elements = (config_setting_t **)realloc(
+    list->elements = (struct config_setting_t **)realloc(
       list->elements,
-      (list->length + CHUNK_SIZE) * sizeof(config_setting_t *));
+      (list->length + CHUNK_SIZE) * sizeof(struct config_setting_t *));
   }
 
   list->elements[list->length] = setting;
@@ -417,11 +417,11 @@ static void __config_list_add(config_list_t *list, config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-static config_setting_t *__config_list_search(config_list_t *list,
+static struct config_setting_t *__config_list_search(struct config_list_t *list,
                                               const char *name,
                                               unsigned int *idx)
 {
-  config_setting_t **found = NULL;
+  struct config_setting_t **found = NULL;
   unsigned int i;
 
   if(! list)
@@ -446,15 +446,15 @@ static config_setting_t *__config_list_search(config_list_t *list,
 
 /* ------------------------------------------------------------------------- */
 
-static config_setting_t *__config_list_remove(config_list_t *list, int idx)
+static struct config_setting_t *__config_list_remove(struct config_list_t *list, int idx)
 {
-  config_setting_t *removed = *(list->elements + idx);
-  int offset = (idx * sizeof(config_setting_t *));
+  struct config_setting_t *removed = *(list->elements + idx);
+  int offset = (idx * sizeof(struct config_setting_t *));
   int len = list->length - 1 - idx;
   char *base = (char *)list->elements + offset;
 
-  memmove(base, base + sizeof(config_setting_t *),
-          len * sizeof(config_setting_t *));
+  memmove(base, base + sizeof(struct config_setting_t *),
+          len * sizeof(struct config_setting_t *));
 
   list->length--;
 
@@ -465,7 +465,7 @@ static config_setting_t *__config_list_remove(config_list_t *list, int idx)
 
 /* ------------------------------------------------------------------------- */
 
-static void __config_setting_destroy(config_setting_t *setting)
+static void __config_setting_destroy(struct config_setting_t *setting)
 {
   if(setting)
   {
@@ -492,9 +492,9 @@ static void __config_setting_destroy(config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-static void __config_list_destroy(config_list_t *list)
+static void __config_list_destroy(struct config_list_t *list)
 {
-  config_setting_t **p;
+  struct config_setting_t **p;
   unsigned int i;
 
   if(! list)
@@ -513,7 +513,7 @@ static void __config_list_destroy(config_list_t *list)
 
 /* ------------------------------------------------------------------------- */
 
-static int __config_vector_checktype(const config_setting_t *vector, int type)
+static int __config_vector_checktype(const struct config_setting_t *vector, int type)
 {
   /* if the array is empty, then it has no type yet */
 
@@ -557,7 +557,7 @@ static int __config_validate_name(const char *name)
 
 /* ------------------------------------------------------------------------- */
 
-static int __config_read(config_t *config, FILE *stream, const char *filename,
+static int __config_read(struct config_t *config, FILE *stream, const char *filename,
                          const char *str)
 {
   yyscan_t scanner;
@@ -623,22 +623,22 @@ static int __config_read(config_t *config, FILE *stream, const char *filename,
 
 /* ------------------------------------------------------------------------- */
 
-int config_read(config_t *config, FILE *stream)
+int config_read(struct config_t *config, FILE *stream)
 {
   return(__config_read(config, stream, NULL, NULL));
 }
 
 /* ------------------------------------------------------------------------- */
 
-int config_read_string(config_t *config, const char *str)
+int config_read_string(struct config_t *config, const char *str)
 {
   return(__config_read(config, NULL, NULL, str));
 }
 
 /* ------------------------------------------------------------------------- */
 
-static void __config_write_setting(const config_t *config,
-                                   const config_setting_t *setting,
+static void __config_write_setting(const struct config_t *config,
+                                   const struct config_setting_t *setting,
                                    FILE *stream, int depth)
 {
   char group_assign_char = __config_has_option(
@@ -673,7 +673,7 @@ static void __config_write_setting(const config_t *config,
 
 /* ------------------------------------------------------------------------- */
 
-void config_write(const config_t *config, FILE *stream)
+void config_write(const struct config_t *config, FILE *stream)
 {
   __config_locale_override();
 
@@ -684,7 +684,7 @@ void config_write(const config_t *config, FILE *stream)
 
 /* ------------------------------------------------------------------------- */
 
-int config_read_file(config_t *config, const char *filename)
+int config_read_file(struct config_t *config, const char *filename)
 {
   int ret, ok = 0;
 
@@ -721,7 +721,7 @@ int config_read_file(config_t *config, const char *filename)
 
 /* ------------------------------------------------------------------------- */
 
-int config_write_file(config_t *config, const char *filename)
+int config_write_file(struct config_t *config, const char *filename)
 {
   FILE *stream = fopen(filename, "wt");
   if(stream == NULL)
@@ -740,7 +740,7 @@ int config_write_file(config_t *config, const char *filename)
 
 /* ------------------------------------------------------------------------- */
 
-void config_destroy(config_t *config)
+void config_destroy(struct config_t *config)
 {
   unsigned int count = config->num_filenames;
   const char **f;
@@ -753,16 +753,16 @@ void config_destroy(config_t *config)
   _delete(config->filenames);
   _delete(config->include_dir);
 
-  memset((void *)config, 0, sizeof(config_t));
+  memset((void *)config, 0, sizeof(struct config_t));
 }
 
 /* ------------------------------------------------------------------------- */
 
-void config_init(config_t *config)
+void config_init(struct config_t *config)
 {
-  memset((void *)config, 0, sizeof(config_t));
+  memset((void *)config, 0, sizeof(struct config_t));
 
-  config->root = _new(config_setting_t);
+  config->root = _new(struct config_setting_t);
   config->root->type = CONFIG_TYPE_GROUP;
   config->root->config = config;
   config->options = (CONFIG_OPTION_SEMICOLON_SEPARATORS
@@ -773,7 +773,7 @@ void config_init(config_t *config)
 
 /* ------------------------------------------------------------------------- */
 
-void config_set_auto_convert(config_t *config, int flag)
+void config_set_auto_convert(struct config_t *config, int flag)
 {
   if(flag)
     config->options |= CONFIG_OPTION_AUTOCONVERT;
@@ -783,39 +783,39 @@ void config_set_auto_convert(config_t *config, int flag)
 
 /* ------------------------------------------------------------------------- */
 
-int config_get_auto_convert(const config_t *config)
+int config_get_auto_convert(const struct config_t *config)
 {
   return(__config_has_option(config, CONFIG_OPTION_AUTOCONVERT));
 }
 
 /* ------------------------------------------------------------------------- */
 
-void config_set_options(config_t *config, int options)
+void config_set_options(struct config_t *config, int options)
 {
   config->options = options;
 }
 
 /* ------------------------------------------------------------------------- */
 
-int config_get_options(const config_t *config)
+int config_get_options(const struct config_t *config)
 {
   return(config->options);
 }
 
 /* ------------------------------------------------------------------------- */
 
-static config_setting_t *config_setting_create(config_setting_t *parent,
+static struct config_setting_t *config_setting_create(struct config_setting_t *parent,
                                                const char *name, int type)
 {
-  config_setting_t *setting;
-  config_list_t *list;
+  struct config_setting_t *setting;
+  struct config_list_t *list;
 
   if((parent->type != CONFIG_TYPE_GROUP)
      && (parent->type != CONFIG_TYPE_ARRAY)
      && (parent->type != CONFIG_TYPE_LIST))
     return(NULL);
 
-  setting = _new(config_setting_t);
+  setting = _new(struct config_setting_t);
   setting->parent = parent;
   setting->name = (name == NULL) ? NULL : strdup(name);
   setting->type = type;
@@ -826,7 +826,7 @@ static config_setting_t *config_setting_create(config_setting_t *parent,
   list = parent->value.list;
 
   if(! list)
-    list = parent->value.list = _new(config_list_t);
+    list = parent->value.list = _new(struct config_list_t);
 
   __config_list_add(list, setting);
 
@@ -835,7 +835,7 @@ static config_setting_t *config_setting_create(config_setting_t *parent,
 
 /* ------------------------------------------------------------------------- */
 
-static int __config_setting_get_int(const config_setting_t *setting,
+static int __config_setting_get_int(const struct config_setting_t *setting,
                                     int *value)
 {
   switch(setting->type)
@@ -868,7 +868,7 @@ static int __config_setting_get_int(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_get_int(const config_setting_t *setting)
+int config_setting_get_int(const struct config_setting_t *setting)
 {
   int value = 0;
   __config_setting_get_int(setting, &value);
@@ -877,7 +877,7 @@ int config_setting_get_int(const config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-static int __config_setting_get_int64(const config_setting_t *setting,
+static int __config_setting_get_int64(const struct config_setting_t *setting,
                                       long long *value)
 {
   switch(setting->type)
@@ -906,7 +906,7 @@ static int __config_setting_get_int64(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-long long config_setting_get_int64(const config_setting_t *setting)
+long long config_setting_get_int64(const struct config_setting_t *setting)
 {
   long long value = 0;
   __config_setting_get_int64(setting, &value);
@@ -915,10 +915,10 @@ long long config_setting_get_int64(const config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_lookup_int(const config_setting_t *setting,
+int config_setting_lookup_int(const struct config_setting_t *setting,
                               const char *name, int *value)
 {
-  config_setting_t *member = config_setting_get_member(setting, name);
+  struct config_setting_t *member = config_setting_get_member(setting, name);
   if(! member)
     return(CONFIG_FALSE);
 
@@ -927,10 +927,10 @@ int config_setting_lookup_int(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_lookup_int64(const config_setting_t *setting,
+int config_setting_lookup_int64(const struct config_setting_t *setting,
                                 const char *name, long long *value)
 {
-  config_setting_t *member = config_setting_get_member(setting, name);
+  struct config_setting_t *member = config_setting_get_member(setting, name);
   if(! member)
     return(CONFIG_FALSE);
 
@@ -939,7 +939,7 @@ int config_setting_lookup_int64(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-static int __config_setting_get_float(const config_setting_t *setting,
+static int __config_setting_get_float(const struct config_setting_t *setting,
                                       double *value)
 {
   switch(setting->type)
@@ -973,7 +973,7 @@ static int __config_setting_get_float(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-double config_setting_get_float(const config_setting_t *setting)
+double config_setting_get_float(const struct config_setting_t *setting)
 {
   double value = 0.0;
   __config_setting_get_float(setting, &value);
@@ -982,10 +982,10 @@ double config_setting_get_float(const config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_lookup_float(const config_setting_t *setting,
+int config_setting_lookup_float(const struct config_setting_t *setting,
                                 const char *name, double *value)
 {
-  config_setting_t *member = config_setting_get_member(setting, name);
+  struct config_setting_t *member = config_setting_get_member(setting, name);
   if(! member)
     return(CONFIG_FALSE);
 
@@ -994,10 +994,10 @@ int config_setting_lookup_float(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_lookup_string(const config_setting_t *setting,
+int config_setting_lookup_string(const struct config_setting_t *setting,
                                  const char *name, const char **value)
 {
-  config_setting_t *member = config_setting_get_member(setting, name);
+  struct config_setting_t *member = config_setting_get_member(setting, name);
   if(! member)
     return(CONFIG_FALSE);
 
@@ -1010,10 +1010,10 @@ int config_setting_lookup_string(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_lookup_bool(const config_setting_t *setting,
+int config_setting_lookup_bool(const struct config_setting_t *setting,
                                const char *name, int *value)
 {
-  config_setting_t *member = config_setting_get_member(setting, name);
+  struct config_setting_t *member = config_setting_get_member(setting, name);
   if(! member)
     return(CONFIG_FALSE);
 
@@ -1026,7 +1026,7 @@ int config_setting_lookup_bool(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_int(config_setting_t *setting, int value)
+int config_setting_set_int(struct config_setting_t *setting, int value)
 {
   switch(setting->type)
   {
@@ -1054,7 +1054,7 @@ int config_setting_set_int(config_setting_t *setting, int value)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_int64(config_setting_t *setting, long long value)
+int config_setting_set_int64(struct config_setting_t *setting, long long value)
 {
   switch(setting->type)
   {
@@ -1089,7 +1089,7 @@ int config_setting_set_int64(config_setting_t *setting, long long value)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_float(config_setting_t *setting, double value)
+int config_setting_set_float(struct config_setting_t *setting, double value)
 {
   switch(setting->type)
   {
@@ -1126,14 +1126,14 @@ int config_setting_set_float(config_setting_t *setting, double value)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_get_bool(const config_setting_t *setting)
+int config_setting_get_bool(const struct config_setting_t *setting)
 {
   return((setting->type == CONFIG_TYPE_BOOL) ? setting->value.ival : 0);
 }
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_bool(config_setting_t *setting, int value)
+int config_setting_set_bool(struct config_setting_t *setting, int value)
 {
   if(setting->type == CONFIG_TYPE_NONE)
     setting->type = CONFIG_TYPE_BOOL;
@@ -1146,14 +1146,14 @@ int config_setting_set_bool(config_setting_t *setting, int value)
 
 /* ------------------------------------------------------------------------- */
 
-const char *config_setting_get_string(const config_setting_t *setting)
+const char *config_setting_get_string(const struct config_setting_t *setting)
 {
   return((setting->type == CONFIG_TYPE_STRING) ? setting->value.sval : NULL);
 }
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_string(config_setting_t *setting, const char *value)
+int config_setting_set_string(struct config_setting_t *setting, const char *value)
 {
   if(setting->type == CONFIG_TYPE_NONE)
     setting->type = CONFIG_TYPE_STRING;
@@ -1169,7 +1169,7 @@ int config_setting_set_string(config_setting_t *setting, const char *value)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_set_format(config_setting_t *setting, short format)
+int config_setting_set_format(struct config_setting_t *setting, short format)
 {
   if(((setting->type != CONFIG_TYPE_INT)
       && (setting->type != CONFIG_TYPE_INT64))
@@ -1183,7 +1183,7 @@ int config_setting_set_format(config_setting_t *setting, short format)
 
 /* ------------------------------------------------------------------------- */
 
-short config_setting_get_format(const config_setting_t *setting)
+short config_setting_get_format(const struct config_setting_t *setting)
 {
   return(setting->format != 0 ? setting->format
          : setting->config->default_format);
@@ -1191,11 +1191,11 @@ short config_setting_get_format(const config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_lookup(config_setting_t *setting,
+struct config_setting_t *config_setting_lookup(struct config_setting_t *setting,
                                         const char *path)
 {
   const char *p = path;
-  config_setting_t *found;
+  struct config_setting_t *found;
 
   for(;;)
   {
@@ -1224,17 +1224,17 @@ config_setting_t *config_setting_lookup(config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_lookup(const config_t *config, const char *path)
+struct config_setting_t *config_lookup(const struct config_t *config, const char *path)
 {
   return(config_setting_lookup(config->root, path));
 }
 
 /* ------------------------------------------------------------------------- */
 
-int config_lookup_string(const config_t *config, const char *path,
+int config_lookup_string(const struct config_t *config, const char *path,
                          const char **value)
 {
-  const config_setting_t *s = config_lookup(config, path);
+  const struct config_setting_t *s = config_lookup(config, path);
   if(! s)
     return(CONFIG_FALSE);
 
@@ -1248,10 +1248,10 @@ int config_lookup_string(const config_t *config, const char *path,
 
 /* ------------------------------------------------------------------------- */
 
-int config_lookup_int(const config_t *config, const char *path,
+int config_lookup_int(const struct config_t *config, const char *path,
                       int *value)
 {
-  const config_setting_t *s = config_lookup(config, path);
+  const struct config_setting_t *s = config_lookup(config, path);
   if(! s)
     return(CONFIG_FALSE);
 
@@ -1260,10 +1260,10 @@ int config_lookup_int(const config_t *config, const char *path,
 
 /* ------------------------------------------------------------------------- */
 
-int config_lookup_int64(const config_t *config, const char *path,
+int config_lookup_int64(const struct config_t *config, const char *path,
                         long long *value)
 {
-  const config_setting_t *s = config_lookup(config, path);
+  const struct config_setting_t *s = config_lookup(config, path);
   if(! s)
     return(CONFIG_FALSE);
 
@@ -1272,10 +1272,10 @@ int config_lookup_int64(const config_t *config, const char *path,
 
 /* ------------------------------------------------------------------------- */
 
-int config_lookup_float(const config_t *config, const char *path,
+int config_lookup_float(const struct config_t *config, const char *path,
                         double *value)
 {
-  const config_setting_t *s = config_lookup(config, path);
+  const struct config_setting_t *s = config_lookup(config, path);
   if(! s)
     return(CONFIG_FALSE);
 
@@ -1284,9 +1284,9 @@ int config_lookup_float(const config_t *config, const char *path,
 
 /* ------------------------------------------------------------------------- */
 
-int config_lookup_bool(const config_t *config, const char *path, int *value)
+int config_lookup_bool(const struct config_t *config, const char *path, int *value)
 {
-  const config_setting_t *s = config_lookup(config, path);
+  const struct config_setting_t *s = config_lookup(config, path);
   if(! s)
     return(CONFIG_FALSE);
 
@@ -1299,19 +1299,19 @@ int config_lookup_bool(const config_t *config, const char *path, int *value)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_get_int_elem(const config_setting_t *vector, int idx)
+int config_setting_get_int_elem(const struct config_setting_t *vector, int idx)
 {
-  const config_setting_t *element = config_setting_get_elem(vector, idx);
+  const struct config_setting_t *element = config_setting_get_elem(vector, idx);
 
   return(element ? config_setting_get_int(element) : 0);
 }
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_set_int_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_int_elem(struct config_setting_t *vector,
                                               int idx, int value)
 {
-  config_setting_t *element = NULL;
+  struct config_setting_t *element = NULL;
 
   if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
     return(NULL);
@@ -1339,20 +1339,20 @@ config_setting_t *config_setting_set_int_elem(config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-long long config_setting_get_int64_elem(const config_setting_t *vector,
+long long config_setting_get_int64_elem(const struct config_setting_t *vector,
                                         int idx)
 {
-  const config_setting_t *element = config_setting_get_elem(vector, idx);
+  const struct config_setting_t *element = config_setting_get_elem(vector, idx);
 
   return(element ? config_setting_get_int64(element) : 0);
 }
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_set_int64_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_int64_elem(struct config_setting_t *vector,
                                                 int idx, long long value)
 {
-  config_setting_t *element = NULL;
+  struct config_setting_t *element = NULL;
 
   if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
     return(NULL);
@@ -1380,19 +1380,19 @@ config_setting_t *config_setting_set_int64_elem(config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-double config_setting_get_float_elem(const config_setting_t *vector, int idx)
+double config_setting_get_float_elem(const struct config_setting_t *vector, int idx)
 {
-  config_setting_t *element = config_setting_get_elem(vector, idx);
+  struct config_setting_t *element = config_setting_get_elem(vector, idx);
 
   return(element ? config_setting_get_float(element) : 0.0);
 }
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_set_float_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_float_elem(struct config_setting_t *vector,
                                                 int idx, double value)
 {
-  config_setting_t *element = NULL;
+  struct config_setting_t *element = NULL;
 
   if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
     return(NULL);
@@ -1418,9 +1418,9 @@ config_setting_t *config_setting_set_float_elem(config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_get_bool_elem(const config_setting_t *vector, int idx)
+int config_setting_get_bool_elem(const struct config_setting_t *vector, int idx)
 {
-  config_setting_t *element = config_setting_get_elem(vector, idx);
+  struct config_setting_t *element = config_setting_get_elem(vector, idx);
 
   if(! element)
     return(CONFIG_FALSE);
@@ -1433,10 +1433,10 @@ int config_setting_get_bool_elem(const config_setting_t *vector, int idx)
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_set_bool_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_bool_elem(struct config_setting_t *vector,
                                                int idx, int value)
 {
-  config_setting_t *element = NULL;
+  struct config_setting_t *element = NULL;
 
   if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
     return(NULL);
@@ -1462,10 +1462,10 @@ config_setting_t *config_setting_set_bool_elem(config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-const char *config_setting_get_string_elem(const config_setting_t *vector,
+const char *config_setting_get_string_elem(const struct config_setting_t *vector,
                                            int idx)
 {
-  config_setting_t *element = config_setting_get_elem(vector, idx);
+  struct config_setting_t *element = config_setting_get_elem(vector, idx);
 
   if(! element)
     return(NULL);
@@ -1478,10 +1478,10 @@ const char *config_setting_get_string_elem(const config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_set_string_elem(config_setting_t *vector,
+struct config_setting_t *config_setting_set_string_elem(struct config_setting_t *vector,
                                                  int idx, const char *value)
 {
-  config_setting_t *element = NULL;
+  struct config_setting_t *element = NULL;
 
   if((vector->type != CONFIG_TYPE_ARRAY) && (vector->type != CONFIG_TYPE_LIST))
     return(NULL);
@@ -1507,10 +1507,10 @@ config_setting_t *config_setting_set_string_elem(config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_get_elem(const config_setting_t *vector,
+struct config_setting_t *config_setting_get_elem(const struct config_setting_t *vector,
                                           unsigned int idx)
 {
-  config_list_t *list = vector->value.list;
+  struct config_list_t *list = vector->value.list;
 
   if(((vector->type != CONFIG_TYPE_ARRAY)
       && (vector->type != CONFIG_TYPE_LIST)
@@ -1525,7 +1525,7 @@ config_setting_t *config_setting_get_elem(const config_setting_t *vector,
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_get_member(const config_setting_t *setting,
+struct config_setting_t *config_setting_get_member(const struct config_setting_t *setting,
                                             const char *name)
 {
   if(setting->type != CONFIG_TYPE_GROUP)
@@ -1536,14 +1536,14 @@ config_setting_t *config_setting_get_member(const config_setting_t *setting,
 
 /* ------------------------------------------------------------------------- */
 
-void config_set_destructor(config_t *config, void (*destructor)(void *))
+void config_set_destructor(struct config_t *config, void (*destructor)(void *))
 {
   config->destructor = destructor;
 }
 
 /* ------------------------------------------------------------------------- */
 
-void config_set_include_dir(config_t *config, const char *include_dir)
+void config_set_include_dir(struct config_t *config, const char *include_dir)
 {
   _delete(config->include_dir);
   config->include_dir = strdup(include_dir);
@@ -1551,7 +1551,7 @@ void config_set_include_dir(config_t *config, const char *include_dir)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_length(const config_setting_t *setting)
+int config_setting_length(const struct config_setting_t *setting)
 {
   if((setting->type != CONFIG_TYPE_GROUP)
      && (setting->type != CONFIG_TYPE_ARRAY)
@@ -1566,14 +1566,14 @@ int config_setting_length(const config_setting_t *setting)
 
 /* ------------------------------------------------------------------------- */
 
-void config_setting_set_hook(config_setting_t *setting, void *hook)
+void config_setting_set_hook(struct config_setting_t *setting, void *hook)
 {
   setting->hook = hook;
 }
 
 /* ------------------------------------------------------------------------- */
 
-config_setting_t *config_setting_add(config_setting_t *parent,
+struct config_setting_t *config_setting_add(struct config_setting_t *parent,
                                      const char *name, int type)
 {
   if((type < CONFIG_TYPE_NONE) || (type > CONFIG_TYPE_LIST))
@@ -1608,10 +1608,10 @@ config_setting_t *config_setting_add(config_setting_t *parent,
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_remove(config_setting_t *parent, const char *name)
+int config_setting_remove(struct config_setting_t *parent, const char *name)
 {
   unsigned int idx;
-  config_setting_t *setting;
+  struct config_setting_t *setting;
 
   if(! parent)
     return(CONFIG_FALSE);
@@ -1630,10 +1630,10 @@ int config_setting_remove(config_setting_t *parent, const char *name)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_remove_elem(config_setting_t *parent, unsigned int idx)
+int config_setting_remove_elem(struct config_setting_t *parent, unsigned int idx)
 {
-  config_list_t *list;
-  config_setting_t *removed = NULL;
+  struct config_list_t *list;
+  struct config_setting_t *removed = NULL;
 
   if(! parent)
     return(CONFIG_FALSE);
@@ -1656,10 +1656,10 @@ int config_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 
 /* ------------------------------------------------------------------------- */
 
-int config_setting_index(const config_setting_t *setting)
+int config_setting_index(const struct config_setting_t *setting)
 {
-  config_setting_t **found = NULL;
-  config_list_t *list;
+  struct config_setting_t **found = NULL;
+  struct config_list_t *list;
   int i;
 
   if(! setting->parent)
diff --git a/3rdparty/libconfig/libconfig.h b/3rdparty/libconfig/libconfig.h
index cf54775a3..58c1f914e 100644
--- a/3rdparty/libconfig/libconfig.h
+++ b/3rdparty/libconfig/libconfig.h
@@ -67,44 +67,44 @@ extern "C" {
 #define CONFIG_TRUE  (1)
 #define CONFIG_FALSE (0)
 
-typedef union config_value_t
+union config_value_t
 {
   int ival;
   long long llval;
   double fval;
   char *sval;
   struct config_list_t *list;
-} config_value_t;
+};
 
-typedef struct config_setting_t
+struct config_setting_t
 {
   char *name;
   short type;
   short format;
-  config_value_t value;
+  union config_value_t value;
   struct config_setting_t *parent;
   struct config_t *config;
   void *hook;
   unsigned int line;
   const char *file;
-} config_setting_t;
+};
 
-typedef enum
+enum config_error_t
 {
   CONFIG_ERR_NONE = 0,
   CONFIG_ERR_FILE_IO = 1,
   CONFIG_ERR_PARSE = 2
-} config_error_t;
+};
 
-typedef struct config_list_t
+struct config_list_t
 {
   unsigned int length;
-  config_setting_t **elements;
-} config_list_t;
+  struct config_setting_t **elements;
+};
 
-typedef struct config_t
+struct config_t
 {
-  config_setting_t *root;
+  struct config_setting_t *root;
   void (*destructor)(void *);
   int options;
   unsigned short tab_width;
@@ -113,212 +113,212 @@ typedef struct config_t
   const char *error_text;
   const char *error_file;
   int error_line;
-  config_error_t error_type;
+  enum config_error_t error_type;
   const char **filenames;
   unsigned int num_filenames;
-} config_t;
+};
 
-extern LIBCONFIG_API int config_read(config_t *config, FILE *stream);
-extern LIBCONFIG_API void config_write(const config_t *config, FILE *stream);
+extern LIBCONFIG_API int config_read(struct config_t *config, FILE *stream);
+extern LIBCONFIG_API void config_write(const struct config_t *config, FILE *stream);
 
-extern LIBCONFIG_API void config_set_default_format(config_t *config,
+extern LIBCONFIG_API void config_set_default_format(struct config_t *config,
                                                     short format);
 
-extern LIBCONFIG_API void config_set_options(config_t *config, int options);
-extern LIBCONFIG_API int config_get_options(const config_t *config);
+extern LIBCONFIG_API void config_set_options(struct config_t *config, int options);
+extern LIBCONFIG_API int config_get_options(const struct config_t *config);
 
-extern LIBCONFIG_API void config_set_auto_convert(config_t *config, int flag);
-extern LIBCONFIG_API int config_get_auto_convert(const config_t *config);
+extern LIBCONFIG_API void config_set_auto_convert(struct config_t *config, int flag);
+extern LIBCONFIG_API int config_get_auto_convert(const struct config_t *config);
 
-extern LIBCONFIG_API int config_read_string(config_t *config, const char *str);
+extern LIBCONFIG_API int config_read_string(struct config_t *config, const char *str);
 
-extern LIBCONFIG_API int config_read_file(config_t *config,
+extern LIBCONFIG_API int config_read_file(struct config_t *config,
                                           const char *filename);
-extern LIBCONFIG_API int config_write_file(config_t *config,
+extern LIBCONFIG_API int config_write_file(struct config_t *config,
                                            const char *filename);
 
-extern LIBCONFIG_API void config_set_destructor(config_t *config,
+extern LIBCONFIG_API void config_set_destructor(struct config_t *config,
                                                 void (*destructor)(void *));
-extern LIBCONFIG_API void config_set_include_dir(config_t *config,
+extern LIBCONFIG_API void config_set_include_dir(struct config_t *config,
                                                  const char *include_dir);
 
-extern LIBCONFIG_API void config_init(config_t *config);
-extern LIBCONFIG_API void config_destroy(config_t *config);
+extern LIBCONFIG_API void config_init(struct config_t *config);
+extern LIBCONFIG_API void config_destroy(struct config_t *config);
 
 extern LIBCONFIG_API int config_setting_get_int(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 extern LIBCONFIG_API long long config_setting_get_int64(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 extern LIBCONFIG_API double config_setting_get_float(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 extern LIBCONFIG_API int config_setting_get_bool(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 extern LIBCONFIG_API const char *config_setting_get_string(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 
 extern LIBCONFIG_API int config_setting_lookup_int(
-  const config_setting_t *setting, const char *name, int *value);
+  const struct config_setting_t *setting, const char *name, int *value);
 extern LIBCONFIG_API int config_setting_lookup_int64(
-  const config_setting_t *setting, const char *name, long long *value);
+  const struct config_setting_t *setting, const char *name, long long *value);
 extern LIBCONFIG_API int config_setting_lookup_float(
-  const config_setting_t *setting, const char *name, double *value);
+  const struct config_setting_t *setting, const char *name, double *value);
 extern LIBCONFIG_API int config_setting_lookup_bool(
-  const config_setting_t *setting, const char *name, int *value);
+  const struct config_setting_t *setting, const char *name, int *value);
 extern LIBCONFIG_API int config_setting_lookup_string(
-  const config_setting_t *setting, const char *name, const char **value);
+  const struct config_setting_t *setting, const char *name, const char **value);
 
-extern LIBCONFIG_API int config_setting_set_int(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_int(struct config_setting_t *setting,
                                                 int value);
-extern LIBCONFIG_API int config_setting_set_int64(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_int64(struct config_setting_t *setting,
                                                   long long value);
-extern LIBCONFIG_API int config_setting_set_float(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_float(struct config_setting_t *setting,
                                                   double value);
-extern LIBCONFIG_API int config_setting_set_bool(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_bool(struct config_setting_t *setting,
                                                  int value);
-extern LIBCONFIG_API int config_setting_set_string(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_string(struct config_setting_t *setting,
                                                    const char *value);
 
-extern LIBCONFIG_API int config_setting_set_format(config_setting_t *setting,
+extern LIBCONFIG_API int config_setting_set_format(struct config_setting_t *setting,
                                                    short format);
 extern LIBCONFIG_API short config_setting_get_format(
-  const config_setting_t *setting);
+  const struct config_setting_t *setting);
 
 extern LIBCONFIG_API int config_setting_get_int_elem(
-  const config_setting_t *setting, int idx);
+  const struct config_setting_t *setting, int idx);
 extern LIBCONFIG_API long long config_setting_get_int64_elem(
-  const config_setting_t *setting, int idx);
+  const struct config_setting_t *setting, int idx);
 extern LIBCONFIG_API double config_setting_get_float_elem(
-  const config_setting_t *setting, int idx);
+  const struct config_setting_t *setting, int idx);
 extern LIBCONFIG_API int config_setting_get_bool_elem(
-  const config_setting_t *setting, int idx);
+  const struct config_setting_t *setting, int idx);
 extern LIBCONFIG_API const char *config_setting_get_string_elem(
-  const config_setting_t *setting, int idx);
-
-extern LIBCONFIG_API config_setting_t *config_setting_set_int_elem(
-  config_setting_t *setting, int idx, int value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_int64_elem(
-  config_setting_t *setting, int idx, long long value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_float_elem(
-  config_setting_t *setting, int idx, double value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_bool_elem(
-  config_setting_t *setting, int idx, int value);
-extern LIBCONFIG_API config_setting_t *config_setting_set_string_elem(
-  config_setting_t *setting, int idx, const char *value);
-
-#define /* const char * */ config_get_include_dir(/* const config_t * */ C) \
+  const struct config_setting_t *setting, int idx);
+
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_int_elem(
+  struct config_setting_t *setting, int idx, int value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_int64_elem(
+  struct config_setting_t *setting, int idx, long long value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_float_elem(
+  struct config_setting_t *setting, int idx, double value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_bool_elem(
+  struct config_setting_t *setting, int idx, int value);
+extern LIBCONFIG_API struct config_setting_t *config_setting_set_string_elem(
+  struct config_setting_t *setting, int idx, const char *value);
+
+#define /* const char * */ config_get_include_dir(/* const struct config_t * */ C) \
   ((C)->include_dir)
 
-#define /* int */ config_setting_type(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_type(/* const struct config_setting_t * */ S) \
   ((S)->type)
 
-#define /* int */ config_setting_is_group(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_group(/* const struct config_setting_t * */ S) \
   ((S)->type == CONFIG_TYPE_GROUP)
-#define /* int */ config_setting_is_array(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_array(/* const struct config_setting_t * */ S) \
   ((S)->type == CONFIG_TYPE_ARRAY)
-#define /* int */ config_setting_is_list(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_list(/* const struct config_setting_t * */ S) \
   ((S)->type == CONFIG_TYPE_LIST)
 
 #define /* int */ config_setting_is_aggregate( \
-  /* const config_setting_t * */ S)                                     \
+  /* const struct config_setting_t * */ S)                                     \
   (((S)->type == CONFIG_TYPE_GROUP) || ((S)->type == CONFIG_TYPE_LIST)  \
    || ((S)->type == CONFIG_TYPE_ARRAY))
 
-#define /* int */ config_setting_is_number(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_number(/* const struct config_setting_t * */ S) \
   (((S)->type == CONFIG_TYPE_INT)                                       \
    || ((S)->type == CONFIG_TYPE_INT64)                                  \
    || ((S)->type == CONFIG_TYPE_FLOAT))
 
-#define /* int */ config_setting_is_scalar(/* const config_setting_t * */ S) \
+#define /* int */ config_setting_is_scalar(/* const struct config_setting_t * */ S) \
   (((S)->type == CONFIG_TYPE_BOOL) || ((S)->type == CONFIG_TYPE_STRING) \
    || config_setting_is_number(S))
 
 #define /* const char * */ config_setting_name( \
-  /* const config_setting_t * */ S)             \
+  /* const struct config_setting_t * */ S)             \
   ((S)->name)
 
-#define /* config_setting_t * */ config_setting_parent( \
-  /* const config_setting_t * */ S)                     \
+#define /* struct config_setting_t * */ config_setting_parent( \
+  /* const struct config_setting_t * */ S)                     \
   ((S)->parent)
 
 #define /* int */ config_setting_is_root(       \
-  /* const config_setting_t * */ S)             \
+  /* const struct config_setting_t * */ S)             \
   ((S)->parent ? CONFIG_FALSE : CONFIG_TRUE)
 
-extern LIBCONFIG_API int config_setting_index(const config_setting_t *setting);
+extern LIBCONFIG_API int config_setting_index(const struct config_setting_t *setting);
 
 extern LIBCONFIG_API int config_setting_length(
-  const config_setting_t *setting);
-extern LIBCONFIG_API config_setting_t *config_setting_get_elem(
-  const config_setting_t *setting, unsigned int idx);
+  const struct config_setting_t *setting);
+extern LIBCONFIG_API struct config_setting_t *config_setting_get_elem(
+  const struct config_setting_t *setting, unsigned int idx);
 
-extern LIBCONFIG_API config_setting_t *config_setting_get_member(
-  const config_setting_t *setting, const char *name);
+extern LIBCONFIG_API struct config_setting_t *config_setting_get_member(
+  const struct config_setting_t *setting, const char *name);
 
-extern LIBCONFIG_API config_setting_t *config_setting_add(
-  config_setting_t *parent, const char *name, int type);
-extern LIBCONFIG_API int config_setting_remove(config_setting_t *parent,
+extern LIBCONFIG_API struct config_setting_t *config_setting_add(
+  struct config_setting_t *parent, const char *name, int type);
+extern LIBCONFIG_API int config_setting_remove(struct config_setting_t *parent,
                                                const char *name);
-extern LIBCONFIG_API int config_setting_remove_elem(config_setting_t *parent,
+extern LIBCONFIG_API int config_setting_remove_elem(struct config_setting_t *parent,
                                                     unsigned int idx);
-extern LIBCONFIG_API void config_setting_set_hook(config_setting_t *setting,
+extern LIBCONFIG_API void config_setting_set_hook(struct config_setting_t *setting,
                                                   void *hook);
 
 #define config_setting_get_hook(S) ((S)->hook)
 
-extern LIBCONFIG_API config_setting_t *config_lookup(const config_t *config,
+extern LIBCONFIG_API struct config_setting_t *config_lookup(const struct config_t *config,
                                                      const char *path);
-extern LIBCONFIG_API config_setting_t *config_setting_lookup(
-  config_setting_t *setting, const char *path);
+extern LIBCONFIG_API struct config_setting_t *config_setting_lookup(
+  struct config_setting_t *setting, const char *path);
 
-extern LIBCONFIG_API int config_lookup_int(const config_t *config,
+extern LIBCONFIG_API int config_lookup_int(const struct config_t *config,
                                            const char *path, int *value);
-extern LIBCONFIG_API int config_lookup_int64(const config_t *config,
+extern LIBCONFIG_API int config_lookup_int64(const struct config_t *config,
                                              const char *path,
                                              long long *value);
-extern LIBCONFIG_API int config_lookup_float(const config_t *config,
+extern LIBCONFIG_API int config_lookup_float(const struct config_t *config,
                                              const char *path, double *value);
-extern LIBCONFIG_API int config_lookup_bool(const config_t *config,
+extern LIBCONFIG_API int config_lookup_bool(const struct config_t *config,
                                             const char *path, int *value);
-extern LIBCONFIG_API int config_lookup_string(const config_t *config,
+extern LIBCONFIG_API int config_lookup_string(const struct config_t *config,
                                               const char *path,
                                               const char **value);
 
-#define /* config_setting_t * */ config_root_setting( \
-  /* const config_t * */ C)                           \
+#define /* struct config_setting_t * */ config_root_setting( \
+  /* const struct config_t * */ C)                           \
   ((C)->root)
 
-#define  /* void */ config_set_default_format(/* config_t * */ C,       \
+#define  /* void */ config_set_default_format(/* struct config_t * */ C,       \
                                               /* short */ F)            \
   (C)->default_format = (F)
 
-#define /* short */ config_get_default_format(/* config_t * */ C)       \
+#define /* short */ config_get_default_format(/* struct config_t * */ C)       \
   ((C)->default_format)
 
-#define /* void */ config_set_tab_width(/* config_t * */ C,     \
+#define /* void */ config_set_tab_width(/* struct config_t * */ C,     \
                                         /* unsigned short */ W) \
   (C)->tab_width = ((W) & 0x0F)
 
-#define /* unsigned char */ config_get_tab_width(/* const config_t * */ C) \
+#define /* unsigned char */ config_get_tab_width(/* const struct config_t * */ C) \
   ((C)->tab_width)
 
 #define /* unsigned short */ config_setting_source_line(   \
-  /* const config_setting_t * */ S)                        \
+  /* const struct config_setting_t * */ S)                        \
   ((S)->line)
 
 #define /* const char */ config_setting_source_file(    \
-  /* const config_setting_t * */ S)                     \
+  /* const struct config_setting_t * */ S)                     \
   ((S)->file)
 
-#define /* const char * */ config_error_text(/* const config_t * */ C)  \
+#define /* const char * */ config_error_text(/* const struct config_t * */ C)  \
   ((C)->error_text)
 
-#define /* const char * */ config_error_file(/* const config_t * */ C)  \
+#define /* const char * */ config_error_file(/* const struct config_t * */ C)  \
   ((C)->error_file)
 
-#define /* int */ config_error_line(/* const config_t * */ C)   \
+#define /* int */ config_error_line(/* const struct config_t * */ C)   \
   ((C)->error_line)
 
-#define /* config_error_t */ config_error_type(/* const config_t * */ C) \
+#define /* enum config_error_t */ config_error_type(/* const struct config_t * */ C) \
   ((C)->error_type)
 
 #ifdef __cplusplus
diff --git a/3rdparty/libconfig/parsectx.h b/3rdparty/libconfig/parsectx.h
index 93cc979c9..4d1f261d9 100644
--- a/3rdparty/libconfig/parsectx.h
+++ b/3rdparty/libconfig/parsectx.h
@@ -28,9 +28,9 @@
 
 struct parse_context
 {
-  config_t *config;
-  config_setting_t *parent;
-  config_setting_t *setting;
+  struct config_t *config;
+  struct config_setting_t *parent;
+  struct config_setting_t *setting;
   char *name;
   strbuf_t string;
 };
diff --git a/3rdparty/libconfig/scanctx.h b/3rdparty/libconfig/scanctx.h
index c8dc22f87..004523e2a 100644
--- a/3rdparty/libconfig/scanctx.h
+++ b/3rdparty/libconfig/scanctx.h
@@ -33,7 +33,7 @@
 
 struct scan_context
 {
-  config_t *config;
+  struct config_t *config;
   const char *top_filename;
   const char *files[MAX_INCLUDE_DEPTH];
   void *buffers[MAX_INCLUDE_DEPTH];
diff --git a/src/common/HPM.c b/src/common/HPM.c
index 0cb23019a..f115c886e 100644
--- a/src/common/HPM.c
+++ b/src/common/HPM.c
@@ -616,8 +616,8 @@ CMDLINEARG(loadplugin)
  * Reads the plugin configuration and loads the plugins as necessary.
  */
 void hplugins_config_read(void) {
-	config_t plugins_conf;
-	config_setting_t *plist = NULL;
+	struct config_t plugins_conf;
+	struct config_setting_t *plist = NULL;
 	const char *config_filename = "conf/plugins.conf"; // FIXME hardcoded name
 	FILE *fp;
 	int i;
@@ -633,7 +633,7 @@ void hplugins_config_read(void) {
 
 	plist = libconfig->lookup(&plugins_conf, "plugins_list");
 	for (i = 0; i < VECTOR_LENGTH(HPM->cmdline_load_plugins); i++) {
-		config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING);
+		struct config_setting_t *entry = libconfig->setting_add(plist, NULL, CONFIG_TYPE_STRING);
 		config_setting_set_string(entry, VECTOR_INDEX(HPM->cmdline_load_plugins, i));
 	}
 
diff --git a/src/common/conf.c b/src/common/conf.c
index ca9b7cbbc..25f1013f5 100644
--- a/src/common/conf.c
+++ b/src/common/conf.c
@@ -43,7 +43,7 @@ struct libconfig_interface *libconfig;
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_load_file(config_t *config, const char *config_filename)
+int config_load_file(struct config_t *config, const char *config_filename)
 {
 	libconfig->init(config);
 	if (libconfig->read_file_src(config, config_filename) != CONFIG_TRUE) {
@@ -58,12 +58,12 @@ int config_load_file(config_t *config, const char *config_filename)
 //
 // Functions to copy settings from libconfig/contrib
 //
-void config_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void config_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src)
+{
 	if (config_setting_is_aggregate(src)) {
 		libconfig->setting_copy_aggregate(parent, src);
-	}
-	else {
-		config_setting_t *set;
+	} else {
+		struct config_setting_t *set;
 
 		if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
 			return;
@@ -87,8 +87,9 @@ void config_setting_copy_simple(config_setting_t *parent, const config_setting_t
 	}
 }
 
-void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
-	config_setting_t *set = NULL;
+void config_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src)
+{
+	struct config_setting_t *set = NULL;
 
 	if (config_setting_is_aggregate(src))
 		libconfig->setting_copy_aggregate(parent, src);
@@ -107,8 +108,9 @@ void config_setting_copy_elem(config_setting_t *parent, const config_setting_t *
 	}
 }
 
-void config_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
-	config_setting_t *newAgg;
+void config_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src)
+{
+	struct config_setting_t *newAgg;
 	int i, n;
 
 	if( libconfig->setting_get_member(parent, config_setting_name(src)) != NULL )
@@ -130,7 +132,8 @@ void config_setting_copy_aggregate(config_setting_t *parent, const config_settin
 	}
 }
 
-int config_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int config_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src)
+{
 	if (!config_setting_is_group(parent) && !config_setting_is_list(parent))
 		return CONFIG_FALSE;
 
@@ -150,7 +153,7 @@ int config_setting_copy(config_setting_t *parent, const config_setting_t *src) {
  * @return The converted value.
  * @retval false in case of failure.
  */
-bool config_setting_get_bool_real(const config_setting_t *setting)
+bool config_setting_get_bool_real(const struct config_setting_t *setting)
 {
 	if (setting == NULL || setting->type != CONFIG_TYPE_BOOL)
 		return false;
@@ -168,9 +171,9 @@ bool config_setting_get_bool_real(const config_setting_t *setting)
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_setting_lookup_bool_real(const config_setting_t *setting, const char *name, bool *value)
+int config_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value)
 {
-	config_setting_t *member = config_setting_get_member(setting, name);
+	struct config_setting_t *member = config_setting_get_member(setting, name);
 
 	if (!member)
 		return CONFIG_FALSE;
@@ -191,7 +194,7 @@ int config_setting_lookup_bool_real(const config_setting_t *setting, const char
  * @return The converted value.
  * @retval 0 in case of failure.
  */
-uint32 config_setting_get_uint32(const config_setting_t *setting)
+uint32 config_setting_get_uint32(const struct config_setting_t *setting)
 {
 	if (setting == NULL || setting->type != CONFIG_TYPE_INT)
 		return 0;
@@ -212,9 +215,9 @@ uint32 config_setting_get_uint32(const config_setting_t *setting)
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_setting_lookup_uint32(const config_setting_t *setting, const char *name, uint32 *value)
+int config_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value)
 {
-	config_setting_t *member = config_setting_get_member(setting, name);
+	struct config_setting_t *member = config_setting_get_member(setting, name);
 
 	if (!member)
 		return CONFIG_FALSE;
@@ -235,7 +238,7 @@ int config_setting_lookup_uint32(const config_setting_t *setting, const char *na
  * @return The converted value.
  * @retval 0 in case of failure.
  */
-uint16 config_setting_get_uint16(const config_setting_t *setting)
+uint16 config_setting_get_uint16(const struct config_setting_t *setting)
 {
 	if (setting == NULL || setting->type != CONFIG_TYPE_INT)
 		return 0;
@@ -258,9 +261,9 @@ uint16 config_setting_get_uint16(const config_setting_t *setting)
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_setting_lookup_uint16(const config_setting_t *setting, const char *name, uint16 *value)
+int config_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value)
 {
-	config_setting_t *member = config_setting_get_member(setting, name);
+	struct config_setting_t *member = config_setting_get_member(setting, name);
 
 	if (!member)
 		return CONFIG_FALSE;
@@ -281,7 +284,7 @@ int config_setting_lookup_uint16(const config_setting_t *setting, const char *na
  * @return The converted value.
  * @retval 0 in case of failure.
  */
-int16 config_setting_get_int16(const config_setting_t *setting)
+int16 config_setting_get_int16(const struct config_setting_t *setting)
 {
 	if (setting == NULL || setting->type != CONFIG_TYPE_INT)
 		return 0;
@@ -304,9 +307,9 @@ int16 config_setting_get_int16(const config_setting_t *setting)
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_setting_lookup_int16(const config_setting_t *setting, const char *name, int16 *value)
+int config_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value)
 {
-	config_setting_t *member = config_setting_get_member(setting, name);
+	struct config_setting_t *member = config_setting_get_member(setting, name);
 
 	if (!member)
 		return CONFIG_FALSE;
@@ -320,7 +323,7 @@ int config_setting_lookup_int16(const config_setting_t *setting, const char *nam
 }
 
 /**
- * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a config_setting_t and copies it into a (non-const) char buffer.
+ * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_setting_t and copies it into a (non-const) char buffer.
  *
  * @param[in]  setting  The setting to read.
  * @param[in]  name     The setting name to lookup.
@@ -330,7 +333,7 @@ int config_setting_lookup_int16(const config_setting_t *setting, const char *nam
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_setting_lookup_mutable_string(const config_setting_t *setting, const char *name, char *out, size_t out_size)
+int config_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size)
 {
 	const char *str = NULL;
 
@@ -343,7 +346,7 @@ int config_setting_lookup_mutable_string(const config_setting_t *setting, const
 }
 
 /**
- * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a config_t and copies it into a (non-const) char buffer.
+ * Looks up a configuration entry of type CONFIG_TYPE_STRING inside a struct config_t and copies it into a (non-const) char buffer.
  *
  * @param[in]  config   The configuration to read.
  * @param[in]  name     The setting name to lookup.
@@ -353,7 +356,7 @@ int config_setting_lookup_mutable_string(const config_setting_t *setting, const
  * @retval CONFIG_TRUE  in case of success.
  * @retval CONFIG_FALSE in case of failure.
  */
-int config_lookup_mutable_string(const config_t *config, const char *name, char *out, size_t out_size)
+int config_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size)
 {
 	const char *str = NULL;
 
diff --git a/src/common/conf.h b/src/common/conf.h
index 3bcb4526f..f2bfcac62 100644
--- a/src/common/conf.h
+++ b/src/common/conf.h
@@ -29,94 +29,94 @@
  * The libconfig interface -- specially for plugins, but we enforce it throughout the core to be consistent
  **/
 struct libconfig_interface {
-	int (*read) (config_t *config, FILE *stream);
-	void (*write) (const config_t *config, FILE *stream);
+	int (*read) (struct config_t *config, FILE *stream);
+	void (*write) (const struct config_t *config, FILE *stream);
 	/* */
-	void (*set_options) (config_t *config, int options);
-	int (*get_options) (const config_t *config);
+	void (*set_options) (struct config_t *config, int options);
+	int (*get_options) (const struct config_t *config);
 	/* */
-	int (*read_string) (config_t *config, const char *str);
-	int (*read_file_src) (config_t *config, const char *filename);
-	int (*write_file) (config_t *config, const char *filename);
-
-	void (*set_destructor) (config_t *config, void (*destructor)(void *));
-	void (*set_include_dir) (config_t *config, const char *include_dir);
-
-	void (*init) (config_t *config);
-	void (*destroy) (config_t *config);
-
-	int (*setting_get_int) (const config_setting_t *setting);
-	long long (*setting_get_int64) (const config_setting_t *setting);
-	double (*setting_get_float) (const config_setting_t *setting);
-
-	int (*setting_get_bool) (const config_setting_t *setting);
-
-	const char * (*setting_get_string) (const config_setting_t *setting);
-
-	config_setting_t * (*setting_lookup) (config_setting_t *setting, const char *name);
-	int (*setting_lookup_int) (const config_setting_t *setting, const char *name, int *value);
-	int (*setting_lookup_int64) (const config_setting_t *setting, const char *name, long long *value);
-	int (*setting_lookup_float) (const config_setting_t *setting, const char *name, double *value);
-	int (*setting_lookup_bool) (const config_setting_t *setting, const char *name, int *value);
-	int (*setting_lookup_string) (const config_setting_t *setting, const char *name, const char **value);
-	int (*setting_set_int) (config_setting_t *setting ,int value);
-	int (*setting_set_int64) (config_setting_t *setting, long long value);
-	int (*setting_set_float) (config_setting_t *setting, double value);
-	int (*setting_set_bool) (config_setting_t *setting, int value);
-	int (*setting_set_string) (config_setting_t *setting, const char *value);
-
-	int (*setting_set_format) (config_setting_t *setting, short format);
-	short (*setting_get_format) (const config_setting_t *setting);
-
-	int (*setting_get_int_elem) (const config_setting_t *setting, int idx);
-	long long (*setting_get_int64_elem) (const config_setting_t *setting, int idx);
-	double (*setting_get_float_elem) (const config_setting_t *setting, int idx);
-	int (*setting_get_bool_elem) (const config_setting_t *setting, int idx);
-	const char * (*setting_get_string_elem) (const config_setting_t *setting, int idx);
-	config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value);
-	config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value);
-	config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value);
-	config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value);
-	config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value);
-
-	int (*setting_index) (const config_setting_t *setting);
-	int (*setting_length) (const config_setting_t *setting);
-
-	config_setting_t * (*setting_get_elem) (const config_setting_t *setting, unsigned int idx);
-	config_setting_t * (*setting_get_member) (const config_setting_t *setting, const char *name);
-
-	config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type);
-	int (*setting_remove) (config_setting_t *parent, const char *name);
-
-	int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx);
-	void (*setting_set_hook) (config_setting_t *setting, void *hook);
-
-	config_setting_t * (*lookup) (const config_t *config, const char *filepath);
-	int (*lookup_int) (const config_t *config, const char *filepath, int *value);
-	int (*lookup_int64) (const config_t *config, const char *filepath, long long *value);
-	int (*lookup_float) (const config_t *config, const char *filepath, double *value);
-	int (*lookup_bool) (const config_t *config, const char *filepath, int *value);
-	int (*lookup_string) (const config_t *config, const char *filepath, const char **value);
+	int (*read_string) (struct config_t *config, const char *str);
+	int (*read_file_src) (struct config_t *config, const char *filename);
+	int (*write_file) (struct config_t *config, const char *filename);
+
+	void (*set_destructor) (struct config_t *config, void (*destructor)(void *));
+	void (*set_include_dir) (struct config_t *config, const char *include_dir);
+
+	void (*init) (struct config_t *config);
+	void (*destroy) (struct config_t *config);
+
+	int (*setting_get_int) (const struct config_setting_t *setting);
+	long long (*setting_get_int64) (const struct config_setting_t *setting);
+	double (*setting_get_float) (const struct config_setting_t *setting);
+
+	int (*setting_get_bool) (const struct config_setting_t *setting);
+
+	const char * (*setting_get_string) (const struct config_setting_t *setting);
+
+	struct config_setting_t * (*setting_lookup) (struct config_setting_t *setting, const char *name);
+	int (*setting_lookup_int) (const struct config_setting_t *setting, const char *name, int *value);
+	int (*setting_lookup_int64) (const struct config_setting_t *setting, const char *name, long long *value);
+	int (*setting_lookup_float) (const struct config_setting_t *setting, const char *name, double *value);
+	int (*setting_lookup_bool) (const struct config_setting_t *setting, const char *name, int *value);
+	int (*setting_lookup_string) (const struct config_setting_t *setting, const char *name, const char **value);
+	int (*setting_set_int) (struct config_setting_t *setting ,int value);
+	int (*setting_set_int64) (struct config_setting_t *setting, long long value);
+	int (*setting_set_float) (struct config_setting_t *setting, double value);
+	int (*setting_set_bool) (struct config_setting_t *setting, int value);
+	int (*setting_set_string) (struct config_setting_t *setting, const char *value);
+
+	int (*setting_set_format) (struct config_setting_t *setting, short format);
+	short (*setting_get_format) (const struct config_setting_t *setting);
+
+	int (*setting_get_int_elem) (const struct config_setting_t *setting, int idx);
+	long long (*setting_get_int64_elem) (const struct config_setting_t *setting, int idx);
+	double (*setting_get_float_elem) (const struct config_setting_t *setting, int idx);
+	int (*setting_get_bool_elem) (const struct config_setting_t *setting, int idx);
+	const char * (*setting_get_string_elem) (const struct config_setting_t *setting, int idx);
+	struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value);
+	struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value);
+	struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value);
+	struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value);
+	struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value);
+
+	int (*setting_index) (const struct config_setting_t *setting);
+	int (*setting_length) (const struct config_setting_t *setting);
+
+	struct config_setting_t * (*setting_get_elem) (const struct config_setting_t *setting, unsigned int idx);
+	struct config_setting_t * (*setting_get_member) (const struct config_setting_t *setting, const char *name);
+
+	struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type);
+	int (*setting_remove) (struct config_setting_t *parent, const char *name);
+
+	int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx);
+	void (*setting_set_hook) (struct config_setting_t *setting, void *hook);
+
+	struct config_setting_t * (*lookup) (const struct config_t *config, const char *filepath);
+	int (*lookup_int) (const struct config_t *config, const char *filepath, int *value);
+	int (*lookup_int64) (const struct config_t *config, const char *filepath, long long *value);
+	int (*lookup_float) (const struct config_t *config, const char *filepath, double *value);
+	int (*lookup_bool) (const struct config_t *config, const char *filepath, int *value);
+	int (*lookup_string) (const struct config_t *config, const char *filepath, const char **value);
 
 	/* those are custom and are from src/common/conf.c */
 	/* Functions to copy settings from libconfig/contrib */
-	int (*load_file) (config_t *config, const char *config_filename);
-	void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src);
-	void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src);
-	void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src);
-	int (*setting_copy) (config_setting_t *parent, const config_setting_t *src);
+	int (*load_file) (struct config_t *config, const char *config_filename);
+	void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src);
+	void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src);
+	void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src);
+	int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src);
 	/* Functions to get other types */
-	bool (*setting_get_bool_real) (const config_setting_t *setting);
-	uint32 (*setting_get_uint32) (const config_setting_t *setting);
-	uint16 (*setting_get_uint16) (const config_setting_t *setting);
-	int16 (*setting_get_int16) (const config_setting_t *setting);
-
-	int (*setting_lookup_bool_real) (const config_setting_t *setting, const char *name, bool *value);
-	int (*setting_lookup_uint32) (const config_setting_t *setting, const char *name, uint32 *value);
-	int (*setting_lookup_uint16) (const config_setting_t *setting, const char *name, uint16 *value);
-	int (*setting_lookup_int16) (const config_setting_t *setting, const char *name, int16 *value);
-	int (*setting_lookup_mutable_string) (const config_setting_t *setting, const char *name, char *out, size_t out_size);
-	int (*lookup_mutable_string) (const config_t *config, const char *name, char *out, size_t out_size);
+	bool (*setting_get_bool_real) (const struct config_setting_t *setting);
+	uint32 (*setting_get_uint32) (const struct config_setting_t *setting);
+	uint16 (*setting_get_uint16) (const struct config_setting_t *setting);
+	int16 (*setting_get_int16) (const struct config_setting_t *setting);
+
+	int (*setting_lookup_bool_real) (const struct config_setting_t *setting, const char *name, bool *value);
+	int (*setting_lookup_uint32) (const struct config_setting_t *setting, const char *name, uint32 *value);
+	int (*setting_lookup_uint16) (const struct config_setting_t *setting, const char *name, uint16 *value);
+	int (*setting_lookup_int16) (const struct config_setting_t *setting, const char *name, int16 *value);
+	int (*setting_lookup_mutable_string) (const struct config_setting_t *setting, const char *name, char *out, size_t out_size);
+	int (*lookup_mutable_string) (const struct config_t *config, const char *name, char *out, size_t out_size);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/common/showmsg.c b/src/common/showmsg.c
index 956222a7d..9e2ff9898 100644
--- a/src/common/showmsg.c
+++ b/src/common/showmsg.c
@@ -799,8 +799,8 @@ void showmsg_showWarning(const char *string, ...)
 	vShowMessage_(MSG_WARNING, string, ap);
 	va_end(ap);
 }
-void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
-void showmsg_showConfigWarning(config_setting_t *config, const char *string, ...)
+void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
+void showmsg_showConfigWarning(struct config_setting_t *config, const char *string, ...)
 {
 	StringBuf buf;
 	va_list ap;
diff --git a/src/common/showmsg.h b/src/common/showmsg.h
index ed8776fb0..85a1527bd 100644
--- a/src/common/showmsg.h
+++ b/src/common/showmsg.h
@@ -118,7 +118,7 @@ struct showmsg_interface {
 	void (*showDebug) (const char *, ...) __attribute__((format(printf, 1, 2)));
 	void (*showError) (const char *, ...) __attribute__((format(printf, 1, 2)));
 	void (*showFatalError) (const char *, ...) __attribute__((format(printf, 1, 2)));
-	void (*showConfigWarning) (config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
+	void (*showConfigWarning) (struct config_setting_t *config, const char *string, ...) __attribute__((format(printf, 2, 3)));
 };
 
 /* the purpose of these macros is simply to not make calling them be an annoyance */
diff --git a/src/common/socket.c b/src/common/socket.c
index be144fd50..1fc1b2bff 100644
--- a/src/common/socket.c
+++ b/src/common/socket.c
@@ -1686,7 +1686,7 @@ bool socket_trusted_ip_check(uint32 ip)
  * @param[in]     groupname Current group name, for output/logging reasons.
  * @return The amount of entries read, zero in case of errors.
  */
-int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname)
+int socket_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname)
 {
 	int i, len;
 	char ipbuf[64], maskbuf[64];
@@ -1722,7 +1722,7 @@ int socket_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list
  */
 void socket_net_config_read(const char *filename)
 {
-	config_t network_config;
+	struct config_t network_config;
 	int i;
 	nullpo_retv(filename);
 
diff --git a/src/common/socket.h b/src/common/socket.h
index e99278052..5103c3850 100644
--- a/src/common/socket.h
+++ b/src/common/socket.h
@@ -214,7 +214,7 @@ struct socket_interface {
 	uint32 (*lan_subnet_check) (uint32 ip, struct s_subnet *info);
 	bool (*allowed_ip_check) (uint32 ip);
 	bool (*trusted_ip_check) (uint32 ip);
-	int (*net_config_read_sub) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+	int (*net_config_read_sub) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 	void (*net_config_read) (const char *filename);
 };
 
diff --git a/src/map/atcommand.c b/src/map/atcommand.c
index 3966ff2f1..eb48adc1d 100644
--- a/src/map/atcommand.c
+++ b/src/map/atcommand.c
@@ -3613,7 +3613,7 @@ ACMD(reloadskilldb)
  * @reloadatcommand - reloads conf/atcommand.conf conf/groups.conf
  *------------------------------------------*/
 ACMD(reloadatcommand) {
-	config_t run_test;
+	struct config_t run_test;
 
 	if (!libconfig->load_file(&run_test, "conf/groups.conf")) {
 		clif->message(fd, msg_fd(fd,1036)); // Error reading groups.conf, reload failed.
@@ -10006,8 +10006,8 @@ bool atcommand_exec(const int fd, struct map_session_data *sd, const char *messa
  *
  *------------------------------------------*/
 void atcommand_config_read(const char* config_filename) {
-	config_t atcommand_config;
-	config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL;
+	struct config_t atcommand_config;
+	struct config_setting_t *aliases = NULL, *help = NULL, *nolog = NULL;
 	const char *symbol = NULL;
 	int num_aliases = 0;
 
@@ -10041,7 +10041,7 @@ void atcommand_config_read(const char* config_filename) {
 		int count = libconfig->setting_length(aliases);
 
 		for (i = 0; i < count; ++i) {
-			config_setting_t *command;
+			struct config_setting_t *command;
 			const char *commandname = NULL;
 			int j = 0, alias_count = 0;
 			AtCommandInfo *commandinfo = NULL;
@@ -10079,7 +10079,7 @@ void atcommand_config_read(const char* config_filename) {
 		int count = libconfig->setting_length(nolog);
 
 		for (i = 0; i < count; ++i) {
-			config_setting_t *command;
+			struct config_setting_t *command;
 			const char *commandname = NULL;
 			AtCommandInfo *commandinfo = NULL;
 
@@ -10101,7 +10101,7 @@ void atcommand_config_read(const char* config_filename) {
 		int i;
 
 		for (i = 0; i < count; ++i) {
-			config_setting_t *command;
+			struct config_setting_t *command;
 			const char *commandname;
 			AtCommandInfo *commandinfo = NULL;
 
@@ -10144,7 +10144,7 @@ static inline int atcommand_command_type2idx(AtCommandType type)
  * Loads permissions for groups to use commands.
  *
  */
-void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz)
+void atcommand_db_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz)
 {
 	DBIterator *iter = db_iterator(atcommand->db);
 	AtCommandInfo *atcmd;
@@ -10157,7 +10157,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command
 		CREATE(atcmd->char_groups, char, sz);
 		for (i = 0; i < sz; i++) {
 			GroupSettings *group = groups[i];
-			config_setting_t *commands = commands_[i];
+			struct config_setting_t *commands = commands_[i];
 			int result = 0;
 			int idx = -1;
 
@@ -10178,7 +10178,7 @@ void atcommand_db_load_groups(GroupSettings **groups, config_setting_t **command
 			}
 
 			if (commands != NULL) {
-				config_setting_t *cmd = NULL;
+				struct config_setting_t *cmd = NULL;
 
 				// <commandname> : <bool> (only atcommand)
 				if (config_setting_lookup_bool(commands, atcmd->command, &result) && result) {
diff --git a/src/map/atcommand.h b/src/map/atcommand.h
index 5c4acdf01..384bab20d 100644
--- a/src/map/atcommand.h
+++ b/src/map/atcommand.h
@@ -110,7 +110,7 @@ struct atcommand_interface {
 	bool (*create) (char *name, AtCommandFunc func);
 	bool (*can_use) (struct map_session_data *sd, const char *command);
 	bool (*can_use2) (struct map_session_data *sd, const char *command, AtCommandType type);
-	void (*load_groups) (GroupSettings **groups, config_setting_t **commands_, size_t sz);
+	void (*load_groups) (GroupSettings **groups, struct config_setting_t **commands_, size_t sz);
 	AtCommandInfo* (*exists) (const char* name);
 	bool (*msg_read) (const char *cfg_name, bool allow_override);
 	void (*final_msg) (void);
diff --git a/src/map/battleground.c b/src/map/battleground.c
index 995122d52..d25aef851 100644
--- a/src/map/battleground.c
+++ b/src/map/battleground.c
@@ -330,8 +330,8 @@ enum bg_queue_types bg_str2teamtype (const char *str) {
 }
 
 void bg_config_read(void) {
-	config_t bg_conf;
-	config_setting_t *data = NULL;
+	struct config_t bg_conf;
+	struct config_setting_t *data = NULL;
 	const char *config_filename = "conf/battlegrounds.conf"; // FIXME hardcoded name
 
 	if (!libconfig->load_file(&bg_conf, config_filename))
@@ -340,8 +340,8 @@ void bg_config_read(void) {
 	data = libconfig->lookup(&bg_conf, "battlegrounds");
 
 	if (data != NULL) {
-		config_setting_t *settings = libconfig->setting_get_elem(data, 0);
-		config_setting_t *arenas;
+		struct config_setting_t *settings = libconfig->setting_get_elem(data, 0);
+		struct config_setting_t *arenas;
 		const char *delay_var;
 		int offline = 0;
 
@@ -361,8 +361,8 @@ void bg_config_read(void) {
 			int arena_count = libconfig->setting_length(arenas);
 			CREATE( bg->arena, struct bg_arena *, arena_count );
 			for(i = 0; i < arena_count; i++) {
-				config_setting_t *arena = libconfig->setting_get_elem(arenas, i);
-				config_setting_t *reward;
+				struct config_setting_t *arena = libconfig->setting_get_elem(arenas, i);
+				struct config_setting_t *reward;
 				const char *aName, *aEvent, *aDelayVar, *aTeamTypes;
 				int minLevel = 0, maxLevel = 0;
 				int prizeWin, prizeLoss, prizeDraw;
diff --git a/src/map/channel.c b/src/map/channel.c
index c1b28fd84..45b59898c 100644
--- a/src/map/channel.c
+++ b/src/map/channel.c
@@ -589,8 +589,8 @@ void channel_quit_guild(struct map_session_data *sd)
 
 void read_channels_config(void)
 {
-	config_t channels_conf;
-	config_setting_t *chsys = NULL;
+	struct config_t channels_conf;
+	struct config_setting_t *chsys = NULL;
 	const char *config_filename = "conf/channels.conf"; // FIXME hardcoded name
 
 	if (!libconfig->load_file(&channels_conf, config_filename))
@@ -599,9 +599,9 @@ void read_channels_config(void)
 	chsys = libconfig->lookup(&channels_conf, "chsys");
 
 	if (chsys != NULL) {
-		config_setting_t *settings = libconfig->setting_get_elem(chsys, 0);
-		config_setting_t *channels;
-		config_setting_t *colors;
+		struct config_setting_t *settings = libconfig->setting_get_elem(chsys, 0);
+		struct config_setting_t *channels;
+		struct config_setting_t *colors;
 		int i,k;
 		const char *local_name, *ally_name,
 					*local_color, *ally_color,
@@ -710,7 +710,7 @@ void read_channels_config(void)
 			CREATE(channel->config->colors, unsigned int, color_count);
 			CREATE(channel->config->colors_name, char *, color_count);
 			for(i = 0; i < color_count; i++) {
-				config_setting_t *color = libconfig->setting_get_elem(colors, i);
+				struct config_setting_t *color = libconfig->setting_get_elem(colors, i);
 
 				CREATE(channel->config->colors_name[i], char, HCS_NAME_LENGTH);
 
@@ -771,7 +771,7 @@ void read_channels_config(void)
 			int channel_count = libconfig->setting_length(channels);
 
 			for(i = 0; i < channel_count; i++) {
-				config_setting_t *chan = libconfig->setting_get_elem(channels, i);
+				struct config_setting_t *chan = libconfig->setting_get_elem(channels, i);
 				const char *name = config_setting_name(chan);
 				const char *color = libconfig->setting_get_string_elem(channels,i);
 
diff --git a/src/map/clif.c b/src/map/clif.c
index 5b9e9c99e..66a8e92b8 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -17308,8 +17308,8 @@ void clif_parse_MoveItem(int fd, struct map_session_data *sd) {
 
 /* [Ind/Hercules] */
 void clif_cashshop_db(void) {
-	config_t cashshop_conf;
-	config_setting_t *cashshop = NULL, *cats = NULL;
+	struct config_t cashshop_conf;
+	struct config_setting_t *cashshop = NULL, *cats = NULL;
 	const char *config_filename = "db/cashshop_db.conf"; // FIXME hardcoded name
 	int i, item_count_t = 0;
 	for( i = 0; i < CASHSHOP_TAB_MAX; i++ ) {
@@ -17324,7 +17324,7 @@ void clif_cashshop_db(void) {
 
 	if( cashshop != NULL && (cats = libconfig->setting_get_elem(cashshop, 0)) != NULL ) {
 		for(i = 0; i < CASHSHOP_TAB_MAX; i++) {
-			config_setting_t *cat;
+			struct config_setting_t *cat;
 			char entry_name[10];
 
 			sprintf(entry_name,"cat_%d",i);
@@ -17333,7 +17333,7 @@ void clif_cashshop_db(void) {
 				int k, item_count = libconfig->setting_length(cat);
 
 				for(k = 0; k < item_count; k++) {
-					config_setting_t *entry = libconfig->setting_get_elem(cat,k);
+					struct config_setting_t *entry = libconfig->setting_get_elem(cat,k);
 					const char *name = config_setting_name(entry);
 					int price = libconfig->setting_get_int(entry);
 					struct item_data * data = NULL;
@@ -18366,8 +18366,8 @@ void clif_parse_RouletteRecvItem(int fd, struct map_session_data* sd) {
 }
 
 bool clif_parse_roulette_db(void) {
-	config_t roulette_conf;
-	config_setting_t *roulette = NULL, *levels = NULL;
+	struct config_t roulette_conf;
+	struct config_setting_t *roulette = NULL, *levels = NULL;
 	const char *config_filename = "db/roulette_db.conf"; // FIXME hardcoded name
 	int i, j, item_count_t = 0;
 
@@ -18381,7 +18381,7 @@ bool clif_parse_roulette_db(void) {
 
 	if( roulette != NULL && (levels = libconfig->setting_get_elem(roulette, 0)) != NULL ) {
 		for(i = 0; i < MAX_ROULETTE_LEVEL; i++) {
-			config_setting_t *level;
+			struct config_setting_t *level;
 			char entry_name[10];
 
 			sprintf(entry_name,"level_%d",i+1);
@@ -18390,7 +18390,7 @@ bool clif_parse_roulette_db(void) {
 				int k, item_count = libconfig->setting_length(level);
 
 				for(k = 0; k < item_count; k++) {
-					config_setting_t *entry = libconfig->setting_get_elem(level,k);
+					struct config_setting_t *entry = libconfig->setting_get_elem(level,k);
 					const char *name = config_setting_name(entry);
 					int qty = libconfig->setting_get_int(entry);
 					struct item_data * data = NULL;
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index 83535f294..da72ab05a 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -637,8 +637,8 @@ int itemdb_isidentified2(struct item_data *data) {
 }
 
 void itemdb_read_groups(void) {
-	config_t item_group_conf;
-	config_setting_t *itg = NULL, *it = NULL;
+	struct config_t item_group_conf;
+	struct config_setting_t *itg = NULL, *it = NULL;
 #ifdef RENEWAL
 	const char *config_filename = "db/re/item_group.conf"; // FIXME hardcoded name
 #else
@@ -927,8 +927,8 @@ bool itemdb_read_cached_packages(const char *config_filename) {
 	return true;
 }
 void itemdb_read_packages(void) {
-	config_t item_packages_conf;
-	config_setting_t *itg = NULL, *it = NULL, *t = NULL;
+	struct config_t item_packages_conf;
+	struct config_setting_t *itg = NULL, *it = NULL, *t = NULL;
 #ifdef RENEWAL
 	const char *config_filename = "db/re/item_packages.conf"; // FIXME hardcoded name
 #else
@@ -1157,8 +1157,8 @@ void itemdb_read_packages(void) {
 }
 
 void itemdb_read_chains(void) {
-	config_t item_chain_conf;
-	config_setting_t *itc = NULL;
+	struct config_t item_chain_conf;
+	struct config_setting_t *itc = NULL;
 #ifdef RENEWAL
 	const char *config_filename = "db/re/item_chain.conf"; // FIXME hardcoded name
 #else
@@ -1180,7 +1180,7 @@ void itemdb_read_chains(void) {
 		struct item_chain_entry *prev = NULL;
 		const char *name = config_setting_name(itc);
 		int c = 0;
-		config_setting_t *entry = NULL;
+		struct config_setting_t *entry = NULL;
 
 		script->set_constant2(name, i-1, false, false);
 		itemdb->chains[count].qty = (unsigned short)libconfig->setting_length(itc);
@@ -1529,7 +1529,7 @@ int itemdb_validate_entry(struct item_data *entry, int n, const char *source) {
 	return item->nameid;
 }
 
-void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source)
+void itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source)
 {
     // do nothing. plugins can do own work
 }
@@ -1547,9 +1547,9 @@ void itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, co
  *               validation errors.
  * @return Nameid of the validated entry, or 0 in case of failure.
  */
-int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) {
+int itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) {
 	struct item_data id = { 0 };
-	config_setting_t *t = NULL;
+	struct config_setting_t *t = NULL;
 	const char *str = NULL;
 	int i32 = 0;
 	bool inherit = false;
@@ -1730,7 +1730,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 
 	if ( (t = libconfig->setting_get_member(it, "Trade")) ) {
 		if (config_setting_is_group(t)) {
-			config_setting_t *tt = NULL;
+			struct config_setting_t *tt = NULL;
 
 			if ((tt = libconfig->setting_get_member(t, "override"))) {
 				id.gm_lv_trade_override = libconfig->setting_get_int(tt);
@@ -1796,7 +1796,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 
 	if ((t = libconfig->setting_get_member(it, "Nouse"))) {
 		if (config_setting_is_group(t)) {
-			config_setting_t *nt = NULL;
+			struct config_setting_t *nt = NULL;
 
 			if ((nt = libconfig->setting_get_member(t, "override"))) {
 				id.item_usage.override = libconfig->setting_get_int(nt);
@@ -1844,7 +1844,7 @@ int itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source)
 	return itemdb->validate_entry(&id, n, source);
 }
 
-bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *value)
+bool itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value)
 {
 	nullpo_retr(false, name);
 	nullpo_retr(false, value);
@@ -1873,8 +1873,8 @@ bool itemdb_lookup_const(const config_setting_t *it, const char *name, int *valu
  */
 int itemdb_readdb_libconfig(const char *filename) {
 	bool duplicate[MAX_ITEMDB];
-	config_t item_db_conf;
-	config_setting_t *itdb, *it;
+	struct config_t item_db_conf;
+	struct config_setting_t *itdb, *it;
 	char filepath[256];
 	int i = 0, count = 0;
 
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 8a0ec389d..8c2a7ac53 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -631,8 +631,8 @@ struct itemdb_interface {
 	void (*read_combos) (void);
 	int (*gendercheck) (struct item_data *id);
 	int (*validate_entry) (struct item_data *entry, int n, const char *source);
-	void (*readdb_additional_fields) (int itemid, config_setting_t *it, int n, const char *source);
-	int (*readdb_libconfig_sub) (config_setting_t *it, int n, const char *source);
+	void (*readdb_additional_fields) (int itemid, struct config_setting_t *it, int n, const char *source);
+	int (*readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source);
 	int (*readdb_libconfig) (const char *filename);
 	uint64 (*unique_id) (struct map_session_data *sd);
 	void (*read) (bool minimal);
@@ -641,7 +641,7 @@ struct itemdb_interface {
 	void (*clear) (bool total);
 	struct item_combo * (*id2combo) (unsigned short id);
 	bool (*is_item_usable) (struct item_data *item);
-	bool (*lookup_const) (const config_setting_t *it, const char *name, int *value);
+	bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/map.c b/src/map/map.c
index 3089f7ce0..c17dd9b0e 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -4982,8 +4982,8 @@ enum bl_type map_zone_bl_type(const char *entry, enum map_zone_skill_subtype *su
 }
 /* [Ind/Hercules] */
 void read_map_zone_db(void) {
-	config_t map_zone_db;
-	config_setting_t *zones = NULL;
+	struct config_t map_zone_db;
+	struct config_setting_t *zones = NULL;
 	/* TODO: #ifndef required for re/pre-re */
 #ifdef RENEWAL
 	const char *config_filename = "db/re/map_zone_db.conf"; // FIXME hardcoded name
@@ -4997,12 +4997,12 @@ void read_map_zone_db(void) {
 
 	if (zones != NULL) {
 		struct map_zone_data *zone;
-		config_setting_t *zone_e;
-		config_setting_t *skills;
-		config_setting_t *items;
-		config_setting_t *mapflags;
-		config_setting_t *commands;
-		config_setting_t *caps;
+		struct config_setting_t *zone_e;
+		struct config_setting_t *skills;
+		struct config_setting_t *items;
+		struct config_setting_t *mapflags;
+		struct config_setting_t *commands;
+		struct config_setting_t *caps;
 		const char *name;
 		const char *zonename;
 		int i,h,v,j;
@@ -5054,7 +5054,7 @@ void read_map_zone_db(void) {
 				disabled_skills_count = libconfig->setting_length(skills);
 				/* validate */
 				for(h = 0; h < libconfig->setting_length(skills); h++) {
-					config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
+					struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
 					name = config_setting_name(skillinfo);
 					if( !map->zone_str2skillid(name) ) {
 						ShowError("map_zone_db: unknown skill (%s) in disabled_skills for zone '%s', skipping skill...\n",name,zone->name);
@@ -5069,7 +5069,7 @@ void read_map_zone_db(void) {
 				/* all ok, process */
 				CREATE( zone->disabled_skills, struct map_zone_disabled_skill_entry *, disabled_skills_count );
 				for(h = 0, v = 0; h < libconfig->setting_length(skills); h++) {
-					config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
+					struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, h);
 					struct map_zone_disabled_skill_entry * entry;
 					enum bl_type type;
 					name = config_setting_name(skillinfo);
@@ -5092,7 +5092,7 @@ void read_map_zone_db(void) {
 				disabled_items_count = libconfig->setting_length(items);
 				/* validate */
 				for(h = 0; h < libconfig->setting_length(items); h++) {
-					config_setting_t *item = libconfig->setting_get_elem(items, h);
+					struct config_setting_t *item = libconfig->setting_get_elem(items, h);
 					name = config_setting_name(item);
 					if( !map->zone_str2itemid(name) ) {
 						ShowError("map_zone_db: unknown item (%s) in disabled_items for zone '%s', skipping item...\n",name,zone->name);
@@ -5111,7 +5111,7 @@ void read_map_zone_db(void) {
 					CREATE(zone->cant_disable_items, int, zone->cant_disable_items_count);
 				}
 				for(h = 0, v = 0, j = 0; h < libconfig->setting_length(items); h++) {
-					config_setting_t *item = libconfig->setting_get_elem(items, h);
+					struct config_setting_t *item = libconfig->setting_get_elem(items, h);
 
 					name = config_setting_name(item);
 					if( libconfig->setting_get_bool(item) ) { /* only add if enabled */
@@ -5143,7 +5143,7 @@ void read_map_zone_db(void) {
 				disabled_commands_count = libconfig->setting_length(commands);
 				/* validate */
 				for(h = 0; h < libconfig->setting_length(commands); h++) {
-					config_setting_t *command = libconfig->setting_get_elem(commands, h);
+					struct config_setting_t *command = libconfig->setting_get_elem(commands, h);
 					name = config_setting_name(command);
 					if( !atcommand->exists(name) ) {
 						ShowError("map_zone_db: unknown command '%s' in disabled_commands for zone '%s', skipping entry...\n",name,zone->name);
@@ -5158,7 +5158,7 @@ void read_map_zone_db(void) {
 				/* all ok, process */
 				CREATE( zone->disabled_commands, struct map_zone_disabled_command_entry *, disabled_commands_count );
 				for(h = 0, v = 0; h < libconfig->setting_length(commands); h++) {
-					config_setting_t *command = libconfig->setting_get_elem(commands, h);
+					struct config_setting_t *command = libconfig->setting_get_elem(commands, h);
 					struct map_zone_disabled_command_entry * entry;
 					int group_lv;
 					name = config_setting_name(command);
@@ -5179,7 +5179,7 @@ void read_map_zone_db(void) {
 				capped_skills_count = libconfig->setting_length(caps);
 				/* validate */
 				for(h = 0; h < libconfig->setting_length(caps); h++) {
-					config_setting_t *cap = libconfig->setting_get_elem(caps, h);
+					struct config_setting_t *cap = libconfig->setting_get_elem(caps, h);
 					name = config_setting_name(cap);
 					if( !map->zone_str2skillid(name) ) {
 						ShowError("map_zone_db: unknown skill (%s) in skill_damage_cap for zone '%s', skipping skill...\n",name,zone->name);
@@ -5194,7 +5194,7 @@ void read_map_zone_db(void) {
 				/* all ok, process */
 				CREATE( zone->capped_skills, struct map_zone_skill_damage_cap_entry *, capped_skills_count );
 				for(h = 0, v = 0; h < libconfig->setting_length(caps); h++) {
-					config_setting_t *cap = libconfig->setting_get_elem(caps, h);
+					struct config_setting_t *cap = libconfig->setting_get_elem(caps, h);
 					struct map_zone_skill_damage_cap_entry * entry;
 					enum bl_type type;
 					name = config_setting_name(cap);
@@ -5219,8 +5219,8 @@ void read_map_zone_db(void) {
 
 		/* process inheritance, aka loop through the whole thing again :P */
 		for (i = 0; i < zone_count; ++i) {
-			config_setting_t *inherit_tree = NULL;
-			config_setting_t *new_entry = NULL;
+			struct config_setting_t *inherit_tree = NULL;
+			struct config_setting_t *new_entry = NULL;
 			int inherit_count;
 
 			zone_e = libconfig->setting_get_elem(zones, i);
@@ -5278,7 +5278,7 @@ void read_map_zone_db(void) {
 					for(j = 0; j < disabled_skills_count_i; j++) {
 						int k;
 						for(k = 0; k < disabled_skills_count; k++) {
-							config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k);
+							struct config_setting_t *skillinfo = libconfig->setting_get_elem(skills, k);
 							if( map->zone_str2skillid(config_setting_name(skillinfo)) == izone->disabled_skills[j]->nameid ) {
 								break;
 							}
@@ -5302,7 +5302,7 @@ void read_map_zone_db(void) {
 					for(j = 0; j < disabled_items_count_i; j++) {
 						int k;
 						for(k = 0; k < disabled_items_count; k++) {
-							config_setting_t *item = libconfig->setting_get_elem(items, k);
+							struct config_setting_t *item = libconfig->setting_get_elem(items, k);
 
 							name = config_setting_name(item);
 
@@ -5348,7 +5348,7 @@ void read_map_zone_db(void) {
 					for(j = 0; j < disabled_commands_count_i; j++) {
 						int k;
 						for(k = 0; k < disabled_commands_count; k++) {
-							config_setting_t *command = libconfig->setting_get_elem(commands, k);
+							struct config_setting_t *command = libconfig->setting_get_elem(commands, k);
 							if( atcommand->exists(config_setting_name(command))->func == izone->disabled_commands[j]->cmd ) {
 								break;
 							}
@@ -5372,7 +5372,7 @@ void read_map_zone_db(void) {
 					for(j = 0; j < capped_skills_count_i; j++) {
 						int k;
 						for(k = 0; k < capped_skills_count; k++) {
-							config_setting_t *cap = libconfig->setting_get_elem(caps, k);
+							struct config_setting_t *cap = libconfig->setting_get_elem(caps, k);
 							if( map->zone_str2skillid(config_setting_name(cap)) == izone->capped_skills[j]->nameid ) {
 								break;
 							}
diff --git a/src/map/mob.c b/src/map/mob.c
index fc6e23427..85e1ad5d5 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -3691,7 +3691,7 @@ static inline int mob_parse_dbrow_cap_value(int class_, int min, int max, int va
  *                      (mob_id is expected to be already set).
  * @param[in]     t     The libconfig entry.
  */
-void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t)
 {
 	int i32;
 	if (mob->lookup_const(t, "Str", &i32) && i32 >= 0) {
@@ -3722,10 +3722,10 @@ void mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t)
  *
  * @return The parsed mode.
  */
-int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t)
+int mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t)
 {
 	int mode = 0;
-	config_setting_t *t2;
+	struct config_setting_t *t2;
 
 	if ((t2 = libconfig->setting_get_member(t, "CanMove")))
 		mode |= libconfig->setting_get_bool(t2) ? MD_CANMOVE : 0;
@@ -3768,9 +3768,9 @@ int mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t)
  *                      (mob_id is expected to be already set).
  * @param[in]     t     The libconfig entry.
  */
-void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t)
 {
-	config_setting_t *drop;
+	struct config_setting_t *drop;
 	int i = 0;
 	int idx = 0;
 	int i32;
@@ -3824,9 +3824,9 @@ void mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t)
  *                      (mob_id, status.mode are expected to be already set).
  * @param[in]     t     The libconfig entry.
  */
-void mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t)
+void mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t)
 {
-	config_setting_t *drop;
+	struct config_setting_t *drop;
 	int i = 0;
 	int idx = 0;
 	int i32;
@@ -4051,10 +4051,10 @@ int mob_db_validate_entry(struct mob_db *entry, int n, const char *source)
  *               validation errors.
  * @return Mob ID of the validated entry, or 0 in case of failure.
  */
-int mob_read_db_sub(config_setting_t *mobt, int n, const char *source)
+int mob_read_db_sub(struct config_setting_t *mobt, int n, const char *source)
 {
 	struct mob_db md = { 0 };
-	config_setting_t *t = NULL;
+	struct config_setting_t *t = NULL;
 	const char *str = NULL;
 	int i32 = 0;
 	bool inherit = false;
@@ -4359,12 +4359,12 @@ int mob_read_db_sub(config_setting_t *mobt, int n, const char *source)
  * @param[in]     source Source of the entry (file name), to be displayed in
  *                       case of validation errors.
  */
-void mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *t, int n, const char *source)
+void mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *t, int n, const char *source)
 {
 	// do nothing. plugins can do own work
 }
 
-bool mob_lookup_const(const config_setting_t *it, const char *name, int *value)
+bool mob_lookup_const(const struct config_setting_t *it, const char *name, int *value)
 {
 	if (libconfig->setting_lookup_int(it, name, value))
 	{
@@ -4382,7 +4382,7 @@ bool mob_lookup_const(const config_setting_t *it, const char *name, int *value)
 	return false;
 }
 
-bool mob_get_const(const config_setting_t *it, int *value)
+bool mob_get_const(const struct config_setting_t *it, int *value)
 {
 	const char *str = config_setting_get_string(it);
 	if (str && *str && script->get_constant(str, value))
@@ -4419,10 +4419,10 @@ void mob_readdb(void) {
 int mob_read_libconfig(const char *filename, bool ignore_missing)
 {
 	bool duplicate[MAX_MOB_DB] = { 0 };
-	config_t mob_db_conf;
+	struct config_t mob_db_conf;
 	char filepath[256];
-	config_setting_t *mdb;
-	config_setting_t *t;
+	struct config_setting_t *mdb;
+	struct config_setting_t *t;
 	int i = 0, count = 0;
 
 	nullpo_ret(filename);
diff --git a/src/map/mob.h b/src/map/mob.h
index 9a5239b11..00e2b0723 100644
--- a/src/map/mob.h
+++ b/src/map/mob.h
@@ -510,16 +510,16 @@ struct mob_interface {
 	unsigned int (*drop_adjust) (int baserate, int rate_adjust, unsigned short rate_min, unsigned short rate_max);
 	void (*item_dropratio_adjust) (int nameid, int mob_id, int *rate_adjust);
 	void (*readdb) (void);
-	bool (*lookup_const) (const config_setting_t *it, const char *name, int *value);
-	bool (*get_const) (const config_setting_t *it, int *value);
+	bool (*lookup_const) (const struct config_setting_t *it, const char *name, int *value);
+	bool (*get_const) (const struct config_setting_t *it, int *value);
 	int (*db_validate_entry) (struct mob_db *entry, int n, const char *source);
 	int (*read_libconfig) (const char *filename, bool ignore_missing);
-	void (*read_db_additional_fields) (struct mob_db *entry, config_setting_t *it, int n, const char *source);
-	int (*read_db_sub) (config_setting_t *mobt, int id, const char *source);
-	void (*read_db_drops_sub) (struct mob_db *entry, config_setting_t *t);
-	void (*read_db_mvpdrops_sub) (struct mob_db *entry, config_setting_t *t);
-	int (*read_db_mode_sub) (struct mob_db *entry, config_setting_t *t);
-	void (*read_db_stats_sub) (struct mob_db *entry, config_setting_t *t);
+	void (*read_db_additional_fields) (struct mob_db *entry, struct config_setting_t *it, int n, const char *source);
+	int (*read_db_sub) (struct config_setting_t *mobt, int id, const char *source);
+	void (*read_db_drops_sub) (struct mob_db *entry, struct config_setting_t *t);
+	void (*read_db_mvpdrops_sub) (struct mob_db *entry, struct config_setting_t *t);
+	int (*read_db_mode_sub) (struct mob_db *entry, struct config_setting_t *t);
+	void (*read_db_stats_sub) (struct mob_db *entry, struct config_setting_t *t);
 	void (*name_constants) (void);
 	bool (*readdb_mobavail) (char *str[], int columns, int current);
 	int (*read_randommonster) (void);
diff --git a/src/map/pc.c b/src/map/pc.c
index 8fe1b7c57..fb6fc523c 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -10642,8 +10642,8 @@ int pc_split_atoui(char* str, unsigned int* val, char sep, int max)
  */
 void pc_read_skill_tree(void)
 {
-	config_t skill_tree_conf;
-	config_setting_t *skt = NULL;
+	struct config_t skill_tree_conf;
+	struct config_setting_t *skt = NULL;
 	char config_filename[128];
 	int i = 0;
 	struct s_mapiterator *iter;
@@ -10656,7 +10656,7 @@ void pc_read_skill_tree(void)
 
 	// Foreach job
 	while ((skt = libconfig->setting_get_elem(skill_tree_conf.root, i++))) {
-		config_setting_t *t = NULL;
+		struct config_setting_t *t = NULL;
 		int job_idx;
 		const char *job_name = config_setting_name(skt);
 		int job_id = pc->check_job_name(job_name);
@@ -10746,11 +10746,11 @@ void pc_read_skill_tree(void)
 		}
 		if ((t = libconfig->setting_get_member(skt, "skills")) != NULL) {
 			int j = 0;
-			config_setting_t *sk = NULL;
+			struct config_setting_t *sk = NULL;
 			// Foreach skill
 			while ((sk = libconfig->setting_get_elem(t, j++)) != NULL) {
 				int skill_id, sk_idx;
-				config_setting_t *rsk = NULL;
+				struct config_setting_t *rsk = NULL;
 				const char *sk_name = config_setting_name(sk);
 				struct skill_tree_entry *tree_entry = NULL;
 
diff --git a/src/map/pc_groups.c b/src/map/pc_groups.c
index 5a86030fc..72935adc3 100644
--- a/src/map/pc_groups.c
+++ b/src/map/pc_groups.c
@@ -63,8 +63,8 @@ static inline GroupSettings* name2group(const char* group_name)
  * @private
  */
 static void read_config(void) {
-	config_t pc_group_config;
-	config_setting_t *groups = NULL;
+	struct config_t pc_group_config;
+	struct config_setting_t *groups = NULL;
 	const char *config_filename = "conf/groups.conf"; // FIXME hardcoded name
 	int group_count = 0;
 
@@ -83,7 +83,7 @@ static void read_config(void) {
 			int id = 0, level = 0;
 			const char *groupname = NULL;
 			int log_commands = 0;
-			config_setting_t *group = libconfig->setting_get_elem(groups, i);
+			struct config_setting_t *group = libconfig->setting_get_elem(groups, i);
 
 			if (!libconfig->setting_lookup_int(group, "id", &id)) {
 				ShowConfigWarning(group, "pc_groups:read_config: \"groups\" list member #%d has undefined id, removing...", i);
@@ -106,7 +106,7 @@ static void read_config(void) {
 
 			if (!libconfig->setting_lookup_string(group, "name", &groupname)) {
 				char temp[20];
-				config_setting_t *name = NULL;
+				struct config_setting_t *name = NULL;
 				snprintf(temp, sizeof(temp), "Group %d", id);
 				if ((name = config_setting_add(group, "name", CONFIG_TYPE_STRING)) == NULL ||
 				    !config_setting_set_string(name, temp)) {
@@ -148,7 +148,7 @@ static void read_config(void) {
 		// Check if all commands and permissions exist
 		iter = db_iterator(pcg->db);
 		for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
-			config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions;
+			struct config_setting_t *commands = group_settings->commands, *permissions = group_settings->permissions;
 			int count = 0;
 
 			// Make sure there is "commands" group
@@ -157,7 +157,7 @@ static void read_config(void) {
 			count = libconfig->setting_length(commands);
 
 			for (i = 0; i < count; ++i) {
-				config_setting_t *command = libconfig->setting_get_elem(commands, i);
+				struct config_setting_t *command = libconfig->setting_get_elem(commands, i);
 				const char *name = config_setting_name(command);
 				if (!atcommand->exists(name)) {
 					ShowConfigWarning(command, "pc_groups:read_config: non-existent command name '%s', removing...", name);
@@ -173,7 +173,7 @@ static void read_config(void) {
 			count = libconfig->setting_length(permissions);
 
 			for(i = 0; i < count; ++i) {
-				config_setting_t *permission = libconfig->setting_get_elem(permissions, i);
+				struct config_setting_t *permission = libconfig->setting_get_elem(permissions, i);
 				const char *name = config_setting_name(permission);
 				int j;
 
@@ -193,7 +193,7 @@ static void read_config(void) {
 		while (i < group_count) {
 			iter = db_iterator(pcg->db);
 			for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
-				config_setting_t *inherit = NULL,
+				struct config_setting_t *inherit = NULL,
 				                 *commands = group_settings->commands,
 					             *permissions = group_settings->permissions;
 				int j, inherit_count = 0, done = 0;
@@ -258,11 +258,11 @@ static void read_config(void) {
 		// Pack permissions into GroupSettings.e_permissions for faster checking
 		iter = db_iterator(pcg->db);
 		for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
-			config_setting_t *permissions = group_settings->permissions;
+			struct config_setting_t *permissions = group_settings->permissions;
 			int count = libconfig->setting_length(permissions);
 
 			for (i = 0; i < count; ++i) {
-				config_setting_t *perm = libconfig->setting_get_elem(permissions, i);
+				struct config_setting_t *perm = libconfig->setting_get_elem(permissions, i);
 				const char *name = config_setting_name(perm);
 				int val = libconfig->setting_get_bool(perm);
 				int j;
@@ -280,9 +280,9 @@ static void read_config(void) {
 		// to atcommand->load_group() for processing.
 		if (group_count > 0) {
 			GroupSettings **pc_groups = NULL;
-			config_setting_t **commands = NULL;
+			struct config_setting_t **commands = NULL;
 			CREATE(pc_groups, GroupSettings*, group_count);
-			CREATE(commands, config_setting_t*, group_count);
+			CREATE(commands, struct config_setting_t*, group_count);
 			i = 0;
 			iter = db_iterator(pcg->db);
 			for (group_settings = dbi_first(iter); dbi_exists(iter); group_settings = dbi_next(iter)) {
diff --git a/src/map/pc_groups.h b/src/map/pc_groups.h
index 62704fb12..52ad25191 100644
--- a/src/map/pc_groups.h
+++ b/src/map/pc_groups.h
@@ -66,11 +66,11 @@ struct GroupSettings {
 	bool log_commands; // groups.[].log_commands
 	int index; // internal index of the group (contiguous range starting at 0) [Ind]
 	/// Following are used/available only during config reading
-	config_setting_t *commands; // groups.[].commands
-	config_setting_t *permissions; // groups.[].permissions
-	config_setting_t *inherit; // groups.[].inherit
+	struct config_setting_t *commands; // groups.[].commands
+	struct config_setting_t *permissions; // groups.[].permissions
+	struct config_setting_t *inherit; // groups.[].inherit
 	bool inheritance_done; // have all inheritance rules been evaluated?
-	config_setting_t *root; // groups.[]
+	struct config_setting_t *root; // groups.[]
 };
 
 typedef struct GroupSettings GroupSettings;
diff --git a/src/map/quest.c b/src/map/quest.c
index 9af7c8ea2..7e2421c79 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -425,10 +425,10 @@ int quest_check(struct map_session_data *sd, int quest_id, enum quest_check_type
  * @return The parsed quest entry.
  * @retval NULL in case of errors.
  */
-struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *source)
+struct quest_db *quest_read_db_sub(struct config_setting_t *cs, int n, const char *source)
 {
 	struct quest_db *entry = NULL;
-	config_setting_t *t = NULL;
+	struct config_setting_t *t = NULL;
 	int i32 = 0, quest_id;
 	const char *str = NULL;
 	/*
@@ -477,7 +477,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
 		for (i = 0; i < len && entry->objectives_count < MAX_QUEST_OBJECTIVES; i++) {
 			// Note: We ensure that objectives_count < MAX_QUEST_OBJECTIVES because
 			//       quest_log (as well as the client) expect this maximum size.
-			config_setting_t *tt = libconfig->setting_get_elem(t, i);
+			struct config_setting_t *tt = libconfig->setting_get_elem(t, i);
 			int mob_id = 0, count = 0;
 			if (!tt)
 				break;
@@ -496,7 +496,7 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
 	if ((t=libconfig->setting_get_member(cs, "Drops")) && config_setting_is_list(t)) {
 		int i, len = libconfig->setting_length(t);
 		for (i = 0; i < len; i++) {
-			config_setting_t *tt = libconfig->setting_get_elem(t, i);
+			struct config_setting_t *tt = libconfig->setting_get_elem(t, i);
 			int mob_id = 0, nameid = 0, rate = 0;
 			if (!tt)
 				break;
@@ -527,8 +527,8 @@ struct quest_db *quest_read_db_sub(config_setting_t *cs, int n, const char *sour
 int quest_read_db(void)
 {
 	char filepath[256];
-	config_t quest_db_conf;
-	config_setting_t *qdb = NULL, *q = NULL;
+	struct config_t quest_db_conf;
+	struct config_setting_t *qdb = NULL, *q = NULL;
 	int i = 0, count = 0;
 	const char *filename = "quest_db.conf";
 
diff --git a/src/map/quest.h b/src/map/quest.h
index 8e2cb4e23..a4d778219 100644
--- a/src/map/quest.h
+++ b/src/map/quest.h
@@ -77,7 +77,7 @@ struct quest_interface {
 	int (*check) (struct map_session_data *sd, int quest_id, enum quest_check_type type);
 	void (*clear) (void);
 	int (*read_db) (void);
-	struct quest_db *(*read_db_sub) (config_setting_t *cs, int n, const char *source);
+	struct quest_db *(*read_db_sub) (struct config_setting_t *cs, int n, const char *source);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/map/script.c b/src/map/script.c
index eb8879a2a..e6a9c8ae4 100644
--- a/src/map/script.c
+++ b/src/map/script.c
@@ -2289,10 +2289,10 @@ void script_set_constant2(const char *name, int value, bool is_parameter, bool i
  */
 void read_constdb(void)
 {
-	config_t constants_conf;
+	struct config_t constants_conf;
 	char filepath[256];
-	config_setting_t *cdb;
-	config_setting_t *t;
+	struct config_setting_t *cdb;
+	struct config_setting_t *t;
 	int i = 0;
 
 	sprintf(filepath, "%s/constants.conf", map->db_path);
@@ -4803,9 +4803,9 @@ uint8 script_add_language(const char *name) {
  * Goes thru db/translations.conf file
  **/
 void script_load_translations(void) {
-	config_t translations_conf;
+	struct config_t translations_conf;
 	const char *config_filename = "db/translations.conf"; // FIXME hardcoded name
-	config_setting_t *translations = NULL;
+	struct config_setting_t *translations = NULL;
 	int i, size;
 	uint32 total = 0;
 	uint8 lang_id = 0, k;
diff --git a/src/map/status.c b/src/map/status.c
index 32f7bc2d8..39df5c693 100644
--- a/src/map/status.c
+++ b/src/map/status.c
@@ -12556,9 +12556,9 @@ int status_get_sc_type(sc_type type) {
 	return status->dbs->sc_conf[type];
 }
 
-void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
+void status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb)
 {
-	config_setting_t *temp = NULL;
+	struct config_setting_t *temp = NULL;
 	int i32 = 0;
 
 	struct {
@@ -12698,7 +12698,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
 
 	if ((temp = libconfig->setting_get_member(jdb, "BaseASPD"))) {
 		int widx = 0;
-		config_setting_t *wpn = NULL;
+		struct config_setting_t *wpn = NULL;
 		while ((wpn = libconfig->setting_get_elem(temp, widx++))) {
 			int w, wlen = ARRAYLENGTH(wnames);
 			const char *wname = config_setting_name(wpn);
@@ -12714,7 +12714,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
 
 	if ((temp = libconfig->setting_get_member(jdb, "HPTable"))) {
 		int level = 0, avg_increment, base;
-		config_setting_t *hp = NULL;
+		struct config_setting_t *hp = NULL;
 		while (level <= MAX_LEVEL && (hp = libconfig->setting_get_elem(temp, level)) != NULL) {
 			i32 = libconfig->setting_get_int(hp);
 			status->dbs->HP_table[idx][++level] = min(i32, battle_config.max_hp);
@@ -12734,7 +12734,7 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
 
 	if ((temp = libconfig->setting_get_member(jdb, "SPTable"))) {
 		int level = 0, avg_increment, base;
-		config_setting_t *sp = NULL;
+		struct config_setting_t *sp = NULL;
 		while (level <= MAX_LEVEL && (sp = libconfig->setting_get_elem(temp, level)) != NULL) {
 			i32 = libconfig->setting_get_int(sp);
 			status->dbs->SP_table[idx][++level] = min(i32, battle_config.max_sp);
@@ -12762,8 +12762,8 @@ void status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
 *------------------------------------------*/
 void status_read_job_db(void) { /* [malufett/Hercules] */
 	int i = 0;
-	config_t job_db_conf;
-	config_setting_t *jdb = NULL;
+	struct config_t job_db_conf;
+	struct config_setting_t *jdb = NULL;
 #ifdef RENEWAL_ASPD
 	const char *config_filename = "db/re/job_db.conf";
 #else
@@ -12832,9 +12832,9 @@ bool status_readdb_sizefix(char* fields[], int columns, int current)
  *               validation errors.
  * @return # of the validated entry, or 0 in case of failure.
  */
-int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source)
+int status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source)
 {
-	config_setting_t *rate = NULL;
+	struct config_setting_t *rate = NULL;
 	int type = REFINE_TYPE_ARMOR, bonus_per_level = 0, rnd_bonus_v = 0, rnd_bonus_lv = 0;
 	char lv[4];
 	nullpo_ret(r);
@@ -12865,7 +12865,7 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co
 	}
 
 	if ((rate=libconfig->setting_get_member(r, "Rates")) != NULL && config_setting_is_group(rate)) {
-		config_setting_t *t = NULL;
+		struct config_setting_t *t = NULL;
 		bool duplicate[MAX_REFINE];
 		int bonus[MAX_REFINE], rnd_bonus[MAX_REFINE], chance[MAX_REFINE];
 		int i;
@@ -12925,8 +12925,8 @@ int status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, co
  */
 int status_readdb_refine_libconfig(const char *filename) {
 	bool duplicate[REFINE_TYPE_MAX];
-	config_t refine_db_conf;
-	config_setting_t *r;
+	struct config_t refine_db_conf;
+	struct config_setting_t *r;
 	char filepath[256];
 	int i = 0, count = 0,type = 0;
 
diff --git a/src/map/status.h b/src/map/status.h
index be6d4c209..1f28826a5 100644
--- a/src/map/status.h
+++ b/src/map/status.h
@@ -2298,10 +2298,10 @@ struct status_interface {
 	bool (*readdb_job2) (char *fields[], int columns, int current);
 	bool (*readdb_sizefix) (char *fields[], int columns, int current);
 	int (*readdb_refine_libconfig) (const char *filename);
-	int (*readdb_refine_libconfig_sub) (config_setting_t *r, const char *name, const char *source);
+	int (*readdb_refine_libconfig_sub) (struct config_setting_t *r, const char *name, const char *source);
 	bool (*readdb_scconfig) (char *fields[], int columns, int current);
 	void (*read_job_db) (void);
-	void (*read_job_db_sub) (int idx, const char *name, config_setting_t *jdb);
+	void (*read_job_db_sub) (int idx, const char *name, struct config_setting_t *jdb);
 };
 
 #ifdef HERCULES_CORE
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 44e2bac3c..ee6b0548a 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -65,9 +65,9 @@ bool itemdb2sql_torun = false;
 bool mobdb2sql_torun = false;
 
 /// Backup of the original item_db parser function pointer.
-int (*itemdb_readdb_libconfig_sub) (config_setting_t *it, int n, const char *source);
+int (*itemdb_readdb_libconfig_sub) (struct config_setting_t *it, int n, const char *source);
 /// Backup of the original mob_db parser function pointer.
-int (*mob_read_db_sub) (config_setting_t *it, int n, const char *source);
+int (*mob_read_db_sub) (struct config_setting_t *it, int n, const char *source);
 
 /**
  * Normalizes and appends a string to the output buffer.
@@ -124,7 +124,7 @@ void db2sql_fileheader(void)
  *
  * @see itemdb_readdb_libconfig_sub.
  */
-int itemdb2sql_sub(config_setting_t *entry, int n, const char *source)
+int itemdb2sql_sub(struct config_setting_t *entry, int n, const char *source)
 {
 	struct item_data *it = NULL;
 
@@ -134,7 +134,7 @@ int itemdb2sql_sub(config_setting_t *entry, int n, const char *source)
 		char *str;
 		int i32;
 		uint32 ui32;
-		config_setting_t *t = NULL;
+		struct config_setting_t *t = NULL;
 		StringBuf buf;
 
 		nullpo_ret(entry);
@@ -424,7 +424,7 @@ void do_itemdb2sql(void)
  *
  * @see mobdb_readdb_libconfig_sub.
  */
-int mobdb2sql_sub(config_setting_t *mobt, int n, const char *source)
+int mobdb2sql_sub(struct config_setting_t *mobt, int n, const char *source)
 {
 	struct mob_db *md = NULL;
 	nullpo_ret(mobt);
diff --git a/src/test/test_libconfig.c b/src/test/test_libconfig.c
index e5e6b4d70..a3b233b98 100644
--- a/src/test/test_libconfig.c
+++ b/src/test/test_libconfig.c
@@ -71,7 +71,7 @@ static const char *test_libconfig_defaults(void)
 
 static const char *test_libconfig_init_destroy(void)
 {
-	config_t config;
+	struct config_t config;
 	libconfig->init(&config);
 	if (config.root == NULL || config.root != config_root_setting(&config)) {
 		return "Unable to create config.";
@@ -85,7 +85,7 @@ static const char *test_libconfig_init_destroy(void)
 
 static const char *test_libconfig_read_file_src(void)
 {
-	config_t config;
+	struct config_t config;
 #define FILENAME "src/test/libconfig/test.conf"
 	if (libconfig->read_file_src(&config, FILENAME) == CONFIG_FALSE) {
 		libconfig->destroy(&config);
@@ -102,7 +102,7 @@ static const char *test_libconfig_read_file_src(void)
 
 static const char *test_libconfig_read(void)
 {
-	config_t config;
+	struct config_t config;
 #define FILENAME "src/test/libconfig/test.conf"
 	FILE *fp = fopen(FILENAME, "r");
 	if (!fp) {
@@ -124,7 +124,7 @@ static const char *test_libconfig_read(void)
 
 static const char *test_libconfig_load_file(void)
 {
-	config_t config;
+	struct config_t config;
 #define FILENAME "src/test/libconfig/test.conf"
 	if (libconfig->load_file(&config, FILENAME) == CONFIG_FALSE) {
 		return "Unable to read file '" FILENAME "'.";
@@ -140,19 +140,19 @@ static const char *test_libconfig_load_file(void)
 
 static const char *test_libconfig_write(void)
 {
-	//void (*write) (const config_t *config, FILE *stream);
+	//void (*write) (const struct config_t *config, FILE *stream);
 	return "TEST NOT IMPLEMENTED";
 }
 
 static const char *test_libconfig_write_file(void)
 {
-	//int (*write_file) (config_t *config, const char *filename);
+	//int (*write_file) (struct config_t *config, const char *filename);
 	return "TEST NOT IMPLEMENTED";
 }
 
 static const char *test_libconfig_read_string(void)
 {
-	config_t config;
+	struct config_t config;
 	if (libconfig->read_string(&config, "") == CONFIG_FALSE) {
 		libconfig->destroy(&config);
 		return "Unable to read from string.";
@@ -167,7 +167,7 @@ static const char *test_libconfig_read_string(void)
 
 static const char *test_libconfig_syntax(void)
 {
-	config_t config;
+	struct config_t config;
 	const char *input = "/* Test File */\n"
 		"Setting_Int: 1;\n"
 		"Setting_Int64: 1L;\n"
@@ -193,14 +193,14 @@ static const char *test_libconfig_syntax(void)
 
 static const char *test_libconfig_set_include_dir(void)
 {
-	//void (*set_include_dir) (config_t *config, const char *include_dir);
+	//void (*set_include_dir) (struct config_t *config, const char *include_dir);
 	return "TEST NOT IMPLEMENTED";
 }
 
 static const char *test_libconfig_lookup(void)
 {
-	config_t config;
-	config_setting_t *t = NULL;
+	struct config_t config;
+	struct config_setting_t *t = NULL;
 	int32 i32;
 	int64 i64;
 	double f;
@@ -263,8 +263,8 @@ static const char *test_libconfig_lookup(void)
 
 static const char *test_libconfig_setting_get(void)
 {
-	config_t config;
-	config_setting_t *t = NULL;
+	struct config_t config;
+	struct config_setting_t *t = NULL;
 	double f;
 	const char *str;
 	const char *input = "/* Test File */\n"
@@ -366,17 +366,17 @@ static const char *test_libconfig_setting_get(void)
 
 static const char *test_libconfig_set(void)
 {
-	//int (*setting_set_int) (config_setting_t *setting ,int value);
-	//int (*setting_set_int64) (config_setting_t *setting, long long value);
-	//int (*setting_set_float) (config_setting_t *setting, double value);
-	//int (*setting_set_bool) (config_setting_t *setting, int value);
-	//int (*setting_set_string) (config_setting_t *setting, const char *value);
+	//int (*setting_set_int) (struct config_setting_t *setting ,int value);
+	//int (*setting_set_int64) (struct config_setting_t *setting, long long value);
+	//int (*setting_set_float) (struct config_setting_t *setting, double value);
+	//int (*setting_set_bool) (struct config_setting_t *setting, int value);
+	//int (*setting_set_string) (struct config_setting_t *setting, const char *value);
 	return "TEST NOT IMPLEMENTED";
 }
 
 static const char *test_libconfig_setting_lookup(void)
 {
-	config_t config;
+	struct config_t config;
 	int32 i32;
 	int64 i64;
 	double f;
@@ -429,8 +429,8 @@ static const char *test_libconfig_setting_lookup(void)
 
 static const char *test_libconfig_setting_types(void)
 {
-	config_t config;
-	config_setting_t *t;
+	struct config_t config;
+	struct config_setting_t *t;
 	const char *input = "/* Test File */\n"
 		"Setting_Int: 1;\n"
 		"Setting_Int64: 1L;\n"
@@ -523,7 +523,7 @@ static const char *test_libconfig_setting_types(void)
 
 static const char *test_libconfig_values(void)
 {
-	config_t config;
+	struct config_t config;
 	int32 i32;
 	int64 i64;
 	const char *input = "/* Test File */\n"
@@ -583,7 +583,7 @@ static const char *test_libconfig_values(void)
 
 static const char *test_libconfig_path_lookup(void)
 {
-	config_t config;
+	struct config_t config;
 	int32 i32;
 	const char *input = "/* Test File */\n"
 		"Setting_Array: [1, 2, 3];\n"
@@ -666,7 +666,7 @@ static const char *test_libconfig_path_lookup(void)
 
 static const char *test_libconfig_setting_names(void)
 {
-	config_t config;
+	struct config_t config;
 	int32 i32;
 	const char *input = "/* Test File */\n"
 		"Setting'with'apostrophes: 1;\n"
@@ -724,9 +724,9 @@ static const char *test_libconfig_setting_names(void)
 
 static const char *test_libconfig_duplicate_keys(void)
 {
-	config_t config;
+	struct config_t config;
 	int32 i32;
-	config_setting_t *t, *tt;
+	struct config_setting_t *t, *tt;
 	int i = 0;
 	const char *input = "/* Test File */\n"
 		"Setting_Group: {\n"
@@ -775,7 +775,7 @@ static const char *test_libconfig_duplicate_keys(void)
 
 static const char *test_libconfig_special_string_syntax(void)
 {
-	config_t config;
+	struct config_t config;
 	const char *str;
 	const char *input = "/* Test File */\n"
 		"SpecialString: <\"This is an \"Item_Script\" Special String\n\tWith a line-break inside.\">;\n"
@@ -815,27 +815,27 @@ int do_init(int argc, char **argv)
 	TEST("libconfig->read_string", test_libconfig_read_string);
 	TEST("libconfig syntax", test_libconfig_syntax);
 	(void)test_libconfig_set_include_dir; //TEST("libconfig->set_include_dir", test_libconfig_set_include_dir);
-	//int (*setting_set_format) (config_setting_t *setting, short format);
-	//short (*setting_get_format) (const config_setting_t *setting);
-	//config_setting_t * (*setting_set_int_elem) (config_setting_t *setting, int idx, int value);
-	//config_setting_t * (*setting_set_int64_elem) (config_setting_t *setting, int idx, long long value);
-	//config_setting_t * (*setting_set_float_elem) (config_setting_t *setting, int idx, double value);
-	//config_setting_t * (*setting_set_bool_elem) (config_setting_t *setting, int idx, int value);
-	//config_setting_t * (*setting_set_string_elem) (config_setting_t *setting, int idx, const char *value);
-	//config_setting_t * (*setting_add) (config_setting_t *parent, const char *name, int type);
-	//int (*setting_remove) (config_setting_t *parent, const char *name);
-	//int (*setting_remove_elem) (config_setting_t *parent, unsigned int idx);
-	//void (*setting_set_hook) (config_setting_t *setting, void *hook);
-	//void (*set_destructor) (config_t *config, void (*destructor)(void *));
+	//int (*setting_set_format) (struct config_setting_t *setting, short format);
+	//short (*setting_get_format) (const struct config_setting_t *setting);
+	//struct config_setting_t * (*setting_set_int_elem) (struct config_setting_t *setting, int idx, int value);
+	//struct config_setting_t * (*setting_set_int64_elem) (struct config_setting_t *setting, int idx, long long value);
+	//struct config_setting_t * (*setting_set_float_elem) (struct config_setting_t *setting, int idx, double value);
+	//struct config_setting_t * (*setting_set_bool_elem) (struct config_setting_t *setting, int idx, int value);
+	//struct config_setting_t * (*setting_set_string_elem) (struct config_setting_t *setting, int idx, const char *value);
+	//struct config_setting_t * (*setting_add) (struct config_setting_t *parent, const char *name, int type);
+	//int (*setting_remove) (struct config_setting_t *parent, const char *name);
+	//int (*setting_remove_elem) (struct config_setting_t *parent, unsigned int idx);
+	//void (*setting_set_hook) (struct config_setting_t *setting, void *hook);
+	//void (*set_destructor) (struct config_t *config, void (*destructor)(void *));
 	TEST("libconfig->lookup_*", test_libconfig_lookup);
 	TEST("libconfig->setting_get_*", test_libconfig_setting_get);
 	(void)test_libconfig_set; //TEST("libconfig->setting_set_*", test_libconfig_setting_set);
 	TEST("libconfig->setting_lookup_*", test_libconfig_setting_lookup);
 	TEST("setting types", test_libconfig_setting_types);
-	//void (*setting_copy_simple) (config_setting_t *parent, const config_setting_t *src);
-	//void (*setting_copy_elem) (config_setting_t *parent, const config_setting_t *src);
-	//void (*setting_copy_aggregate) (config_setting_t *parent, const config_setting_t *src);
-	//int (*setting_copy) (config_setting_t *parent, const config_setting_t *src);
+	//void (*setting_copy_simple) (struct config_setting_t *parent, const struct config_setting_t *src);
+	//void (*setting_copy_elem) (struct config_setting_t *parent, const struct config_setting_t *src);
+	//void (*setting_copy_aggregate) (struct config_setting_t *parent, const struct config_setting_t *src);
+	//int (*setting_copy) (struct config_setting_t *parent, const struct config_setting_t *src);
 	TEST("values", test_libconfig_values);
 	TEST("path lookup", test_libconfig_path_lookup);
 	TEST("setting key names", test_libconfig_setting_names);
-- 
cgit v1.2.3-60-g2f50