Index: trunk/src/Makefile.dep
===================================================================
--- trunk/src/Makefile.dep	(revision 4512)
+++ trunk/src/Makefile.dep	(revision 4513)
@@ -2212,7 +2212,8 @@
  ../src_3rd/liblihata/genht/htsi.h ../src_3rd/liblihata/genht/ht.h \
  ../src_3rd/genregex/regex_se.h ../src_3rd/genregex/regex_templ.h \
  ../src_3rd/genregex/regex.h ../src_plugins/query/fields_sphash.h \
- ../src_plugins/query/query_exec.h ../src_plugins/query/query_access.h
+ ../src_plugins/query/query_exec.h ../src_plugins/query/query_access.h \
+ pcb-printf.h ../src_3rd/genvector/gds_char.h
 ../src_plugins/query/query_l.o: ../src_plugins/query/query_l.c global.h \
  ../config.h const.h macro.h vtroutestyle.h unit.h \
  ../src_3rd/genvector/genvector_impl.h \
Index: trunk/src/compat_fs.c
===================================================================
--- trunk/src/compat_fs.c	(revision 4512)
+++ trunk/src/compat_fs.c	(revision 4513)
@@ -32,6 +32,7 @@
 #include "compat_inc.h"
 
 #include <stdlib.h>
+#include <stdio.h>
 #include <stdarg.h>
 #include <math.h>
 #include <string.h>
Index: trunk/src/compat_misc.c
===================================================================
--- trunk/src/compat_misc.c	(revision 4512)
+++ trunk/src/compat_misc.c	(revision 4513)
@@ -22,6 +22,7 @@
 
 #include "config.h"
 
+#include <stdio.h>
 #include <sys/types.h>
 #include <math.h>
 #include "compat_misc.h"
Index: trunk/src/conf.c
===================================================================
--- trunk/src/conf.c	(revision 4512)
+++ trunk/src/conf.c	(revision 4513)
@@ -21,6 +21,9 @@
  */
 
 #include <assert.h>
+#include <string.h>
+#include <strings.h>
+#include <ctype.h>
 #include <genht/hash.h>
 #include <liblihata/tree.h>
 #include <stdarg.h>
Index: trunk/src/funchash.c
===================================================================
--- trunk/src/funchash.c	(revision 4512)
+++ trunk/src/funchash.c	(revision 4513)
@@ -22,6 +22,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 #include <stdio.h>
 #include <genht/htpi.h>
 #include <genht/hash.h>
Index: trunk/src/global.h
===================================================================
--- trunk/src/global.h	(revision 4512)
+++ trunk/src/global.h	(revision 4513)
@@ -33,13 +33,6 @@
 
 #include "const.h"
 #include "macro.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <stdarg.h>
-#include <math.h>
-#include <ctype.h>
 
 #include "vtroutestyle.h"
 
Index: trunk/src/hid_cfg.h
===================================================================
--- trunk/src/hid_cfg.h	(revision 4512)
+++ trunk/src/hid_cfg.h	(revision 4513)
@@ -26,6 +26,7 @@
 #define PCB_HID_CFG_H
 
 #include <liblihata/dom.h>
+#include <stdarg.h>
 
 typedef struct hid_cfg_s {
 	lht_doc_t *doc;
Index: trunk/src/hid_cfg_input.c
===================================================================
--- trunk/src/hid_cfg_input.c	(revision 4512)
+++ trunk/src/hid_cfg_input.c	(revision 4513)
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <strings.h>
+#include <ctype.h>
 #include <liblihata/lihata.h>
 #include <liblihata/tree.h>
 #include <genht/hash.h>
Index: trunk/src/hid_init.c
===================================================================
--- trunk/src/hid_init.c	(revision 4512)
+++ trunk/src/hid_init.c	(revision 4513)
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <strings.h>
 
 #include "global.h"
 #include "hid.h"
Index: trunk/src/pcb-printf.c
===================================================================
--- trunk/src/pcb-printf.c	(revision 4512)
+++ trunk/src/pcb-printf.c	(revision 4513)
@@ -33,6 +33,7 @@
  */
 
 #include <locale.h>
+#include <ctype.h>
 #include "config.h"
 #include "global.h"
 
Index: trunk/src/route_style.c
===================================================================
--- trunk/src/route_style.c	(revision 4512)
+++ trunk/src/route_style.c	(revision 4513)
@@ -24,6 +24,7 @@
  *  Thomas.Nau@rz.uni-ulm.de
  *
  */
+#include <ctype.h>
 #include "config.h"
 #include "global.h"
 #include "pcb-printf.h"
Index: trunk/src/unit.c
===================================================================
--- trunk/src/unit.c	(revision 4512)
+++ trunk/src/unit.c	(revision 4513)
@@ -26,6 +26,7 @@
  */
 #include "config.h"
 #include <stdlib.h>
+#include <ctype.h>
 #include <locale.h>
 #include "global.h"
 #include "compat_misc.h"
Index: trunk/src_plugins/fp_fs/fp_fs.c
===================================================================
--- trunk/src_plugins/fp_fs/fp_fs.c	(revision 4512)
+++ trunk/src_plugins/fp_fs/fp_fs.c	(revision 4513)
@@ -36,6 +36,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 
 #include "mymem.h"
 #include "data.h"
Index: trunk/src_plugins/lib_legacy_func/lib_legacy_func.c
===================================================================
--- trunk/src_plugins/lib_legacy_func/lib_legacy_func.c	(revision 4512)
+++ trunk/src_plugins/lib_legacy_func/lib_legacy_func.c	(revision 4513)
@@ -30,6 +30,7 @@
 #define _BSD_SOURCE
 
 #include <genvector/gds_char.h>
+#include <stdio.h>
 #include "config.h"
 #include "global.h"
 #include "data.h"
Index: trunk/src_plugins/propedit/propsel.c
===================================================================
--- trunk/src_plugins/propedit/propsel.c	(revision 4512)
+++ trunk/src_plugins/propedit/propsel.c	(revision 4513)
@@ -20,6 +20,7 @@
  *
  */
 
+#include <ctype.h>
 #include "data.h"
 #include "props.h"
 #include "propsel.h"
Index: trunk/src_plugins/query/query_act.c
===================================================================
--- trunk/src_plugins/query/query_act.c	(revision 4512)
+++ trunk/src_plugins/query/query_act.c	(revision 4513)
@@ -22,6 +22,7 @@
 
 /* Query language - actions */
 
+#include <stdio.h>
 #include "global.h"
 #include "query.h"
 #include "query_y.h"
Index: trunk/src_plugins/query/query_exec.c
===================================================================
--- trunk/src_plugins/query/query_exec.c	(revision 4512)
+++ trunk/src_plugins/query/query_exec.c	(revision 4513)
@@ -22,11 +22,13 @@
 
 /* Query language - execution */
 
+#include <stdio.h>
 #include "global.h"
 #include "data.h"
 #include "query.h"
 #include "query_exec.h"
 #include "query_access.h"
+#include "pcb-printf.h"
 
 void pcb_qry_init(pcb_qry_exec_t *ctx, pcb_qry_node_t *root)
 {
@@ -139,6 +141,7 @@
 		case PCBQ_VT_OBJ:
 		case PCBQ_VT_LST:   return NULL;
 	}
+	return NULL;
 }
 
 int pcb_qry_is_true(pcb_qry_val_t *val)