Merge pull request #1160 from MishimaHaruna/libconfig

Libconfig: update to 1.5 and various improvements

10 files changed, 1769 insertions, 809 deletions

diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index 9d8a2750d..849354fa1 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -610,10 +610,10 @@ struct {
 	struct HPMHookPoint *HP_libconfig_read_post;
 	struct HPMHookPoint *HP_libconfig_write_pre;
 	struct HPMHookPoint *HP_libconfig_write_post;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+	struct HPMHookPoint *HP_libconfig_set_options_pre;
+	struct HPMHookPoint *HP_libconfig_set_options_post;
+	struct HPMHookPoint *HP_libconfig_get_options_pre;
+	struct HPMHookPoint *HP_libconfig_get_options_post;
 	struct HPMHookPoint *HP_libconfig_read_string_pre;
 	struct HPMHookPoint *HP_libconfig_read_string_post;
 	struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -638,6 +638,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -700,8 +702,6 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
 	struct HPMHookPoint *HP_libconfig_lookup_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_post;
-	struct HPMHookPoint *HP_libconfig_lookup_from_pre;
-	struct HPMHookPoint *HP_libconfig_lookup_from_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -712,8 +712,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_lookup_bool_post;
 	struct HPMHookPoint *HP_libconfig_lookup_string_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_string_post;
-	struct HPMHookPoint *HP_libconfig_read_file_pre;
-	struct HPMHookPoint *HP_libconfig_read_file_post;
+	struct HPMHookPoint *HP_libconfig_load_file_pre;
+	struct HPMHookPoint *HP_libconfig_load_file_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -722,6 +722,26 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
 	struct HPMHookPoint *HP_loginif_init_pre;
 	struct HPMHookPoint *HP_loginif_init_post;
 	struct HPMHookPoint *HP_loginif_final_pre;
@@ -1989,10 +2009,10 @@ struct {
 	int HP_libconfig_read_post;
 	int HP_libconfig_write_pre;
 	int HP_libconfig_write_post;
-	int HP_libconfig_set_auto_convert_pre;
-	int HP_libconfig_set_auto_convert_post;
-	int HP_libconfig_get_auto_convert_pre;
-	int HP_libconfig_get_auto_convert_post;
+	int HP_libconfig_set_options_pre;
+	int HP_libconfig_set_options_post;
+	int HP_libconfig_get_options_pre;
+	int HP_libconfig_get_options_post;
 	int HP_libconfig_read_string_pre;
 	int HP_libconfig_read_string_post;
 	int HP_libconfig_read_file_src_pre;
@@ -2017,6 +2037,8 @@ struct {
 	int HP_libconfig_setting_get_bool_post;
 	int HP_libconfig_setting_get_string_pre;
 	int HP_libconfig_setting_get_string_post;
+	int HP_libconfig_setting_lookup_pre;
+	int HP_libconfig_setting_lookup_post;
 	int HP_libconfig_setting_lookup_int_pre;
 	int HP_libconfig_setting_lookup_int_post;
 	int HP_libconfig_setting_lookup_int64_pre;
@@ -2079,8 +2101,6 @@ struct {
 	int HP_libconfig_setting_set_hook_post;
 	int HP_libconfig_lookup_pre;
 	int HP_libconfig_lookup_post;
-	int HP_libconfig_lookup_from_pre;
-	int HP_libconfig_lookup_from_post;
 	int HP_libconfig_lookup_int_pre;
 	int HP_libconfig_lookup_int_post;
 	int HP_libconfig_lookup_int64_pre;
@@ -2091,8 +2111,8 @@ struct {
 	int HP_libconfig_lookup_bool_post;
 	int HP_libconfig_lookup_string_pre;
 	int HP_libconfig_lookup_string_post;
-	int HP_libconfig_read_file_pre;
-	int HP_libconfig_read_file_post;
+	int HP_libconfig_load_file_pre;
+	int HP_libconfig_load_file_post;
 	int HP_libconfig_setting_copy_simple_pre;
 	int HP_libconfig_setting_copy_simple_post;
 	int HP_libconfig_setting_copy_elem_pre;
@@ -2101,6 +2121,26 @@ struct {
 	int HP_libconfig_setting_copy_aggregate_post;
 	int HP_libconfig_setting_copy_pre;
 	int HP_libconfig_setting_copy_post;
+	int HP_libconfig_setting_get_bool_real_pre;
+	int HP_libconfig_setting_get_bool_real_post;
+	int HP_libconfig_setting_get_uint32_pre;
+	int HP_libconfig_setting_get_uint32_post;
+	int HP_libconfig_setting_get_uint16_pre;
+	int HP_libconfig_setting_get_uint16_post;
+	int HP_libconfig_setting_get_int16_pre;
+	int HP_libconfig_setting_get_int16_post;
+	int HP_libconfig_setting_lookup_bool_real_pre;
+	int HP_libconfig_setting_lookup_bool_real_post;
+	int HP_libconfig_setting_lookup_uint32_pre;
+	int HP_libconfig_setting_lookup_uint32_post;
+	int HP_libconfig_setting_lookup_uint16_pre;
+	int HP_libconfig_setting_lookup_uint16_post;
+	int HP_libconfig_setting_lookup_int16_pre;
+	int HP_libconfig_setting_lookup_int16_post;
+	int HP_libconfig_setting_lookup_mutable_string_pre;
+	int HP_libconfig_setting_lookup_mutable_string_post;
+	int HP_libconfig_lookup_mutable_string_pre;
+	int HP_libconfig_lookup_mutable_string_post;
 	int HP_loginif_init_pre;
 	int HP_loginif_init_post;
 	int HP_loginif_final_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index fe3e806b1..7f359a9b4 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -335,8 +335,8 @@ struct HookingPointData HookingPoints[] = {
 /* libconfig */
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
-	{ HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
-	{ HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+	{ HP_POP(libconfig->get_options, HP_libconfig_get_options) },
 	{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
 	{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
 	{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -349,6 +349,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
 	{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
 	{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+	{ HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
 	{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
 	{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
 	{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -380,17 +381,26 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
 	{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
 	{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
-	{ HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
 	{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
 	{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
 	{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
 	{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
 	{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
-	{ HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+	{ HP_POP(libconfig->load_file, HP_libconfig_load_file) },
 	{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
 	{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
 	{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
 	{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+	{ HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+	{ HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+	{ HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+	{ HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+	{ HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+	{ HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+	{ HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+	{ HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+	{ HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+	{ HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
 /* loginif */
 	{ HP_POP(loginif->init, HP_loginif_init) },
 	{ HP_POP(loginif->final, HP_loginif_final) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index e6100ffdd..10b518e98 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -7824,11 +7824,11 @@ int HP_inter_storage_parse_frommap(int fd) {
 	return retVal___;
 }
 /* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_pre ) {
-		int (*preHookFunc) (config_t *config, FILE *stream);
+		int (*preHookFunc) (struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -7843,7 +7843,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 		retVal___ = HPMHooks.source.libconfig.read(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_read_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+		int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, stream);
@@ -7851,10 +7851,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 	}
 	return retVal___;
 }
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_write_pre ) {
-		void (*preHookFunc) (const config_t *config, FILE *stream);
+		void (*preHookFunc) (const struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -7869,7 +7869,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 		HPMHooks.source.libconfig.write(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_write_post ) {
-		void (*postHookFunc) (const config_t *config, FILE *stream);
+		void (*postHookFunc) (const struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
 			postHookFunc(config, stream);
@@ -7877,14 +7877,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 	}
 	return;
 }
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
 	int hIndex = 0;
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
-		void (*preHookFunc) (config_t *config, int *flag);
+	if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+		void (*preHookFunc) (struct config_t *config, int *options);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
-			preHookFunc(config, &flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+			preHookFunc(config, &options);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -7892,25 +7892,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
 		}
 	}
 	{
-		HPMHooks.source.libconfig.set_auto_convert(config, flag);
+		HPMHooks.source.libconfig.set_options(config, options);
 	}
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
-		void (*postHookFunc) (config_t *config, int *flag);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
-			postHookFunc(config, &flag);
+	if( HPMHooks.count.HP_libconfig_set_options_post ) {
+		void (*postHookFunc) (struct config_t *config, int *options);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+			postHookFunc(config, &options);
 		}
 	}
 	return;
 }
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
-		int (*preHookFunc) (const config_t *config);
+	if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+		int (*preHookFunc) (const struct config_t *config);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
 			retVal___ = preHookFunc(config);
 		}
 		if( *HPMforce_return ) {
@@ -7919,22 +7919,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+		retVal___ = HPMHooks.source.libconfig.get_options(config);
 	}
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_get_options_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config);
 		}
 	}
 	return retVal___;
 }
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_string_pre ) {
-		int (*preHookFunc) (config_t *config, const char *str);
+		int (*preHookFunc) (struct config_t *config, const char *str);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -7949,7 +7949,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 		retVal___ = HPMHooks.source.libconfig.read_string(config, str);
 	}
 	if( HPMHooks.count.HP_libconfig_read_string_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, str);
@@ -7957,11 +7957,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -7976,7 +7976,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -7984,11 +7984,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_write_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -8003,7 +8003,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_write_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -8011,10 +8011,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
-		void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -8029,7 +8029,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 		HPMHooks.source.libconfig.set_destructor(config, destructor);
 	}
 	if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
-		void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
 			postHookFunc(config, destructor);
@@ -8037,10 +8037,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 	}
 	return;
 }
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
-		void (*preHookFunc) (config_t *config, const char *include_dir);
+		void (*preHookFunc) (struct config_t *config, const char *include_dir);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -8055,7 +8055,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 		HPMHooks.source.libconfig.set_include_dir(config, include_dir);
 	}
 	if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
-		void (*postHookFunc) (config_t *config, const char *include_dir);
+		void (*postHookFunc) (struct config_t *config, const char *include_dir);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
 			postHookFunc(config, include_dir);
@@ -8063,10 +8063,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 	}
 	return;
 }
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_init_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -8081,7 +8081,7 @@ void HP_libconfig_init(config_t *config) {
 		HPMHooks.source.libconfig.init(config);
 	}
 	if( HPMHooks.count.HP_libconfig_init_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
 			postHookFunc(config);
@@ -8089,10 +8089,10 @@ void HP_libconfig_init(config_t *config) {
 	}
 	return;
 }
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_destroy_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -8107,7 +8107,7 @@ void HP_libconfig_destroy(config_t *config) {
 		HPMHooks.source.libconfig.destroy(config);
 	}
 	if( HPMHooks.count.HP_libconfig_destroy_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
 			postHookFunc(config);
@@ -8115,11 +8115,11 @@ void HP_libconfig_destroy(config_t *config) {
 	}
 	return;
 }
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -8134,7 +8134,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8142,11 +8142,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting);
+		long long (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -8161,7 +8161,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8169,11 +8169,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting);
+		double (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -8188,7 +8188,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8196,11 +8196,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -8215,7 +8215,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8223,11 +8223,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting);
+		const char* (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -8242,7 +8242,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8250,11 +8250,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+	int hIndex = 0;
+	struct config_setting_t* retVal___ = NULL;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -8269,7 +8296,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8277,11 +8304,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -8296,7 +8323,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8304,11 +8331,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -8323,7 +8350,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8331,11 +8358,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -8350,7 +8377,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8358,11 +8385,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -8377,7 +8404,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -8385,11 +8412,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -8404,7 +8431,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8412,11 +8439,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, long long *value);
+		int (*preHookFunc) (struct config_setting_t *setting, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -8431,7 +8458,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8439,11 +8466,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, double *value);
+		int (*preHookFunc) (struct config_setting_t *setting, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -8458,7 +8485,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8466,11 +8493,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -8485,7 +8512,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -8493,11 +8520,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, const char *value);
+		int (*preHookFunc) (struct config_setting_t *setting, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -8512,7 +8539,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 		retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, value);
@@ -8520,11 +8547,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, short *format);
+		int (*preHookFunc) (struct config_setting_t *setting, short *format);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -8539,7 +8566,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &format);
@@ -8547,11 +8574,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 	}
 	return retVal___;
 }
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	short retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
-		short (*preHookFunc) (const config_setting_t *setting);
+		short (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -8566,7 +8593,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
-		short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+		short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8574,11 +8601,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -8593,7 +8620,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8601,11 +8628,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+		long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -8620,7 +8647,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8628,11 +8655,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting, int *idx);
+		double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -8647,7 +8674,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 		retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8655,11 +8682,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -8674,7 +8701,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8682,11 +8709,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+		const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -8701,7 +8728,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8709,11 +8736,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -8728,7 +8755,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8736,11 +8763,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -8755,7 +8782,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8763,11 +8790,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -8782,7 +8809,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8790,11 +8817,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -8809,7 +8836,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -8817,11 +8844,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -8836,7 +8863,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -8844,11 +8871,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -8863,7 +8890,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_index(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_index_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8871,11 +8898,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -8890,7 +8917,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_length(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_length_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -8898,11 +8925,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -8917,7 +8944,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -8925,11 +8952,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -8944,7 +8971,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 		retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name);
@@ -8952,11 +8979,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -8971,7 +8998,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 		retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_add_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -8979,11 +9006,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const char *name);
+		int (*preHookFunc) (struct config_setting_t *parent, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -8998,7 +9025,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 		retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name);
@@ -9006,11 +9033,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+		int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -9025,7 +9052,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -9033,10 +9060,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
-		void (*preHookFunc) (config_setting_t *setting, void *hook);
+		void (*preHookFunc) (struct config_setting_t *setting, void *hook);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -9051,7 +9078,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 		HPMHooks.source.libconfig.setting_set_hook(setting, hook);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
-		void (*postHookFunc) (config_setting_t *setting, void *hook);
+		void (*postHookFunc) (struct config_setting_t *setting, void *hook);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
 			postHookFunc(setting, hook);
@@ -9059,11 +9086,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 	}
 	return;
 }
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_lookup_pre ) {
-		config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+		struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -9078,7 +9105,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 		retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath);
@@ -9086,38 +9113,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
-	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
-	if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
-		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
-			retVal___ = preHookFunc(setting, filepath);
-		}
-		if( *HPMforce_return ) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
-	}
-	if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, setting, filepath);
-		}
-	}
-	return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -9132,7 +9132,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 		retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9140,11 +9140,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -9159,7 +9159,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 		retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9167,11 +9167,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -9186,7 +9186,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 		retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9194,11 +9194,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -9213,7 +9213,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 		retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9221,11 +9221,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -9240,7 +9240,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 		retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -9248,14 +9248,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_read_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *config_filename);
+	if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+		int (*preHookFunc) (struct config_t *config, const char *config_filename);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
 			retVal___ = preHookFunc(config, config_filename);
 		}
 		if( *HPMforce_return ) {
@@ -9264,21 +9264,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+		retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
 	}
-	if( HPMHooks.count.HP_libconfig_read_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_load_file_post ) {
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, config_filename);
 		}
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -9293,7 +9293,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 		HPMHooks.source.libconfig.setting_copy_simple(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -9301,10 +9301,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 	}
 	return;
 }
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -9319,7 +9319,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 		HPMHooks.source.libconfig.setting_copy_elem(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -9327,10 +9327,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 	}
 	return;
 }
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -9345,7 +9345,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 		HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -9353,11 +9353,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 	}
 	return;
 }
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -9372,7 +9372,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 		retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, src);
@@ -9380,6 +9380,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 	}
 	return retVal___;
 }
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+		bool (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint32 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+		uint32 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+		uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+		uint16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+		uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	int16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+		int16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+		int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(config, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
 /* loginif */
 void HP_loginif_init(void) {
 	int hIndex = 0;
@@ -15820,11 +16090,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
 	}
 	return retVal___;
 }
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -15839,7 +16109,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
 		retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
 	}
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
index a9abae542..c8d9d7e0d 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -94,10 +94,10 @@ struct {
 	struct HPMHookPoint *HP_libconfig_read_post;
 	struct HPMHookPoint *HP_libconfig_write_pre;
 	struct HPMHookPoint *HP_libconfig_write_post;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+	struct HPMHookPoint *HP_libconfig_set_options_pre;
+	struct HPMHookPoint *HP_libconfig_set_options_post;
+	struct HPMHookPoint *HP_libconfig_get_options_pre;
+	struct HPMHookPoint *HP_libconfig_get_options_post;
 	struct HPMHookPoint *HP_libconfig_read_string_pre;
 	struct HPMHookPoint *HP_libconfig_read_string_post;
 	struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -122,6 +122,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -184,8 +186,6 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
 	struct HPMHookPoint *HP_libconfig_lookup_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_post;
-	struct HPMHookPoint *HP_libconfig_lookup_from_pre;
-	struct HPMHookPoint *HP_libconfig_lookup_from_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -196,8 +196,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_lookup_bool_post;
 	struct HPMHookPoint *HP_libconfig_lookup_string_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_string_post;
-	struct HPMHookPoint *HP_libconfig_read_file_pre;
-	struct HPMHookPoint *HP_libconfig_read_file_post;
+	struct HPMHookPoint *HP_libconfig_load_file_pre;
+	struct HPMHookPoint *HP_libconfig_load_file_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -206,6 +206,26 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
 	struct HPMHookPoint *HP_login_mmo_auth_pre;
 	struct HPMHookPoint *HP_login_mmo_auth_post;
 	struct HPMHookPoint *HP_login_mmo_auth_new_pre;
@@ -673,10 +693,10 @@ struct {
 	int HP_libconfig_read_post;
 	int HP_libconfig_write_pre;
 	int HP_libconfig_write_post;
-	int HP_libconfig_set_auto_convert_pre;
-	int HP_libconfig_set_auto_convert_post;
-	int HP_libconfig_get_auto_convert_pre;
-	int HP_libconfig_get_auto_convert_post;
+	int HP_libconfig_set_options_pre;
+	int HP_libconfig_set_options_post;
+	int HP_libconfig_get_options_pre;
+	int HP_libconfig_get_options_post;
 	int HP_libconfig_read_string_pre;
 	int HP_libconfig_read_string_post;
 	int HP_libconfig_read_file_src_pre;
@@ -701,6 +721,8 @@ struct {
 	int HP_libconfig_setting_get_bool_post;
 	int HP_libconfig_setting_get_string_pre;
 	int HP_libconfig_setting_get_string_post;
+	int HP_libconfig_setting_lookup_pre;
+	int HP_libconfig_setting_lookup_post;
 	int HP_libconfig_setting_lookup_int_pre;
 	int HP_libconfig_setting_lookup_int_post;
 	int HP_libconfig_setting_lookup_int64_pre;
@@ -763,8 +785,6 @@ struct {
 	int HP_libconfig_setting_set_hook_post;
 	int HP_libconfig_lookup_pre;
 	int HP_libconfig_lookup_post;
-	int HP_libconfig_lookup_from_pre;
-	int HP_libconfig_lookup_from_post;
 	int HP_libconfig_lookup_int_pre;
 	int HP_libconfig_lookup_int_post;
 	int HP_libconfig_lookup_int64_pre;
@@ -775,8 +795,8 @@ struct {
 	int HP_libconfig_lookup_bool_post;
 	int HP_libconfig_lookup_string_pre;
 	int HP_libconfig_lookup_string_post;
-	int HP_libconfig_read_file_pre;
-	int HP_libconfig_read_file_post;
+	int HP_libconfig_load_file_pre;
+	int HP_libconfig_load_file_post;
 	int HP_libconfig_setting_copy_simple_pre;
 	int HP_libconfig_setting_copy_simple_post;
 	int HP_libconfig_setting_copy_elem_pre;
@@ -785,6 +805,26 @@ struct {
 	int HP_libconfig_setting_copy_aggregate_post;
 	int HP_libconfig_setting_copy_pre;
 	int HP_libconfig_setting_copy_post;
+	int HP_libconfig_setting_get_bool_real_pre;
+	int HP_libconfig_setting_get_bool_real_post;
+	int HP_libconfig_setting_get_uint32_pre;
+	int HP_libconfig_setting_get_uint32_post;
+	int HP_libconfig_setting_get_uint16_pre;
+	int HP_libconfig_setting_get_uint16_post;
+	int HP_libconfig_setting_get_int16_pre;
+	int HP_libconfig_setting_get_int16_post;
+	int HP_libconfig_setting_lookup_bool_real_pre;
+	int HP_libconfig_setting_lookup_bool_real_post;
+	int HP_libconfig_setting_lookup_uint32_pre;
+	int HP_libconfig_setting_lookup_uint32_post;
+	int HP_libconfig_setting_lookup_uint16_pre;
+	int HP_libconfig_setting_lookup_uint16_post;
+	int HP_libconfig_setting_lookup_int16_pre;
+	int HP_libconfig_setting_lookup_int16_post;
+	int HP_libconfig_setting_lookup_mutable_string_pre;
+	int HP_libconfig_setting_lookup_mutable_string_post;
+	int HP_libconfig_lookup_mutable_string_pre;
+	int HP_libconfig_lookup_mutable_string_post;
 	int HP_login_mmo_auth_pre;
 	int HP_login_mmo_auth_post;
 	int HP_login_mmo_auth_new_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
index 5e501c62c..7a02e799c 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -64,8 +64,8 @@ struct HookingPointData HookingPoints[] = {
 /* libconfig */
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
-	{ HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
-	{ HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+	{ HP_POP(libconfig->get_options, HP_libconfig_get_options) },
 	{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
 	{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
 	{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -78,6 +78,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
 	{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
 	{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+	{ HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
 	{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
 	{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
 	{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -109,17 +110,26 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
 	{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
 	{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
-	{ HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
 	{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
 	{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
 	{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
 	{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
 	{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
-	{ HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+	{ HP_POP(libconfig->load_file, HP_libconfig_load_file) },
 	{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
 	{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
 	{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
 	{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+	{ HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+	{ HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+	{ HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+	{ HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+	{ HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+	{ HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+	{ HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+	{ HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+	{ HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+	{ HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
 /* login */
 	{ HP_POP(login->mmo_auth, HP_login_mmo_auth) },
 	{ HP_POP(login->mmo_auth_new, HP_login_mmo_auth_new) },
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index bf0610688..5bbc8fefb 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -918,11 +918,11 @@ void HP_DB_final(void) {
 	return;
 }
 /* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_pre ) {
-		int (*preHookFunc) (config_t *config, FILE *stream);
+		int (*preHookFunc) (struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -937,7 +937,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 		retVal___ = HPMHooks.source.libconfig.read(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_read_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+		int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, stream);
@@ -945,10 +945,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 	}
 	return retVal___;
 }
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_write_pre ) {
-		void (*preHookFunc) (const config_t *config, FILE *stream);
+		void (*preHookFunc) (const struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -963,7 +963,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 		HPMHooks.source.libconfig.write(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_write_post ) {
-		void (*postHookFunc) (const config_t *config, FILE *stream);
+		void (*postHookFunc) (const struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
 			postHookFunc(config, stream);
@@ -971,14 +971,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 	}
 	return;
 }
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
 	int hIndex = 0;
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
-		void (*preHookFunc) (config_t *config, int *flag);
+	if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+		void (*preHookFunc) (struct config_t *config, int *options);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
-			preHookFunc(config, &flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+			preHookFunc(config, &options);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -986,25 +986,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
 		}
 	}
 	{
-		HPMHooks.source.libconfig.set_auto_convert(config, flag);
+		HPMHooks.source.libconfig.set_options(config, options);
 	}
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
-		void (*postHookFunc) (config_t *config, int *flag);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
-			postHookFunc(config, &flag);
+	if( HPMHooks.count.HP_libconfig_set_options_post ) {
+		void (*postHookFunc) (struct config_t *config, int *options);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+			postHookFunc(config, &options);
 		}
 	}
 	return;
 }
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
-		int (*preHookFunc) (const config_t *config);
+	if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+		int (*preHookFunc) (const struct config_t *config);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
 			retVal___ = preHookFunc(config);
 		}
 		if( *HPMforce_return ) {
@@ -1013,22 +1013,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+		retVal___ = HPMHooks.source.libconfig.get_options(config);
 	}
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_get_options_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config);
 		}
 	}
 	return retVal___;
 }
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_string_pre ) {
-		int (*preHookFunc) (config_t *config, const char *str);
+		int (*preHookFunc) (struct config_t *config, const char *str);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -1043,7 +1043,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 		retVal___ = HPMHooks.source.libconfig.read_string(config, str);
 	}
 	if( HPMHooks.count.HP_libconfig_read_string_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, str);
@@ -1051,11 +1051,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -1070,7 +1070,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -1078,11 +1078,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_write_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -1097,7 +1097,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_write_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -1105,10 +1105,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
-		void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -1123,7 +1123,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 		HPMHooks.source.libconfig.set_destructor(config, destructor);
 	}
 	if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
-		void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
 			postHookFunc(config, destructor);
@@ -1131,10 +1131,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 	}
 	return;
 }
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
-		void (*preHookFunc) (config_t *config, const char *include_dir);
+		void (*preHookFunc) (struct config_t *config, const char *include_dir);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -1149,7 +1149,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 		HPMHooks.source.libconfig.set_include_dir(config, include_dir);
 	}
 	if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
-		void (*postHookFunc) (config_t *config, const char *include_dir);
+		void (*postHookFunc) (struct config_t *config, const char *include_dir);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
 			postHookFunc(config, include_dir);
@@ -1157,10 +1157,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 	}
 	return;
 }
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_init_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -1175,7 +1175,7 @@ void HP_libconfig_init(config_t *config) {
 		HPMHooks.source.libconfig.init(config);
 	}
 	if( HPMHooks.count.HP_libconfig_init_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
 			postHookFunc(config);
@@ -1183,10 +1183,10 @@ void HP_libconfig_init(config_t *config) {
 	}
 	return;
 }
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_destroy_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -1201,7 +1201,7 @@ void HP_libconfig_destroy(config_t *config) {
 		HPMHooks.source.libconfig.destroy(config);
 	}
 	if( HPMHooks.count.HP_libconfig_destroy_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
 			postHookFunc(config);
@@ -1209,11 +1209,11 @@ void HP_libconfig_destroy(config_t *config) {
 	}
 	return;
 }
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -1228,7 +1228,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1236,11 +1236,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting);
+		long long (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -1255,7 +1255,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1263,11 +1263,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting);
+		double (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -1282,7 +1282,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1290,11 +1290,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -1309,7 +1309,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1317,11 +1317,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting);
+		const char* (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -1336,7 +1336,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1344,11 +1344,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+	int hIndex = 0;
+	struct config_setting_t* retVal___ = NULL;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -1363,7 +1390,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1371,11 +1398,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -1390,7 +1417,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1398,11 +1425,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -1417,7 +1444,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1425,11 +1452,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -1444,7 +1471,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1452,11 +1479,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -1471,7 +1498,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -1479,11 +1506,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -1498,7 +1525,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1506,11 +1533,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, long long *value);
+		int (*preHookFunc) (struct config_setting_t *setting, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -1525,7 +1552,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1533,11 +1560,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, double *value);
+		int (*preHookFunc) (struct config_setting_t *setting, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -1552,7 +1579,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1560,11 +1587,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -1579,7 +1606,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -1587,11 +1614,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, const char *value);
+		int (*preHookFunc) (struct config_setting_t *setting, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -1606,7 +1633,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 		retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, value);
@@ -1614,11 +1641,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, short *format);
+		int (*preHookFunc) (struct config_setting_t *setting, short *format);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -1633,7 +1660,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &format);
@@ -1641,11 +1668,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 	}
 	return retVal___;
 }
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	short retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
-		short (*preHookFunc) (const config_setting_t *setting);
+		short (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -1660,7 +1687,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
-		short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+		short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1668,11 +1695,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -1687,7 +1714,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1695,11 +1722,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+		long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -1714,7 +1741,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1722,11 +1749,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting, int *idx);
+		double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -1741,7 +1768,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 		retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1749,11 +1776,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -1768,7 +1795,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1776,11 +1803,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+		const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -1795,7 +1822,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -1803,11 +1830,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -1822,7 +1849,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1830,11 +1857,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -1849,7 +1876,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1857,11 +1884,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -1876,7 +1903,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1884,11 +1911,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -1903,7 +1930,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -1911,11 +1938,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -1930,7 +1957,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -1938,11 +1965,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -1957,7 +1984,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_index(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_index_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1965,11 +1992,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -1984,7 +2011,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_length(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_length_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -1992,11 +2019,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -2011,7 +2038,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -2019,11 +2046,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -2038,7 +2065,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 		retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name);
@@ -2046,11 +2073,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -2065,7 +2092,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 		retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_add_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -2073,11 +2100,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const char *name);
+		int (*preHookFunc) (struct config_setting_t *parent, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -2092,7 +2119,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 		retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name);
@@ -2100,11 +2127,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+		int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -2119,7 +2146,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -2127,10 +2154,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
-		void (*preHookFunc) (config_setting_t *setting, void *hook);
+		void (*preHookFunc) (struct config_setting_t *setting, void *hook);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -2145,7 +2172,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 		HPMHooks.source.libconfig.setting_set_hook(setting, hook);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
-		void (*postHookFunc) (config_setting_t *setting, void *hook);
+		void (*postHookFunc) (struct config_setting_t *setting, void *hook);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
 			postHookFunc(setting, hook);
@@ -2153,11 +2180,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 	}
 	return;
 }
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_lookup_pre ) {
-		config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+		struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -2172,7 +2199,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 		retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath);
@@ -2180,38 +2207,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
-	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
-	if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
-		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
-			retVal___ = preHookFunc(setting, filepath);
-		}
-		if( *HPMforce_return ) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
-	}
-	if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, setting, filepath);
-		}
-	}
-	return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -2226,7 +2226,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 		retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2234,11 +2234,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -2253,7 +2253,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 		retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2261,11 +2261,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -2280,7 +2280,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 		retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2288,11 +2288,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -2307,7 +2307,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 		retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2315,11 +2315,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -2334,7 +2334,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 		retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -2342,14 +2342,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_read_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *config_filename);
+	if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+		int (*preHookFunc) (struct config_t *config, const char *config_filename);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
 			retVal___ = preHookFunc(config, config_filename);
 		}
 		if( *HPMforce_return ) {
@@ -2358,21 +2358,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+		retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
 	}
-	if( HPMHooks.count.HP_libconfig_read_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_load_file_post ) {
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, config_filename);
 		}
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -2387,7 +2387,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 		HPMHooks.source.libconfig.setting_copy_simple(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -2395,10 +2395,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 	}
 	return;
 }
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -2413,7 +2413,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 		HPMHooks.source.libconfig.setting_copy_elem(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -2421,10 +2421,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 	}
 	return;
 }
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -2439,7 +2439,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 		HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -2447,11 +2447,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 	}
 	return;
 }
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -2466,7 +2466,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 		retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, src);
@@ -2474,6 +2474,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 	}
 	return retVal___;
 }
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+		bool (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint32 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+		uint32 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+		uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+		uint16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+		uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	int16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+		int16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+		int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(config, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
 /* login */
 int HP_login_mmo_auth(struct login_session_data *sd, bool isServer) {
 	int hIndex = 0;
@@ -5146,11 +5416,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
 	}
 	return retVal___;
 }
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -5165,7 +5435,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
 		retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
 	}
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 911e84586..d3210cbe7 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2742,10 +2742,10 @@ struct {
 	struct HPMHookPoint *HP_libconfig_read_post;
 	struct HPMHookPoint *HP_libconfig_write_pre;
 	struct HPMHookPoint *HP_libconfig_write_post;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
-	struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+	struct HPMHookPoint *HP_libconfig_set_options_pre;
+	struct HPMHookPoint *HP_libconfig_set_options_post;
+	struct HPMHookPoint *HP_libconfig_get_options_pre;
+	struct HPMHookPoint *HP_libconfig_get_options_post;
 	struct HPMHookPoint *HP_libconfig_read_string_pre;
 	struct HPMHookPoint *HP_libconfig_read_string_post;
 	struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -2770,6 +2770,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
 	struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -2832,8 +2834,6 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
 	struct HPMHookPoint *HP_libconfig_lookup_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_post;
-	struct HPMHookPoint *HP_libconfig_lookup_from_pre;
-	struct HPMHookPoint *HP_libconfig_lookup_from_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_int_post;
 	struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -2844,8 +2844,8 @@ struct {
 	struct HPMHookPoint *HP_libconfig_lookup_bool_post;
 	struct HPMHookPoint *HP_libconfig_lookup_string_pre;
 	struct HPMHookPoint *HP_libconfig_lookup_string_post;
-	struct HPMHookPoint *HP_libconfig_read_file_pre;
-	struct HPMHookPoint *HP_libconfig_read_file_post;
+	struct HPMHookPoint *HP_libconfig_load_file_pre;
+	struct HPMHookPoint *HP_libconfig_load_file_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_simple_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_elem_pre;
@@ -2854,6 +2854,26 @@ struct {
 	struct HPMHookPoint *HP_libconfig_setting_copy_aggregate_post;
 	struct HPMHookPoint *HP_libconfig_setting_copy_pre;
 	struct HPMHookPoint *HP_libconfig_setting_copy_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_get_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_bool_real_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint32_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_uint16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_int16_post;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_setting_lookup_mutable_string_post;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_pre;
+	struct HPMHookPoint *HP_libconfig_lookup_mutable_string_post;
 	struct HPMHookPoint *HP_logs_pick_pc_pre;
 	struct HPMHookPoint *HP_logs_pick_pc_post;
 	struct HPMHookPoint *HP_logs_pick_mob_pre;
@@ -8593,10 +8613,10 @@ struct {
 	int HP_libconfig_read_post;
 	int HP_libconfig_write_pre;
 	int HP_libconfig_write_post;
-	int HP_libconfig_set_auto_convert_pre;
-	int HP_libconfig_set_auto_convert_post;
-	int HP_libconfig_get_auto_convert_pre;
-	int HP_libconfig_get_auto_convert_post;
+	int HP_libconfig_set_options_pre;
+	int HP_libconfig_set_options_post;
+	int HP_libconfig_get_options_pre;
+	int HP_libconfig_get_options_post;
 	int HP_libconfig_read_string_pre;
 	int HP_libconfig_read_string_post;
 	int HP_libconfig_read_file_src_pre;
@@ -8621,6 +8641,8 @@ struct {
 	int HP_libconfig_setting_get_bool_post;
 	int HP_libconfig_setting_get_string_pre;
 	int HP_libconfig_setting_get_string_post;
+	int HP_libconfig_setting_lookup_pre;
+	int HP_libconfig_setting_lookup_post;
 	int HP_libconfig_setting_lookup_int_pre;
 	int HP_libconfig_setting_lookup_int_post;
 	int HP_libconfig_setting_lookup_int64_pre;
@@ -8683,8 +8705,6 @@ struct {
 	int HP_libconfig_setting_set_hook_post;
 	int HP_libconfig_lookup_pre;
 	int HP_libconfig_lookup_post;
-	int HP_libconfig_lookup_from_pre;
-	int HP_libconfig_lookup_from_post;
 	int HP_libconfig_lookup_int_pre;
 	int HP_libconfig_lookup_int_post;
 	int HP_libconfig_lookup_int64_pre;
@@ -8695,8 +8715,8 @@ struct {
 	int HP_libconfig_lookup_bool_post;
 	int HP_libconfig_lookup_string_pre;
 	int HP_libconfig_lookup_string_post;
-	int HP_libconfig_read_file_pre;
-	int HP_libconfig_read_file_post;
+	int HP_libconfig_load_file_pre;
+	int HP_libconfig_load_file_post;
 	int HP_libconfig_setting_copy_simple_pre;
 	int HP_libconfig_setting_copy_simple_post;
 	int HP_libconfig_setting_copy_elem_pre;
@@ -8705,6 +8725,26 @@ struct {
 	int HP_libconfig_setting_copy_aggregate_post;
 	int HP_libconfig_setting_copy_pre;
 	int HP_libconfig_setting_copy_post;
+	int HP_libconfig_setting_get_bool_real_pre;
+	int HP_libconfig_setting_get_bool_real_post;
+	int HP_libconfig_setting_get_uint32_pre;
+	int HP_libconfig_setting_get_uint32_post;
+	int HP_libconfig_setting_get_uint16_pre;
+	int HP_libconfig_setting_get_uint16_post;
+	int HP_libconfig_setting_get_int16_pre;
+	int HP_libconfig_setting_get_int16_post;
+	int HP_libconfig_setting_lookup_bool_real_pre;
+	int HP_libconfig_setting_lookup_bool_real_post;
+	int HP_libconfig_setting_lookup_uint32_pre;
+	int HP_libconfig_setting_lookup_uint32_post;
+	int HP_libconfig_setting_lookup_uint16_pre;
+	int HP_libconfig_setting_lookup_uint16_post;
+	int HP_libconfig_setting_lookup_int16_pre;
+	int HP_libconfig_setting_lookup_int16_post;
+	int HP_libconfig_setting_lookup_mutable_string_pre;
+	int HP_libconfig_setting_lookup_mutable_string_post;
+	int HP_libconfig_lookup_mutable_string_pre;
+	int HP_libconfig_lookup_mutable_string_post;
 	int HP_logs_pick_pc_pre;
 	int HP_logs_pick_pc_post;
 	int HP_logs_pick_mob_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 303f5ed7e..4ccb217a1 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1405,8 +1405,8 @@ struct HookingPointData HookingPoints[] = {
 /* libconfig */
 	{ HP_POP(libconfig->read, HP_libconfig_read) },
 	{ HP_POP(libconfig->write, HP_libconfig_write) },
-	{ HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
-	{ HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+	{ HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+	{ HP_POP(libconfig->get_options, HP_libconfig_get_options) },
 	{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
 	{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
 	{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -1419,6 +1419,7 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
 	{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
 	{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+	{ HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
 	{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
 	{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
 	{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -1450,17 +1451,26 @@ struct HookingPointData HookingPoints[] = {
 	{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
 	{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
 	{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
-	{ HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
 	{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
 	{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
 	{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
 	{ HP_POP(libconfig->lookup_bool, HP_libconfig_lookup_bool) },
 	{ HP_POP(libconfig->lookup_string, HP_libconfig_lookup_string) },
-	{ HP_POP(libconfig->read_file, HP_libconfig_read_file) },
+	{ HP_POP(libconfig->load_file, HP_libconfig_load_file) },
 	{ HP_POP(libconfig->setting_copy_simple, HP_libconfig_setting_copy_simple) },
 	{ HP_POP(libconfig->setting_copy_elem, HP_libconfig_setting_copy_elem) },
 	{ HP_POP(libconfig->setting_copy_aggregate, HP_libconfig_setting_copy_aggregate) },
 	{ HP_POP(libconfig->setting_copy, HP_libconfig_setting_copy) },
+	{ HP_POP(libconfig->setting_get_bool_real, HP_libconfig_setting_get_bool_real) },
+	{ HP_POP(libconfig->setting_get_uint32, HP_libconfig_setting_get_uint32) },
+	{ HP_POP(libconfig->setting_get_uint16, HP_libconfig_setting_get_uint16) },
+	{ HP_POP(libconfig->setting_get_int16, HP_libconfig_setting_get_int16) },
+	{ HP_POP(libconfig->setting_lookup_bool_real, HP_libconfig_setting_lookup_bool_real) },
+	{ HP_POP(libconfig->setting_lookup_uint32, HP_libconfig_setting_lookup_uint32) },
+	{ HP_POP(libconfig->setting_lookup_uint16, HP_libconfig_setting_lookup_uint16) },
+	{ HP_POP(libconfig->setting_lookup_int16, HP_libconfig_setting_lookup_int16) },
+	{ HP_POP(libconfig->setting_lookup_mutable_string, HP_libconfig_setting_lookup_mutable_string) },
+	{ HP_POP(libconfig->lookup_mutable_string, HP_libconfig_lookup_mutable_string) },
 /* logs */
 	{ HP_POP(logs->pick_pc, HP_logs_pick_pc) },
 	{ HP_POP(logs->pick_mob, HP_logs_pick_mob) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index ee07b99cb..bc26e2f37 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -265,10 +265,10 @@ bool HP_atcommand_can_use2(struct map_session_data *sd, const char *command, AtC
 	}
 	return retVal___;
 }
-void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **commands_, size_t sz) {
+void HP_atcommand_load_groups(GroupSettings **groups, struct config_setting_t **commands_, size_t sz) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_atcommand_load_groups_pre ) {
-		void (*preHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz);
+		void (*preHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_atcommand_load_groups_pre[hIndex].func;
@@ -283,7 +283,7 @@ void HP_atcommand_load_groups(GroupSettings **groups, config_setting_t **command
 		HPMHooks.source.atcommand.load_groups(groups, commands_, sz);
 	}
 	if( HPMHooks.count.HP_atcommand_load_groups_post ) {
-		void (*postHookFunc) (GroupSettings **groups, config_setting_t **commands_, size_t *sz);
+		void (*postHookFunc) (GroupSettings **groups, struct config_setting_t **commands_, size_t *sz);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_atcommand_load_groups_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_atcommand_load_groups_post[hIndex].func;
 			postHookFunc(groups, commands_, &sz);
@@ -35754,10 +35754,10 @@ int HP_itemdb_validate_entry(struct item_data *entry, int n, const char *source)
 	}
 	return retVal___;
 }
-void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n, const char *source) {
+void HP_itemdb_readdb_additional_fields(int itemid, struct config_setting_t *it, int n, const char *source) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_itemdb_readdb_additional_fields_pre ) {
-		void (*preHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source);
+		void (*preHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_pre[hIndex].func;
@@ -35772,7 +35772,7 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n,
 		HPMHooks.source.itemdb.readdb_additional_fields(itemid, it, n, source);
 	}
 	if( HPMHooks.count.HP_itemdb_readdb_additional_fields_post ) {
-		void (*postHookFunc) (int *itemid, config_setting_t *it, int *n, const char *source);
+		void (*postHookFunc) (int *itemid, struct config_setting_t *it, int *n, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_additional_fields_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_itemdb_readdb_additional_fields_post[hIndex].func;
 			postHookFunc(&itemid, it, &n, source);
@@ -35780,11 +35780,11 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n,
 	}
 	return;
 }
-int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) {
+int HP_itemdb_readdb_libconfig_sub(struct config_setting_t *it, int n, const char *source) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *it, int *n, const char *source);
+		int (*preHookFunc) (struct config_setting_t *it, int *n, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_pre[hIndex].func;
@@ -35799,7 +35799,7 @@ int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *sour
 		retVal___ = HPMHooks.source.itemdb.readdb_libconfig_sub(it, n, source);
 	}
 	if( HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *it, int *n, const char *source);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *it, int *n, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_libconfig_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_itemdb_readdb_libconfig_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, it, &n, source);
@@ -36026,11 +36026,11 @@ bool HP_itemdb_is_item_usable(struct item_data *item) {
 	}
 	return retVal___;
 }
-bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *value) {
+bool HP_itemdb_lookup_const(const struct config_setting_t *it, const char *name, int *value) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if( HPMHooks.count.HP_itemdb_lookup_const_pre ) {
-		bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value);
+		bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_itemdb_lookup_const_pre[hIndex].func;
@@ -36045,7 +36045,7 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v
 		retVal___ = HPMHooks.source.itemdb.lookup_const(it, name, value);
 	}
 	if( HPMHooks.count.HP_itemdb_lookup_const_post ) {
-		bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value);
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_lookup_const_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_itemdb_lookup_const_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, it, name, value);
@@ -36054,11 +36054,11 @@ bool HP_itemdb_lookup_const(const config_setting_t *it, const char *name, int *v
 	return retVal___;
 }
 /* libconfig */
-int HP_libconfig_read(config_t *config, FILE *stream) {
+int HP_libconfig_read(struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_pre ) {
-		int (*preHookFunc) (config_t *config, FILE *stream);
+		int (*preHookFunc) (struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_pre[hIndex].func;
@@ -36073,7 +36073,7 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 		retVal___ = HPMHooks.source.libconfig.read(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_read_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, FILE *stream);
+		int (*postHookFunc) (int retVal___, struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, stream);
@@ -36081,10 +36081,10 @@ int HP_libconfig_read(config_t *config, FILE *stream) {
 	}
 	return retVal___;
 }
-void HP_libconfig_write(const config_t *config, FILE *stream) {
+void HP_libconfig_write(const struct config_t *config, FILE *stream) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_write_pre ) {
-		void (*preHookFunc) (const config_t *config, FILE *stream);
+		void (*preHookFunc) (const struct config_t *config, FILE *stream);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_pre[hIndex].func;
@@ -36099,7 +36099,7 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 		HPMHooks.source.libconfig.write(config, stream);
 	}
 	if( HPMHooks.count.HP_libconfig_write_post ) {
-		void (*postHookFunc) (const config_t *config, FILE *stream);
+		void (*postHookFunc) (const struct config_t *config, FILE *stream);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_post[hIndex].func;
 			postHookFunc(config, stream);
@@ -36107,14 +36107,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
 	}
 	return;
 }
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(struct config_t *config, int options) {
 	int hIndex = 0;
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
-		void (*preHookFunc) (config_t *config, int *flag);
+	if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+		void (*preHookFunc) (struct config_t *config, int *options);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
-			preHookFunc(config, &flag);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+			preHookFunc(config, &options);
 		}
 		if( *HPMforce_return ) {
 			*HPMforce_return = false;
@@ -36122,25 +36122,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
 		}
 	}
 	{
-		HPMHooks.source.libconfig.set_auto_convert(config, flag);
+		HPMHooks.source.libconfig.set_options(config, options);
 	}
-	if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
-		void (*postHookFunc) (config_t *config, int *flag);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
-			postHookFunc(config, &flag);
+	if( HPMHooks.count.HP_libconfig_set_options_post ) {
+		void (*postHookFunc) (struct config_t *config, int *options);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+			postHookFunc(config, &options);
 		}
 	}
 	return;
 }
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const struct config_t *config) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
-		int (*preHookFunc) (const config_t *config);
+	if( HPMHooks.count.HP_libconfig_get_options_pre ) {
+		int (*preHookFunc) (const struct config_t *config);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
 			retVal___ = preHookFunc(config);
 		}
 		if( *HPMforce_return ) {
@@ -36149,22 +36149,22 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+		retVal___ = HPMHooks.source.libconfig.get_options(config);
 	}
-	if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_get_options_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config);
 		}
 	}
 	return retVal___;
 }
-int HP_libconfig_read_string(config_t *config, const char *str) {
+int HP_libconfig_read_string(struct config_t *config, const char *str) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_string_pre ) {
-		int (*preHookFunc) (config_t *config, const char *str);
+		int (*preHookFunc) (struct config_t *config, const char *str);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_string_pre[hIndex].func;
@@ -36179,7 +36179,7 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 		retVal___ = HPMHooks.source.libconfig.read_string(config, str);
 	}
 	if( HPMHooks.count.HP_libconfig_read_string_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *str);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *str);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, str);
@@ -36187,11 +36187,11 @@ int HP_libconfig_read_string(config_t *config, const char *str) {
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file_src(config_t *config, const char *filename) {
+int HP_libconfig_read_file_src(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_read_file_src_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_read_file_src_pre[hIndex].func;
@@ -36206,7 +36206,7 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.read_file_src(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_read_file_src_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_src_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_read_file_src_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -36214,11 +36214,11 @@ int HP_libconfig_read_file_src(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-int HP_libconfig_write_file(config_t *config, const char *filename) {
+int HP_libconfig_write_file(struct config_t *config, const char *filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_write_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *filename);
+		int (*preHookFunc) (struct config_t *config, const char *filename);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_write_file_pre[hIndex].func;
@@ -36233,7 +36233,7 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 		retVal___ = HPMHooks.source.libconfig.write_file(config, filename);
 	}
 	if( HPMHooks.count.HP_libconfig_write_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *filename);
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *filename);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_write_file_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_write_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filename);
@@ -36241,10 +36241,10 @@ int HP_libconfig_write_file(config_t *config, const char *filename) {
 	}
 	return retVal___;
 }
-void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)) {
+void HP_libconfig_set_destructor(struct config_t *config, void ( *destructor ) (void *)) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_destructor_pre ) {
-		void (*preHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*preHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_destructor_pre[hIndex].func;
@@ -36259,7 +36259,7 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 		HPMHooks.source.libconfig.set_destructor(config, destructor);
 	}
 	if( HPMHooks.count.HP_libconfig_set_destructor_post ) {
-		void (*postHookFunc) (config_t *config, void ( *destructor ) (void *));
+		void (*postHookFunc) (struct config_t *config, void ( *destructor ) (void *));
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_destructor_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_destructor_post[hIndex].func;
 			postHookFunc(config, destructor);
@@ -36267,10 +36267,10 @@ void HP_libconfig_set_destructor(config_t *config, void ( *destructor ) (void *)
 	}
 	return;
 }
-void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
+void HP_libconfig_set_include_dir(struct config_t *config, const char *include_dir) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_set_include_dir_pre ) {
-		void (*preHookFunc) (config_t *config, const char *include_dir);
+		void (*preHookFunc) (struct config_t *config, const char *include_dir);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_pre[hIndex].func;
@@ -36285,7 +36285,7 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 		HPMHooks.source.libconfig.set_include_dir(config, include_dir);
 	}
 	if( HPMHooks.count.HP_libconfig_set_include_dir_post ) {
-		void (*postHookFunc) (config_t *config, const char *include_dir);
+		void (*postHookFunc) (struct config_t *config, const char *include_dir);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_include_dir_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_set_include_dir_post[hIndex].func;
 			postHookFunc(config, include_dir);
@@ -36293,10 +36293,10 @@ void HP_libconfig_set_include_dir(config_t *config, const char *include_dir) {
 	}
 	return;
 }
-void HP_libconfig_init(config_t *config) {
+void HP_libconfig_init(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_init_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_init_pre[hIndex].func;
@@ -36311,7 +36311,7 @@ void HP_libconfig_init(config_t *config) {
 		HPMHooks.source.libconfig.init(config);
 	}
 	if( HPMHooks.count.HP_libconfig_init_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_init_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_init_post[hIndex].func;
 			postHookFunc(config);
@@ -36319,10 +36319,10 @@ void HP_libconfig_init(config_t *config) {
 	}
 	return;
 }
-void HP_libconfig_destroy(config_t *config) {
+void HP_libconfig_destroy(struct config_t *config) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_destroy_pre ) {
-		void (*preHookFunc) (config_t *config);
+		void (*preHookFunc) (struct config_t *config);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_destroy_pre[hIndex].func;
@@ -36337,7 +36337,7 @@ void HP_libconfig_destroy(config_t *config) {
 		HPMHooks.source.libconfig.destroy(config);
 	}
 	if( HPMHooks.count.HP_libconfig_destroy_post ) {
-		void (*postHookFunc) (config_t *config);
+		void (*postHookFunc) (struct config_t *config);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_destroy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_destroy_post[hIndex].func;
 			postHookFunc(config);
@@ -36345,11 +36345,11 @@ void HP_libconfig_destroy(config_t *config) {
 	}
 	return;
 }
-int HP_libconfig_setting_get_int(const config_setting_t *setting) {
+int HP_libconfig_setting_get_int(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_pre[hIndex].func;
@@ -36364,7 +36364,7 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36372,11 +36372,11 @@ int HP_libconfig_setting_get_int(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
+long long HP_libconfig_setting_get_int64(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting);
+		long long (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_pre[hIndex].func;
@@ -36391,7 +36391,7 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36399,11 +36399,11 @@ long long HP_libconfig_setting_get_int64(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float(const config_setting_t *setting) {
+double HP_libconfig_setting_get_float(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting);
+		double (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_pre[hIndex].func;
@@ -36418,7 +36418,7 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_float(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36426,11 +36426,11 @@ double HP_libconfig_setting_get_float(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
+int HP_libconfig_setting_get_bool(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_pre[hIndex].func;
@@ -36445,7 +36445,7 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36453,11 +36453,11 @@ int HP_libconfig_setting_get_bool(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
+const char* HP_libconfig_setting_get_string(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting);
+		const char* (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_pre[hIndex].func;
@@ -36472,7 +36472,7 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_string(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36480,11 +36480,38 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
+struct config_setting_t* HP_libconfig_setting_lookup(struct config_setting_t *setting, const char *name) {
+	int hIndex = 0;
+	struct config_setting_t* retVal___ = NULL;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, const char *name);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, const char *name);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_pre[hIndex].func;
@@ -36499,7 +36526,7 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36507,11 +36534,11 @@ int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const char *name, long long *value) {
+int HP_libconfig_setting_lookup_int64(const struct config_setting_t *setting, const char *name, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, long long *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_pre[hIndex].func;
@@ -36526,7 +36553,7 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_int64(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36534,11 +36561,11 @@ int HP_libconfig_setting_lookup_int64(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const char *name, double *value) {
+int HP_libconfig_setting_lookup_float(const struct config_setting_t *setting, const char *name, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, double *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_pre[hIndex].func;
@@ -36553,7 +36580,7 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_float(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36561,11 +36588,11 @@ int HP_libconfig_setting_lookup_float(const config_setting_t *setting, const cha
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char *name, int *value) {
+int HP_libconfig_setting_lookup_bool(const struct config_setting_t *setting, const char *name, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, int *value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_pre[hIndex].func;
@@ -36580,7 +36607,7 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36588,11 +36615,11 @@ int HP_libconfig_setting_lookup_bool(const config_setting_t *setting, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const char *name, const char **value) {
+int HP_libconfig_setting_lookup_string(const struct config_setting_t *setting, const char *name, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, const char *name, const char **value);
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_pre[hIndex].func;
@@ -36607,7 +36634,7 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 		retVal___ = HPMHooks.source.libconfig.setting_lookup_string(setting, name, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, const char *name, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name, value);
@@ -36615,11 +36642,11 @@ int HP_libconfig_setting_lookup_string(const config_setting_t *setting, const ch
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_int(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_pre[hIndex].func;
@@ -36634,7 +36661,7 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36642,11 +36669,11 @@ int HP_libconfig_setting_set_int(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
+int HP_libconfig_setting_set_int64(struct config_setting_t *setting, long long value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, long long *value);
+		int (*preHookFunc) (struct config_setting_t *setting, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_pre[hIndex].func;
@@ -36661,7 +36688,7 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, long long *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36669,11 +36696,11 @@ int HP_libconfig_setting_set_int64(config_setting_t *setting, long long value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
+int HP_libconfig_setting_set_float(struct config_setting_t *setting, double value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, double *value);
+		int (*preHookFunc) (struct config_setting_t *setting, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_pre[hIndex].func;
@@ -36688,7 +36715,7 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_float(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, double *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36696,11 +36723,11 @@ int HP_libconfig_setting_set_float(config_setting_t *setting, double value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
+int HP_libconfig_setting_set_bool(struct config_setting_t *setting, int value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, int *value);
+		int (*preHookFunc) (struct config_setting_t *setting, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_pre[hIndex].func;
@@ -36715,7 +36742,7 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, int *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &value);
@@ -36723,11 +36750,11 @@ int HP_libconfig_setting_set_bool(config_setting_t *setting, int value) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value) {
+int HP_libconfig_setting_set_string(struct config_setting_t *setting, const char *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, const char *value);
+		int (*preHookFunc) (struct config_setting_t *setting, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_pre[hIndex].func;
@@ -36742,7 +36769,7 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 		retVal___ = HPMHooks.source.libconfig.setting_set_string(setting, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, const char *value);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, value);
@@ -36750,11 +36777,11 @@ int HP_libconfig_setting_set_string(config_setting_t *setting, const char *value
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
+int HP_libconfig_setting_set_format(struct config_setting_t *setting, short format) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_format_pre ) {
-		int (*preHookFunc) (config_setting_t *setting, short *format);
+		int (*preHookFunc) (struct config_setting_t *setting, short *format);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_pre[hIndex].func;
@@ -36769,7 +36796,7 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 		retVal___ = HPMHooks.source.libconfig.setting_set_format(setting, format);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_format_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *setting, short *format);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *setting, short *format);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &format);
@@ -36777,11 +36804,11 @@ int HP_libconfig_setting_set_format(config_setting_t *setting, short format) {
 	}
 	return retVal___;
 }
-short HP_libconfig_setting_get_format(const config_setting_t *setting) {
+short HP_libconfig_setting_get_format(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	short retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_format_pre ) {
-		short (*preHookFunc) (const config_setting_t *setting);
+		short (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_pre[hIndex].func;
@@ -36796,7 +36823,7 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_get_format(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_format_post ) {
-		short (*postHookFunc) (short retVal___, const config_setting_t *setting);
+		short (*postHookFunc) (short retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_format_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_format_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -36804,11 +36831,11 @@ short HP_libconfig_setting_get_format(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_int_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_pre[hIndex].func;
@@ -36823,7 +36850,7 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_int_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36831,11 +36858,11 @@ int HP_libconfig_setting_get_int_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, int idx) {
+long long HP_libconfig_setting_get_int64_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	long long retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre ) {
-		long long (*preHookFunc) (const config_setting_t *setting, int *idx);
+		long long (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_pre[hIndex].func;
@@ -36850,7 +36877,7 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_get_int64_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_int64_elem_post ) {
-		long long (*postHookFunc) (long long retVal___, const config_setting_t *setting, int *idx);
+		long long (*postHookFunc) (long long retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36858,11 +36885,11 @@ long long HP_libconfig_setting_get_int64_elem(const config_setting_t *setting, i
 	}
 	return retVal___;
 }
-double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int idx) {
+double HP_libconfig_setting_get_float_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	double retVal___ = 0.;
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_pre ) {
-		double (*preHookFunc) (const config_setting_t *setting, int *idx);
+		double (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_pre[hIndex].func;
@@ -36877,7 +36904,7 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 		retVal___ = HPMHooks.source.libconfig.setting_get_float_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_float_elem_post ) {
-		double (*postHookFunc) (double retVal___, const config_setting_t *setting, int *idx);
+		double (*postHookFunc) (double retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36885,11 +36912,11 @@ double HP_libconfig_setting_get_float_elem(const config_setting_t *setting, int
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx) {
+int HP_libconfig_setting_get_bool_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting, int *idx);
+		int (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_pre[hIndex].func;
@@ -36904,7 +36931,7 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_get_bool_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_bool_elem_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting, int *idx);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36912,11 +36939,11 @@ int HP_libconfig_setting_get_bool_elem(const config_setting_t *setting, int idx)
 	}
 	return retVal___;
 }
-const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting, int idx) {
+const char* HP_libconfig_setting_get_string_elem(const struct config_setting_t *setting, int idx) {
 	int hIndex = 0;
 	const char* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_pre ) {
-		const char* (*preHookFunc) (const config_setting_t *setting, int *idx);
+		const char* (*preHookFunc) (const struct config_setting_t *setting, int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_pre[hIndex].func;
@@ -36931,7 +36958,7 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_get_string_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_string_elem_post ) {
-		const char* (*postHookFunc) (const char* retVal___, const config_setting_t *setting, int *idx);
+		const char* (*postHookFunc) (const char* retVal___, const struct config_setting_t *setting, int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -36939,11 +36966,11 @@ const char* HP_libconfig_setting_get_string_elem(const config_setting_t *setting
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_int_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_pre[hIndex].func;
@@ -36958,7 +36985,7 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 		retVal___ = HPMHooks.source.libconfig.setting_set_int_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -36966,11 +36993,11 @@ config_setting_t* HP_libconfig_setting_set_int_elem(config_setting_t *setting, i
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting, int idx, long long value) {
+struct config_setting_t* HP_libconfig_setting_set_int64_elem(struct config_setting_t *setting, int idx, long long value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_pre[hIndex].func;
@@ -36985,7 +37012,7 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_int64_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_int64_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, long long *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_int64_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_int64_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -36993,11 +37020,11 @@ config_setting_t* HP_libconfig_setting_set_int64_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting, int idx, double value) {
+struct config_setting_t* HP_libconfig_setting_set_float_elem(struct config_setting_t *setting, int idx, double value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_pre[hIndex].func;
@@ -37012,7 +37039,7 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_float_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_float_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, double *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_float_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_float_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -37020,11 +37047,11 @@ config_setting_t* HP_libconfig_setting_set_float_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting, int idx, int value) {
+struct config_setting_t* HP_libconfig_setting_set_bool_elem(struct config_setting_t *setting, int idx, int value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_pre[hIndex].func;
@@ -37039,7 +37066,7 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_set_bool_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_bool_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, int *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_bool_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_bool_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, &value);
@@ -37047,11 +37074,11 @@ config_setting_t* HP_libconfig_setting_set_bool_elem(config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting, int idx, const char *value) {
+struct config_setting_t* HP_libconfig_setting_set_string_elem(struct config_setting_t *setting, int idx, const char *value) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *setting, int *idx, const char *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_pre[hIndex].func;
@@ -37066,7 +37093,7 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 		retVal___ = HPMHooks.source.libconfig.setting_set_string_elem(setting, idx, value);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_string_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, int *idx, const char *value);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *setting, int *idx, const char *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_string_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_string_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx, value);
@@ -37074,11 +37101,11 @@ config_setting_t* HP_libconfig_setting_set_string_elem(config_setting_t *setting
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_index(const config_setting_t *setting) {
+int HP_libconfig_setting_index(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_index_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_index_pre[hIndex].func;
@@ -37093,7 +37120,7 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_index(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_index_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_index_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_index_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -37101,11 +37128,11 @@ int HP_libconfig_setting_index(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_length(const config_setting_t *setting) {
+int HP_libconfig_setting_length(const struct config_setting_t *setting) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_length_pre ) {
-		int (*preHookFunc) (const config_setting_t *setting);
+		int (*preHookFunc) (const struct config_setting_t *setting);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_length_pre[hIndex].func;
@@ -37120,7 +37147,7 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 		retVal___ = HPMHooks.source.libconfig.setting_length(setting);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_length_post ) {
-		int (*postHookFunc) (int retVal___, const config_setting_t *setting);
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_length_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_length_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting);
@@ -37128,11 +37155,11 @@ int HP_libconfig_setting_length(const config_setting_t *setting) {
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting, unsigned int idx) {
+struct config_setting_t* HP_libconfig_setting_get_elem(const struct config_setting_t *setting, unsigned int idx) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_pre[hIndex].func;
@@ -37147,7 +37174,7 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 		retVal___ = HPMHooks.source.libconfig.setting_get_elem(setting, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_elem_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, unsigned int *idx);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, &idx);
@@ -37155,11 +37182,11 @@ config_setting_t* HP_libconfig_setting_get_elem(const config_setting_t *setting,
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *setting, const char *name) {
+struct config_setting_t* HP_libconfig_setting_get_member(const struct config_setting_t *setting, const char *name) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_get_member_pre ) {
-		config_setting_t* (*preHookFunc) (const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*preHookFunc) (const struct config_setting_t *setting, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_pre[hIndex].func;
@@ -37174,7 +37201,7 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 		retVal___ = HPMHooks.source.libconfig.setting_get_member(setting, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_get_member_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_setting_t *setting, const char *name);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_setting_t *setting, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_member_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_member_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, setting, name);
@@ -37182,11 +37209,11 @@ config_setting_t* HP_libconfig_setting_get_member(const config_setting_t *settin
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char *name, int type) {
+struct config_setting_t* HP_libconfig_setting_add(struct config_setting_t *parent, const char *name, int type) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_setting_add_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*preHookFunc) (struct config_setting_t *parent, const char *name, int *type);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_add_pre[hIndex].func;
@@ -37201,7 +37228,7 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 		retVal___ = HPMHooks.source.libconfig.setting_add(parent, name, type);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_add_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *parent, const char *name, int *type);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, struct config_setting_t *parent, const char *name, int *type);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_add_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_add_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name, &type);
@@ -37209,11 +37236,11 @@ config_setting_t* HP_libconfig_setting_add(config_setting_t *parent, const char
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
+int HP_libconfig_setting_remove(struct config_setting_t *parent, const char *name) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const char *name);
+		int (*preHookFunc) (struct config_setting_t *parent, const char *name);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_pre[hIndex].func;
@@ -37228,7 +37255,7 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 		retVal___ = HPMHooks.source.libconfig.setting_remove(parent, name);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const char *name);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const char *name);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, name);
@@ -37236,11 +37263,11 @@ int HP_libconfig_setting_remove(config_setting_t *parent, const char *name) {
 	}
 	return retVal___;
 }
-int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx) {
+int HP_libconfig_setting_remove_elem(struct config_setting_t *parent, unsigned int idx) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, unsigned int *idx);
+		int (*preHookFunc) (struct config_setting_t *parent, unsigned int *idx);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_pre[hIndex].func;
@@ -37255,7 +37282,7 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 		retVal___ = HPMHooks.source.libconfig.setting_remove_elem(parent, idx);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_remove_elem_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, unsigned int *idx);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, unsigned int *idx);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_remove_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_remove_elem_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, &idx);
@@ -37263,10 +37290,10 @@ int HP_libconfig_setting_remove_elem(config_setting_t *parent, unsigned int idx)
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
+void HP_libconfig_setting_set_hook(struct config_setting_t *setting, void *hook) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_pre ) {
-		void (*preHookFunc) (config_setting_t *setting, void *hook);
+		void (*preHookFunc) (struct config_setting_t *setting, void *hook);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_pre[hIndex].func;
@@ -37281,7 +37308,7 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 		HPMHooks.source.libconfig.setting_set_hook(setting, hook);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_set_hook_post ) {
-		void (*postHookFunc) (config_setting_t *setting, void *hook);
+		void (*postHookFunc) (struct config_setting_t *setting, void *hook);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_set_hook_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_set_hook_post[hIndex].func;
 			postHookFunc(setting, hook);
@@ -37289,11 +37316,11 @@ void HP_libconfig_setting_set_hook(config_setting_t *setting, void *hook) {
 	}
 	return;
 }
-config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepath) {
+struct config_setting_t* HP_libconfig_lookup(const struct config_t *config, const char *filepath) {
 	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
+	struct config_setting_t* retVal___ = NULL;
 	if( HPMHooks.count.HP_libconfig_lookup_pre ) {
-		config_setting_t* (*preHookFunc) (const config_t *config, const char *filepath);
+		struct config_setting_t* (*preHookFunc) (const struct config_t *config, const char *filepath);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_pre[hIndex].func;
@@ -37308,7 +37335,7 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 		retVal___ = HPMHooks.source.libconfig.lookup(config, filepath);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, const config_t *config, const char *filepath);
+		struct config_setting_t* (*postHookFunc) (struct config_setting_t* retVal___, const struct config_t *config, const char *filepath);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath);
@@ -37316,38 +37343,11 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
 	}
 	return retVal___;
 }
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
-	int hIndex = 0;
-	config_setting_t* retVal___ = NULL;
-	if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
-		config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
-		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
-			retVal___ = preHookFunc(setting, filepath);
-		}
-		if( *HPMforce_return ) {
-			*HPMforce_return = false;
-			return retVal___;
-		}
-	}
-	{
-		retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
-	}
-	if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
-		config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
-			retVal___ = postHookFunc(retVal___, setting, filepath);
-		}
-	}
-	return retVal___;
-}
-int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_int(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int_pre[hIndex].func;
@@ -37362,7 +37362,7 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 		retVal___ = HPMHooks.source.libconfig.lookup_int(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37370,11 +37370,11 @@ int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *v
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long long *value) {
+int HP_libconfig_lookup_int64(const struct config_t *config, const char *filepath, long long *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_int64_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, long long *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, long long *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_pre[hIndex].func;
@@ -37389,7 +37389,7 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 		retVal___ = HPMHooks.source.libconfig.lookup_int64(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_int64_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, long long *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, long long *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_int64_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_int64_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37397,11 +37397,11 @@ int HP_libconfig_lookup_int64(const config_t *config, const char *filepath, long
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_float(const config_t *config, const char *filepath, double *value) {
+int HP_libconfig_lookup_float(const struct config_t *config, const char *filepath, double *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_float_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, double *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, double *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_float_pre[hIndex].func;
@@ -37416,7 +37416,7 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 		retVal___ = HPMHooks.source.libconfig.lookup_float(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_float_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, double *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, double *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_float_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_float_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37424,11 +37424,11 @@ int HP_libconfig_lookup_float(const config_t *config, const char *filepath, doub
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *value) {
+int HP_libconfig_lookup_bool(const struct config_t *config, const char *filepath, int *value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_bool_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, int *value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_pre[hIndex].func;
@@ -37443,7 +37443,7 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 		retVal___ = HPMHooks.source.libconfig.lookup_bool(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_bool_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, int *value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_bool_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_bool_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37451,11 +37451,11 @@ int HP_libconfig_lookup_bool(const config_t *config, const char *filepath, int *
 	}
 	return retVal___;
 }
-int HP_libconfig_lookup_string(const config_t *config, const char *filepath, const char **value) {
+int HP_libconfig_lookup_string(const struct config_t *config, const char *filepath, const char **value) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_lookup_string_pre ) {
-		int (*preHookFunc) (const config_t *config, const char *filepath, const char **value);
+		int (*preHookFunc) (const struct config_t *config, const char *filepath, const char **value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_lookup_string_pre[hIndex].func;
@@ -37470,7 +37470,7 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 		retVal___ = HPMHooks.source.libconfig.lookup_string(config, filepath, value);
 	}
 	if( HPMHooks.count.HP_libconfig_lookup_string_post ) {
-		int (*postHookFunc) (int retVal___, const config_t *config, const char *filepath, const char **value);
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *filepath, const char **value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_string_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_lookup_string_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, filepath, value);
@@ -37478,14 +37478,14 @@ int HP_libconfig_lookup_string(const config_t *config, const char *filepath, con
 	}
 	return retVal___;
 }
-int HP_libconfig_read_file(config_t *config, const char *config_filename) {
+int HP_libconfig_load_file(struct config_t *config, const char *config_filename) {
 	int hIndex = 0;
 	int retVal___ = 0;
-	if( HPMHooks.count.HP_libconfig_read_file_pre ) {
-		int (*preHookFunc) (config_t *config, const char *config_filename);
+	if( HPMHooks.count.HP_libconfig_load_file_pre ) {
+		int (*preHookFunc) (struct config_t *config, const char *config_filename);
 		*HPMforce_return = false;
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_pre; hIndex++ ) {
-			preHookFunc = HPMHooks.list.HP_libconfig_read_file_pre[hIndex].func;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_load_file_pre[hIndex].func;
 			retVal___ = preHookFunc(config, config_filename);
 		}
 		if( *HPMforce_return ) {
@@ -37494,21 +37494,21 @@ int HP_libconfig_read_file(config_t *config, const char *config_filename) {
 		}
 	}
 	{
-		retVal___ = HPMHooks.source.libconfig.read_file(config, config_filename);
+		retVal___ = HPMHooks.source.libconfig.load_file(config, config_filename);
 	}
-	if( HPMHooks.count.HP_libconfig_read_file_post ) {
-		int (*postHookFunc) (int retVal___, config_t *config, const char *config_filename);
-		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_read_file_post; hIndex++ ) {
-			postHookFunc = HPMHooks.list.HP_libconfig_read_file_post[hIndex].func;
+	if( HPMHooks.count.HP_libconfig_load_file_post ) {
+		int (*postHookFunc) (int retVal___, struct config_t *config, const char *config_filename);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_load_file_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_load_file_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, config, config_filename);
 		}
 	}
 	return retVal___;
 }
-void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_simple(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_pre[hIndex].func;
@@ -37523,7 +37523,7 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 		HPMHooks.source.libconfig.setting_copy_simple(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_simple_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_simple_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_simple_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -37531,10 +37531,10 @@ void HP_libconfig_setting_copy_simple(config_setting_t *parent, const config_set
 	}
 	return;
 }
-void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_elem(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_pre[hIndex].func;
@@ -37549,7 +37549,7 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 		HPMHooks.source.libconfig.setting_copy_elem(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_elem_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_elem_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_elem_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -37557,10 +37557,10 @@ void HP_libconfig_setting_copy_elem(config_setting_t *parent, const config_setti
 	}
 	return;
 }
-void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_setting_t *src) {
+void HP_libconfig_setting_copy_aggregate(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre ) {
-		void (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_pre[hIndex].func;
@@ -37575,7 +37575,7 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 		HPMHooks.source.libconfig.setting_copy_aggregate(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_aggregate_post ) {
-		void (*postHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		void (*postHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_aggregate_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_aggregate_post[hIndex].func;
 			postHookFunc(parent, src);
@@ -37583,11 +37583,11 @@ void HP_libconfig_setting_copy_aggregate(config_setting_t *parent, const config_
 	}
 	return;
 }
-int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *src) {
+int HP_libconfig_setting_copy(struct config_setting_t *parent, const struct config_setting_t *src) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_libconfig_setting_copy_pre ) {
-		int (*preHookFunc) (config_setting_t *parent, const config_setting_t *src);
+		int (*preHookFunc) (struct config_setting_t *parent, const struct config_setting_t *src);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_libconfig_setting_copy_pre[hIndex].func;
@@ -37602,7 +37602,7 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 		retVal___ = HPMHooks.source.libconfig.setting_copy(parent, src);
 	}
 	if( HPMHooks.count.HP_libconfig_setting_copy_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *parent, const config_setting_t *src);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *parent, const struct config_setting_t *src);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_copy_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_libconfig_setting_copy_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, parent, src);
@@ -37610,6 +37610,276 @@ int HP_libconfig_setting_copy(config_setting_t *parent, const config_setting_t *
 	}
 	return retVal___;
 }
+bool HP_libconfig_setting_get_bool_real(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	bool retVal___ = false;
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_pre ) {
+		bool (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_bool_real(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_bool_real_post ) {
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint32 HP_libconfig_setting_get_uint32(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint32 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_pre ) {
+		uint32 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint32(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint32_post ) {
+		uint32 (*postHookFunc) (uint32 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+uint16 HP_libconfig_setting_get_uint16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	uint16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_pre ) {
+		uint16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_uint16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_uint16_post ) {
+		uint16 (*postHookFunc) (uint16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int16 HP_libconfig_setting_get_int16(const struct config_setting_t *setting) {
+	int hIndex = 0;
+	int16 retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_pre ) {
+		int16 (*preHookFunc) (const struct config_setting_t *setting);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_get_int16(setting);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_get_int16_post ) {
+		int16 (*postHookFunc) (int16 retVal___, const struct config_setting_t *setting);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_get_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_get_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_bool_real(const struct config_setting_t *setting, const char *name, bool *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, bool *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_bool_real(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, bool *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_bool_real_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_bool_real_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint32(const struct config_setting_t *setting, const char *name, uint32 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint32 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint32(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint32_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint32 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint32_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint32_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_uint16(const struct config_setting_t *setting, const char *name, uint16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, uint16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_uint16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_uint16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, uint16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_uint16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_uint16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_int16(const struct config_setting_t *setting, const char *name, int16 *value) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, int16 *value);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, value);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_int16(setting, name, value);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_int16_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, int16 *value);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_int16_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_int16_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, value);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_setting_lookup_mutable_string(const struct config_setting_t *setting, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(setting, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.setting_lookup_mutable_string(setting, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_setting_t *setting, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, setting, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
+int HP_libconfig_lookup_mutable_string(const struct config_t *config, const char *name, char *out, size_t out_size) {
+	int hIndex = 0;
+	int retVal___ = 0;
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_pre ) {
+		int (*preHookFunc) (const struct config_t *config, const char *name, char *out, size_t *out_size);
+		*HPMforce_return = false;
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_pre; hIndex++ ) {
+			preHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_pre[hIndex].func;
+			retVal___ = preHookFunc(config, name, out, &out_size);
+		}
+		if( *HPMforce_return ) {
+			*HPMforce_return = false;
+			return retVal___;
+		}
+	}
+	{
+		retVal___ = HPMHooks.source.libconfig.lookup_mutable_string(config, name, out, out_size);
+	}
+	if( HPMHooks.count.HP_libconfig_lookup_mutable_string_post ) {
+		int (*postHookFunc) (int retVal___, const struct config_t *config, const char *name, char *out, size_t *out_size);
+		for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_mutable_string_post; hIndex++ ) {
+			postHookFunc = HPMHooks.list.HP_libconfig_lookup_mutable_string_post[hIndex].func;
+			retVal___ = postHookFunc(retVal___, config, name, out, &out_size);
+		}
+	}
+	return retVal___;
+}
 /* logs */
 void HP_logs_pick_pc(struct map_session_data *sd, e_log_pick_type type, int amount, struct item *itm, struct item_data *data) {
 	int hIndex = 0;
@@ -46177,11 +46447,11 @@ void HP_mob_readdb(void) {
 	}
 	return;
 }
-bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *value) {
+bool HP_mob_lookup_const(const struct config_setting_t *it, const char *name, int *value) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if( HPMHooks.count.HP_mob_lookup_const_pre ) {
-		bool (*preHookFunc) (const config_setting_t *it, const char *name, int *value);
+		bool (*preHookFunc) (const struct config_setting_t *it, const char *name, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_lookup_const_pre[hIndex].func;
@@ -46196,7 +46466,7 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu
 		retVal___ = HPMHooks.source.mob.lookup_const(it, name, value);
 	}
 	if( HPMHooks.count.HP_mob_lookup_const_post ) {
-		bool (*postHookFunc) (bool retVal___, const config_setting_t *it, const char *name, int *value);
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, const char *name, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_lookup_const_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_lookup_const_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, it, name, value);
@@ -46204,11 +46474,11 @@ bool HP_mob_lookup_const(const config_setting_t *it, const char *name, int *valu
 	}
 	return retVal___;
 }
-bool HP_mob_get_const(const config_setting_t *it, int *value) {
+bool HP_mob_get_const(const struct config_setting_t *it, int *value) {
 	int hIndex = 0;
 	bool retVal___ = false;
 	if( HPMHooks.count.HP_mob_get_const_pre ) {
-		bool (*preHookFunc) (const config_setting_t *it, int *value);
+		bool (*preHookFunc) (const struct config_setting_t *it, int *value);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_get_const_pre[hIndex].func;
@@ -46223,7 +46493,7 @@ bool HP_mob_get_const(const config_setting_t *it, int *value) {
 		retVal___ = HPMHooks.source.mob.get_const(it, value);
 	}
 	if( HPMHooks.count.HP_mob_get_const_post ) {
-		bool (*postHookFunc) (bool retVal___, const config_setting_t *it, int *value);
+		bool (*postHookFunc) (bool retVal___, const struct config_setting_t *it, int *value);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_get_const_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_get_const_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, it, value);
@@ -46285,10 +46555,10 @@ int HP_mob_read_libconfig(const char *filename, bool ignore_missing) {
 	}
 	return retVal___;
 }
-void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it, int n, const char *source) {
+void HP_mob_read_db_additional_fields(struct mob_db *entry, struct config_setting_t *it, int n, const char *source) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_mob_read_db_additional_fields_pre ) {
-		void (*preHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
+		void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_pre[hIndex].func;
@@ -46303,7 +46573,7 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it
 		HPMHooks.source.mob.read_db_additional_fields(entry, it, n, source);
 	}
 	if( HPMHooks.count.HP_mob_read_db_additional_fields_post ) {
-		void (*postHookFunc) (struct mob_db *entry, config_setting_t *it, int *n, const char *source);
+		void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *it, int *n, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_additional_fields_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_additional_fields_post[hIndex].func;
 			postHookFunc(entry, it, &n, source);
@@ -46311,11 +46581,11 @@ void HP_mob_read_db_additional_fields(struct mob_db *entry, config_setting_t *it
 	}
 	return;
 }
-int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
+int HP_mob_read_db_sub(struct config_setting_t *mobt, int id, const char *source) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_mob_read_db_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *mobt, int *id, const char *source);
+		int (*preHookFunc) (struct config_setting_t *mobt, int *id, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_sub_pre[hIndex].func;
@@ -46330,7 +46600,7 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
 		retVal___ = HPMHooks.source.mob.read_db_sub(mobt, id, source);
 	}
 	if( HPMHooks.count.HP_mob_read_db_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *mobt, int *id, const char *source);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *mobt, int *id, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, mobt, &id, source);
@@ -46338,10 +46608,10 @@ int HP_mob_read_db_sub(config_setting_t *mobt, int id, const char *source) {
 	}
 	return retVal___;
 }
-void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_drops_sub(struct mob_db *entry, struct config_setting_t *t) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_mob_read_db_drops_sub_pre ) {
-		void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_pre[hIndex].func;
@@ -46356,7 +46626,7 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
 		HPMHooks.source.mob.read_db_drops_sub(entry, t);
 	}
 	if( HPMHooks.count.HP_mob_read_db_drops_sub_post ) {
-		void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_drops_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_drops_sub_post[hIndex].func;
 			postHookFunc(entry, t);
@@ -46364,10 +46634,10 @@ void HP_mob_read_db_drops_sub(struct mob_db *entry, config_setting_t *t) {
 	}
 	return;
 }
-void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, struct config_setting_t *t) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre ) {
-		void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_pre[hIndex].func;
@@ -46382,7 +46652,7 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
 		HPMHooks.source.mob.read_db_mvpdrops_sub(entry, t);
 	}
 	if( HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post ) {
-		void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mvpdrops_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_mvpdrops_sub_post[hIndex].func;
 			postHookFunc(entry, t);
@@ -46390,11 +46660,11 @@ void HP_mob_read_db_mvpdrops_sub(struct mob_db *entry, config_setting_t *t) {
 	}
 	return;
 }
-int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
+int HP_mob_read_db_mode_sub(struct mob_db *entry, struct config_setting_t *t) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_mob_read_db_mode_sub_pre ) {
-		int (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+		int (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_pre[hIndex].func;
@@ -46409,7 +46679,7 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
 		retVal___ = HPMHooks.source.mob.read_db_mode_sub(entry, t);
 	}
 	if( HPMHooks.count.HP_mob_read_db_mode_sub_post ) {
-		int (*postHookFunc) (int retVal___, struct mob_db *entry, config_setting_t *t);
+		int (*postHookFunc) (int retVal___, struct mob_db *entry, struct config_setting_t *t);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_mode_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_mode_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, entry, t);
@@ -46417,10 +46687,10 @@ int HP_mob_read_db_mode_sub(struct mob_db *entry, config_setting_t *t) {
 	}
 	return retVal___;
 }
-void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) {
+void HP_mob_read_db_stats_sub(struct mob_db *entry, struct config_setting_t *t) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_mob_read_db_stats_sub_pre ) {
-		void (*preHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*preHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_pre[hIndex].func;
@@ -46435,7 +46705,7 @@ void HP_mob_read_db_stats_sub(struct mob_db *entry, config_setting_t *t) {
 		HPMHooks.source.mob.read_db_stats_sub(entry, t);
 	}
 	if( HPMHooks.count.HP_mob_read_db_stats_sub_post ) {
-		void (*postHookFunc) (struct mob_db *entry, config_setting_t *t);
+		void (*postHookFunc) (struct mob_db *entry, struct config_setting_t *t);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_db_stats_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_mob_read_db_stats_sub_post[hIndex].func;
 			postHookFunc(entry, t);
@@ -59336,11 +59606,11 @@ int HP_quest_read_db(void) {
 	}
 	return retVal___;
 }
-struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *source) {
+struct quest_db* HP_quest_read_db_sub(struct config_setting_t *cs, int n, const char *source) {
 	int hIndex = 0;
 	struct quest_db* retVal___ = NULL;
 	if( HPMHooks.count.HP_quest_read_db_sub_pre ) {
-		struct quest_db* (*preHookFunc) (config_setting_t *cs, int *n, const char *source);
+		struct quest_db* (*preHookFunc) (struct config_setting_t *cs, int *n, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_quest_read_db_sub_pre[hIndex].func;
@@ -59355,7 +59625,7 @@ struct quest_db* HP_quest_read_db_sub(config_setting_t *cs, int n, const char *s
 		retVal___ = HPMHooks.source.quest.read_db_sub(cs, n, source);
 	}
 	if( HPMHooks.count.HP_quest_read_db_sub_post ) {
-		struct quest_db* (*postHookFunc) (struct quest_db* retVal___, config_setting_t *cs, int *n, const char *source);
+		struct quest_db* (*postHookFunc) (struct quest_db* retVal___, struct config_setting_t *cs, int *n, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_quest_read_db_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_quest_read_db_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, cs, &n, source);
@@ -70991,11 +71261,11 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
 	}
 	return retVal___;
 }
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*preHookFunc) (struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
@@ -71010,7 +71280,7 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *li
 		retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
 	}
 	if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
@@ -74830,11 +75100,11 @@ int HP_status_readdb_refine_libconfig(const char *filename) {
 	}
 	return retVal___;
 }
-int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name, const char *source) {
+int HP_status_readdb_refine_libconfig_sub(struct config_setting_t *r, const char *name, const char *source) {
 	int hIndex = 0;
 	int retVal___ = 0;
 	if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre ) {
-		int (*preHookFunc) (config_setting_t *r, const char *name, const char *source);
+		int (*preHookFunc) (struct config_setting_t *r, const char *name, const char *source);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_pre[hIndex].func;
@@ -74849,7 +75119,7 @@ int HP_status_readdb_refine_libconfig_sub(config_setting_t *r, const char *name,
 		retVal___ = HPMHooks.source.status.readdb_refine_libconfig_sub(r, name, source);
 	}
 	if( HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post ) {
-		int (*postHookFunc) (int retVal___, config_setting_t *r, const char *name, const char *source);
+		int (*postHookFunc) (int retVal___, struct config_setting_t *r, const char *name, const char *source);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_readdb_refine_libconfig_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_status_readdb_refine_libconfig_sub_post[hIndex].func;
 			retVal___ = postHookFunc(retVal___, r, name, source);
@@ -74910,10 +75180,10 @@ void HP_status_read_job_db(void) {
 	}
 	return;
 }
-void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb) {
+void HP_status_read_job_db_sub(int idx, const char *name, struct config_setting_t *jdb) {
 	int hIndex = 0;
 	if( HPMHooks.count.HP_status_read_job_db_sub_pre ) {
-		void (*preHookFunc) (int *idx, const char *name, config_setting_t *jdb);
+		void (*preHookFunc) (int *idx, const char *name, struct config_setting_t *jdb);
 		*HPMforce_return = false;
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_pre; hIndex++ ) {
 			preHookFunc = HPMHooks.list.HP_status_read_job_db_sub_pre[hIndex].func;
@@ -74928,7 +75198,7 @@ void HP_status_read_job_db_sub(int idx, const char *name, config_setting_t *jdb)
 		HPMHooks.source.status.read_job_db_sub(idx, name, jdb);
 	}
 	if( HPMHooks.count.HP_status_read_job_db_sub_post ) {
-		void (*postHookFunc) (int *idx, const char *name, config_setting_t *jdb);
+		void (*postHookFunc) (int *idx, const char *name, struct config_setting_t *jdb);
 		for(hIndex = 0; hIndex < HPMHooks.count.HP_status_read_job_db_sub_post; hIndex++ ) {
 			postHookFunc = HPMHooks.list.HP_status_read_job_db_sub_post[hIndex].func;
 			postHookFunc(&idx, name, jdb);
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);