Index: trunk/doc/developer/plugin/conf.h =================================================================== --- trunk/doc/developer/plugin/conf.h (revision 29256) +++ trunk/doc/developer/plugin/conf.h (revision 29257) @@ -3,7 +3,7 @@ #ifndef PCB_FOOBAR_CONF_H #define PCB_FOOBAR_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/doc/developer/plugin/template/foobar.c =================================================================== --- trunk/doc/developer/plugin/template/foobar.c (revision 29256) +++ trunk/doc/developer/plugin/template/foobar.c (revision 29257) @@ -28,7 +28,7 @@ #include -#include "plugins.h" +#include int pplg_check_ver_foobar(int ver_needed) { return 0; } Index: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in (revision 29256) +++ trunk/src/Makefile.in (revision 29257) @@ -3,7 +3,7 @@ append /local/pcb/CFLAGS_GENERIC cc/fpic append /local/pcb/CFLAGS_GENERIC ?/local/pcb/cflags_profile put /local/pcb/CFLAGS /local/pcb/CFLAGS_GENERIC -append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src_3rd/liblihata } +append /local/pcb/CFLAGS {-I. -I.. -I../src_3rd -I../src -I../src_3rd/liblihata } append /local/pcb/LDFLAGS cc/ldflags append /local/pcb/LDFLAGS cc/rdynamic append /local/pcb/LDFLAGS ?/local/pcb/cflags_profile @@ -385,8 +385,8 @@ OBJS_C99_HIDLIB_PLG=@/local/pcb/OBJS_C99_HIDLIB_PLG@ OBJS_UTIL=@/local/pcb/OBJS_UTIL@ SRCS=@/local/pcb/SRCS@ -CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@ -I$(LIBRND)/core -C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ -I$(LIBRND)/core +CFLAGS=@?cc/argstd/std_c99@ @/local/pcb/CFLAGS@ +C89FLAGS=@/local/pcb/c89flags@ @/local/pcb/CFLAGS@ LDFLAGS=@/local/pcb/LDFLAGS@ LIBS_PRE=@/local/pcb/LIBS_PRE@ LIBS=@/local/pcb/LIBS@ -lm @?/target/libs/ldl@ Index: trunk/src/actions_pcb.c =================================================================== --- trunk/src/actions_pcb.c (revision 29256) +++ trunk/src/actions_pcb.c (revision 29257) @@ -32,13 +32,13 @@ #include -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "compat_misc.h" +#include #include "layer.h" #include "layer_addr.h" -#include "pcb-printf.h" +#include #include "conf_core.h" const char *PCB_PTR_DOMAIN_LAYER = "pcb_fgw_ptr_domain_layer"; Index: trunk/src/board.c =================================================================== --- trunk/src/board.c (revision 29256) +++ trunk/src/board.c (revision 29257) @@ -29,16 +29,16 @@ #include "board.h" #include "data.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "plug_io.h" -#include "compat_misc.h" -#include "actions.h" -#include "paths.h" +#include +#include +#include #include "rtree.h" #include "undo.h" #include "draw.h" -#include "event.h" -#include "safe_fs.h" +#include +#include #include "tool.h" #include "layer.h" #include "netlist.h" Index: trunk/src/board.h =================================================================== --- trunk/src/board.h (revision 29256) +++ trunk/src/board.h (revision 29257) @@ -47,14 +47,14 @@ #include #include -#include "global_typedefs.h" +#include #include "vtroutestyle.h" #include "layer.h" #include "layer_grp.h" -#include "attrib.h" +#include #include "rats_patch.h" #include "font.h" -#include "hidlib.h" +#include typedef htsp_t pcb_netlist_t; Index: trunk/src/brave.c =================================================================== --- trunk/src/brave.c (revision 29256) +++ trunk/src/brave.c (revision 29257) @@ -33,12 +33,12 @@ #include "board.h" #include "brave.h" -#include "actions.h" +#include #include "conf_core.h" -#include "conf_hid.h" -#include "compat_misc.h" -#include "error.h" -#include "hid_dad.h" +#include +#include +#include +#include pcb_brave_t pcb_brave = 0; static const char brave_cookie[] = "brave"; Index: trunk/src/buffer.c =================================================================== --- trunk/src/buffer.c (revision 29256) +++ trunk/src/buffer.c (revision 29257) @@ -44,7 +44,7 @@ #include "draw.h" #include "undo.h" #include "funchash_core.h" -#include "compat_misc.h" +#include #include "obj_arc_op.h" #include "obj_line_op.h" #include "obj_text_op.h" @@ -54,12 +54,12 @@ #include "obj_rat_op.h" #include "obj_pstk.h" #include "layer_grp.h" -#include "event.h" -#include "safe_fs.h" -#include "actions.h" +#include +#include +#include #include "tool.h" #include "extobj.h" -#include "hid_dad.h" +#include static int move_buffer_pre(pcb_opctx_t *ctx, pcb_any_obj_t *ptr2, void *ptr3); static void move_buffer_post(pcb_opctx_t *ctx, pcb_any_obj_t *ptr2, void *ptr3); Index: trunk/src/build_run.c =================================================================== --- trunk/src/build_run.c (revision 29256) +++ trunk/src/build_run.c (revision 29257) @@ -34,9 +34,9 @@ #include "conf_core.h" #include "board.h" #include "build_run.h" -#include "hid_init.h" +#include #include "plug_io.h" -#include "compat_misc.h" +#include extern void pcb_main_uninit(void); Index: trunk/src/change.c =================================================================== --- trunk/src/change.c (revision 29256) +++ trunk/src/change.c (revision 29257) @@ -32,13 +32,13 @@ #include "conf_core.h" #include "change.h" -#include "compat_misc.h" +#include #include "board.h" #include "data.h" #include "draw.h" #include "select.h" #include "undo.h" -#include "actions.h" +#include #include "macro.h" #include "obj_pstk_op.h" #include "obj_subc_parent.h" Index: trunk/src/change.h =================================================================== --- trunk/src/change.h (revision 29256) +++ trunk/src/change.h (revision 29257) @@ -34,8 +34,8 @@ #include "config.h" #include "board.h" #include "flag.h" -#include "pcb_bool.h" -#include "unit.h" +#include +#include extern int defer_updates, defer_needs_update; Index: trunk/src/change_act.c =================================================================== --- trunk/src/change_act.c (revision 29256) +++ trunk/src/change_act.c (revision 29257) @@ -39,19 +39,19 @@ #include "funchash_core.h" #include "board.h" -#include "actions.h" +#include #include "change.h" #include "draw.h" #include "search.h" #include "undo.h" -#include "event.h" -#include "compat_misc.h" +#include +#include #include "obj_rat_draw.h" #include "data_it.h" #include "macro.h" -#include "grid.h" +#include #include "route_style.h" -#include "hidlib_conf.h" +#include #define PCB (do not use PCB directly) Index: trunk/src/color_cache.h =================================================================== --- trunk/src/color_cache.h (revision 29256) +++ trunk/src/color_cache.h (revision 29257) @@ -30,8 +30,8 @@ #include #include #include -#include "global_typedefs.h" -#include "color.h" +#include +#include typedef void (*pcb_clrcache_free_t)(pcb_clrcache_t *cache, void *hidclr); Index: trunk/src/conf_act.c =================================================================== --- trunk/src/conf_act.c (revision 29256) +++ trunk/src/conf_act.c (revision 29257) @@ -26,12 +26,12 @@ #include "config.h" #include "board.h" -#include "actions.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "funchash_core.h" #include "route_style.h" -#include "error.h" +#include #include "tool.h" #include "macro.h" Index: trunk/src/conf_core.c =================================================================== --- trunk/src/conf_core.c (revision 29256) +++ trunk/src/conf_core.c (revision 29257) @@ -1,10 +1,10 @@ #include "config.h" -#include "conf.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include TODO("win32: remove this once the w32_ dir workaround is removed") -#include "hid_init.h" +#include conf_core_t conf_core; Index: trunk/src/crosshair.c =================================================================== --- trunk/src/crosshair.c (revision 29256) +++ trunk/src/crosshair.c (revision 29257) @@ -30,7 +30,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "crosshair.h" @@ -39,15 +39,15 @@ #include "draw_wireframe.h" #include "search.h" #include "polygon.h" -#include "actions.h" +#include #include "hid_inlines.h" -#include "compat_misc.h" +#include #include "vtonpoint.h" #include "find.h" #include "undo.h" -#include "event.h" +#include #include "macro.h" -#include "grid.h" +#include #include "stub_stroke.h" #include "obj_line_draw.h" Index: trunk/src/crosshair.h =================================================================== --- trunk/src/crosshair.h (revision 29256) +++ trunk/src/crosshair.h (revision 29257) @@ -31,7 +31,7 @@ #include "config.h" #include "vtonpoint.h" -#include "hid.h" +#include #include "obj_line.h" #include "obj_poly.h" #include "route.h" Index: trunk/src/data.c =================================================================== --- trunk/src/data.c (revision 29256) +++ trunk/src/data.c (revision 29257) @@ -38,7 +38,7 @@ #include "data_it.h" #include "rtree.h" #include "list_common.h" -#include "compat_misc.h" +#include #include "layer_it.h" #include "operation.h" #include "flag.h" Index: trunk/src/data.h =================================================================== --- trunk/src/data.h (revision 29256) +++ trunk/src/data.h (revision 29257) @@ -32,7 +32,7 @@ #define PCB_DATA_H #include "globalconst.h" -#include "global_typedefs.h" +#include #include "layer.h" #include "crosshair.h" #include "buffer.h" Index: trunk/src/data_parent.h =================================================================== --- trunk/src/data_parent.h (revision 29256) +++ trunk/src/data_parent.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef PCB_DATA_PARENT_H #define PCB_DATA_PARENT_H -#include "global_typedefs.h" +#include /* which elem of the parent union is active */ typedef enum pcb_parenttype_e { Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 29256) +++ trunk/src/draw.c (revision 29257) @@ -30,12 +30,12 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "math_helper.h" #include "board.h" #include "data.h" #include "draw.h" -#include "event.h" +#include #include "rotate.h" #include "rtree.h" #include "stub_draw.h" Index: trunk/src/draw.h =================================================================== --- trunk/src/draw.h (revision 29256) +++ trunk/src/draw.h (revision 29257) @@ -30,7 +30,7 @@ #define PCB_DRAW_H #include "config.h" -#include "hid.h" +#include #include "layer.h" /* holds information about output window */ Index: trunk/src/draw_wireframe.h =================================================================== --- trunk/src/draw_wireframe.h (revision 29256) +++ trunk/src/draw_wireframe.h (revision 29257) @@ -29,7 +29,7 @@ #define PCB_DRAW_WIREFRAME_H #include "config.h" -#include "hid.h" +#include /*----------------------------------------------------------- * Draws the outline of an arc Index: trunk/src/drc.c =================================================================== --- trunk/src/drc.c (revision 29256) +++ trunk/src/drc.c (revision 29257) @@ -27,13 +27,13 @@ */ #include "config.h" -#include "actions.h" +#include #include "board.h" #include "drc.h" -#include "hidlib_conf.h" +#include #include "conf_core.h" -#include "compat_misc.h" -#include "event.h" +#include +#include pcb_view_list_t pcb_drc_lst; Index: trunk/src/extobj_act.c =================================================================== --- trunk/src/extobj_act.c (revision 29256) +++ trunk/src/extobj_act.c (revision 29257) @@ -26,10 +26,10 @@ #include "config.h" -#include "actions.h" +#include #include "conf_core.h" #include "funchash_core.h" -#include "hid_dad.h" +#include #include "search.h" #include "tool.h" Index: trunk/src/extobj_helper.h =================================================================== --- trunk/src/extobj_helper.h (revision 29256) +++ trunk/src/extobj_helper.h (revision 29257) @@ -27,7 +27,7 @@ #include "obj_subc.h" #include "conf_core.h" #include "hid_inlines.h" -#include "hid_dad.h" +#include #include "change.h" #include "undo.h" Index: trunk/src/file_act.c =================================================================== --- trunk/src/file_act.c (revision 29256) +++ trunk/src/file_act.c (revision 29257) @@ -44,14 +44,14 @@ #include "plug_import.h" #include "remove.h" #include "draw.h" -#include "event.h" +#include #include "find.h" #include "search.h" -#include "actions.h" -#include "compat_misc.h" -#include "hid_init.h" +#include +#include +#include #include "layer_vis.h" -#include "safe_fs.h" +#include #include "tool.h" #include "netlist.h" #include "plug_io.h" Index: trunk/src/find.h =================================================================== --- trunk/src/find.h (revision 29256) +++ trunk/src/find.h (revision 29257) @@ -30,7 +30,7 @@ #define PCB_FIND2_H #include -#include "global_typedefs.h" +#include #include "flag.h" typedef enum { Index: trunk/src/flag_str.c =================================================================== --- trunk/src/flag_str.c (revision 29256) +++ trunk/src/flag_str.c (revision 29257) @@ -39,7 +39,7 @@ #include #include "flag_str.h" -#include "compat_misc.h" +#include #include "obj_common.h" #include "macro.h" Index: trunk/src/font.c =================================================================== --- trunk/src/font.c (revision 29256) +++ trunk/src/font.c (revision 29257) @@ -37,12 +37,12 @@ #include "font.h" #include "board.h" #include "conf_core.h" -#include "error.h" +#include #include "plug_io.h" -#include "paths.h" -#include "compat_misc.h" -#include "event.h" -#include "file_loaded.h" +#include +#include +#include +#include #define STEP_SYMBOLLINE 10 Index: trunk/src/font.h =================================================================== --- trunk/src/font.h (revision 29256) +++ trunk/src/font.h (revision 29257) @@ -31,12 +31,12 @@ #define PCB_FONT_H #include -#include "global_typedefs.h" +#include #include "obj_poly.h" #include "obj_poly_list.h" #include "obj_arc.h" #include "obj_arc_list.h" -#include "box.h" +#include /* --------------------------------------------------------------------------- * symbol and font related stuff Index: trunk/src/font_act.c =================================================================== --- trunk/src/font_act.c (revision 29256) +++ trunk/src/font_act.c (revision 29257) @@ -26,12 +26,12 @@ #include "config.h" #include #include "board.h" -#include "actions.h" -#include "error.h" +#include +#include #include "font.h" #include "conf_core.h" #include "plug_io.h" -#include "event.h" +#include #define PCB (do not use PCB directly) Index: trunk/src/funchash_core.h =================================================================== --- trunk/src/funchash_core.h (revision 29256) +++ trunk/src/funchash_core.h (revision 29257) @@ -1,6 +1,6 @@ /* central, auto-generated enum of core function IDs */ -#include "funchash.h" +#include #define action_entry(x) F_ ## x, typedef enum { Index: trunk/src/gui_act.c =================================================================== --- trunk/src/gui_act.c (revision 29256) +++ trunk/src/gui_act.c (revision 29257) @@ -36,11 +36,11 @@ #include "board.h" #include "build_run.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "data.h" #include "tool.h" -#include "grid.h" -#include "error.h" +#include +#include #include "undo.h" #include "funchash_core.h" #include "change.h" @@ -49,16 +49,16 @@ #include "search.h" #include "find.h" #include "stub_stroke.h" -#include "actions.h" -#include "hid_init.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include +#include #include "layer.h" #include "layer_ui.h" #include "layer_grp.h" #include "layer_vis.h" -#include "attrib.h" -#include "hid_attrib.h" +#include +#include #include "operation.h" #include "obj_subc_op.h" #include "tool.h" Index: trunk/src/hid_cam.c =================================================================== --- trunk/src/hid_cam.c (revision 29256) +++ trunk/src/hid_cam.c (revision 29257) @@ -36,12 +36,12 @@ #include "board.h" #include "data.h" #include "hid_cam.h" -#include "hid_attrib.h" -#include "compat_misc.h" +#include +#include #include "layer_addr.h" #include "layer_vis.h" #include "plug_io.h" -#include "misc_util.h" +#include htsp_t *pcb_cam_vars = NULL; /* substitute %% variables from this hash */ Index: trunk/src/hid_cam.h =================================================================== --- trunk/src/hid_cam.h (revision 29256) +++ trunk/src/hid_cam.h (revision 29257) @@ -2,7 +2,7 @@ #define PCB_HID_HELPER_H #include "layer.h" -#include "hid_attrib.h" +#include #include /*** CAM plugin side API ***/ Index: trunk/src/hid_inlines.h =================================================================== --- trunk/src/hid_inlines.h (revision 29256) +++ trunk/src/hid_inlines.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef PCB_HID_INLINES #define PCB_HID_INLINES -#include "hid.h" +#include #include "globalconst.h" PCB_INLINE pcb_hid_gc_t pcb_hid_make_gc(void) Index: trunk/src/idpath.c =================================================================== --- trunk/src/idpath.c (revision 29256) +++ trunk/src/idpath.c (revision 29257) @@ -39,7 +39,7 @@ #include "board.h" #include "data.h" #include "layer.h" -#include "pcb-printf.h" +#include static int idpath_map(pcb_idpath_t *idp, pcb_any_obj_t *obj, int level, int *numlevels) { Index: trunk/src/intersect.c =================================================================== --- trunk/src/intersect.c (revision 29256) +++ trunk/src/intersect.c (revision 29257) @@ -43,7 +43,7 @@ #include #include "intersect.h" -#include "box.h" +#include static int compareleft(const void *ptr1, const void *ptr2); static int compareright(const void *ptr1, const void *ptr2); Index: trunk/src/intersect.h =================================================================== --- trunk/src/intersect.h (revision 29256) +++ trunk/src/intersect.h (revision 29257) @@ -41,7 +41,7 @@ #ifndef PCB_INTERSECT_H #define PCB_INTERSECT_H -#include "global_typedefs.h" +#include double pcb_intersect_box_box(pcb_box_list_t *boxlist); /* will sort boxlist */ double pcb_union_box_box(pcb_box_list_t *boxlist); Index: trunk/src/layer.c =================================================================== --- trunk/src/layer.c (revision 29256) +++ trunk/src/layer.c (revision 29257) @@ -32,9 +32,9 @@ #include "data.h" #include "conf_core.h" #include "layer.h" -#include "compat_misc.h" +#include #include "undo.h" -#include "event.h" +#include #include "layer_ui.h" #include "layer_vis.h" #include "funchash_core.h" Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 29256) +++ trunk/src/layer.h (revision 29257) @@ -108,9 +108,9 @@ #define PCB_LAYER_IS_OUTLINE(lyt, purpi) (((lyt) & PCB_LYT_BOUNDARY) && (((purpi) == F_proute) || ((purpi) == F_uroute) || ((purpi) == F_ucut) || ((purpi) == F_uvcut))) #include "globalconst.h" -#include "global_typedefs.h" -#include "attrib.h" -#include "color.h" +#include +#include +#include #include "obj_common.h" #include "obj_arc_list.h" #include "obj_line_list.h" Index: trunk/src/layer_addr.c =================================================================== --- trunk/src/layer_addr.c (revision 29256) +++ trunk/src/layer_addr.c (revision 29257) @@ -30,9 +30,9 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "compat_misc.h" -#include "misc_util.h" +#include +#include +#include #include "layer_addr.h" Index: trunk/src/layer_grp.c =================================================================== --- trunk/src/layer_grp.c (revision 29256) +++ trunk/src/layer_grp.c (revision 29257) @@ -31,9 +31,9 @@ #include "board.h" #include "data.h" #include "layer_grp.h" -#include "compat_misc.h" -#include "event.h" -#include "funchash.h" +#include +#include +#include #include "funchash_core.h" /* notify the rest of the code after layer group changes so that the GUI Index: trunk/src/layer_ui.c =================================================================== --- trunk/src/layer_ui.c (revision 29256) +++ trunk/src/layer_ui.c (revision 29257) @@ -32,8 +32,8 @@ #include "config.h" #include "board.h" #include "layer.h" -#include "event.h" -#include "compat_misc.h" +#include +#include #include "genvector/vtp0.h" #include "layer_ui.h" Index: trunk/src/layer_ui.h =================================================================== --- trunk/src/layer_ui.h (revision 29256) +++ trunk/src/layer_ui.h (revision 29257) @@ -32,7 +32,7 @@ #define PCB_LAYER_UI_H /* Virtual layers for UI and debug */ -#include "global_typedefs.h" +#include #include "genvector/vtp0.h" Index: trunk/src/layer_vis.c =================================================================== --- trunk/src/layer_vis.c (revision 29256) +++ trunk/src/layer_vis.c (revision 29257) @@ -36,9 +36,9 @@ #include "layer.h" #include "layer_ui.h" #include "layer_vis.h" -#include "event.h" -#include "compat_misc.h" -#include "conf_hid.h" +#include +#include +#include /* * Used by pcb_layervis_save_stack() and Index: trunk/src/librnd/core/actions.c =================================================================== --- trunk/src/librnd/core/actions.c (revision 29256) +++ trunk/src/librnd/core/actions.c (revision 29257) @@ -35,12 +35,12 @@ #include #include -#include "error.h" -#include "event.h" -#include "actions.h" -#include "compat_misc.h" -#include "funchash.h" -#include "hidlib_conf.h" +#include +#include +#include +#include +#include +#include const pcb_action_t *pcb_current_action = NULL; Index: trunk/src/librnd/core/actions.h =================================================================== --- trunk/src/librnd/core/actions.h (revision 29256) +++ trunk/src/librnd/core/actions.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_ACTIONS_H #define PCB_ACTIONS_H -#include "hid.h" +#include #include #include Index: trunk/src/librnd/core/attrib.c =================================================================== --- trunk/src/librnd/core/attrib.c (revision 29256) +++ trunk/src/librnd/core/attrib.c (revision 29257) @@ -32,8 +32,8 @@ #include #include #include "config.h" -#include "compat_misc.h" -#include "attrib.h" +#include +#include #define NOTIFY(list, name, value) \ do { \ Index: trunk/src/librnd/core/base64.c =================================================================== --- trunk/src/librnd/core/base64.c (revision 29256) +++ trunk/src/librnd/core/base64.c (revision 29257) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ #include -#include "base64.h" +#include static char int2digit(int digit) { Index: trunk/src/librnd/core/box.c =================================================================== --- trunk/src/librnd/core/box.c (revision 29256) +++ trunk/src/librnd/core/box.c (revision 29257) @@ -31,7 +31,7 @@ #include #include "rotate.h" -#include "box.h" +#include void pcb_box_rotate90(pcb_box_t *Box, pcb_coord_t X, pcb_coord_t Y, unsigned Number) { Index: trunk/src/librnd/core/box.h =================================================================== --- trunk/src/librnd/core/box.h (revision 29256) +++ trunk/src/librnd/core/box.h (revision 29257) @@ -46,8 +46,8 @@ #include #include "config.h" #include "math_helper.h" -#include "global_typedefs.h" -#include "pcb_bool.h" +#include +#include struct pcb_box_list_s { pcb_cardinal_t BoxN, /* the number of boxes contained */ @@ -55,7 +55,7 @@ pcb_box_t *Box; }; -#include "misc_util.h" +#include typedef enum { PCB_NORTH = 0, PCB_EAST = 1, PCB_SOUTH = 2, PCB_WEST = 3, Index: trunk/src/librnd/core/color.c =================================================================== --- trunk/src/librnd/core/color.c (revision 29256) +++ trunk/src/librnd/core/color.c (revision 29257) @@ -30,7 +30,7 @@ #include #define GVT_DONT_UNDEF -#include "color.h" +#include #include #define PACK_COLOR_(r,g,b,a) ((((unsigned long)(r)) << 24) | (((unsigned long)(g)) << 16) | (((unsigned long)(b)) << 8) | (((unsigned long)(a)))) Index: trunk/src/librnd/core/color.h =================================================================== --- trunk/src/librnd/core/color.h (revision 29256) +++ trunk/src/librnd/core/color.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef PCB_COLOR_H #define PCB_COLOR_H -#include "global_typedefs.h" +#include #include struct pcb_color_s { Index: trunk/src/librnd/core/compat_fs.c =================================================================== --- trunk/src/librnd/core/compat_fs.c (revision 29256) +++ trunk/src/librnd/core/compat_fs.c (revision 29257) @@ -46,15 +46,15 @@ #include #include #include -#include "compat_fs.h" -#include "compat_misc.h" +#include +#include #include "globalconst.h" -#include "safe_fs.h" -#include "hid_init.h" +#include +#include #include -#include "error.h" +#include char *pcb_get_wd(char *path) { Index: trunk/src/librnd/core/compat_lrealpath.c =================================================================== --- trunk/src/librnd/core/compat_lrealpath.c (revision 29256) +++ trunk/src/librnd/core/compat_lrealpath.c (revision 29257) @@ -35,7 +35,7 @@ #include "compat_inc.h" #include "config.h" -#include "compat_lrealpath.h" +#include #include #include #ifdef HAVE_UNISTD_H @@ -42,7 +42,7 @@ #include #endif #include -#include "compat_misc.h" +#include /* On GNU libc systems the declaration is only visible with _GNU_SOURCE. */ #if defined(HAVE_CANONICALIZE_FILE_NAME) \ Index: trunk/src/librnd/core/compat_misc.c =================================================================== --- trunk/src/librnd/core/compat_misc.c (revision 29256) +++ trunk/src/librnd/core/compat_misc.c (revision 29257) @@ -34,7 +34,7 @@ #include #include #include -#include "compat_misc.h" +#include /* On some old systems random() works better than rand(). Unfortunately random() is less portable than rand(), which is C89. By default, just Index: trunk/src/librnd/core/conf.c =================================================================== --- trunk/src/librnd/core/conf.c (revision 29256) +++ trunk/src/librnd/core/conf.c (revision 29257) @@ -32,18 +32,18 @@ #include #include #include "config.h" -#include "conf.h" +#include #include "conf_core.h" -#include "conf_hid.h" -#include "hid_cfg.h" -#include "misc_util.h" -#include "error.h" -#include "paths.h" -#include "compat_fs.h" -#include "compat_misc.h" -#include "safe_fs.h" -#include "file_loaded.h" -#include "hidlib.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* conf list node's name */ const char *pcb_conf_list_name = "pcb-rnd-conf-v1"; Index: trunk/src/librnd/core/conf.h =================================================================== --- trunk/src/librnd/core/conf.h (revision 29256) +++ trunk/src/librnd/core/conf.h (revision 29257) @@ -27,12 +27,12 @@ #ifndef PCB_CONF_H #define PCB_CONF_H #include "config.h" -#include "global_typedefs.h" -#include "pcb-printf.h" +#include +#include #include #include #include -#include "unit.h" +#include typedef union confitem_u confitem_t ; typedef struct conf_listitem_s pcb_conf_listitem_t; Index: trunk/src/librnd/core/conf_hid.c =================================================================== --- trunk/src/librnd/core/conf_hid.c (revision 29256) +++ trunk/src/librnd/core/conf_hid.c (revision 29257) @@ -1,9 +1,9 @@ #include "config.h" -#include "conf_hid.h" +#include #include #include -#include "error.h" -#include "hidlib_conf.h" +#include +#include typedef struct { const conf_hid_callbacks_t *cb; Index: trunk/src/librnd/core/conf_hid.h =================================================================== --- trunk/src/librnd/core/conf_hid.h (revision 29256) +++ trunk/src/librnd/core/conf_hid.h (revision 29257) @@ -1,8 +1,8 @@ #ifndef PCB_CONF_HID_H #define PCB_CONF_HID_H -#include "conf.h" -#include "error.h" +#include +#include typedef struct conf_hid_callbacks_s { /* Called before/after a value of a config item is updated - this doesn't necessarily mean the value actually changes */ Index: trunk/src/librnd/core/error.c =================================================================== --- trunk/src/librnd/core/error.c (revision 29256) +++ trunk/src/librnd/core/error.c (revision 29257) @@ -29,14 +29,14 @@ #include #include -#include "actions.h" +#include #include "data.h" -#include "error.h" -#include "event.h" -#include "hid_dad.h" -#include "safe_fs.h" +#include +#include +#include +#include #include "funchash_core.h" -#include "hidlib_conf.h" +#include #include "genvector/gds_char.h" void pcb_trace(const char *Format, ...) Index: trunk/src/librnd/core/error.h =================================================================== --- trunk/src/librnd/core/error.h (revision 29256) +++ trunk/src/librnd/core/error.h (revision 29257) @@ -30,7 +30,7 @@ #define PCB_ERROR_H #include -#include "global_typedefs.h" +#include /* pcb_printf()-like call to print temporary trace messages to stderr; disabled in non-debug compilation */ Index: trunk/src/librnd/core/event.c =================================================================== --- trunk/src/librnd/core/event.c (revision 29256) +++ trunk/src/librnd/core/event.c (revision 29257) @@ -28,10 +28,10 @@ #include #include #include "config.h" -#include "event.h" -#include "error.h" -#include "actions.h" -#include "fptr_cast.h" +#include +#include +#include +#include static const char *pcb_fgw_evnames[] = { "pcbev_gui_init", Index: trunk/src/librnd/core/event.h =================================================================== --- trunk/src/librnd/core/event.h (revision 29256) +++ trunk/src/librnd/core/event.h (revision 29257) @@ -27,9 +27,9 @@ #ifndef PCB_EVENT_H #define PCB_EVENT_H #include "config.h" -#include "unit.h" -#include "global_typedefs.h" -#include "hidlib.h" +#include +#include +#include typedef enum { PCB_EVENT_GUI_INIT, /* finished initializing the GUI called right before the main loop of the GUI; args: (void) */ Index: trunk/src/librnd/core/file_loaded.c =================================================================== --- trunk/src/librnd/core/file_loaded.c (revision 29256) +++ trunk/src/librnd/core/file_loaded.c (revision 29257) @@ -29,8 +29,8 @@ #include "config.h" #include #include -#include "file_loaded.h" -#include "compat_misc.h" +#include +#include htsp_t pcb_file_loaded; Index: trunk/src/librnd/core/fptr_cast.c =================================================================== --- trunk/src/librnd/core/fptr_cast.c (revision 29256) +++ trunk/src/librnd/core/fptr_cast.c (revision 29257) @@ -26,7 +26,7 @@ #include #include "config.h" -#include "fptr_cast.h" +#include void *pcb_cast_f2d(pcb_fptr_t f) { Index: trunk/src/librnd/core/funchash.c =================================================================== --- trunk/src/librnd/core/funchash.c (revision 29256) +++ trunk/src/librnd/core/funchash.c (revision 29257) @@ -32,7 +32,7 @@ #include "funchash_core.h" #include "config.h" #include "macro.h" -#include "compat_misc.h" +#include #define action_entry(x) { #x, F_ ## x}, static pcb_funchash_table_t Functions[] = { Index: trunk/src/librnd/core/global_typedefs.h =================================================================== --- trunk/src/librnd/core/global_typedefs.h (revision 29256) +++ trunk/src/librnd/core/global_typedefs.h (revision 29257) @@ -107,6 +107,6 @@ typedef struct pcb_hid_attribute_s pcb_hid_attribute_t; typedef struct pcb_export_opt_s pcb_export_opt_t; -#include "pcb_bool.h" +#include #endif Index: trunk/src/librnd/core/grid.c =================================================================== --- trunk/src/librnd/core/grid.c (revision 29256) +++ trunk/src/librnd/core/grid.c (revision 29257) @@ -35,16 +35,16 @@ #include #include -#include "unit.h" -#include "grid.h" +#include +#include #include "board.h" -#include "conf.h" -#include "hidlib_conf.h" -#include "conf_hid.h" -#include "compat_misc.h" -#include "misc_util.h" -#include "pcb_bool.h" -#include "pcb-printf.h" +#include +#include +#include +#include +#include +#include +#include pcb_coord_t pcb_grid_fit(pcb_coord_t x, pcb_coord_t grid_spacing, pcb_coord_t grid_offset) { Index: trunk/src/librnd/core/grid.h =================================================================== --- trunk/src/librnd/core/grid.h (revision 29256) +++ trunk/src/librnd/core/grid.h (revision 29257) @@ -31,9 +31,9 @@ #define PCB_GRID_H #include -#include "pcb_bool.h" -#include "global_typedefs.h" -#include "unit.h" +#include +#include +#include /* String packed syntax (bracket means optional): Index: trunk/src/librnd/core/hid.h =================================================================== --- trunk/src/librnd/core/hid.h (revision 29256) +++ trunk/src/librnd/core/hid.h (revision 29257) @@ -5,10 +5,10 @@ #include #include "config.h" -#include "error.h" -#include "global_typedefs.h" -#include "attrib.h" -#include "box.h" +#include +#include +#include +#include /* attribute dialog properties */ typedef enum pcb_hat_property_e { Index: trunk/src/librnd/core/hid_attrib.c =================================================================== --- trunk/src/librnd/core/hid_attrib.c (revision 29256) +++ trunk/src/librnd/core/hid_attrib.c (revision 29257) @@ -30,8 +30,8 @@ #include "config.h" #include -#include "hid_attrib.h" -#include "compat_misc.h" +#include +#include #include "macro.h" pcb_hid_attr_node_t *hid_attr_nodes = 0; Index: trunk/src/librnd/core/hid_attrib.h =================================================================== --- trunk/src/librnd/core/hid_attrib.h (revision 29256) +++ trunk/src/librnd/core/hid_attrib.h (revision 29257) @@ -2,8 +2,8 @@ #define PCB_HID_ATTRIB_H #include -#include "hid.h" -#include "color.h" +#include +#include /* Used for HID attributes (exporting and printing, mostly). HA_boolean uses lng, HA_enum sets lng to the index and Index: trunk/src/librnd/core/hid_cfg.c =================================================================== --- trunk/src/librnd/core/hid_cfg.c (revision 29256) +++ trunk/src/librnd/core/hid_cfg.c (revision 29257) @@ -32,15 +32,15 @@ #include #include "config.h" -#include "hid.h" -#include "hid_cfg.h" -#include "error.h" -#include "paths.h" -#include "safe_fs.h" -#include "compat_misc.h" -#include "file_loaded.h" -#include "hidlib.h" -#include "hidlib_conf.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include char hid_cfg_error_shared[1024]; Index: trunk/src/librnd/core/hid_cfg.h =================================================================== --- trunk/src/librnd/core/hid_cfg.h (revision 29256) +++ trunk/src/librnd/core/hid_cfg.h (revision 29257) @@ -31,8 +31,8 @@ #include #include -#include "global_typedefs.h" -#include "hid.h" +#include +#include struct pcb_hid_cfg_s { lht_doc_t *doc; Index: trunk/src/librnd/core/hid_cfg_action.c =================================================================== --- trunk/src/librnd/core/hid_cfg_action.c (revision 29256) +++ trunk/src/librnd/core/hid_cfg_action.c (revision 29257) @@ -25,8 +25,8 @@ */ #include "config.h" -#include "hid_cfg_action.h" -#include "actions.h" +#include +#include int pcb_hid_cfg_action(pcb_hidlib_t *hl, const lht_node_t *node) { Index: trunk/src/librnd/core/hid_cfg_action.h =================================================================== --- trunk/src/librnd/core/hid_cfg_action.h (revision 29256) +++ trunk/src/librnd/core/hid_cfg_action.h (revision 29257) @@ -25,7 +25,7 @@ */ -#include "hid_cfg.h" +#include /* Run an action node. The node is either a list of text nodes or a text node; returns non-zero on error, the first action that fails in a chain breaks the chain */ int pcb_hid_cfg_action(pcb_hidlib_t *hl, const lht_node_t *node); Index: trunk/src/librnd/core/hid_cfg_input.c =================================================================== --- trunk/src/librnd/core/hid_cfg_input.c (revision 29256) +++ trunk/src/librnd/core/hid_cfg_input.c (revision 29257) @@ -34,12 +34,12 @@ #include #include "config.h" -#include "hid_cfg_input.h" -#include "hid_cfg_action.h" -#include "hidlib_conf.h" -#include "error.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include +#include +#include +#include #include "crosshair.h" /* split value into a list of '-' separated words; examine each word Index: trunk/src/librnd/core/hid_cfg_input.h =================================================================== --- trunk/src/librnd/core/hid_cfg_input.h (revision 29256) +++ trunk/src/librnd/core/hid_cfg_input.h (revision 29257) @@ -4,7 +4,7 @@ #include #include #include -#include "hid_cfg.h" +#include #define PCB_M_Mod0(n) (1u<<(n)) typedef enum { Index: trunk/src/librnd/core/hid_dad.c =================================================================== --- trunk/src/librnd/core/hid_dad.c (revision 29256) +++ trunk/src/librnd/core/hid_dad.c (revision 29257) @@ -27,7 +27,7 @@ /* widget-type-independent DAD functions */ #include "config.h" -#include "hid_dad.h" +#include int pcb_dock_is_vert[PCB_HID_DOCK_max] = {0, 0, 0, 1, 0, 1}; /* Update this if pcb_hid_dock_t changes */ int pcb_dock_has_frame[PCB_HID_DOCK_max] = {0, 0, 0, 1, 0, 0}; /* Update this if pcb_hid_dock_t changes */ Index: trunk/src/librnd/core/hid_dad.h =================================================================== --- trunk/src/librnd/core/hid_dad.h (revision 29256) +++ trunk/src/librnd/core/hid_dad.h (revision 29257) @@ -29,10 +29,10 @@ #include #include -#include "compat_misc.h" -#include "hid_attrib.h" -#include "pcb-printf.h" -#include "global_typedefs.h" +#include +#include +#include +#include #include @@ -145,7 +145,7 @@ void (*free)(pcb_hid_attribute_t *attrib); /* called by DAD on free'ing the PCB_HATT_BEGIN_COMPOUND and PCB_HATT_END_COMPOUND widget */ } pcb_hid_compound_t; -#include "hid_dad_spin.h" +#include /*** Helpers for building dynamic attribute dialogs (DAD) ***/ #define PCB_DAD_DECL(table) \ Index: trunk/src/librnd/core/hid_dad_spin.c =================================================================== --- trunk/src/librnd/core/hid_dad_spin.c (revision 29256) +++ trunk/src/librnd/core/hid_dad_spin.c (revision 29257) @@ -30,13 +30,13 @@ #include -#include "hid_attrib.h" -#include "hid_dad.h" -#include "hid_dad_spin.h" -#include "hid_dad_unit.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "hidlib_conf.h" +#include +#include +#include +#include +#include +#include +#include gdl_list_t pcb_dad_coord_spins; Index: trunk/src/librnd/core/hid_dad_tree.c =================================================================== --- trunk/src/librnd/core/hid_dad_tree.c (revision 29256) +++ trunk/src/librnd/core/hid_dad_tree.c (revision 29257) @@ -27,7 +27,7 @@ /* Non-inline utility functions for the DAD tree widget */ #include "config.h" -#include "hid_dad_tree.h" +#include /* recursively free a row list subtree */ static void pcb_dad_tree_free_rowlist(pcb_hid_attribute_t *attr, gdl_list_t *list) Index: trunk/src/librnd/core/hid_dad_tree.h =================================================================== --- trunk/src/librnd/core/hid_dad_tree.h (revision 29256) +++ trunk/src/librnd/core/hid_dad_tree.h (revision 29257) @@ -29,8 +29,8 @@ #ifndef PCB_HID_DAD_TREE_H #define PCB_HID_DAD_TREE_H -#include "hid_attrib.h" -#include "hid_dad.h" +#include +#include #include #include #include Index: trunk/src/librnd/core/hid_dad_unit.c =================================================================== --- trunk/src/librnd/core/hid_dad_unit.c (revision 29256) +++ trunk/src/librnd/core/hid_dad_unit.c (revision 29257) @@ -28,10 +28,10 @@ #include "config.h" -#include "hid_attrib.h" -#include "hid_dad.h" -#include "hid_dad_unit.h" -#include "unit.h" +#include +#include +#include +#include void pcb_dad_unit_change_cb(void *hid_ctx, void *caller_data, pcb_hid_attribute_t *attr) { Index: trunk/src/librnd/core/hid_dad_unit.h =================================================================== --- trunk/src/librnd/core/hid_dad_unit.h (revision 29256) +++ trunk/src/librnd/core/hid_dad_unit.h (revision 29257) @@ -31,7 +31,7 @@ #include -#include "hid_dad.h" +#include typedef struct { pcb_hid_compound_t cmp; Index: trunk/src/librnd/core/hid_dlg.c =================================================================== --- trunk/src/librnd/core/hid_dlg.c (revision 29256) +++ trunk/src/librnd/core/hid_dlg.c (revision 29257) @@ -29,11 +29,11 @@ #include "config.h" -#include "actions.h" -#include "event.h" -#include "hid.h" -#include "hid_dad.h" -#include "hid_nogui.h" +#include +#include +#include +#include +#include static int hid_dlg_gui_inited = 0; Index: trunk/src/librnd/core/hid_init.c =================================================================== --- trunk/src/librnd/core/hid_init.c (revision 29256) +++ trunk/src/librnd/core/hid_init.c (revision 29257) @@ -39,26 +39,26 @@ #include -#include "hid.h" -#include "hid_nogui.h" -#include "event.h" +#include +#include +#include /* for dlopen() and friends; will also solve all system-dependent includes and provides a dl-compat layer on windows. Also solves the opendir related includes. */ -#include "plugins.h" -#include "actions.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "hid_dad_unit.h" -#include "misc_util.h" -#include "compat_misc.h" +#include +#include +#include +#include +#include +#include +#include #include "compat_inc.h" -#include "compat_fs.h" -#include "file_loaded.h" -#include "hidlib.h" -#include "hidlib_conf.h" -#include "conf.h" +#include +#include +#include +#include +#include static const char *flt_any[] = {"*", "*.*", NULL}; Index: trunk/src/librnd/core/hid_init.h =================================================================== --- trunk/src/librnd/core/hid_init.h (revision 29256) +++ trunk/src/librnd/core/hid_init.h (revision 29257) @@ -33,7 +33,7 @@ #include #include -#include "hid.h" +#include #define PCBHL_ACTION_ARGS_WIDTH 5 Index: trunk/src/librnd/core/hid_nogui.c =================================================================== --- trunk/src/librnd/core/hid_nogui.c (revision 29256) +++ trunk/src/librnd/core/hid_nogui.c (revision 29257) @@ -34,10 +34,10 @@ #include #include -#include "actions.h" -#include "hid.h" -#include "compat_misc.h" -#include "hidlib_conf.h" +#include +#include +#include +#include /* This is the "gui" that is installed at startup, and is used when there is no other real GUI to use. For the most part, it just Index: trunk/src/librnd/core/hidlib.c =================================================================== --- trunk/src/librnd/core/hidlib.c (revision 29256) +++ trunk/src/librnd/core/hidlib.c (revision 29257) @@ -26,10 +26,10 @@ #include "config.h" -#include "hidlib_conf.h" +#include #include "tool.h" -#include "event.h" -#include "hid.h" +#include +#include static const char *hidlib_cookie = "hidlib"; Index: trunk/src/librnd/core/hidlib_conf.c =================================================================== --- trunk/src/librnd/core/hidlib_conf.c (revision 29256) +++ trunk/src/librnd/core/hidlib_conf.c (revision 29257) @@ -26,13 +26,13 @@ #include "config.h" -#include "conf.h" -#include "error.h" -#include "color.h" -#include "hidlib.h" -#include "hid.h" +#include +#include +#include +#include +#include -#include "hidlib_conf.h" +#include #define PCB_MAX_GRID PCB_MIL_TO_COORD(1000) Index: trunk/src/librnd/core/hidlib_conf.h =================================================================== --- trunk/src/librnd/core/hidlib_conf.h (revision 29256) +++ trunk/src/librnd/core/hidlib_conf.h (revision 29257) @@ -27,8 +27,8 @@ #ifndef PCB_HIDLIB_CONF_H #define PCB_HIDLIB_CONF_H -#include "conf.h" -#include "color.h" +#include +#include enum pcb_crosshair_shape_e { pcb_ch_shape_basic = 0, /* 4-ray */ Index: trunk/src/librnd/core/list_conf.c =================================================================== --- trunk/src/librnd/core/list_conf.c (revision 29256) +++ trunk/src/librnd/core/list_conf.c (revision 29257) @@ -25,6 +25,6 @@ */ #define FROM_CONF_C -#include "conf.h" +#include #include "list_conf.h" #include Index: trunk/src/librnd/core/list_conf.h =================================================================== --- trunk/src/librnd/core/list_conf.h (revision 29256) +++ trunk/src/librnd/core/list_conf.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef LIST_CONF_H #define LIST_CONF_H -#include "conf.h" +#include #include Index: trunk/src/librnd/core/misc_util.c =================================================================== --- trunk/src/librnd/core/misc_util.c (revision 29256) +++ trunk/src/librnd/core/misc_util.c (revision 29257) @@ -37,8 +37,8 @@ #include #include #include -#include "misc_util.h" -#include "unit.h" +#include +#include /* pcb_distance() should be used so that there is only one * place to deal with overflow/precision errors Index: trunk/src/librnd/core/misc_util.h =================================================================== --- trunk/src/librnd/core/misc_util.h (revision 29256) +++ trunk/src/librnd/core/misc_util.h (revision 29257) @@ -31,8 +31,8 @@ #ifndef PCB_MISC_UTIL_H #define PCB_MISC_UTIL_H -#include "unit.h" -#include "pcb_bool.h" +#include +#include double pcb_distance(double x1, double y1, double x2, double y2); double pcb_distance2(double x1, double y1, double x2, double y2); /* distance square */ Index: trunk/src/librnd/core/paths.c =================================================================== --- trunk/src/librnd/core/paths.c (revision 29256) +++ trunk/src/librnd/core/paths.c (revision 29257) @@ -29,11 +29,11 @@ #include #include #include "config.h" -#include "paths.h" -#include "error.h" -#include "hidlib.h" -#include "hid_init.h" -#include "hidlib_conf.h" +#include +#include +#include +#include +#include int pcb_getpid(void); Index: trunk/src/librnd/core/paths.h =================================================================== --- trunk/src/librnd/core/paths.h (revision 29256) +++ trunk/src/librnd/core/paths.h (revision 29257) @@ -27,7 +27,7 @@ /* Resolve paths, build paths using template */ #include "genvector/gds_char.h" -#include "global_typedefs.h" +#include /* Allocate *out and copy the path from in to out, replacing ~ with conf_core.rc.path.home If extra_room is non-zero, allocate this many bytes extra for each slot; Index: trunk/src/librnd/core/pcb-printf.c =================================================================== --- trunk/src/librnd/core/pcb-printf.c (revision 29256) +++ trunk/src/librnd/core/pcb-printf.c (revision 29257) @@ -40,7 +40,7 @@ #include #include #include "config.h" -#include "pcb-printf.h" +#include const char *pcb_printf_slot[PCB_PRINTF_SLOT_max] = { Index: trunk/src/librnd/core/pcb-printf.h =================================================================== --- trunk/src/librnd/core/pcb-printf.h (revision 29256) +++ trunk/src/librnd/core/pcb-printf.h (revision 29257) @@ -101,7 +101,7 @@ #include #include #include -#include "unit.h" +#include typedef enum { /* bitmask for printf hardening */ PCB_SAFEPRINT_arg_max = 1023, /* for internal use */ Index: trunk/src/librnd/core/pcb_bool.c =================================================================== --- trunk/src/librnd/core/pcb_bool.c (revision 29256) +++ trunk/src/librnd/core/pcb_bool.c (revision 29257) @@ -25,8 +25,8 @@ */ #include "config.h" -#include "pcb_bool.h" -#include "compat_misc.h" +#include +#include pcb_bool_op_t pcb_str2boolop(const char *s) { Index: trunk/src/librnd/core/pixmap.c =================================================================== --- trunk/src/librnd/core/pixmap.c (revision 29256) +++ trunk/src/librnd/core/pixmap.c (revision 29257) @@ -30,9 +30,9 @@ #include #include -#include "pixmap.h" +#include -#include "error.h" +#include static unsigned int pixmap_hash_(const void *key_, int pixels) { Index: trunk/src/librnd/core/pixmap.h =================================================================== --- trunk/src/librnd/core/pixmap.h (revision 29256) +++ trunk/src/librnd/core/pixmap.h (revision 29257) @@ -29,7 +29,7 @@ #ifndef PCB_PIXMAP_H #define PCB_PIXMAP_H -#include "global_typedefs.h" +#include typedef struct pcb_pixmap_import_s pcb_pixmap_import_t; Index: trunk/src/librnd/core/plugins.c =================================================================== --- trunk/src/librnd/core/plugins.c (revision 29256) +++ trunk/src/librnd/core/plugins.c (revision 29257) @@ -26,13 +26,13 @@ #include #include -#include "plugins.h" +#include /* for the action */ #include "config.h" #include "genvector/gds_char.h" -#include "compat_misc.h" -#include "actions.h" +#include +#include unsigned long pcb_api_ver = PCB_API_VER; Index: trunk/src/librnd/core/safe_fs.c =================================================================== --- trunk/src/librnd/core/safe_fs.c (revision 29256) +++ trunk/src/librnd/core/safe_fs.c (revision 29257) @@ -36,15 +36,15 @@ #include #include -#include "safe_fs.h" +#include -#include "actions.h" -#include "compat_fs.h" -#include "compat_misc.h" -#include "error.h" +#include +#include +#include +#include #include "globalconst.h" -#include "paths.h" -#include "hidlib.h" +#include +#include /* Evaluates op(arg1,arg2); returns 0 if the operation is permitted */ Index: trunk/src/librnd/core/safe_fs.h =================================================================== --- trunk/src/librnd/core/safe_fs.h (revision 29256) +++ trunk/src/librnd/core/safe_fs.h (revision 29257) @@ -33,7 +33,7 @@ #define PCB_SAFE_FS_H #include -#include "global_typedefs.h" +#include /* file name templating wrappers around file system calls; later they will also execute checks to avoid unsafe access */ @@ -80,7 +80,7 @@ FILE *pcb_fopen_at(pcb_hidlib_t *hidlib, const char *dir, const char *fn, const char *mode, char **full_path, int recursive); -#include "conf.h" +#include /* Open a file with standard path search and substitutions performed on the file name. If fn is not an absolute path, search paths for the Index: trunk/src/librnd/core/unit.c =================================================================== --- trunk/src/librnd/core/unit.c (revision 29256) +++ trunk/src/librnd/core/unit.c (revision 29257) @@ -35,8 +35,8 @@ #include #include #include -#include "compat_misc.h" -#include "unit.h" +#include +#include /* Should be kept in order of smallest scale_factor to largest -- the code uses this ordering for finding the best scale to use for a group of units */ Index: trunk/src/librnd/core/unit.h =================================================================== --- trunk/src/librnd/core/unit.h (revision 29256) +++ trunk/src/librnd/core/unit.h (revision 29257) @@ -35,7 +35,7 @@ #ifndef PCB_UNIT_H #define PCB_UNIT_H -#include "global_typedefs.h" +#include enum pcb_allow_e { PCB_UNIT_NO_PRINT = 0, /* suffixes we can read but not print (i.e., "inch") */ Index: trunk/src/librnd/core/vtc0.c =================================================================== --- trunk/src/librnd/core/vtc0.c (revision 29256) +++ trunk/src/librnd/core/vtc0.c (revision 29257) @@ -1,3 +1,3 @@ #define GVT_DONT_UNDEF -#include "vtc0.h" +#include #include Index: trunk/src/main.c =================================================================== --- trunk/src/main.c (revision 29256) +++ trunk/src/main.c (revision 29257) @@ -40,25 +40,25 @@ #include "board.h" #include "brave.h" #include "data.h" -#include "error.h" +#include #include "plug_io.h" #include "buffer.h" #include "crosshair.h" -#include "compat_lrealpath.h" +#include #include "polygon.h" #include "buildin.h" #include "build_run.h" -#include "file_loaded.h" +#include #include "flag.h" #include "flag_str.h" -#include "plugins.h" +#include #include "plug_footprint.h" #include "plug_import.h" -#include "event.h" -#include "funchash.h" -#include "conf.h" +#include +#include +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include #include "layer_vis.h" #include "layer_ui.h" @@ -65,15 +65,15 @@ #include "obj_text.h" #include "pcb_minuid.h" #include "tool.h" -#include "color.h" +#include #include "netlist.h" #include "extobj.h" -#include "pixmap.h" +#include -#include "actions.h" +#include #include "actions_pcb.h" -#include "hid_init.h" -#include "compat_misc.h" +#include +#include const char *pcbhl_menu_file_paths[4]; const char *pcbhl_menu_name_fmt = "pcb-menu-%s.lht"; Index: trunk/src/main_act.c =================================================================== --- trunk/src/main_act.c (revision 29256) +++ trunk/src/main_act.c (revision 29257) @@ -44,18 +44,18 @@ #include "board.h" #include "data.h" #include "crosshair.h" -#include "compat_misc.h" +#include #include "layer.h" -#include "actions.h" -#include "hid_init.h" +#include +#include #include "conf_core.h" -#include "plugins.h" +#include #include "build_run.h" -#include "file_loaded.h" -#include "safe_fs.h" +#include +#include #include "flag_str.h" #include "obj_common.h" -#include "hid_init.h" +#include static const char pcb_acts_PrintActions[] = "PrintActions()"; static const char pcb_acth_PrintActions[] = "Print all actions available."; Index: trunk/src/move.c =================================================================== --- trunk/src/move.c (revision 29256) +++ trunk/src/move.c (revision 29257) @@ -34,13 +34,13 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "move.h" #include "select.h" #include "undo.h" -#include "event.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include #include "obj_arc_op.h" #include "obj_line_op.h" #include "obj_text_op.h" Index: trunk/src/netlist.c =================================================================== --- trunk/src/netlist.c (revision 29256) +++ trunk/src/netlist.c (revision 29257) @@ -33,8 +33,8 @@ #include "board.h" #include "data.h" #include "data_it.h" -#include "event.h" -#include "compat_misc.h" +#include +#include #include "layer_grp.h" #include "find.h" #include "obj_term.h" Index: trunk/src/netlist_act.c =================================================================== --- trunk/src/netlist_act.c (revision 29256) +++ trunk/src/netlist_act.c (revision 29257) @@ -40,10 +40,10 @@ #include "data.h" #include "data_it.h" #include "board.h" -#include "error.h" +#include #include "plug_io.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include #include "netlist.h" #include "data_it.h" #include "find.h" Index: trunk/src/obj_arc.c =================================================================== --- trunk/src/obj_arc.c (revision 29256) +++ trunk/src/obj_arc.c (revision 29257) @@ -37,7 +37,7 @@ #include "rotate.h" #include "move.h" #include "conf_core.h" -#include "compat_misc.h" +#include #include "draw_wireframe.h" #include "hid_inlines.h" Index: trunk/src/obj_arc_ui.c =================================================================== --- trunk/src/obj_arc_ui.c (revision 29256) +++ trunk/src/obj_arc_ui.c (revision 29257) @@ -30,7 +30,7 @@ #include #include "obj_arc_ui.h" #include "obj_arc.h" -#include "box.h" +#include #include Index: trunk/src/obj_common.c =================================================================== --- trunk/src/obj_common.c (revision 29256) +++ trunk/src/obj_common.c (revision 29257) @@ -31,8 +31,8 @@ #include #include "conf_core.h" #include "flag_str.h" -#include "global_typedefs.h" -#include "error.h" +#include +#include #include "obj_common.h" #include "obj_arc_ui.h" #include "obj_pstk.h" Index: trunk/src/obj_common.h =================================================================== --- trunk/src/obj_common.h (revision 29256) +++ trunk/src/obj_common.h (revision 29257) @@ -32,8 +32,8 @@ #include #include #include "flag.h" -#include "attrib.h" -#include "global_typedefs.h" +#include +#include #include "data_parent.h" /* Real objects that have actual struct; can be used as a bitfield */ Index: trunk/src/obj_hash.h =================================================================== --- trunk/src/obj_hash.h (revision 29256) +++ trunk/src/obj_hash.h (revision 29257) @@ -26,7 +26,7 @@ #include #include -#include "compat_misc.h" +#include /* compare two strings and return 0 if they are equal. NULL == NULL means equal. */ PCB_INLINE int pcb_neqs(const char *s1, const char *s2) Index: trunk/src/obj_line.c =================================================================== --- trunk/src/obj_line.c (revision 29256) +++ trunk/src/obj_line.c (revision 29257) @@ -38,7 +38,7 @@ #include "search.h" #include "polygon.h" #include "conf_core.h" -#include "compat_misc.h" +#include #include "rotate.h" #include "hid_inlines.h" Index: trunk/src/obj_poly_draw_helper.c =================================================================== --- trunk/src/obj_poly_draw_helper.c (revision 29256) +++ trunk/src/obj_poly_draw_helper.c (revision 29257) @@ -29,7 +29,7 @@ */ #include "config.h" -#include "hid.h" +#include #include "polygon.h" #include "obj_poly.h" #include "hid_inlines.h" Index: trunk/src/obj_pstk.c =================================================================== --- trunk/src/obj_pstk.c (revision 29256) +++ trunk/src/obj_pstk.c (revision 29257) @@ -46,7 +46,7 @@ #include "search.h" #include "undo.h" #include "vtpadstack.h" -#include "event.h" +#include #include "hid_inlines.h" #include "polygon_offs.h" Index: trunk/src/obj_pstk_act.c =================================================================== --- trunk/src/obj_pstk_act.c (revision 29256) +++ trunk/src/obj_pstk_act.c (revision 29257) @@ -33,7 +33,7 @@ #include "board.h" #include "conf_core.h" #include "data.h" -#include "actions.h" +#include #include "search.h" #include "data_list.h" Index: trunk/src/obj_pstk_proto.c =================================================================== --- trunk/src/obj_pstk_proto.c (revision 29256) +++ trunk/src/obj_pstk_proto.c (revision 29257) @@ -30,7 +30,7 @@ #include "board.h" #include "buffer.h" -#include "compat_misc.h" +#include #include "conf_core.h" #include "data.h" #include "data_list.h" Index: trunk/src/obj_pstk_shape.h =================================================================== --- trunk/src/obj_pstk_shape.h (revision 29256) +++ trunk/src/obj_pstk_shape.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef PCB_OBJ_PSTK_SHAPE_H #define PCB_OBJ_PSTK_SHAPE_H -#include "unit.h" +#include #include "polygon.h" #include "layer.h" Index: trunk/src/obj_subc.c =================================================================== --- trunk/src/obj_subc.c (revision 29256) +++ trunk/src/obj_subc.c (revision 29257) @@ -33,7 +33,7 @@ #include "crosshair.h" #include "brave.h" #include "data.h" -#include "error.h" +#include #include "obj_subc.h" #include "obj_subc_op.h" #include "obj_subc_parent.h" @@ -52,11 +52,11 @@ #include "operation.h" #include "undo.h" #include "macro.h" -#include "compat_misc.h" +#include #include "math_helper.h" #include "pcb_minuid.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "hid_inlines.h" #include "extobj.h" Index: trunk/src/obj_subc.h =================================================================== --- trunk/src/obj_subc.h (revision 29256) +++ trunk/src/obj_subc.h (revision 29257) @@ -32,7 +32,7 @@ #include #include "obj_common.h" #include "layer.h" -#include "global_typedefs.h" +#include #include "rtree2_compat.h" Index: trunk/src/obj_term.c =================================================================== --- trunk/src/obj_term.c (revision 29256) +++ trunk/src/obj_term.c (revision 29257) @@ -32,11 +32,11 @@ #include #include "change.h" -#include "compat_misc.h" +#include #include "obj_common.h" #include "obj_term.h" #include "obj_subc_parent.h" -#include "pcb-printf.h" +#include #include "undo.h" #include "macro.h" #include "polygon.h" Index: trunk/src/obj_text.c =================================================================== --- trunk/src/obj_text.c (revision 29256) +++ trunk/src/obj_text.c (revision 29257) @@ -34,12 +34,12 @@ #include "rotate.h" #include "board.h" #include "data.h" -#include "compat_misc.h" +#include #include "hid_inlines.h" #include "undo.h" #include "polygon.h" #include "polygon_offs.h" -#include "event.h" +#include #include "layer.h" #include "obj_text.h" Index: trunk/src/object_act.c =================================================================== --- trunk/src/object_act.c (revision 29256) +++ trunk/src/object_act.c (revision 29257) @@ -35,15 +35,15 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "data.h" #include "board.h" #include "tool.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "event.h" +#include #include "funchash_core.h" #include "search.h" @@ -50,13 +50,13 @@ #include "draw.h" #include "move.h" #include "remove.h" -#include "compat_misc.h" +#include #include "layer_vis.h" #include "operation.h" #include "obj_pstk.h" #include "macro.h" #include "rotate.h" -#include "actions.h" +#include static const char pcb_acts_Attributes[] = "Attributes(Layout|Layer|Element|Subc)\n" "Attributes(Layer,layername)"; static const char pcb_acth_Attributes[] = Index: trunk/src/operation.h =================================================================== --- trunk/src/operation.h (revision 29256) +++ trunk/src/operation.h (revision 29257) @@ -30,7 +30,7 @@ #ifndef PCB_OPERATION_H #define PCB_OPERATION_H -#include "global_typedefs.h" +#include /* Each object operation gets an operation-context with some operation-specific configuration, and the board to operate on. Optionally this is the place to Index: trunk/src/pcb_minuid.c =================================================================== --- trunk/src/pcb_minuid.c (revision 29256) +++ trunk/src/pcb_minuid.c (revision 29257) @@ -1,5 +1,5 @@ #include -#include "compat_misc.h" +#include #include "pcb_minuid.h" minuid_session_t pcb_minuid; Index: trunk/src/pixmap_pcb.c =================================================================== --- trunk/src/pixmap_pcb.c (revision 29256) +++ trunk/src/pixmap_pcb.c (revision 29257) @@ -29,7 +29,7 @@ #include #include -#include "pixmap.h" +#include #include "pixmap_pcb.h" void pcb_pixmap_hash_init(pcb_pixmap_hash_t *pmhash) Index: trunk/src/pixmap_pcb.h =================================================================== --- trunk/src/pixmap_pcb.h (revision 29256) +++ trunk/src/pixmap_pcb.h (revision 29257) @@ -29,10 +29,10 @@ #ifndef PCB_PIXMAP_PCB_H #define PCB_PIXMAP_PCB_H -#include "global_typedefs.h" +#include #include -#include "pixmap.h" +#include typedef struct pcb_pixmap_hash_s { htpp_t meta; /* all pixmaps, hashed and compared only by metadata (including natural_oid) - used to look up a specific transformed version */ Index: trunk/src/plug_footprint.c =================================================================== --- trunk/src/plug_footprint.c (revision 29256) +++ trunk/src/plug_footprint.c (revision 29257) @@ -29,14 +29,14 @@ #include "config.h" #include "plug_footprint.h" -#include "plugins.h" +#include #include #include #include "conf_core.h" -#include "error.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include FILE PCB_FP_FOPEN_IN_DST_, *PCB_FP_FOPEN_IN_DST = &PCB_FP_FOPEN_IN_DST_; Index: trunk/src/plug_footprint.h =================================================================== --- trunk/src/plug_footprint.h (revision 29256) +++ trunk/src/plug_footprint.h (revision 29257) @@ -4,7 +4,7 @@ #include #include "vtlibrary.h" #include "data.h" -#include "conf.h" +#include typedef struct pcb_plug_fp_s pcb_plug_fp_t; Index: trunk/src/plug_footprint_act.c =================================================================== --- trunk/src/plug_footprint_act.c (revision 29256) +++ trunk/src/plug_footprint_act.c (revision 29257) @@ -28,7 +28,7 @@ */ #include "config.h" -#include "actions.h" +#include #include "board.h" #include "plug_footprint.h" Index: trunk/src/plug_import.c =================================================================== --- trunk/src/plug_import.c (revision 29256) +++ trunk/src/plug_import.c (revision 29257) @@ -38,10 +38,10 @@ #include #include -#include "plugins.h" +#include #include "plug_import.h" -#include "error.h" -#include "safe_fs.h" +#include +#include pcb_plug_import_t *pcb_plug_import_chain = NULL; Index: trunk/src/plug_import.h =================================================================== --- trunk/src/plug_import.h (revision 29256) +++ trunk/src/plug_import.h (revision 29257) @@ -31,7 +31,7 @@ #define PCB_PLUG_IMPORT_H #include "config.h" -#include "conf.h" +#include /**************************** API definition *********************************/ Index: trunk/src/plug_io.c =================================================================== --- trunk/src/plug_io.c (revision 29256) +++ trunk/src/plug_io.c (revision 29257) @@ -40,7 +40,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include #include @@ -50,25 +50,25 @@ #include #include "change.h" -#include "conf.h" +#include #include "data.h" -#include "error.h" +#include #include "plug_io.h" #include "remove.h" -#include "paths.h" +#include #include "rats_patch.h" -#include "actions.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "event.h" -#include "compat_misc.h" +#include +#include +#include +#include +#include #include "route_style.h" -#include "compat_fs.h" -#include "compat_lrealpath.h" +#include +#include #include "layer_vis.h" -#include "safe_fs.h" +#include #include "plug_footprint.h" -#include "file_loaded.h" +#include #include "macro.h" #include "view.h" Index: trunk/src/plug_io.h =================================================================== --- trunk/src/plug_io.h (revision 29256) +++ trunk/src/plug_io.h (revision 29257) @@ -30,8 +30,8 @@ #ifndef PCB_PLUG_IO_H #define PCB_PLUG_IO_H -#include "global_typedefs.h" -#include "conf.h" +#include +#include typedef enum { /* I/O type bitmask; each bit is one thing to save or load, not all formats support all things */ PCB_IOT_PCB = 1, Index: trunk/src/polygon.c =================================================================== --- trunk/src/polygon.c (revision 29256) +++ trunk/src/polygon.c (revision 29257) @@ -38,10 +38,10 @@ #include #include "board.h" -#include "box.h" +#include #include "data.h" #include "draw.h" -#include "error.h" +#include #include "polygon.h" #include "remove.h" #include "search.h" @@ -52,7 +52,7 @@ #include "obj_text_draw.h" #include "polygon_selfi.h" #include "polygon1_gen.h" -#include "event.h" +#include #define UNSUBTRACT_BLOAT 10 #define SUBTRACT_PIN_VIA_BATCH_SIZE 100 Index: trunk/src/polygon1.c =================================================================== --- trunk/src/polygon1.c (revision 29256) +++ trunk/src/polygon1.c (revision 29257) @@ -50,11 +50,11 @@ #include "math_helper.h" #include "heap.h" #include "compat_cc.h" -#include "pcb-printf.h" +#include #include "polyarea.h" #include "obj_common.h" #include "macro.h" -#include "box.h" +#include #include "rtree2_compat.h" Index: trunk/src/polygon1_gen.c =================================================================== --- trunk/src/polygon1_gen.c (revision 29256) +++ trunk/src/polygon1_gen.c (revision 29257) @@ -32,10 +32,10 @@ #include #include -#include "global_typedefs.h" +#include #include "polyarea.h" #include "math_helper.h" -#include "unit.h" +#include #include "polygon1_gen.h" Index: trunk/src/polygon1_gen.h =================================================================== --- trunk/src/polygon1_gen.h (revision 29256) +++ trunk/src/polygon1_gen.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_POLYGON1_GEN_H #define PCB_POLYGON1_GEN_H -#include "global_typedefs.h" +#include #include "polyarea.h" void pcb_poly_square_pin_factors(int style, double *xm, double *ym); Index: trunk/src/polygon_act.c =================================================================== --- trunk/src/polygon_act.c (revision 29256) +++ trunk/src/polygon_act.c (revision 29257) @@ -33,7 +33,7 @@ */ #include "config.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "data.h" @@ -45,7 +45,7 @@ #include "search.h" #include "crosshair.h" #include "tool.h" -#include "actions.h" +#include #include "obj_poly.h" Index: trunk/src/polygon_offs.c =================================================================== --- trunk/src/polygon_offs.c (revision 29256) +++ trunk/src/polygon_offs.c (revision 29257) @@ -26,7 +26,7 @@ /* Polygon contour offset calculation */ -#include "compat_misc.h" +#include #include "polygon_offs.h" #if 0 Index: trunk/src/rats_act.c =================================================================== --- trunk/src/rats_act.c (revision 29256) +++ trunk/src/rats_act.c (revision 29257) @@ -36,13 +36,13 @@ #include "board.h" #include "data.h" -#include "error.h" +#include #include "undo.h" #include "find.h" #include "remove.h" #include "funchash_core.h" #include "obj_rat.h" -#include "actions.h" +#include #include "netlist.h" #include "draw.h" Index: trunk/src/rats_patch.c =================================================================== --- trunk/src/rats_patch.c (revision 29256) +++ trunk/src/rats_patch.c (revision 29257) @@ -32,12 +32,12 @@ #include -#include "actions.h" +#include #include "data.h" -#include "error.h" +#include #include "move.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "funchash_core.h" #include "search.h" #include "undo.h" Index: trunk/src/remove_act.c =================================================================== --- trunk/src/remove_act.c (revision 29256) +++ trunk/src/remove_act.c (revision 29257) @@ -34,7 +34,7 @@ */ #include "config.h" #include "data.h" -#include "actions.h" +#include #include "tool.h" #include "remove.h" #include "board.h" Index: trunk/src/rotate.c =================================================================== --- trunk/src/rotate.c (revision 29256) +++ trunk/src/rotate.c (revision 29257) @@ -32,13 +32,13 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "polygon.h" #include "rotate.h" #include "search.h" #include "select.h" #include "undo.h" -#include "event.h" +#include #include "data.h" #include "conf_core.h" #include "obj_arc_op.h" Index: trunk/src/rotate.h =================================================================== --- trunk/src/rotate.h (revision 29256) +++ trunk/src/rotate.h (revision 29257) @@ -30,8 +30,8 @@ #define PCB_ROTATE_H #include "config.h" -#include "global_typedefs.h" -#include "compat_misc.h" +#include +#include /*** Transformation macros ***/ #define PCB_COORD_ROTATE90(x,y,x0,y0,n) \ Index: trunk/src/route.c =================================================================== --- trunk/src/route.c (revision 29256) +++ trunk/src/route.c (revision 29257) @@ -28,9 +28,9 @@ */ #include "config.h" -#include "compat_misc.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "math_helper.h" #include "board.h" #include "data.h" Index: trunk/src/route.h =================================================================== --- trunk/src/route.h (revision 29256) +++ trunk/src/route.h (revision 29257) @@ -33,7 +33,7 @@ #define ROUTE_SMALL_DATA_SIZE 4 #include "obj_common.h" -#include "global_typedefs.h" +#include typedef struct { pcb_objtype_t type; Index: trunk/src/route_draw.h =================================================================== --- trunk/src/route_draw.h (revision 29256) +++ trunk/src/route_draw.h (revision 29257) @@ -1,8 +1,8 @@ #ifndef PCB_ROUTE_DRAW_H #define PCB_ROUTE_DRAW_H -#include "global_typedefs.h" -#include "hid.h" +#include +#include void pcb_route_draw(pcb_route_t *p_route, pcb_hid_gc_t GC); void pcb_route_draw_drc(pcb_route_t *p_route, pcb_hid_gc_t GC); Index: trunk/src/route_style.c =================================================================== --- trunk/src/route_style.c (revision 29256) +++ trunk/src/route_style.c (revision 29257) @@ -28,12 +28,12 @@ */ #include #include "config.h" -#include "pcb-printf.h" +#include #include "genvector/gds_char.h" #include "route_style.h" -#include "error.h" -#include "conf.h" -#include "misc_util.h" +#include +#include +#include #include "board.h" #include "funchash_core.h" #include "conf_core.h" Index: trunk/src/rtree.c =================================================================== --- trunk/src/rtree.c (revision 29256) +++ trunk/src/rtree.c (revision 29257) @@ -30,7 +30,7 @@ #include #include -#include "unit.h" +#include #include "rtree.h" #include Index: trunk/src/rtree.h =================================================================== --- trunk/src/rtree.h (revision 29256) +++ trunk/src/rtree.h (revision 29257) @@ -27,7 +27,7 @@ #ifndef PCB_RTREE_H #define PCB_RTREE_H -#include "global_typedefs.h" +#include typedef long int pcb_rtree_cardinal_t; typedef pcb_coord_t pcb_rtree_coord_t; Index: trunk/src/search.c =================================================================== --- trunk/src/search.c (revision 29256) +++ trunk/src/search.c (revision 29257) @@ -38,7 +38,7 @@ #include "board.h" #include "data.h" -#include "error.h" +#include #include "find.h" #include "polygon.h" #include "search.h" Index: trunk/src/search.h =================================================================== --- trunk/src/search.h (revision 29256) +++ trunk/src/search.h (revision 29257) @@ -31,7 +31,7 @@ #ifndef PCB_SEARCH_H #define PCB_SEARCH_H -#include "global_typedefs.h" +#include #include "layer.h" int pcb_lines_intersect(pcb_coord_t ax1, pcb_coord_t ay1, pcb_coord_t ax2, pcb_coord_t ay2, pcb_coord_t bx1, pcb_coord_t by1, pcb_coord_t bx2, pcb_coord_t by2); Index: trunk/src/select.c =================================================================== --- trunk/src/select.c (revision 29256) +++ trunk/src/select.c (revision 29257) @@ -33,19 +33,19 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "data.h" #include "data_it.h" #include "draw.h" -#include "error.h" +#include #include "polygon.h" #include "search.h" #include "select.h" #include "undo.h" #include "find.h" -#include "compat_misc.h" +#include #include "obj_arc_draw.h" #include "obj_line_draw.h" Index: trunk/src/select_act.c =================================================================== --- trunk/src/select_act.c (revision 29256) +++ trunk/src/select_act.c (revision 29257) @@ -36,7 +36,7 @@ #include "board.h" #include "data.h" -#include "error.h" +#include #include "undo.h" #include "funchash_core.h" @@ -45,10 +45,10 @@ #include "draw.h" #include "remove.h" #include "move.h" -#include "grid.h" -#include "hid_attrib.h" -#include "compat_misc.h" -#include "actions.h" +#include +#include +#include +#include static const char pcb_acts_Select[] = Index: trunk/src/stub_draw.h =================================================================== --- trunk/src/stub_draw.h (revision 29256) +++ trunk/src/stub_draw.h (revision 29257) @@ -31,9 +31,9 @@ #ifndef PCB_STUB_DRAW_FAB_H #define PCB_STUB_DRAW_FAB_H -#include "hid.h" -#include "pcb_bool.h" -#include "global_typedefs.h" +#include +#include +#include #include "draw.h" /* fab */ Index: trunk/src/stub_stroke.c =================================================================== --- trunk/src/stub_stroke.c (revision 29256) +++ trunk/src/stub_stroke.c (revision 29257) @@ -23,9 +23,9 @@ * lead developer: http://repo.hu/projects/pcb-rnd/contact.html * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "error.h" +#include #include "config.h" -#include "pcb_bool.h" +#include pcb_bool pcb_mid_stroke = pcb_false; Index: trunk/src/thermal.c =================================================================== --- trunk/src/thermal.c (revision 29256) +++ trunk/src/thermal.c (revision 29257) @@ -28,7 +28,7 @@ #include "thermal.h" -#include "compat_misc.h" +#include #include "data.h" #include "obj_pstk.h" #include "obj_pstk_inlines.h" Index: trunk/src/tool.c =================================================================== --- trunk/src/tool.c (revision 29256) +++ trunk/src/tool.c (revision 29257) @@ -29,18 +29,18 @@ #include "tool.h" #include "board.h" -#include "hidlib_conf.h" +#include #include "conf_core.h" #include "crosshair.h" #include "data.h" #include "draw.h" -#include "error.h" -#include "event.h" +#include +#include #include "find.h" -#include "grid.h" +#include #include "undo.h" -#include "actions.h" -#include "conf_hid.h" +#include +#include pcb_toolid_t pcb_tool_prev_id; Index: trunk/src/tool.h =================================================================== --- trunk/src/tool.h (revision 29256) +++ trunk/src/tool.h (revision 29257) @@ -29,8 +29,8 @@ #include -#include "global_typedefs.h" -#include "pcb_bool.h" +#include +#include typedef enum { PCB_MODE_VIA = 15, /* draw vias */ Index: trunk/src/tool_arc.c =================================================================== --- trunk/src/tool_arc.c (revision 29256) +++ trunk/src/tool_arc.c (revision 29257) @@ -35,7 +35,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "crosshair.h" Index: trunk/src/tool_arrow.c =================================================================== --- trunk/src/tool_arrow.c (revision 29256) +++ trunk/src/tool_arrow.c (revision 29257) @@ -39,7 +39,7 @@ #include "buffer.h" #include "crosshair.h" #include "data.h" -#include "actions.h" +#include #include "remove.h" #include "move.h" #include "search.h" Index: trunk/src/tool_buffer.c =================================================================== --- trunk/src/tool_buffer.c (revision 29256) +++ trunk/src/tool_buffer.c (revision 29257) @@ -37,9 +37,9 @@ #include "board.h" #include "buffer.h" -#include "compat_misc.h" +#include #include "data.h" -#include "actions.h" +#include #include "rtree.h" #include "search.h" #include "tool.h" Index: trunk/src/tool_line.c =================================================================== --- trunk/src/tool_line.c (revision 29256) +++ trunk/src/tool_line.c (revision 29257) @@ -35,7 +35,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "crosshair.h" Index: trunk/src/tool_lock.c =================================================================== --- trunk/src/tool_lock.c (revision 29256) +++ trunk/src/tool_lock.c (revision 29257) @@ -38,7 +38,7 @@ #include "change.h" #include "data.h" #include "draw.h" -#include "actions.h" +#include #include "search.h" #include "tool.h" #include "tool_lock.h" Index: trunk/src/tool_poly.c =================================================================== --- trunk/src/tool_poly.c (revision 29256) +++ trunk/src/tool_poly.c (revision 29257) @@ -36,7 +36,7 @@ #include "conf_core.h" #include "crosshair.h" -#include "actions.h" +#include #include "polygon.h" #include "tool.h" Index: trunk/src/tool_polyhole.c =================================================================== --- trunk/src/tool_polyhole.c (revision 29256) +++ trunk/src/tool_polyhole.c (revision 29257) @@ -36,7 +36,7 @@ #include "conf_core.h" #include "crosshair.h" -#include "actions.h" +#include #include "polygon.h" #include "search.h" #include "tool.h" Index: trunk/src/tool_remove.c =================================================================== --- trunk/src/tool_remove.c (revision 29256) +++ trunk/src/tool_remove.c (revision 29257) @@ -35,8 +35,8 @@ #include "config.h" #include "board.h" -#include "event.h" -#include "actions.h" +#include +#include #include "undo.h" #include "remove.h" #include "search.h" Index: trunk/src/tool_rotate.c =================================================================== --- trunk/src/tool_rotate.c (revision 29256) +++ trunk/src/tool_rotate.c (revision 29257) @@ -35,7 +35,7 @@ #include "config.h" #include "conf_core.h" -#include "actions.h" +#include #include "board.h" #include "rotate.h" #include "tool.h" Index: trunk/src/tool_text.c =================================================================== --- trunk/src/tool_text.c (revision 29256) +++ trunk/src/tool_text.c (revision 29257) @@ -38,7 +38,7 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "actions.h" +#include #include "tool.h" #include "undo.h" Index: trunk/src/tool_thermal.c =================================================================== --- trunk/src/tool_thermal.c (revision 29256) +++ trunk/src/tool_thermal.c (revision 29257) @@ -37,7 +37,7 @@ #include "board.h" #include "change.h" #include "data.h" -#include "actions.h" +#include #include "obj_pstk.h" #include "search.h" #include "thermal.h" Index: trunk/src/tool_via.c =================================================================== --- trunk/src/tool_via.c (revision 29256) +++ trunk/src/tool_via.c (revision 29257) @@ -35,7 +35,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include "change.h" Index: trunk/src/undo.c =================================================================== --- trunk/src/undo.c (revision 29256) +++ trunk/src/undo.c (revision 29257) @@ -51,8 +51,8 @@ #include "change.h" #include "data.h" #include "draw.h" -#include "error.h" -#include "event.h" +#include +#include #include "insert.h" #include "polygon.h" #include "remove.h" @@ -62,7 +62,7 @@ #include "undo_old.h" #include "flag_str.h" #include "conf_core.h" -#include "compat_misc.h" +#include #include "obj_poly_draw.h" Index: trunk/src/undo.h =================================================================== --- trunk/src/undo.h (revision 29256) +++ trunk/src/undo.h (revision 29257) @@ -73,7 +73,7 @@ void undo_dump(void); /* temporary */ -#include "pcb_bool.h" +#include extern pcb_data_t *pcb_removelist; extern pcb_bool pcb_undo_and_draw; Index: trunk/src/undo_act.c =================================================================== --- trunk/src/undo_act.c (revision 29256) +++ trunk/src/undo_act.c (revision 29257) @@ -35,10 +35,10 @@ #include "conf_core.h" #include "board.h" -#include "actions.h" +#include #include "data.h" -#include "compat_misc.h" -#include "error.h" +#include +#include #include "funchash_core.h" #include "undo.h" Index: trunk/src/undo_old.c =================================================================== --- trunk/src/undo_old.c (revision 29256) +++ trunk/src/undo_old.c (revision 29257) @@ -53,7 +53,7 @@ #include "data.h" #include "draw.h" #include "move.h" -#include "error.h" +#include #include "extobj.h" #include "insert.h" #include "polygon.h" @@ -64,7 +64,7 @@ #include "undo_old.h" #include "flag_str.h" #include "conf_core.h" -#include "compat_misc.h" +#include #include "netlist.h" #include "obj_poly_draw.h" Index: trunk/src/undo_old.h =================================================================== --- trunk/src/undo_old.h (revision 29256) +++ trunk/src/undo_old.h (revision 29257) @@ -31,7 +31,7 @@ #ifndef PCB_UNDO_OLD_H #define PCB_UNDO_OLD_H -#include "global_typedefs.h" +#include void pcb_undo_move_obj_to_remove(int, void *, void *, void *); void pcb_undo_add_obj_to_remove_point(int, void *, void *, pcb_cardinal_t); Index: trunk/src/view.c =================================================================== --- trunk/src/view.c (revision 29256) +++ trunk/src/view.c (revision 29257) @@ -40,10 +40,10 @@ #include -#include "actions.h" -#include "compat_misc.h" -#include "error.h" -#include "pcb-printf.h" +#include +#include +#include +#include static unsigned long int pcb_view_next_uid = 0; Index: trunk/src/view.h =================================================================== --- trunk/src/view.h (revision 29256) +++ trunk/src/view.h (revision 29257) @@ -31,9 +31,9 @@ #include #include #include -#include "unit.h" +#include #include "idpath.h" -#include "box.h" +#include /* A saved view on the board (e.g. a drc violation); metadata includes two lists of objects to highlight on preview and some optional, application-specific Index: trunk/src/vtonpoint.h =================================================================== --- trunk/src/vtonpoint.h (revision 29256) +++ trunk/src/vtonpoint.h (revision 29257) @@ -3,7 +3,7 @@ #include #include -#include "global_typedefs.h" +#include typedef struct pcb_onpoint_st { int type; Index: trunk/src/vtpadstack_t.c =================================================================== --- trunk/src/vtpadstack_t.c (revision 29256) +++ trunk/src/vtpadstack_t.c (revision 29257) @@ -1,6 +1,6 @@ #include #include -#include "color.h" +#include #define GVT_DONT_UNDEF #include "vtpadstack_t.h" #include Index: trunk/src/vtroutestyle.h =================================================================== --- trunk/src/vtroutestyle.h (revision 29256) +++ trunk/src/vtroutestyle.h (revision 29257) @@ -2,9 +2,9 @@ #define PCB_VTROUTESTYLE_H #include #include -#include "unit.h" -#include "attrib.h" -#include "global_typedefs.h" +#include +#include +#include /* Elem=RouteStyle; init=0 */ Index: trunk/src_plugins/acompnet/acompnet.c =================================================================== --- trunk/src_plugins/acompnet/acompnet.c (revision 29256) +++ trunk/src_plugins/acompnet/acompnet.c (revision 29257) @@ -30,14 +30,14 @@ #include "layer.h" #include "layer_ui.h" /*#include "acompnet_conf.h"*/ -#include "actions.h" -#include "plugins.h" +#include +#include #include "search.h" #include "polygon.h" -#include "conf.h" +#include #include "conf_core.h" -#include "compat_misc.h" -#include "error.h" +#include +#include #include "meshgraph.h" static pcb_layer_t *ly; Index: trunk/src_plugins/acompnet/meshgraph.c =================================================================== --- trunk/src_plugins/acompnet/meshgraph.c (revision 29256) +++ trunk/src_plugins/acompnet/meshgraph.c (revision 29257) @@ -31,7 +31,7 @@ #include "conf_core.h" #include "data.h" #include "meshgraph.h" -#include "error.h" +#include #include "layer.h" #include "route.h" Index: trunk/src_plugins/acompnet/meshgraph.h =================================================================== --- trunk/src_plugins/acompnet/meshgraph.h (revision 29256) +++ trunk/src_plugins/acompnet/meshgraph.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_ACOMPNET_MESHGRAPH_H #define PCB_ACOMPNET_MESHGRAPH_H #include "rtree.h" -#include "box.h" +#include #include typedef struct { Index: trunk/src_plugins/act_draw/act_draw.c =================================================================== --- trunk/src_plugins/act_draw/act_draw.c (revision 29256) +++ trunk/src_plugins/act_draw/act_draw.c (revision 29257) @@ -30,15 +30,15 @@ #include "config.h" #include "conf_core.h" -#include "actions.h" +#include #include "board.h" -#include "compat_misc.h" +#include #include "flag_str.h" #include "obj_arc.h" #include "obj_line.h" #include "obj_pstk.h" #include "obj_text.h" -#include "plugins.h" +#include #include "undo.h" #include "keywords_sphash.h" Index: trunk/src_plugins/act_read/act_geo.c =================================================================== --- trunk/src_plugins/act_read/act_geo.c (revision 29256) +++ trunk/src_plugins/act_read/act_geo.c (revision 29257) @@ -30,9 +30,9 @@ #include "config.h" #include "board.h" -#include "actions.h" -#include "plugins.h" -#include "misc_util.h" +#include +#include +#include #include "idpath.h" #include "search.h" #include "find.h" Index: trunk/src_plugins/act_read/act_layer.c =================================================================== --- trunk/src_plugins/act_read/act_layer.c (revision 29256) +++ trunk/src_plugins/act_read/act_layer.c (revision 29257) @@ -32,10 +32,10 @@ #include "board.h" #include "data.h" #include "layer.h" -#include "actions.h" +#include #include "actions_pcb.h" -#include "plugins.h" -#include "misc_util.h" +#include +#include #include "idpath.h" #include "search.h" #include "find.h" Index: trunk/src_plugins/act_read/act_read.c =================================================================== --- trunk/src_plugins/act_read/act_read.c (revision 29256) +++ trunk/src_plugins/act_read/act_read.c (revision 29257) @@ -31,10 +31,10 @@ #include "board.h" #include "data_parent.h" -#include "actions.h" +#include #include "crosshair.h" -#include "plugins.h" -#include "misc_util.h" +#include +#include #include "idpath.h" #include "obj_subc.h" Index: trunk/src_plugins/ar_cpcb/ar_cpcb.c =================================================================== --- trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 29256) +++ trunk/src_plugins/ar_cpcb/ar_cpcb.c (revision 29257) @@ -34,9 +34,9 @@ #include "board.h" #include "data.h" -#include "plugins.h" -#include "actions.h" -#include "safe_fs.h" +#include +#include +#include #include "conf_core.h" #include "obj_pstk_inlines.h" #include "src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/asm/asm.c =================================================================== --- trunk/src_plugins/asm/asm.c (revision 29256) +++ trunk/src_plugins/asm/asm.c (revision 29257) @@ -34,13 +34,13 @@ #include "board.h" #include "data.h" -#include "plugins.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include #include "obj_subc.h" -#include "pcb-printf.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include +#include #include "search.h" #include "draw.h" #include "select.h" Index: trunk/src_plugins/asm/asm_conf.h =================================================================== --- trunk/src_plugins/asm/asm_conf.h (revision 29256) +++ trunk/src_plugins/asm/asm_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_ASM_CONF_H #define PCB_ASM_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/autocrop/autocrop.c =================================================================== --- trunk/src_plugins/autocrop/autocrop.c (revision 29256) +++ trunk/src_plugins/autocrop/autocrop.c (revision 29257) @@ -35,8 +35,8 @@ #include "data.h" #include "draw.h" #include "undo.h" -#include "actions.h" -#include "plugins.h" +#include +#include static const char pcb_acth_autocrop[] = "Autocrops the board dimensions to (extants + a margin of 1 grid), keeping the move and board size grid aligned"; static const char pcb_acts_autocrop[] = "autocrop()"; Index: trunk/src_plugins/autoplace/action.c =================================================================== --- trunk/src_plugins/autoplace/action.c (revision 29256) +++ trunk/src_plugins/autoplace/action.c (revision 29257) @@ -34,10 +34,10 @@ #include "config.h" #include "autoplace.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "board.h" -#include "event.h" +#include static const char autoplace_syntax[] = "AutoPlaceSelected()"; static const char autoplace_help[] = "Auto-place selected components."; Index: trunk/src_plugins/autoplace/autoplace.c =================================================================== --- trunk/src_plugins/autoplace/autoplace.c (revision 29256) +++ trunk/src_plugins/autoplace/autoplace.c (revision 29257) @@ -50,11 +50,11 @@ #include "board.h" #include "autoplace.h" -#include "box.h" -#include "compat_misc.h" +#include +#include #include "data.h" #include "draw.h" -#include "error.h" +#include #include "layer.h" #include "intersect.h" #include "rtree.h" Index: trunk/src_plugins/autoplace/autoplace.h =================================================================== --- trunk/src_plugins/autoplace/autoplace.h (revision 29256) +++ trunk/src_plugins/autoplace/autoplace.h (revision 29257) @@ -38,7 +38,7 @@ #ifndef PCB_AUTOPLACE_H #define PCB_AUTOPLACE_H -#include "global_typedefs.h" +#include pcb_bool AutoPlaceSelected(void); Index: trunk/src_plugins/autoroute/action.c =================================================================== --- trunk/src_plugins/autoroute/action.c (revision 29256) +++ trunk/src_plugins/autoroute/action.c (revision 29257) @@ -34,9 +34,9 @@ #include "config.h" #include "autoroute.h" -#include "plugins.h" -#include "actions.h" -#include "event.h" +#include +#include +#include #include "funchash_core.h" static const char pcb_acts_AutoRoute[] = "AutoRoute(AllRats|SelectedRats)"; Index: trunk/src_plugins/autoroute/autoroute.c =================================================================== --- trunk/src_plugins/autoroute/autoroute.c (revision 29256) +++ trunk/src_plugins/autoroute/autoroute.c (revision 29257) @@ -68,9 +68,9 @@ #include "data.h" #include "macro.h" #include "autoroute.h" -#include "box.h" +#include #include "draw.h" -#include "error.h" +#include #include "find.h" #include "heap.h" #include "rtree.h" @@ -81,7 +81,7 @@ #include "obj_pinvia_therm.h" #include "undo.h" #include "vector.h" -#include "pcb-printf.h" +#include #include "layer.h" #include #include "layer.h" Index: trunk/src_plugins/autoroute/mtspace.c =================================================================== --- trunk/src_plugins/autoroute/mtspace.c (revision 29256) +++ trunk/src_plugins/autoroute/mtspace.c (revision 29257) @@ -47,7 +47,7 @@ #include #include -#include "box.h" +#include #include "heap.h" #include "rtree.h" #include "mtspace.h" Index: trunk/src_plugins/cam/cam.c =================================================================== --- trunk/src_plugins/cam/cam.c (revision 29256) +++ trunk/src_plugins/cam/cam.c (revision 29257) @@ -34,14 +34,14 @@ #include "board.h" #include "hid_cam.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "hid_nogui.h" -#include "plugins.h" -#include "actions.h" +#include +#include +#include +#include +#include #include "cam_conf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "../src_plugins/cam/conf_internal.c" static const char *cam_cookie = "cam exporter"; Index: trunk/src_plugins/cam/cam_compile.c =================================================================== --- trunk/src_plugins/cam/cam_compile.c (revision 29256) +++ trunk/src_plugins/cam/cam_compile.c (revision 29257) @@ -31,8 +31,8 @@ #define GVT_DONT_UNDEF #include "cam_compile.h" #include "layer_vis.h" -#include "event.h" -#include "safe_fs.h" +#include +#include #include Index: trunk/src_plugins/cam/cam_conf.h =================================================================== --- trunk/src_plugins/cam/cam_conf.h (revision 29256) +++ trunk/src_plugins/cam/cam_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_VENDOR_CONF_H #define PCB_VENDOR_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/cam/cam_gui.c =================================================================== --- trunk/src_plugins/cam/cam_gui.c (revision 29256) +++ trunk/src_plugins/cam/cam_gui.c (revision 29257) @@ -27,8 +27,8 @@ */ #include -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include static const char *OUTFILE_HELP = "Output file name sample, which will\nbe split to prefix and base name (%base%)\nto be used in file name templates"; static const char *PREFIX_HELP = "File name prefix: every output file\npath will start with this prefix.\nIt is derived from outfile."; Index: trunk/src_plugins/ddraft/centgeo.c =================================================================== --- trunk/src_plugins/ddraft/centgeo.c (revision 29256) +++ trunk/src_plugins/ddraft/centgeo.c (revision 29257) @@ -34,7 +34,7 @@ #include "obj_line.h" #include "obj_arc.h" #include "math_helper.h" -#include "compat_misc.h" +#include #include "search.h" /* Note about all intersection code: same basic algo as in find_geo.c - Index: trunk/src_plugins/ddraft/cli.c =================================================================== --- trunk/src_plugins/ddraft/cli.c (revision 29256) +++ trunk/src_plugins/ddraft/cli.c (revision 29257) @@ -27,9 +27,9 @@ */ #include "hid_inlines.h" -#include "compat_misc.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #define CLI_MAX_INS_LEN 128 Index: trunk/src_plugins/ddraft/constraint_gui.c =================================================================== --- trunk/src_plugins/ddraft/constraint_gui.c (revision 29256) +++ trunk/src_plugins/ddraft/constraint_gui.c (revision 29257) @@ -26,7 +26,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "hid_dad.h" +#include typedef struct{ PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/ddraft/ddraft.c =================================================================== --- trunk/src_plugins/ddraft/ddraft.c (revision 29256) +++ trunk/src_plugins/ddraft/ddraft.c (revision 29257) @@ -33,15 +33,15 @@ #include #include -#include "hid_attrib.h" -#include "hid_init.h" -#include "plugins.h" -#include "event.h" -#include "actions.h" +#include +#include +#include +#include +#include #include "funchash_core.h" #include "search.h" #include "centgeo.h" -#include "misc_util.h" +#include #include "board.h" #include "data_it.h" #include "obj_line.h" @@ -49,8 +49,8 @@ #include "fields_sphash.h" #include "draw_wireframe.h" #include "conf_core.h" -#include "conf_hid.h" -#include "vtc0.h" +#include +#include static const char *ddraft_cookie = "ddraft plugin"; static int pcb_ddraft_tool; Index: trunk/src_plugins/diag/diag.c =================================================================== --- trunk/src_plugins/diag/diag.c (revision 29256) +++ trunk/src_plugins/diag/diag.c (revision 29257) @@ -34,15 +34,15 @@ #include "flag_str.h" #include "layer.h" #include "diag_conf.h" -#include "actions.h" -#include "plugins.h" -#include "conf.h" -#include "error.h" -#include "event.h" +#include +#include +#include +#include +#include #include "integrity.h" -#include "hid.h" -#include "hid_attrib.h" -#include "hid_dad.h" +#include +#include +#include #include "search.h" #include "macro.h" #include "plug_footprint.h" Index: trunk/src_plugins/diag/diag_conf.c =================================================================== --- trunk/src_plugins/diag/diag_conf.c (revision 29256) +++ trunk/src_plugins/diag/diag_conf.c (revision 29257) @@ -25,7 +25,7 @@ */ #include "config.h" -#include "conf.h" +#include void conf_dump(FILE *f, const char *prefix, int verbose, const char *match_prefix) { Index: trunk/src_plugins/diag/diag_conf.h =================================================================== --- trunk/src_plugins/diag/diag_conf.h (revision 29256) +++ trunk/src_plugins/diag/diag_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_DIAG_CONF_H #define PCB_DIAG_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/diag/integrity.c =================================================================== --- trunk/src_plugins/diag/integrity.c (revision 29256) +++ trunk/src_plugins/diag/integrity.c (revision 29257) @@ -28,7 +28,7 @@ #include "board.h" #include "data.h" -#include "error.h" +#include #include "undo.h" #define CHK "Broken integrity: " Index: trunk/src_plugins/dialogs/dialogs.c =================================================================== --- trunk/src_plugins/dialogs/dialogs.c (revision 29256) +++ trunk/src_plugins/dialogs/dialogs.c (revision 29257) @@ -28,11 +28,11 @@ */ #include "config.h" -#include "hid.h" -#include "hid_attrib.h" -#include "actions.h" -#include "hid_dad.h" -#include "plugins.h" +#include +#include +#include +#include +#include #include "funchash_core.h" #include "../src_plugins/lib_hid_common/dialogs_conf.h" Index: trunk/src_plugins/dialogs/dlg_about.c =================================================================== --- trunk/src_plugins/dialogs/dlg_about.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_about.c (revision 29257) @@ -27,11 +27,11 @@ #include "config.h" #include -#include "actions.h" +#include #include "build_run.h" -#include "file_loaded.h" -#include "hid_dad.h" -#include "pcb-printf.h" +#include +#include +#include #include "dlg_about.h" typedef struct{ Index: trunk/src_plugins/dialogs/dlg_export.c =================================================================== --- trunk/src_plugins/dialogs/dlg_export.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_export.c (revision 29257) @@ -25,15 +25,15 @@ */ #include "config.h" -#include "actions.h" +#include #include "board.h" #include "data.h" #include "layer_vis.h" -#include "event.h" -#include "hid.h" -#include "hid_dad.h" -#include "hid_dad_unit.h" -#include "hid_init.h" +#include +#include +#include +#include +#include #include "dlg_export.h" typedef struct{ Index: trunk/src_plugins/dialogs/dlg_flag_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_flag_edit.c (revision 29257) @@ -25,8 +25,8 @@ */ #include "config.h" -#include "actions.h" -#include "hid_dad.h" +#include +#include #include "flag.h" #include "flag_str.h" #include "change.h" Index: trunk/src_plugins/dialogs/dlg_fontsel.c =================================================================== --- trunk/src_plugins/dialogs/dlg_fontsel.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_fontsel.c (revision 29257) @@ -25,12 +25,12 @@ */ #include "config.h" -#include "actions.h" +#include #include "board.h" #include "change.h" #include "conf_core.h" -#include "event.h" -#include "hid_dad.h" +#include +#include #include "stub_draw.h" #include "idpath.h" #include "search.h" Index: trunk/src_plugins/dialogs/dlg_infobar.c =================================================================== --- trunk/src_plugins/dialogs/dlg_infobar.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_infobar.c (revision 29257) @@ -29,9 +29,9 @@ action). */ #include "config.h" -#include "actions.h" +#include #include "board.h" -#include "hid_dad.h" +#include #include "../src_plugins/lib_hid_common/xpm.h" #include "../src_plugins/lib_hid_common/dlg_comm_m.h" #include "plug_io.h" Index: trunk/src_plugins/dialogs/dlg_layer_binding.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_layer_binding.c (revision 29257) @@ -25,13 +25,13 @@ */ #include "config.h" -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "event.h" +#include #include "conf_core.h" -#include "compat_misc.h" -#include "hid_dad.h" +#include +#include #include "funchash_core.h" #include "obj_subc.h" #include "search.h" Index: trunk/src_plugins/dialogs/dlg_layer_flags.c =================================================================== --- trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_layer_flags.c (revision 29257) @@ -26,9 +26,9 @@ #include "config.h" #include "board.h" -#include "actions.h" -#include "event.h" -#include "hid_dad.h" +#include +#include +#include #include "dlg_layer_binding.h" #include "dlg_layer_flags.h" Index: trunk/src_plugins/dialogs/dlg_lib_pstk.c =================================================================== --- trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_lib_pstk.c (revision 29257) @@ -27,13 +27,13 @@ /* Padstack library dialog */ #include "config.h" -#include "actions.h" +#include #include "data.h" #include "obj_subc.h" #include "vtpadstack.h" #include "hid_inlines.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include #include "obj_pstk.h" #include "obj_pstk_inlines.h" #include "obj_text_draw.h" Index: trunk/src_plugins/dialogs/dlg_library.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_library.c (revision 29257) @@ -32,22 +32,22 @@ #include #include -#include "actions.h" +#include #include "board.h" #include "buffer.h" #include "conf_core.h" #include "data.h" #include "draw.h" -#include "event.h" +#include #include "obj_subc.h" #include "plug_footprint.h" #include "tool.h" #include "undo.h" -#include "hid.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" -#include "hid_init.h" +#include +#include +#include +#include #include "dlg_library.h" Index: trunk/src_plugins/dialogs/dlg_library_param.c =================================================================== --- trunk/src_plugins/dialogs/dlg_library_param.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_library_param.c (revision 29257) @@ -26,7 +26,7 @@ #include "config.h" -#include "safe_fs.h" +#include static void library_param_close_cb(void *caller_data, pcb_hid_attr_ev_t ev) Index: trunk/src_plugins/dialogs/dlg_loadsave.c =================================================================== --- trunk/src_plugins/dialogs/dlg_loadsave.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_loadsave.c (revision 29257) @@ -27,14 +27,14 @@ #include "config.h" #include -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "event.h" -#include "hid_dad.h" -#include "compat_fs.h" +#include +#include +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "plug_io.h" #include "../src_plugins/lib_hid_common/dialogs_conf.h" Index: trunk/src_plugins/dialogs/dlg_netlist.c =================================================================== --- trunk/src_plugins/dialogs/dlg_netlist.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_netlist.c (revision 29257) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "event.h" +#include #include "netlist.h" #include Index: trunk/src_plugins/dialogs/dlg_padstack.c =================================================================== --- trunk/src_plugins/dialogs/dlg_padstack.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_padstack.c (revision 29257) @@ -25,8 +25,8 @@ */ #include "config.h" -#include "actions.h" -#include "hid_dad.h" +#include +#include #include "funchash_core.h" #include "obj_pstk.h" #include "obj_pstk_op.h" Index: trunk/src_plugins/dialogs/dlg_pinout.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pinout.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pinout.c (revision 29257) @@ -26,7 +26,7 @@ #include #include "build_run.h" -#include "pcb-printf.h" +#include #include "obj_subc_parent.h" #include "draw.h" #include "obj_term.h" Index: trunk/src_plugins/dialogs/dlg_pref.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref.c (revision 29257) @@ -30,15 +30,15 @@ #include #include -#include "actions.h" +#include #include "build_run.h" -#include "pcb-printf.h" -#include "error.h" -#include "event.h" -#include "conf.h" -#include "conf_hid.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include +#include +#include +#include +#include +#include #include "dlg_pref.h" Index: trunk/src_plugins/dialogs/dlg_pref.h =================================================================== --- trunk/src_plugins/dialogs/dlg_pref.h (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref.h (revision 29257) @@ -3,8 +3,8 @@ typedef struct pref_ctx_s pref_ctx_t; -#include "conf.h" -#include "conf_hid.h" +#include +#include #include "dlg_pref_sizes.h" #include "dlg_pref_board.h" #include "dlg_pref_general.h" Index: trunk/src_plugins/dialogs/dlg_pref_board.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_board.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_board.c (revision 29257) @@ -27,7 +27,7 @@ /* Preferences dialog, board tab */ #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" #define PCB_EMPTY(a) ((a) ? (a) : "") Index: trunk/src_plugins/dialogs/dlg_pref_color.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_color.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_color.c (revision 29257) @@ -27,7 +27,7 @@ /* Preferences dialog, color tab */ #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" static void pref_color_brd2dlg(pref_ctx_t *ctx) Index: trunk/src_plugins/dialogs/dlg_pref_conf.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_conf.c (revision 29257) @@ -27,9 +27,9 @@ /* Preferences dialog, conf tree tab */ #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" -#include "misc_util.h" +#include static const char *pref_conf_get_val(const lht_node_t *nd, const conf_native_t *nat, int idx); #include "dlg_pref_confedit.c" Index: trunk/src_plugins/dialogs/dlg_pref_conf.h =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_conf.h (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_DLG_PREF_CONF_H #define PCB_DLG_PREF_CONF_H -#include "conf.h" +#include typedef struct { int wtree, wintree, wdesc, wname, wmainp, wnattype, wfilter; Index: trunk/src_plugins/dialogs/dlg_pref_confedit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_confedit.c (revision 29257) @@ -26,7 +26,7 @@ /* Preferences dialog, conf tree tab -> edit conf node (input side) popup */ -#include "hid_dad_unit.h" +#include #define is_read_only_(role) ((role == CFR_INTERNAL) || (role == CFR_SYSTEM) || (role == CFR_DEFAULTPCB)) #define is_read_only(ctx) is_read_only_(ctx->role) Index: trunk/src_plugins/dialogs/dlg_pref_layer.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_layer.c (revision 29257) @@ -27,7 +27,7 @@ /* Preferences dialog, board tab */ #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" #include "stub_draw.h" Index: trunk/src_plugins/dialogs/dlg_pref_lib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_lib.c (revision 29257) @@ -28,9 +28,9 @@ #include #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" -#include "paths.h" +#include static const char *SRC_BRD = ""; Index: trunk/src_plugins/dialogs/dlg_pref_sizes.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_sizes.c (revision 29257) @@ -28,7 +28,7 @@ #include "board.h" #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" /* Actual board size to dialog box */ Index: trunk/src_plugins/dialogs/dlg_pref_win.c =================================================================== --- trunk/src_plugins/dialogs/dlg_pref_win.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_pref_win.c (revision 29257) @@ -27,9 +27,9 @@ /* Preferences dialog, window geometry tab */ #include "dlg_pref.h" -#include "conf.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "../src_plugins/lib_hid_common/dialogs_conf.h" extern const conf_dialogs_t dialogs_conf; Index: trunk/src_plugins/dialogs/dlg_printcalib.c =================================================================== --- trunk/src_plugins/dialogs/dlg_printcalib.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_printcalib.c (revision 29257) @@ -26,7 +26,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "hid_init.h" +#include static pcb_hid_attribute_t printer_calibrate_attrs[] = { {"Enter Values here:", "", Index: trunk/src_plugins/dialogs/dlg_search.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_search.c (revision 29257) @@ -28,11 +28,11 @@ #include -#include "actions.h" -#include "conf_hid.h" -#include "hid_dad.h" -#include "event.h" -#include "error.h" +#include +#include +#include +#include +#include #include "board.h" #define MAX_ROW 8 Index: trunk/src_plugins/dialogs/dlg_search_edit.c =================================================================== --- trunk/src_plugins/dialogs/dlg_search_edit.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_search_edit.c (revision 29257) @@ -26,11 +26,11 @@ #include "config.h" -#include "actions.h" -#include "conf_hid.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" -#include "error.h" +#include +#include +#include +#include +#include typedef struct{ PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/dialogs/dlg_test.c =================================================================== --- trunk/src_plugins/dialogs/dlg_test.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_test.c (revision 29257) @@ -26,8 +26,8 @@ #include "board.h" #include "obj_text.h" -#include "hid_dad_tree.h" -#include "hid_dad_spin.h" +#include +#include static const char dlg_test_syntax[] = "dlg_test()\n"; static const char dlg_test_help[] = "test the attribute dialog"; Index: trunk/src_plugins/dialogs/dlg_undo.c =================================================================== --- trunk/src_plugins/dialogs/dlg_undo.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_undo.c (revision 29257) @@ -25,7 +25,7 @@ */ #include -#include "event.h" +#include #include "undo.h" const char *dlg_undo_cookie = "undo dialog"; Index: trunk/src_plugins/dialogs/dlg_view.c =================================================================== --- trunk/src_plugins/dialogs/dlg_view.c (revision 29256) +++ trunk/src_plugins/dialogs/dlg_view.c (revision 29257) @@ -30,20 +30,20 @@ #include #include -#include "actions.h" +#include #include "board.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "view.h" #include "draw.h" #include "drc.h" -#include "event.h" +#include #include "hid_inlines.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include #include "undo.h" -#include "safe_fs.h" -#include "misc_util.h" +#include +#include static const char *dlg_view_cookie = "dlg_drc"; Index: trunk/src_plugins/distalign/distalign.c =================================================================== --- trunk/src_plugins/distalign/distalign.c (revision 29256) +++ trunk/src_plugins/distalign/distalign.c (revision 29257) @@ -20,16 +20,16 @@ #include "board.h" #include "config.h" #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" -#include "error.h" +#include #include "move.h" #include "draw.h" -#include "plugins.h" +#include #include "macro.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include enum { K_X, Index: trunk/src_plugins/distaligntext/distaligntext.c =================================================================== --- trunk/src_plugins/distaligntext/distaligntext.c (revision 29256) +++ trunk/src_plugins/distaligntext/distaligntext.c (revision 29257) @@ -23,18 +23,18 @@ #include "config.h" #include "board.h" #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" -#include "error.h" +#include #include "move.h" #include "draw.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "conf_core.h" -#include "box.h" +#include #include "macro.h" -#include "compat_misc.h" +#include enum { K_X, Index: trunk/src_plugins/djopt/djopt.c =================================================================== --- trunk/src_plugins/djopt/djopt.c (revision 29256) +++ trunk/src_plugins/djopt/djopt.c (revision 29257) @@ -33,7 +33,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "board.h" #include @@ -48,13 +48,13 @@ #include "flag_str.h" #include "find.h" #include "layer.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "plugins.h" -#include "actions.h" +#include +#include +#include +#include #include "djopt_conf.h" #include "obj_line.h" -#include "event.h" +#include #include "macro.h" #include "obj_pstk_inlines.h" Index: trunk/src_plugins/djopt/djopt_conf.h =================================================================== --- trunk/src_plugins/djopt/djopt_conf.h (revision 29256) +++ trunk/src_plugins/djopt/djopt_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_DJOPT_CONF_H #define PCB_DJOPT_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/draw_csect/draw_csect.c =================================================================== --- trunk/src_plugins/draw_csect/draw_csect.c (revision 29256) +++ trunk/src_plugins/draw_csect/draw_csect.c (revision 29257) @@ -31,11 +31,11 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "plugins.h" +#include #include "stub_draw.h" -#include "compat_misc.h" -#include "actions.h" -#include "event.h" +#include +#include +#include #include "layer_vis.h" #include "obj_text_draw.h" Index: trunk/src_plugins/draw_fab/draw_fab.c =================================================================== --- trunk/src_plugins/draw_fab/draw_fab.c (revision 29256) +++ trunk/src_plugins/draw_fab/draw_fab.c (revision 29257) @@ -33,15 +33,15 @@ #include "board.h" #include "build_run.h" -#include "compat_misc.h" +#include #include "data.h" #include "draw.h" #include "../report/drill.h" -#include "plugins.h" +#include #include "stub_draw.h" #include "draw_fab_conf.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "macro.h" #include "obj_pstk_inlines.h" #include "hid_inlines.h" Index: trunk/src_plugins/draw_fab/draw_fab_conf.h =================================================================== --- trunk/src_plugins/draw_fab/draw_fab_conf.h (revision 29256) +++ trunk/src_plugins/draw_fab/draw_fab_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_DRAW_FAB_CONF_H #define PCB_DRAW_FAB_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/draw_fontsel/draw_fontsel.c =================================================================== --- trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 29256) +++ trunk/src_plugins/draw_fontsel/draw_fontsel.c (revision 29257) @@ -35,11 +35,11 @@ #include "data.h" #include "draw.h" #include "font.h" -#include "actions.h" -#include "plugins.h" +#include +#include #include "stub_draw.h" -#include "pcb-printf.h" -#include "compat_misc.h" +#include +#include #include "conf_core.h" #include "obj_text.h" Index: trunk/src_plugins/drc_orig/drc_orig.c =================================================================== --- trunk/src_plugins/drc_orig/drc_orig.c (revision 29256) +++ trunk/src_plugins/drc_orig/drc_orig.c (revision 29257) @@ -35,8 +35,8 @@ #include "data_it.h" #include "conf_core.h" #include "find.h" -#include "event.h" -#include "plugins.h" +#include +#include #include "layer_vis.h" #include "obj_arc_draw.h" Index: trunk/src_plugins/expfeat/expfeat.c =================================================================== --- trunk/src_plugins/expfeat/expfeat.c (revision 29256) +++ trunk/src_plugins/expfeat/expfeat.c (revision 29257) @@ -25,13 +25,13 @@ */ #include "config.h" -#include "conf.h" +#include #include "data.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "actions.h" +#include +#include static const char pcb_acts_ExpFeatTmp[] = "ExpFeatTmp(...)"; Index: trunk/src_plugins/export_bom/bom.c =================================================================== --- trunk/src_plugins/export_bom/bom.c (revision 29256) +++ trunk/src_plugins/export_bom/bom.c (revision 29257) @@ -15,17 +15,17 @@ #include "build_run.h" #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include +#include -#include "hid.h" -#include "hid_nogui.h" -#include "hid_attrib.h" +#include +#include +#include #include "hid_cam.h" -#include "hid_init.h" +#include #include "macro.h" const char *bom_cookie = "bom HID"; Index: trunk/src_plugins/export_dsn/dsn.c =================================================================== --- trunk/src_plugins/export_dsn/dsn.c (revision 29256) +++ trunk/src_plugins/export_dsn/dsn.c (revision 29257) @@ -45,25 +45,25 @@ #include "board.h" #include "data.h" -#include "error.h" +#include #include "buffer.h" #include "change.h" #include "draw.h" #include "undo.h" -#include "pcb-printf.h" +#include #include "polygon.h" -#include "compat_misc.h" +#include #include "layer.h" -#include "safe_fs.h" +#include #include "netlist.h" -#include "hid.h" -#include "hid_nogui.h" -#include "actions.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include +#include +#include +#include #include "hid_cam.h" -#include "plugins.h" +#include #include "obj_line.h" #include "obj_pstk_inlines.h" Index: trunk/src_plugins/export_dxf/dxf.c =================================================================== --- trunk/src_plugins/export_dxf/dxf.c (revision 29256) +++ trunk/src_plugins/export_dxf/dxf.c (revision 29257) @@ -38,21 +38,21 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "layer.h" #include "layer_vis.h" -#include "plugins.h" -#include "pcb-printf.h" -#include "compat_misc.h" +#include +#include +#include #include "lht_template.h" -#include "safe_fs.h" +#include #include "funchash_core.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" static const char *layer_names[] = { Index: trunk/src_plugins/export_excellon/aperture.c =================================================================== --- trunk/src_plugins/export_excellon/aperture.c (revision 29256) +++ trunk/src_plugins/export_excellon/aperture.c (revision 29257) @@ -4,7 +4,7 @@ #include #include -#include "global_typedefs.h" +#include #define GVT_DONT_UNDEF #include "aperture.h" Index: trunk/src_plugins/export_excellon/excellon.c =================================================================== --- trunk/src_plugins/export_excellon/excellon.c (revision 29256) +++ trunk/src_plugins/export_excellon/excellon.c (revision 29257) @@ -1,23 +1,23 @@ #include "config.h" #include "board.h" -#include "global_typedefs.h" -#include "pcb-printf.h" -#include "safe_fs.h" -#include "error.h" +#include +#include +#include +#include #include "draw.h" -#include "compat_misc.h" +#include #include "layer.h" #include "layer_vis.h" -#include "hid.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" -#include "hid_init.h" -#include "hid_nogui.h" -#include "plugins.h" +#include +#include +#include #include "funchash_core.h" #include "conf_core.h" -#include "event.h" +#include #include "excellon_conf.h" #include "excellon.h" Index: trunk/src_plugins/export_excellon/excellon_conf.h =================================================================== --- trunk/src_plugins/export_excellon/excellon_conf.h (revision 29256) +++ trunk/src_plugins/export_excellon/excellon_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_EXCELLON_CONF_H #define PCB_EXCELLON_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/export_fidocadj/fidocadj.c =================================================================== --- trunk/src_plugins/export_fidocadj/fidocadj.c (revision 29256) +++ trunk/src_plugins/export_fidocadj/fidocadj.c (revision 29257) @@ -46,17 +46,17 @@ #include "board.h" #include "data.h" #include "layer_vis.h" -#include "plugins.h" -#include "pcb-printf.h" -#include "compat_misc.h" +#include +#include +#include #include "plug_io.h" -#include "safe_fs.h" +#include -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" #include "../src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/export_gcode/gcode.c =================================================================== --- trunk/src_plugins/export_gcode/gcode.c (revision 29256) +++ trunk/src_plugins/export_gcode/gcode.c (revision 29257) @@ -25,18 +25,18 @@ */ #include "config.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "board.h" -#include "safe_fs.h" +#include #include "funchash_core.h" #include "layer.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" #include "../src_plugins/millpath/toolpath.h" Index: trunk/src_plugins/export_gerber/gerber.c =================================================================== --- trunk/src_plugins/export_gerber/gerber.c (revision 29256) +++ trunk/src_plugins/export_gerber/gerber.c (revision 29257) @@ -14,28 +14,28 @@ #include "build_run.h" #include "config.h" #include "data.h" -#include "error.h" +#include #include "draw.h" #include "layer.h" #include "layer_vis.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include #include "hid_cam.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "macro.h" #include "funchash_core.h" #include "gerber_conf.h" -#include "event.h" +#include -#include "hid.h" -#include "hid_nogui.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include +#include +#include #include "hid_inlines.h" -#include "hid_dad.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "../src_plugins/export_excellon/aperture.h" #include "../src_plugins/export_excellon/excellon.h" Index: trunk/src_plugins/export_gerber/gerber_conf.h =================================================================== --- trunk/src_plugins/export_gerber/gerber_conf.h (revision 29256) +++ trunk/src_plugins/export_gerber/gerber_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_GERBER_CONF_H #define PCB_GERBER_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/export_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/export_ipcd356/ipcd356.c (revision 29256) +++ trunk/src_plugins/export_ipcd356/ipcd356.c (revision 29257) @@ -32,10 +32,10 @@ #include "board.h" #include "data.h" -#include "safe_fs.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" -#include "compat_misc.h" +#include +#include #include "netlist.h" #include "math_helper.h" #include "layer.h" @@ -46,12 +46,12 @@ #include "obj_pstk.h" #include "obj_pstk_inlines.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include #include "hid_cam.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "plugins.h" +#include +#include +#include static const char *ipcd356_cookie = "ipcd356 exporter"; Index: trunk/src_plugins/export_lpr/lpr.c =================================================================== --- trunk/src_plugins/export_lpr/lpr.c (revision 29256) +++ trunk/src_plugins/export_lpr/lpr.c (revision 29257) @@ -7,16 +7,16 @@ #include #include "data.h" -#include "plugins.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include -#include "hid.h" +#include #include "../export_ps/ps.h" -#include "hid_nogui.h" -#include "hid_init.h" -#include "hid_attrib.h" -#include "actions.h" +#include +#include +#include +#include const char *lpr_cookie = "lpr HID"; Index: trunk/src_plugins/export_oldconn/oldconn.c =================================================================== --- trunk/src_plugins/export_oldconn/oldconn.c (revision 29256) +++ trunk/src_plugins/export_oldconn/oldconn.c (revision 29257) @@ -30,15 +30,15 @@ #include #include -#include "actions.h" +#include #include "board.h" -#include "compat_fs.h" +#include #include "data.h" #include "data_it.h" #include "draw.h" -#include "plugins.h" +#include #include "plug_io.h" -#include "safe_fs.h" +#include #include "find.h" #include "macro.h" #include "obj_subc_parent.h" @@ -46,8 +46,8 @@ #include "funchash_core.h" #include "search.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include const char *oldconn_cookie = "export_oldconn HID"; Index: trunk/src_plugins/export_openems/excitation.c =================================================================== --- trunk/src_plugins/export_openems/excitation.c (revision 29256) +++ trunk/src_plugins/export_openems/excitation.c (revision 29257) @@ -26,8 +26,8 @@ #include "config.h" -#include "hid_dad.h" -#include "event.h" +#include +#include #define MAX_EXC 16 #define FREQ_MAX ((double)(100.0*1000.0*1000.0*1000.0)) Index: trunk/src_plugins/export_openems/export_openems.c =================================================================== --- trunk/src_plugins/export_openems/export_openems.c (revision 29256) +++ trunk/src_plugins/export_openems/export_openems.c (revision 29257) @@ -37,19 +37,19 @@ #include "data.h" #include "data_it.h" #include "draw.h" -#include "compat_misc.h" -#include "plugins.h" -#include "safe_fs.h" +#include +#include +#include #include "layer_vis.h" #include "obj_subc_parent.h" #include "obj_pstk_inlines.h" -#include "hid.h" -#include "actions.h" -#include "hid_nogui.h" +#include +#include +#include #include "hid_cam.h" -#include "hid_attrib.h" -#include "hid_init.h" +#include +#include #include "../src_plugins/lib_polyhelp/topoly.h" #include "mesh.h" Index: trunk/src_plugins/export_openems/mesh.c =================================================================== --- trunk/src_plugins/export_openems/mesh.c (revision 29256) +++ trunk/src_plugins/export_openems/mesh.c (revision 29257) @@ -29,13 +29,13 @@ #include "mesh.h" #include "layer.h" #include "layer_ui.h" -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "hid_dad.h" -#include "event.h" -#include "safe_fs.h" -#include "pcb-printf.h" +#include +#include +#include +#include static pcb_mesh_t mesh; static const char *mesh_ui_cookie = "mesh ui layer cookie"; Index: trunk/src_plugins/export_openems/mesh.h =================================================================== --- trunk/src_plugins/export_openems/mesh.h (revision 29256) +++ trunk/src_plugins/export_openems/mesh.h (revision 29257) @@ -1,5 +1,5 @@ #include "layer.h" -#include "vtc0.h" +#include #include "vtr0.h" #include Index: trunk/src_plugins/export_openscad/export_openscad.c =================================================================== --- trunk/src_plugins/export_openscad/export_openscad.c (revision 29256) +++ trunk/src_plugins/export_openscad/export_openscad.c (revision 29257) @@ -37,26 +37,26 @@ #include #include -#include "compat_misc.h" +#include #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "layer.h" #include "layer_vis.h" #include "math_helper.h" -#include "misc_util.h" -#include "plugins.h" -#include "safe_fs.h" +#include +#include +#include #include "obj_pstk_inlines.h" #include "funchash_core.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "actions.h" -#include "hid_attrib.h" +#include +#include +#include #include "hid_cam.h" Index: trunk/src_plugins/export_png/png.c =================================================================== --- trunk/src_plugins/export_png/png.c (revision 29256) +++ trunk/src_plugins/export_png/png.c (revision 29257) @@ -42,32 +42,32 @@ #include #include "board.h" -#include "color.h" +#include #include "color_cache.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "layer.h" #include "layer_vis.h" -#include "misc_util.h" -#include "compat_misc.h" -#include "plugins.h" -#include "safe_fs.h" +#include +#include +#include +#include #include "funchash_core.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include #include "png.h" /* the gd library which makes this all so easy */ #include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" #define PNG_SCALE_HACK1 0 -#include "compat_misc.h" +#include #define pcb_hack_round(d) pcb_round(d) #define CRASH(func) fprintf(stderr, "HID error: pcb called unimplemented PNG function %s.\n", func); abort() Index: trunk/src_plugins/export_ps/eps.c =================================================================== --- trunk/src_plugins/export_ps/eps.c (revision 29256) +++ trunk/src_plugins/export_ps/eps.c (revision 29257) @@ -8,19 +8,19 @@ #include "math_helper.h" #include "board.h" -#include "color.h" +#include #include "data.h" #include "draw.h" #include "layer.h" #include "layer_vis.h" -#include "pcb-printf.h" -#include "safe_fs.h" +#include +#include -#include "hid.h" -#include "hid_nogui.h" +#include +#include #include "ps.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" #include "funchash_core.h" Index: trunk/src_plugins/export_ps/ps.c =================================================================== --- trunk/src_plugins/export_ps/ps.c (revision 29256) +++ trunk/src_plugins/export_ps/ps.c (revision 29257) @@ -10,23 +10,23 @@ #include "board.h" #include "data.h" #include "layer.h" -#include "error.h" +#include #include "draw.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include #include "hid_cam.h" -#include "safe_fs.h" +#include #include "funchash_core.h" #include "layer_vis.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include #include "ps.h" -#include "hid_init.h" -#include "hid_attrib.h" -#include "actions.h" +#include +#include +#include #include "conf_core.h" -#include "compat_misc.h" +#include #include "stub_draw.h" #include "../src_plugins/lib_compat_help/media.h" Index: trunk/src_plugins/export_stat/stat.c =================================================================== --- trunk/src_plugins/export_stat/stat.c (revision 29256) +++ trunk/src_plugins/export_stat/stat.c (revision 29257) @@ -49,18 +49,18 @@ #include "data.h" #include "data_it.h" #include "netlist.h" -#include "plugins.h" -#include "pcb-printf.h" -#include "compat_misc.h" +#include +#include +#include #include "plug_io.h" -#include "safe_fs.h" +#include #include "obj_pstk_inlines.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" Index: trunk/src_plugins/export_stl/export_stl.c =================================================================== --- trunk/src_plugins/export_stl/export_stl.c (revision 29256) +++ trunk/src_plugins/export_stl/export_stl.c (revision 29257) @@ -26,13 +26,13 @@ #include "config.h" -#include "actions.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include +#include #include "hid_cam.h" -#include "hid_nogui.h" -#include "safe_fs.h" -#include "plugins.h" +#include +#include +#include #include "../lib_polyhelp/topoly.h" #include "../lib_polyhelp/triangulate.h" Index: trunk/src_plugins/export_svg/svg.c =================================================================== --- trunk/src_plugins/export_svg/svg.c (revision 29256) +++ trunk/src_plugins/export_svg/svg.c (revision 29257) @@ -45,20 +45,20 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "layer.h" #include "layer_vis.h" -#include "misc_util.h" -#include "compat_misc.h" -#include "plugins.h" -#include "safe_fs.h" +#include +#include +#include +#include #include "funchash_core.h" -#include "hid.h" -#include "hid_nogui.h" +#include +#include -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include #include "hid_cam.h" Index: trunk/src_plugins/export_test/export_test.c =================================================================== --- trunk/src_plugins/export_test/export_test.c (revision 29256) +++ trunk/src_plugins/export_test/export_test.c (revision 29257) @@ -10,15 +10,15 @@ #include "build_run.h" #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include +#include -#include "hid.h" -#include "hid_nogui.h" -#include "hid_attrib.h" +#include +#include +#include #include "hid_cam.h" -#include "hid_init.h" +#include const char *export_test_cookie = "export_test HID"; Index: trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c =================================================================== --- trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 29256) +++ trunk/src_plugins/export_vfs_fuse/export_vfs_fuse.c (revision 29257) @@ -20,17 +20,17 @@ #include "build_run.h" #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include +#include #include "plug_io.h" -#include "safe_fs.h" -#include "compat_fs.h" +#include +#include -#include "hid.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "hid_nogui.h" +#include +#include +#include +#include #include "../src_plugins/lib_vfs/lib_vfs.h" Index: trunk/src_plugins/export_vfs_mc/export_vfs_mc.c =================================================================== --- trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 29256) +++ trunk/src_plugins/export_vfs_mc/export_vfs_mc.c (revision 29257) @@ -10,15 +10,15 @@ #include "build_run.h" #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include +#include #include "plug_io.h" -#include "hid.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "hid_nogui.h" +#include +#include +#include +#include #include "../src_plugins/lib_vfs/lib_vfs.h" Index: trunk/src_plugins/export_xy/xy.c =================================================================== --- trunk/src_plugins/export_xy/xy.c (revision 29256) +++ trunk/src_plugins/export_xy/xy.c (revision 29257) @@ -1,6 +1,6 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include #include @@ -14,24 +14,24 @@ #include "board.h" #include "data.h" #include "data_it.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "compat_misc.h" +#include +#include +#include +#include #include "obj_pstk_inlines.h" #include "obj_subc_op.h" #include "layer.h" #include "netlist.h" -#include "safe_fs.h" +#include #include "macro.h" #include "operation.h" #include "xy_conf.h" -#include "hid.h" -#include "hid_nogui.h" -#include "hid_attrib.h" +#include +#include +#include #include "hid_cam.h" -#include "hid_init.h" +#include #include "../src_plugins/lib_compat_help/elem_rot.h" #include "../src_plugins/export_xy/conf_internal.c" Index: trunk/src_plugins/export_xy/xy_conf.h =================================================================== --- trunk/src_plugins/export_xy/xy_conf.h (revision 29256) +++ trunk/src_plugins/export_xy/xy_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_VENDOR_CONF_H #define PCB_VENDOR_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/extedit/extedit.c =================================================================== --- trunk/src_plugins/extedit/extedit.c (revision 29256) +++ trunk/src_plugins/extedit/extedit.c (revision 29257) @@ -29,21 +29,21 @@ #include "config.h" -#include "hid.h" -#include "hid_attrib.h" -#include "actions.h" -#include "hid_dad.h" -#include "plugins.h" +#include +#include +#include +#include +#include #include "board.h" -#include "compat_fs.h" -#include "compat_misc.h" +#include +#include #include "conf_core.h" #include "data.h" #include "buffer.h" -#include "paths.h" +#include #include "remove.h" -#include "safe_fs.h" +#include #include "search.h" #include "undo.h" #include "../src_plugins/io_lihata/io_lihata.h" Index: trunk/src_plugins/extedit/extedit_dad.c =================================================================== --- trunk/src_plugins/extedit/extedit_dad.c (revision 29256) +++ trunk/src_plugins/extedit/extedit_dad.c (revision 29257) @@ -27,7 +27,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "hid_dad.h" +#include typedef struct { PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/exto_std/exto_std.c =================================================================== --- trunk/src_plugins/exto_std/exto_std.c (revision 29256) +++ trunk/src_plugins/exto_std/exto_std.c (revision 29257) @@ -32,15 +32,15 @@ #include "board.h" #include "data.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "obj_subc.h" -#include "pcb-printf.h" +#include #include "extobj.h" #include "extobj_helper.h" #include "conf_core.h" #include "hid_inlines.h" -#include "hid_dad.h" +#include #include "line_of_vias.c" #include "dimension.c" Index: trunk/src_plugins/fontmode/fontmode.c =================================================================== --- trunk/src_plugins/fontmode/fontmode.c (revision 29256) +++ trunk/src_plugins/fontmode/fontmode.c (revision 29257) @@ -50,11 +50,11 @@ #include "rtree.h" #include "flag_str.h" #include "undo.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "actions.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include +#include +#include #include "polygon.h" #include "obj_poly_draw.h" Index: trunk/src_plugins/fp_board/fp_board.c =================================================================== --- trunk/src_plugins/fp_board/fp_board.c (revision 29256) +++ trunk/src_plugins/fp_board/fp_board.c (revision 29257) @@ -1,20 +1,20 @@ #include "config.h" -#include "plugins.h" +#include #include "plug_footprint.h" #include "board.h" #include "buffer.h" #include "data.h" -#include "error.h" +#include #include "obj_subc.h" #include "obj_subc_list.h" #include "obj_subc_op.h" -#include "compat_misc.h" -#include "pcb-printf.h" +#include +#include #include "operation.h" #include "plug_io.h" -#include "safe_fs.h" +#include #define REQUIRE_PATH_PREFIX "board@" Index: trunk/src_plugins/fp_fs/fp_fs.c =================================================================== --- trunk/src_plugins/fp_fs/fp_fs.c (revision 29256) +++ trunk/src_plugins/fp_fs/fp_fs.c (revision 29257) @@ -36,17 +36,17 @@ #include "board.h" #include "data.h" -#include "paths.h" -#include "plugins.h" +#include +#include #include "plug_footprint.h" -#include "compat_fs.h" -#include "compat_misc.h" -#include "error.h" -#include "conf.h" +#include +#include +#include +#include #include "conf_core.h" -#include "hid_init.h" +#include #include "macro.h" -#include "safe_fs.h" +#include #include "safe_fs_dir.h" static pcb_fptype_t pcb_fp_file_type(const char *fn, void ***tags); Index: trunk/src_plugins/fp_wget/edakrill.c =================================================================== --- trunk/src_plugins/fp_wget/edakrill.c (revision 29256) +++ trunk/src_plugins/fp_wget/edakrill.c (revision 29257) @@ -32,13 +32,13 @@ #include #include #include -#include "error.h" +#include #include "wget_common.h" #include "edakrill.h" -#include "plugins.h" +#include #include "plug_footprint.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "fp_wget_conf.h" #include "globalconst.h" Index: trunk/src_plugins/fp_wget/fp_wget.c =================================================================== --- trunk/src_plugins/fp_wget/fp_wget.c (revision 29256) +++ trunk/src_plugins/fp_wget/fp_wget.c (revision 29257) @@ -1,7 +1,7 @@ #include "config.h" #include "gedasymbols.h" #include "edakrill.h" -#include "plugins.h" +#include #include "fp_wget_conf.h" #include "../src_plugins/fp_wget/conf_internal.c" Index: trunk/src_plugins/fp_wget/fp_wget_conf.h =================================================================== --- trunk/src_plugins/fp_wget/fp_wget_conf.h (revision 29256) +++ trunk/src_plugins/fp_wget/fp_wget_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_FP_WGET_CONF_H #define PCB_FP_WGET_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/fp_wget/gedasymbols.c =================================================================== --- trunk/src_plugins/fp_wget/gedasymbols.c (revision 29256) +++ trunk/src_plugins/fp_wget/gedasymbols.c (revision 29257) @@ -32,13 +32,13 @@ #include #include #include -#include "error.h" +#include #include "wget_common.h" #include "gedasymbols.h" -#include "plugins.h" +#include #include "plug_footprint.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "fp_wget_conf.h" #include "globalconst.h" Index: trunk/src_plugins/fp_wget/wget_common.c =================================================================== --- trunk/src_plugins/fp_wget/wget_common.c (revision 29256) +++ trunk/src_plugins/fp_wget/wget_common.c (revision 29257) @@ -29,8 +29,8 @@ #include #include "config.h" #include "wget_common.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "globalconst.h" #include "../src_plugins/lib_wget/lib_wget.h" Index: trunk/src_plugins/hid_batch/batch.c =================================================================== --- trunk/src_plugins/hid_batch/batch.c (revision 29256) +++ trunk/src_plugins/hid_batch/batch.c (revision 29257) @@ -6,20 +6,20 @@ #include #include "board.h" -#include "hid.h" +#include #include "data.h" #include "layer.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include -#include "hid_nogui.h" -#include "actions.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include +#include +#include static const char *batch_cookie = "batch HID"; Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 29256) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 29257) @@ -1,16 +1,16 @@ #include "config.h" -#include "hidlib_conf.h" +#include #include #include "crosshair.h" #include "draw.h" -#include "grid.h" -#include "color.h" +#include +#include #include "color_cache.h" -#include "hid_attrib.h" +#include #include "funchash_core.h" -#include "pixmap.h" +#include #include "../src_plugins/lib_gtk_common/pcb_gtk.h" #include "../src_plugins/lib_gtk_common/compat.h" Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 29256) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-main.c (revision 29257) @@ -2,8 +2,8 @@ #include -#include "plugins.h" -#include "hid_init.h" +#include +#include #include "../src_plugins/lib_gtk_common/glue_common.h" #include "../src_plugins/lib_gtk_common/glue_hid.h" Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 29256) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-gl.c (revision 29257) @@ -5,10 +5,10 @@ #include "crosshair.h" #include "draw.h" #include "color_cache.h" -#include "hid_attrib.h" -#include "hidlib_conf.h" +#include +#include #include "funchash_core.h" -#include "pixmap.h" +#include #include "../src_plugins/lib_hid_common/clip.h" #include "../src_plugins/lib_gtk_common/hid_gtk_conf.h" Index: trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c =================================================================== --- trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 29256) +++ trunk/src_plugins/hid_gtk2_gl/gtkhid-main.c (revision 29257) @@ -2,9 +2,9 @@ #include -#include "plugins.h" -#include "hid_init.h" -#include "hidlib_conf.h" +#include +#include +#include #include "../src_plugins/lib_hid_gl/draw_gl.h" Index: trunk/src_plugins/hid_lesstif/dialogs.c =================================================================== --- trunk/src_plugins/hid_lesstif/dialogs.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/dialogs.c (revision 29257) @@ -1,7 +1,7 @@ #include "xincludes.h" #include "config.h" -#include "hidlib_conf.h" +#include #include #include @@ -10,21 +10,21 @@ #include "FillBox.h" -#include "compat_misc.h" +#include #include "data.h" -#include "event.h" +#include #include "build_run.h" #include "crosshair.h" #include "layer.h" -#include "pcb-printf.h" +#include -#include "hid.h" +#include #include "lesstif.h" -#include "hid_attrib.h" -#include "actions.h" -#include "hid_init.h" +#include +#include +#include #include "ltf_stdarg.h" -#include "misc_util.h" +#include #include "search.h" #include "change.h" Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 29257) @@ -32,7 +32,7 @@ #include "wt_xpm.h" #include "wt_colorbtn.h" -#include "hid_dad.h" +#include #include "../src_plugins/lib_hid_common/dad_markup.h" Index: trunk/src_plugins/hid_lesstif/dlg_attr_tree.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/dlg_attr_tree.c (revision 29257) @@ -1,6 +1,6 @@ #include "brave.h" #include "xm_tree_table_widget.h" -#include "hid_dad_tree.h" +#include typedef struct { lesstif_attr_dlg_t *ctx; Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.c (revision 29257) @@ -30,9 +30,9 @@ #include "lesstif.h" #include "ltf_stdarg.h" -#include "hid.h" -#include "hid_dad.h" -#include "event.h" +#include +#include +#include #include "dlg_fileselect.h" Index: trunk/src_plugins/hid_lesstif/dlg_fileselect.h =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_fileselect.h (revision 29256) +++ trunk/src_plugins/hid_lesstif/dlg_fileselect.h (revision 29257) @@ -1,2 +1,2 @@ -#include "global_typedefs.h" +#include char *pcb_ltf_fileselect(pcb_hid_t *hid, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub); Index: trunk/src_plugins/hid_lesstif/lesstif.h =================================================================== --- trunk/src_plugins/hid_lesstif/lesstif.h (revision 29256) +++ trunk/src_plugins/hid_lesstif/lesstif.h (revision 29257) @@ -1,4 +1,4 @@ -#include "hid_cfg_input.h" +#include #include "board.h" #define app_context lesstif_app_context Index: trunk/src_plugins/hid_lesstif/library.c =================================================================== --- trunk/src_plugins/hid_lesstif/library.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/library.c (revision 29257) @@ -8,17 +8,17 @@ #include #include -#include "compat_misc.h" +#include #include "data.h" -#include "actions.h" +#include #include "buffer.h" #include #include "plug_footprint.h" -#include "hid.h" +#include #include "lesstif.h" #include "ltf_stdarg.h" -#include "event.h" +#include #include "tool.h" extern pcb_hidlib_t *ltf_hidlib; Index: trunk/src_plugins/hid_lesstif/ltf_stdarg.h =================================================================== --- trunk/src_plugins/hid_lesstif/ltf_stdarg.h (revision 29256) +++ trunk/src_plugins/hid_lesstif/ltf_stdarg.h (revision 29257) @@ -1,5 +1,5 @@ #include "xincludes.h" -#include "color.h" +#include extern Colormap lesstif_colormap; Index: trunk/src_plugins/hid_lesstif/main.c =================================================================== --- trunk/src_plugins/hid_lesstif/main.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/main.c (revision 29257) @@ -3,9 +3,9 @@ #include "config.h" #include "math_helper.h" #include "conf_core.h" -#include "hidlib_conf.h" -#include "hidlib.h" -#include "pixmap.h" +#include +#include +#include #include #include @@ -19,32 +19,32 @@ #include "data.h" #include "draw.h" -#include "color.h" +#include #include "color_cache.h" #include "crosshair.h" -#include "conf_hid.h" +#include #include "layer.h" -#include "pcb-printf.h" -#include "event.h" -#include "error.h" -#include "plugins.h" +#include +#include +#include +#include #include "macro.h" -#include "safe_fs.h" +#include #include "funchash_core.h" -#include "hid.h" -#include "hid_nogui.h" -#include "hid_cfg.h" +#include +#include +#include #include "lesstif.h" -#include "hid_cfg_input.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "hid_dad.h" -#include "actions.h" +#include +#include +#include +#include +#include #include "ltf_stdarg.h" -#include "grid.h" -#include "misc_util.h" -#include "compat_misc.h" +#include +#include +#include #include "layer_vis.h" #include "tool.h" Index: trunk/src_plugins/hid_lesstif/menu.c =================================================================== --- trunk/src_plugins/hid_lesstif/menu.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/menu.c (revision 29257) @@ -10,21 +10,21 @@ #include #include "data.h" -#include "error.h" -#include "pcb-printf.h" +#include +#include #include "layer.h" -#include "hid.h" -#include "hid_cfg.h" -#include "hid_cfg_action.h" -#include "hid_cfg_input.h" -#include "conf_hid.h" +#include +#include +#include +#include +#include #include "lesstif.h" -#include "paths.h" -#include "actions.h" +#include +#include #include "ltf_stdarg.h" -#include "event.h" -#include "compat_misc.h" +#include +#include #include "layer_vis.h" #include Index: trunk/src_plugins/hid_lesstif/netlist.c =================================================================== --- trunk/src_plugins/hid_lesstif/netlist.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/netlist.c (revision 29257) @@ -7,7 +7,7 @@ #include "xincludes.h" -#include "compat_misc.h" +#include #include "data.h" #include "find.h" @@ -17,11 +17,11 @@ #include "remove.h" #include "crosshair.h" #include "draw.h" -#include "event.h" -#include "fptr_cast.h" +#include +#include -#include "hid.h" -#include "actions.h" +#include +#include #include "lesstif.h" #include "ltf_stdarg.h" Index: trunk/src_plugins/hid_lesstif/wt_colorbtn.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_colorbtn.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/wt_colorbtn.c (revision 29257) @@ -31,8 +31,8 @@ #include #include -#include "compat_misc.h" -#include "color.h" +#include +#include static int fill_bar(Display *display, XImage *image, const pcb_color_t *color, int width, int height) { Index: trunk/src_plugins/hid_lesstif/wt_preview.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_preview.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/wt_preview.c (revision 29257) @@ -25,7 +25,7 @@ */ #include "wt_preview.h" -#include "hid_attrib.h" +#include static gdl_list_t ltf_previews; Index: trunk/src_plugins/hid_lesstif/wt_xpm.c =================================================================== --- trunk/src_plugins/hid_lesstif/wt_xpm.c (revision 29256) +++ trunk/src_plugins/hid_lesstif/wt_xpm.c (revision 29257) @@ -31,7 +31,7 @@ #include #include -#include "compat_misc.h" +#include static unsigned long hex_digit(char c) Index: trunk/src_plugins/hid_remote/proto.c =================================================================== --- trunk/src_plugins/hid_remote/proto.c (revision 29256) +++ trunk/src_plugins/hid_remote/proto.c (revision 29257) @@ -26,7 +26,7 @@ #include #include -#include "pcb-printf.h" +#include #define proto_vsnprintf pcb_vsnprintf #include "proto_lowcommon.h" #include "proto_lowsend.h" Index: trunk/src_plugins/hid_remote/proto_lowparse.h =================================================================== --- trunk/src_plugins/hid_remote/proto_lowparse.h (revision 29256) +++ trunk/src_plugins/hid_remote/proto_lowparse.h (revision 29257) @@ -26,7 +26,7 @@ #include #include -#include "base64.h" +#include #define MAX_FIELD_ALLOC 1024*1024 Index: trunk/src_plugins/hid_remote/proto_lowsend.h =================================================================== --- trunk/src_plugins/hid_remote/proto_lowsend.h (revision 29256) +++ trunk/src_plugins/hid_remote/proto_lowsend.h (revision 29257) @@ -28,7 +28,7 @@ #include #include #include -#include "base64.h" +#include #define SUBSEQ_MASK (1 << (ctx->depth - 1)) Index: trunk/src_plugins/hid_remote/remote.c =================================================================== --- trunk/src_plugins/hid_remote/remote.c (revision 29256) +++ trunk/src_plugins/hid_remote/remote.c (revision 29257) @@ -6,21 +6,21 @@ #include #include "board.h" -#include "hid.h" +#include #include "data.h" #include "draw.h" #include "layer.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "compat_misc.h" +#include +#include +#include #include "funchash_core.h" -#include "event.h" +#include #include "proto.h" -#include "hid_nogui.h" -#include "actions.h" -#include "hid_init.h" +#include +#include +#include static const char *remote_cookie = "remote HID"; Index: trunk/src_plugins/import_calay/calay.c =================================================================== --- trunk/src_plugins/import_calay/calay.c (revision 29256) +++ trunk/src_plugins/import_calay/calay.c (revision 29257) @@ -34,14 +34,14 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include #define NETEXT ".net" #define CMPEXT ".cmp" Index: trunk/src_plugins/import_dsn/dsn.c =================================================================== --- trunk/src_plugins/import_dsn/dsn.c (revision 29256) +++ trunk/src_plugins/import_dsn/dsn.c (revision 29257) @@ -38,11 +38,11 @@ #include "board.h" #include "data.h" #include "polygon.h" -#include "safe_fs.h" +#include -#include "actions.h" -#include "hid.h" -#include "plugins.h" +#include +#include +#include #include "src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/import_edif/edif.c =================================================================== --- trunk/src_plugins/import_edif/edif.c (revision 29256) +++ trunk/src_plugins/import_edif/edif.c (revision 29257) @@ -106,11 +106,11 @@ #include "math_helper.h" #include "board.h" #include "data.h" -#include "error.h" +#include #include "netlist.h" -#include "plugins.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include /* * Local definitions. Index: trunk/src_plugins/import_edif/edif.y =================================================================== --- trunk/src_plugins/import_edif/edif.y (revision 29256) +++ trunk/src_plugins/import_edif/edif.y (revision 29257) @@ -29,11 +29,11 @@ #include "math_helper.h" #include "board.h" #include "data.h" -#include "error.h" +#include #include "netlist.h" -#include "plugins.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include /* * Local definitions. Index: trunk/src_plugins/import_edif/import_edif.c =================================================================== --- trunk/src_plugins/import_edif/import_edif.c (revision 29256) +++ trunk/src_plugins/import_edif/import_edif.c (revision 29257) @@ -30,7 +30,7 @@ #include "config.h" #include "board.h" #include "data.h" -#include "plugins.h" +#include #include "plug_import.h" #include "rats_patch.h" Index: trunk/src_plugins/import_fpcb_nl/fpcb_nl.c =================================================================== --- trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 29256) +++ trunk/src_plugins/import_fpcb_nl/fpcb_nl.c (revision 29257) @@ -35,14 +35,14 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include static const char *fpcb_nl_cookie = "fpcb_nl importer"; Index: trunk/src_plugins/import_hpgl/hpgl.c =================================================================== --- trunk/src_plugins/import_hpgl/hpgl.c (revision 29256) +++ trunk/src_plugins/import_hpgl/hpgl.c (revision 29257) @@ -38,14 +38,14 @@ #include "conf_core.h" #include "data.h" #include "buffer.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include static const char *hpgl_cookie = "hpgl importer"; Index: trunk/src_plugins/import_ipcd356/ipcd356.c =================================================================== --- trunk/src_plugins/import_ipcd356/ipcd356.c (revision 29256) +++ trunk/src_plugins/import_ipcd356/ipcd356.c (revision 29257) @@ -33,13 +33,13 @@ #include "board.h" #include "data.h" -#include "safe_fs.h" +#include #include "conf_core.h" -#include "hid.h" -#include "compat_misc.h" -#include "actions.h" -#include "plugins.h" +#include +#include +#include +#include #include "rtree.h" #include "../src_plugins/lib_compat_help/pstk_help.h" Index: trunk/src_plugins/import_ltspice/ltspice.c =================================================================== --- trunk/src_plugins/import_ltspice/ltspice.c (revision 29256) +++ trunk/src_plugins/import_ltspice/ltspice.c (revision 29257) @@ -36,14 +36,14 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include static const char *ltspice_cookie = "ltspice importer"; Index: trunk/src_plugins/import_mentor_sch/mentor_sch.c =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 29256) +++ trunk/src_plugins/import_mentor_sch/mentor_sch.c (revision 29257) @@ -34,17 +34,17 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" +#include +#include +#include #include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include #include "mentor_sch_conf.h" -#include "paths.h" -#include "safe_fs.h" +#include +#include #include "netlist_helper.h" Index: trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h =================================================================== --- trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h (revision 29256) +++ trunk/src_plugins/import_mentor_sch/mentor_sch_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_MENTOR_SCH_CONF_H #define PCB_MENTOR_SCH_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/import_mentor_sch/netlist_helper.c =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 29256) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.c (revision 29257) @@ -34,11 +34,11 @@ #include #include "netlist_helper.h" -#include "compat_misc.h" -#include "pcb-printf.h" -#include "error.h" -#include "actions.h" -#include "safe_fs.h" +#include +#include +#include +#include +#include nethlp_ctx_t *nethlp_new(nethlp_ctx_t *prealloc) Index: trunk/src_plugins/import_mentor_sch/netlist_helper.h =================================================================== --- trunk/src_plugins/import_mentor_sch/netlist_helper.h (revision 29256) +++ trunk/src_plugins/import_mentor_sch/netlist_helper.h (revision 29257) @@ -1,6 +1,6 @@ #include #include -#include "global_typedefs.h" +#include typedef struct nethlp_rule_s nethlp_rule_t; Index: trunk/src_plugins/import_mucs/mucs.c =================================================================== --- trunk/src_plugins/import_mucs/mucs.c (revision 29256) +++ trunk/src_plugins/import_mucs/mucs.c (revision 29257) @@ -40,13 +40,13 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" +#include +#include #include "layer.h" #include "conf_core.h" #include "src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/import_netlist/import_netlist.c =================================================================== --- trunk/src_plugins/import_netlist/import_netlist.c (revision 29256) +++ trunk/src_plugins/import_netlist/import_netlist.c (revision 29257) @@ -31,16 +31,16 @@ #include #include "board.h" -#include "plugins.h" +#include #include "plug_io.h" #include "plug_import.h" #include "conf_core.h" -#include "error.h" +#include #include "data.h" #include "rats_patch.h" -#include "compat_misc.h" -#include "paths.h" -#include "safe_fs.h" +#include +#include +#include #include "macro.h" #include "netlist.h" Index: trunk/src_plugins/import_pxm_gd/import_pxm_gd.c =================================================================== --- trunk/src_plugins/import_pxm_gd/import_pxm_gd.c (revision 29256) +++ trunk/src_plugins/import_pxm_gd/import_pxm_gd.c (revision 29257) @@ -33,9 +33,9 @@ #include #include -#include "plugins.h" -#include "pixmap.h" -#include "safe_fs.h" +#include +#include +#include static const char *import_pxm_gd_cookie = "import_pxm_gd"; Index: trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c =================================================================== --- trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c (revision 29256) +++ trunk/src_plugins/import_pxm_pnm/import_pxm_pnm.c (revision 29257) @@ -32,9 +32,9 @@ #include #include -#include "plugins.h" -#include "pixmap.h" -#include "safe_fs.h" +#include +#include +#include static const char *import_pxm_pnm_cookie = "import_pxm_pnm"; Index: trunk/src_plugins/import_sch/import_sch.c =================================================================== --- trunk/src_plugins/import_sch/import_sch.c (revision 29256) +++ trunk/src_plugins/import_sch/import_sch.c (revision 29257) @@ -37,23 +37,23 @@ #include "board.h" #include "data.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "paths.h" +#include +#include -#include "compat_fs.h" -#include "pcb-printf.h" +#include +#include #include "remove.h" -#include "actions.h" +#include #include "import_sch_conf.h" -#include "misc_util.h" -#include "compat_misc.h" +#include +#include #include "obj_rat.h" -#include "safe_fs.h" +#include TODO("win32: remove this once the w32_ dir workaround is removed") -#include "hid_init.h" +#include conf_import_sch_t conf_import_sch; Index: trunk/src_plugins/import_sch/import_sch_conf.h =================================================================== --- trunk/src_plugins/import_sch/import_sch_conf.h (revision 29256) +++ trunk/src_plugins/import_sch/import_sch_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_IMPORT_SCH_CONF_H #define PCB_IMPORT_SCH_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/import_tinycad/tinycad.c =================================================================== --- trunk/src_plugins/import_tinycad/tinycad.c (revision 29256) +++ trunk/src_plugins/import_tinycad/tinycad.c (revision 29257) @@ -35,14 +35,14 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include static const char *tinycad_cookie = "tinycad importer"; Index: trunk/src_plugins/import_ttf/ttf.c =================================================================== --- trunk/src_plugins/import_ttf/ttf.c (revision 29256) +++ trunk/src_plugins/import_ttf/ttf.c (revision 29257) @@ -34,9 +34,9 @@ #include "board.h" #include "data.h" -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include #include "ttf_load.h" Index: trunk/src_plugins/io_autotrax/io_autotrax.c =================================================================== --- trunk/src_plugins/io_autotrax/io_autotrax.c (revision 29256) +++ trunk/src_plugins/io_autotrax/io_autotrax.c (revision 29257) @@ -32,17 +32,17 @@ #include #include -#include "plugins.h" +#include #include "plug_io.h" #include "write.h" #include "read.h" -#include "actions.h" +#include #include "board.h" #include "conf_core.h" #include "buffer.h" -#include "hid.h" -#include "compat_misc.h" +#include +#include static pcb_plug_io_t io_autotrax; static const char *autotrax_cookie = "autotrax IO"; Index: trunk/src_plugins/io_autotrax/read.c =================================================================== --- trunk/src_plugins/io_autotrax/read.c (revision 29256) +++ trunk/src_plugins/io_autotrax/read.c (revision 29257) @@ -33,21 +33,21 @@ #include #include #include -#include "compat_misc.h" +#include #include "board.h" #include "plug_io.h" -#include "error.h" +#include #include "data.h" #include "read.h" #include "layer.h" #include "polygon.h" -#include "misc_util.h" /* for distance calculations */ +#include /* for distance calculations */ #include "conf_core.h" #include "move.h" #include "macro.h" -#include "safe_fs.h" +#include #include "rotate.h" -#include "actions.h" +#include #include "undo.h" #include "../src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/io_autotrax/write.c =================================================================== --- trunk/src_plugins/io_autotrax/write.c (revision 29256) +++ trunk/src_plugins/io_autotrax/write.c (revision 29257) @@ -27,10 +27,10 @@ */ #include #include "config.h" -#include "compat_misc.h" +#include #include "board.h" #include "plug_io.h" -#include "error.h" +#include #include "netlist.h" #include "data.h" #include "write.h" Index: trunk/src_plugins/io_dsn/io_dsn.c =================================================================== --- trunk/src_plugins/io_dsn/io_dsn.c (revision 29256) +++ trunk/src_plugins/io_dsn/io_dsn.c (revision 29257) @@ -35,10 +35,10 @@ #include "read.h" #include "write.h" -#include "hid.h" -#include "compat_misc.h" +#include +#include #include "plug_io.h" -#include "plugins.h" +#include static const char *dsn_cookie = "dsn IO"; Index: trunk/src_plugins/io_dsn/read.c =================================================================== --- trunk/src_plugins/io_dsn/read.c (revision 29256) +++ trunk/src_plugins/io_dsn/read.c (revision 29257) @@ -36,14 +36,14 @@ #include "board.h" #include "data.h" #include "plug_io.h" -#include "error.h" -#include "pcb_bool.h" -#include "safe_fs.h" -#include "compat_misc.h" +#include +#include +#include +#include #include "layer_grp.h" #include "conf_core.h" #include "math_helper.h" -#include "actions.h" +#include #include "netlist.h" #include "polygon_offs.h" Index: trunk/src_plugins/io_dsn/write.c =================================================================== --- trunk/src_plugins/io_dsn/write.c (revision 29256) +++ trunk/src_plugins/io_dsn/write.c (revision 29257) @@ -29,8 +29,8 @@ #include "config.h" #include "plug_io.h" -#include "error.h" -#include "pcb_bool.h" +#include +#include #include "board.h" #include "data.h" #include "layer.h" Index: trunk/src_plugins/io_eagle/eagle_bin.c =================================================================== --- trunk/src_plugins/io_eagle/eagle_bin.c (revision 29256) +++ trunk/src_plugins/io_eagle/eagle_bin.c (revision 29257) @@ -38,9 +38,9 @@ #include "eagle_bin.h" #include "egb_tree.h" -#include "error.h" +#include #include "math_helper.h" -#include "misc_util.h" +#include /* Describe a bitfield: width of the field that hosts the bitfield, first and last bit offsets, inclusive. Bit offsets are starting from 0 at LSB. */ Index: trunk/src_plugins/io_eagle/egb_tree.c =================================================================== --- trunk/src_plugins/io_eagle/egb_tree.c (revision 29256) +++ trunk/src_plugins/io_eagle/egb_tree.c (revision 29257) @@ -32,7 +32,7 @@ #include #include #include "egb_tree.h" -#include "compat_misc.h" +#include egb_node_t *egb_node_alloc(int id, const char *id_name) { Index: trunk/src_plugins/io_eagle/io_eagle.c =================================================================== --- trunk/src_plugins/io_eagle/io_eagle.c (revision 29256) +++ trunk/src_plugins/io_eagle/io_eagle.c (revision 29257) @@ -28,12 +28,12 @@ */ #include "config.h" -#include "plugins.h" -#include "hid.h" +#include +#include #include "plug_io.h" #include "read.h" #include "read_dru.h" -#include "actions.h" +#include static pcb_plug_io_t io_eagle_xml, io_eagle_bin, io_eagle_dru; static const char *eagle_cookie = "eagle plugin"; Index: trunk/src_plugins/io_eagle/read.c =================================================================== --- trunk/src_plugins/io_eagle/read.c (revision 29256) +++ trunk/src_plugins/io_eagle/read.c (revision 29257) @@ -34,14 +34,14 @@ #include "board.h" #include "data.h" #include "read.h" -#include "conf.h" +#include #include "conf_core.h" -#include "error.h" +#include #include "polygon.h" #include "rtree.h" -#include "actions.h" +#include #include "undo.h" -#include "compat_misc.h" +#include #include "trparse.h" #include "trparse_xml.h" #include "trparse_bin.h" Index: trunk/src_plugins/io_eagle/read.h =================================================================== --- trunk/src_plugins/io_eagle/read.h (revision 29256) +++ trunk/src_plugins/io_eagle/read.h (revision 29257) @@ -1,5 +1,5 @@ #include "board.h" -#include "conf.h" +#include #include "plug_io.h" int io_eagle_test_parse_xml(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f); Index: trunk/src_plugins/io_eagle/read_dru.c =================================================================== --- trunk/src_plugins/io_eagle/read_dru.c (revision 29256) +++ trunk/src_plugins/io_eagle/read_dru.c (revision 29257) @@ -131,10 +131,10 @@ #ifndef PCB_EAGLE_DRU_PARSER_TEST -#include "safe_fs.h" +#include #include "board.h" #include "layer_grp.h" -#include "error.h" +#include int io_eagle_test_parse_dru(pcb_plug_io_t *ctx, pcb_plug_iot_t typ, const char *Filename, FILE *f) { Index: trunk/src_plugins/io_eagle/trparse_bin.c =================================================================== --- trunk/src_plugins/io_eagle/trparse_bin.c (revision 29256) +++ trunk/src_plugins/io_eagle/trparse_bin.c (revision 29257) @@ -31,8 +31,8 @@ #include #include -#include "error.h" -#include "safe_fs.h" +#include +#include #include "egb_tree.h" #include "eagle_bin.h" Index: trunk/src_plugins/io_eagle/trparse_xml.c =================================================================== --- trunk/src_plugins/io_eagle/trparse_xml.c (revision 29256) +++ trunk/src_plugins/io_eagle/trparse_xml.c (revision 29257) @@ -32,8 +32,8 @@ #include #include -#include "error.h" -#include "safe_fs.h" +#include +#include #include "trparse.h" #include "trparse_xml.h" Index: trunk/src_plugins/io_hyp/hyp_l.c =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.c (revision 29256) +++ trunk/src_plugins/io_hyp/hyp_l.c (revision 29257) @@ -2205,7 +2205,7 @@ #line 28 "hyp_l.l" #include -char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */ +char *pcb_strdup(const char *s); /* from #include */ #include "hyp_y.h" Index: trunk/src_plugins/io_hyp/hyp_l.l =================================================================== --- trunk/src_plugins/io_hyp/hyp_l.l (revision 29256) +++ trunk/src_plugins/io_hyp/hyp_l.l (revision 29257) @@ -27,7 +27,7 @@ %{ #include -char *pcb_strdup(const char *s); /* from #include "compat_misc.h" */ +char *pcb_strdup(const char *s); /* from #include */ #include "hyp_y.h" Index: trunk/src_plugins/io_hyp/io_hyp.c =================================================================== --- trunk/src_plugins/io_hyp/io_hyp.c (revision 29256) +++ trunk/src_plugins/io_hyp/io_hyp.c (revision 29257) @@ -32,13 +32,13 @@ #include #include -#include "hid.h" -#include "hid_nogui.h" -#include "actions.h" -#include "hid_init.h" -#include "hid_attrib.h" -#include "plugins.h" -#include "event.h" +#include +#include +#include +#include +#include +#include +#include #include "plug_io.h" #include "parser.h" #include "board.h" Index: trunk/src_plugins/io_hyp/parser.c =================================================================== --- trunk/src_plugins/io_hyp/parser.c (revision 29256) +++ trunk/src_plugins/io_hyp/parser.c (revision 29257) @@ -24,8 +24,8 @@ #include "parser.h" #include "hyp_l.h" #include "hyp_y.h" -#include "error.h" -#include "pcb-printf.h" +#include +#include #include "flag_str.h" #include "polygon.h" #include "board.h" @@ -33,10 +33,10 @@ #include "data.h" #include "search.h" #include "rotate.h" -#include "actions.h" +#include #include "plug_io.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include #include "../src_plugins/lib_compat_help/pstk_help.h" #include "../src_plugins/lib_compat_help/subc_help.h" #include Index: trunk/src_plugins/io_hyp/parser.h =================================================================== --- trunk/src_plugins/io_hyp/parser.h (revision 29256) +++ trunk/src_plugins/io_hyp/parser.h (revision 29257) @@ -22,7 +22,7 @@ #define PCB_IO_HYP_PARSER_H #include -#include "pcb_bool.h" +#include #include "board.h" /* Index: trunk/src_plugins/io_hyp/write.c =================================================================== --- trunk/src_plugins/io_hyp/write.c (revision 29256) +++ trunk/src_plugins/io_hyp/write.c (revision 29257) @@ -30,7 +30,7 @@ #include "board.h" #include "data.h" -#include "compat_misc.h" +#include #include "polygon.h" #include "obj_subc_parent.h" #include "obj_pstk_inlines.h" Index: trunk/src_plugins/io_hyp/write.h =================================================================== --- trunk/src_plugins/io_hyp/write.h (revision 29256) +++ trunk/src_plugins/io_hyp/write.h (revision 29257) @@ -1,5 +1,5 @@ #include -#include "pcb_bool.h" +#include #include "plug_io.h" int io_hyp_write_pcb(pcb_plug_io_t * ctx, FILE * f, const char *old_filename, const char *new_filename, pcb_bool emergency); Index: trunk/src_plugins/io_kicad/io_kicad.c =================================================================== --- trunk/src_plugins/io_kicad/io_kicad.c (revision 29256) +++ trunk/src_plugins/io_kicad/io_kicad.c (revision 29257) @@ -28,12 +28,12 @@ */ #include "config.h" -#include "plugins.h" +#include #include "plug_io.h" #include "write.h" #include "read.h" #include "read_net.h" -#include "actions.h" +#include static pcb_plug_io_t io_kicad; static const char *kicad_cookie = "kicad plugin"; Index: trunk/src_plugins/io_kicad/read.c =================================================================== --- trunk/src_plugins/io_kicad/read.c (revision 29256) +++ trunk/src_plugins/io_kicad/read.c (revision 29257) @@ -36,22 +36,22 @@ #include #include -#include "compat_misc.h" +#include #include "board.h" #include "plug_io.h" -#include "error.h" +#include #include "data.h" #include "read.h" #include "layer.h" #include "polygon.h" #include "plug_footprint.h" -#include "misc_util.h" /* for distance calculations */ +#include /* for distance calculations */ #include "conf_core.h" #include "move.h" #include "macro.h" #include "rotate.h" -#include "safe_fs.h" -#include "attrib.h" +#include +#include #include "netlist.h" #include "math_helper.h" #include "obj_pstk_inlines.h" Index: trunk/src_plugins/io_kicad/read_net.c =================================================================== --- trunk/src_plugins/io_kicad/read_net.c (revision 29256) +++ trunk/src_plugins/io_kicad/read_net.c (revision 29257) @@ -36,14 +36,14 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include +#include -#include "actions.h" -#include "plugins.h" -#include "hid.h" +#include +#include +#include #define if_strval(node, name) \ if (strcmp(node->str, #name) == 0) { \ Index: trunk/src_plugins/io_kicad/read_net.h =================================================================== --- trunk/src_plugins/io_kicad/read_net.h (revision 29256) +++ trunk/src_plugins/io_kicad/read_net.h (revision 29257) @@ -1,4 +1,4 @@ -#include "unit.h" +#include #include extern const char pcb_acts_LoadeeschemaFrom[]; Index: trunk/src_plugins/io_kicad/uniq_name.c =================================================================== --- trunk/src_plugins/io_kicad/uniq_name.c (revision 29256) +++ trunk/src_plugins/io_kicad/uniq_name.c (revision 29257) @@ -4,7 +4,7 @@ #include #include "config.h" #include "uniq_name.h" -#include "compat_misc.h" +#include static const char *unm_default_unnamed = "unnamed"; static const char *unm_default_suffix_sep = "_dup"; Index: trunk/src_plugins/io_kicad/write.c =================================================================== --- trunk/src_plugins/io_kicad/write.c (revision 29256) +++ trunk/src_plugins/io_kicad/write.c (revision 29257) @@ -27,10 +27,10 @@ */ #include #include "config.h" -#include "compat_misc.h" +#include #include "board.h" #include "plug_io.h" -#include "error.h" +#include #include "uniq_name.h" #include "data.h" #include "write.h" Index: trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 29256) +++ trunk/src_plugins/io_kicad_legacy/io_kicad_legacy.c (revision 29257) @@ -28,7 +28,7 @@ */ #include "config.h" -#include "plugins.h" +#include #include "plug_io.h" #include "write.h" Index: trunk/src_plugins/io_kicad_legacy/write.c =================================================================== --- trunk/src_plugins/io_kicad_legacy/write.c (revision 29256) +++ trunk/src_plugins/io_kicad_legacy/write.c (revision 29257) @@ -27,10 +27,10 @@ */ #include #include "config.h" -#include "compat_misc.h" +#include #include "board.h" #include "plug_io.h" -#include "error.h" +#include #include "data.h" #include "write.h" #include "layer.h" Index: trunk/src_plugins/io_lihata/io_lihata.c =================================================================== --- trunk/src_plugins/io_lihata/io_lihata.c (revision 29256) +++ trunk/src_plugins/io_lihata/io_lihata.c (revision 29257) @@ -25,7 +25,7 @@ */ #include "config.h" -#include "plugins.h" +#include #include "plug_io.h" #include "read.h" #include "write.h" Index: trunk/src_plugins/io_lihata/io_lihata.h =================================================================== --- trunk/src_plugins/io_lihata/io_lihata.h (revision 29256) +++ trunk/src_plugins/io_lihata/io_lihata.h (revision 29257) @@ -24,7 +24,7 @@ * mailing list: pcb-rnd (at) list.repo.hu (send "subscribe") */ -#include "conf.h" +#include #include "lht_conf.h" extern conf_io_lihata_t conf_io_lihata; Index: trunk/src_plugins/io_lihata/lht_conf.h =================================================================== --- trunk/src_plugins/io_lihata/lht_conf.h (revision 29256) +++ trunk/src_plugins/io_lihata/lht_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_IO_LIHATA_CONF_H #define PCB_IO_LIHATA_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/io_lihata/read.c =================================================================== --- trunk/src_plugins/io_lihata/read.c (revision 29256) +++ trunk/src_plugins/io_lihata/read.c (revision 29257) @@ -36,13 +36,13 @@ #include "config.h" #include "board.h" #include "data.h" -#include "plugins.h" +#include #include "plug_io.h" #include "flag_str.h" -#include "compat_misc.h" +#include #include "macro.h" -#include "error.h" -#include "misc_util.h" +#include +#include #include "layer.h" #include #include "common.h" @@ -52,7 +52,7 @@ #include "pcb_minuid.h" #include "thermal.h" #include "io_lihata.h" -#include "safe_fs.h" +#include #include "plug_footprint.h" #include "vtpadstack.h" #include "obj_pstk_inlines.h" Index: trunk/src_plugins/io_lihata/write.c =================================================================== --- trunk/src_plugins/io_lihata/write.c (revision 29256) +++ trunk/src_plugins/io_lihata/write.c (revision 29257) @@ -35,26 +35,26 @@ #include "board.h" #include "conf_core.h" #include "data.h" -#include "plugins.h" +#include #include "plug_io.h" #include "flag_str.h" -#include "compat_misc.h" +#include #include "rats_patch.h" -#include "actions.h" -#include "misc_util.h" +#include +#include #include "macro.h" #include "layer.h" #include "common.h" #include "write_style.h" #include "io_lihata.h" -#include "paths.h" +#include #include "obj_subc_list.h" #include "pcb_minuid.h" -#include "safe_fs.h" +#include #include "thermal.h" #include "funchash_core.h" #include "netlist.h" -#include "hid_dad.h" +#include #include "src_plugins/lib_compat_help/pstk_compat.h" Index: trunk/src_plugins/io_mentor_cell/io_mentor_cell.c =================================================================== --- trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 29256) +++ trunk/src_plugins/io_mentor_cell/io_mentor_cell.c (revision 29257) @@ -28,10 +28,10 @@ */ #include "config.h" -#include "plugins.h" +#include #include "plug_io.h" #include "read.h" -#include "actions.h" +#include static pcb_plug_io_t io_mentor_cell; static const char *mentor_cell_cookie = "mentor_cell plugin"; Index: trunk/src_plugins/io_mentor_cell/read.c =================================================================== --- trunk/src_plugins/io_mentor_cell/read.c (revision 29256) +++ trunk/src_plugins/io_mentor_cell/read.c (revision 29257) @@ -39,9 +39,9 @@ #include "data.h" #include "conf_core.h" #include "plug_io.h" -#include "error.h" -#include "safe_fs.h" -#include "compat_misc.h" +#include +#include +#include #include "netlist.h" #include "obj_subc.h" Index: trunk/src_plugins/io_pcb/attribs.c =================================================================== --- trunk/src_plugins/io_pcb/attribs.c (revision 29256) +++ trunk/src_plugins/io_pcb/attribs.c (revision 29257) @@ -25,9 +25,9 @@ */ #include "config.h" -#include "conf.h" +#include #include "board.h" -#include "compat_misc.h" +#include #define LISTSEP " [[pcb-rnd]] " Index: trunk/src_plugins/io_pcb/file.c =================================================================== --- trunk/src_plugins/io_pcb/file.c (revision 29256) +++ trunk/src_plugins/io_pcb/file.c (revision 29257) @@ -31,7 +31,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include #include @@ -43,30 +43,30 @@ #include "change.h" #include "crosshair.h" #include "data.h" -#include "error.h" +#include #include "file.h" #include "plug_io.h" -#include "hid.h" +#include #include "layer.h" #include "layer_grp.h" #include "move.h" #include "parse_common.h" -#include "pcb-printf.h" +#include #include "polygon.h" #include "polygon1_gen.h" #include "remove.h" #include "flag_str.h" -#include "compat_fs.h" -#include "compat_misc.h" -#include "paths.h" +#include +#include +#include #include "rats_patch.h" -#include "actions.h" +#include #include "flag_str.h" #include "attribs.h" #include "route_style.h" #include "obj_poly.h" #include "thermal.h" -#include "event.h" +#include #include "macro.h" #include "funchash_core.h" #include "netlist.h" Index: trunk/src_plugins/io_pcb/io_pcb.c =================================================================== --- trunk/src_plugins/io_pcb/io_pcb.c (revision 29256) +++ trunk/src_plugins/io_pcb/io_pcb.c (revision 29257) @@ -28,7 +28,7 @@ */ #include "config.h" -#include "plugins.h" +#include #include "parse_common.h" #include "file.h" Index: trunk/src_plugins/io_pcb/parse_l.c =================================================================== --- trunk/src_plugins/io_pcb/parse_l.c (revision 29256) +++ trunk/src_plugins/io_pcb/parse_l.c (revision 29257) @@ -915,7 +915,7 @@ #include "crosshair.h" #include "data.h" -#include "error.h" +#include #include "file.h" #include "flag_str.h" #include "parse_common.h" @@ -922,11 +922,11 @@ #include "parse_y.h" #include "plug_footprint.h" #include "attribs.h" -#include "compat_misc.h" +#include #include "compat_cc.h" #include "obj_common.h" -#include "paths.h" -#include "safe_fs.h" +#include +#include #include "macro.h" #define YY_NO_INPUT Index: trunk/src_plugins/io_pcb/parse_l.l =================================================================== --- trunk/src_plugins/io_pcb/parse_l.l (revision 29256) +++ trunk/src_plugins/io_pcb/parse_l.l (revision 29257) @@ -46,7 +46,7 @@ #include "crosshair.h" #include "data.h" -#include "error.h" +#include #include "file.h" #include "flag_str.h" #include "parse_common.h" @@ -53,11 +53,11 @@ #include "parse_y.h" #include "plug_footprint.h" #include "attribs.h" -#include "compat_misc.h" +#include #include "compat_cc.h" #include "obj_common.h" -#include "paths.h" -#include "safe_fs.h" +#include +#include #include "macro.h" #define YY_NO_INPUT Index: trunk/src_plugins/io_pcb/parse_y.c =================================================================== --- trunk/src_plugins/io_pcb/parse_y.c (revision 29256) +++ trunk/src_plugins/io_pcb/parse_y.c (revision 29257) @@ -113,7 +113,7 @@ #include "conf_core.h" #include "layer.h" #include "data.h" -#include "error.h" +#include #include "file.h" #include "parse_l.h" #include "polygon.h" @@ -123,7 +123,7 @@ #include "obj_pinvia_therm.h" #include "rats_patch.h" #include "route_style.h" -#include "compat_misc.h" +#include #include "src_plugins/lib_compat_help/pstk_compat.h" #include "netlist.h" Index: trunk/src_plugins/io_pcb/parse_y.y =================================================================== --- trunk/src_plugins/io_pcb/parse_y.y (revision 29256) +++ trunk/src_plugins/io_pcb/parse_y.y (revision 29257) @@ -36,7 +36,7 @@ #include "conf_core.h" #include "layer.h" #include "data.h" -#include "error.h" +#include #include "file.h" #include "parse_l.h" #include "polygon.h" @@ -46,7 +46,7 @@ #include "obj_pinvia_therm.h" #include "rats_patch.h" #include "route_style.h" -#include "compat_misc.h" +#include #include "src_plugins/lib_compat_help/pstk_compat.h" #include "netlist.h" Index: trunk/src_plugins/io_tedax/footprint.c =================================================================== --- trunk/src_plugins/io_tedax/footprint.c (revision 29256) +++ trunk/src_plugins/io_tedax/footprint.c (revision 29257) @@ -36,14 +36,14 @@ #include "footprint.h" #include "parse.h" -#include "unit.h" -#include "attrib.h" -#include "error.h" +#include +#include +#include #include "data.h" #include "board.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "safe_fs.h" +#include +#include +#include #include "obj_line.h" #include "obj_arc.h" #include "obj_pstk.h" Index: trunk/src_plugins/io_tedax/io_tedax.c =================================================================== --- trunk/src_plugins/io_tedax/io_tedax.c (revision 29256) +++ trunk/src_plugins/io_tedax/io_tedax.c (revision 29257) @@ -37,10 +37,10 @@ #include "board.h" #include "conf_core.h" #include "buffer.h" -#include "plugins.h" -#include "hid.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include +#include #include "plug_io.h" #include "stackup.h" #include "tlayer.h" Index: trunk/src_plugins/io_tedax/parse.c =================================================================== --- trunk/src_plugins/io_tedax/parse.c (revision 29256) +++ trunk/src_plugins/io_tedax/parse.c (revision 29257) @@ -31,8 +31,8 @@ #include #include "parse.h" -#include "error.h" -#include "compat_misc.h" +#include +#include int tedax_getline(FILE *f, char *buff, int buff_size, char *argv[], int argv_size) { Index: trunk/src_plugins/io_tedax/stackup.c =================================================================== --- trunk/src_plugins/io_tedax/stackup.c (revision 29256) +++ trunk/src_plugins/io_tedax/stackup.c (revision 29257) @@ -35,9 +35,9 @@ #include "stackup.h" #include "parse.h" -#include "compat_misc.h" -#include "safe_fs.h" -#include "error.h" +#include +#include +#include #include "plug_io.h" void tedax_stackup_init(tedax_stackup_t *ctx) Index: trunk/src_plugins/io_tedax/tboard.c =================================================================== --- trunk/src_plugins/io_tedax/tboard.c (revision 29256) +++ trunk/src_plugins/io_tedax/tboard.c (revision 29257) @@ -39,8 +39,8 @@ #include "data.h" #include "tboard.h" #include "parse.h" -#include "error.h" -#include "safe_fs.h" +#include +#include #include "stackup.h" #include "footprint.h" #include "tdrc.h" @@ -47,7 +47,7 @@ #include "tlayer.h" #include "ht_subc.h" #include "obj_pstk.h" -#include "compat_misc.h" +#include #include "plug_io.h" #include "tnetlist.h" Index: trunk/src_plugins/io_tedax/tdrc.c =================================================================== --- trunk/src_plugins/io_tedax/tdrc.c (revision 29256) +++ trunk/src_plugins/io_tedax/tdrc.c (revision 29257) @@ -32,8 +32,8 @@ #include "board.h" #include "parse.h" -#include "safe_fs.h" -#include "error.h" +#include +#include #include "tdrc.h" typedef struct { Index: trunk/src_plugins/io_tedax/tetest.c =================================================================== --- trunk/src_plugins/io_tedax/tetest.c (revision 29256) +++ trunk/src_plugins/io_tedax/tetest.c (revision 29257) @@ -34,8 +34,8 @@ #include "board.h" #include "data.h" #include "parse.h" -#include "safe_fs.h" -#include "error.h" +#include +#include #include "tetest.h" #include "rtree.h" #include "obj_subc_parent.h" @@ -42,13 +42,13 @@ #include "obj_pstk.h" #include "obj_pstk_inlines.h" #include "netlist.h" -#include "plugins.h" +#include #include "plug_io.h" -#include "hid.h" +#include #include "hid_cam.h" -#include "hid_nogui.h" -#include "hid_init.h" -#include "hid_attrib.h" +#include +#include +#include static const char *sides(pcb_layer_type_t lyt) { Index: trunk/src_plugins/io_tedax/tlayer.c =================================================================== --- trunk/src_plugins/io_tedax/tlayer.c (revision 29256) +++ trunk/src_plugins/io_tedax/tlayer.c (revision 29257) @@ -32,14 +32,14 @@ #include #include "data.h" #include "tlayer.h" -#include "safe_fs.h" -#include "error.h" +#include +#include #include "parse.h" -#include "compat_misc.h" +#include #include "obj_line.h" #include "obj_arc.h" #include "obj_poly.h" -#include "vtc0.h" +#include #include "plug_io.h" int tedax_layer_fsave(pcb_board_t *pcb, pcb_layergrp_id_t gid, const char *layname, FILE *f) Index: trunk/src_plugins/io_tedax/tnetlist.c =================================================================== --- trunk/src_plugins/io_tedax/tnetlist.c (revision 29256) +++ trunk/src_plugins/io_tedax/tnetlist.c (revision 29257) @@ -33,11 +33,11 @@ #include "board.h" #include "data.h" -#include "error.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "actions.h" -#include "safe_fs.h" +#include +#include +#include +#include +#include #include "obj_subc.h" #include "netlist.h" Index: trunk/src_plugins/jostle/jostle.c =================================================================== --- trunk/src_plugins/jostle/jostle.c (revision 29256) +++ trunk/src_plugins/jostle/jostle.c (revision 29257) @@ -20,21 +20,21 @@ #include "config.h" #include "board.h" #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" #include "polygon.h" #include "polygon1_gen.h" #include "remove.h" -#include "error.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "actions.h" +#include +#include +#include +#include #include "layer.h" #include "conf_core.h" -#include "misc_util.h" +#include #include "obj_line.h" -#include "event.h" +#include /*#define DEBUG_pcb_polyarea_t*/ Index: trunk/src_plugins/lib_compat_help/lib_compat_help.c =================================================================== --- trunk/src_plugins/lib_compat_help/lib_compat_help.c (revision 29256) +++ trunk/src_plugins/lib_compat_help/lib_compat_help.c (revision 29257) @@ -1,5 +1,5 @@ #include -#include "plugins.h" +#include #include "layer_compat.c" #include "pstk_compat.c" Index: trunk/src_plugins/lib_compat_help/media.c =================================================================== --- trunk/src_plugins/lib_compat_help/media.c (revision 29256) +++ trunk/src_plugins/lib_compat_help/media.c (revision 29257) @@ -31,7 +31,7 @@ #include "config.h" #include -#include "unit.h" +#include #include "media.h" Index: trunk/src_plugins/lib_compat_help/pstk_compat.c =================================================================== --- trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 29256) +++ trunk/src_plugins/lib_compat_help/pstk_compat.c (revision 29257) @@ -30,7 +30,7 @@ #include "pstk_compat.h" #include "obj_pstk_inlines.h" -#include "compat_misc.h" +#include #include "polygon1_gen.h" #include "plug_io.h" Index: trunk/src_plugins/lib_compat_help/pstk_help.c =================================================================== --- trunk/src_plugins/lib_compat_help/pstk_help.c (revision 29256) +++ trunk/src_plugins/lib_compat_help/pstk_help.c (revision 29257) @@ -28,7 +28,7 @@ #include "pstk_help.h" #include "obj_pstk_inlines.h" -#include "compat_misc.h" +#include #include "search.h" #include "remove.h" #include "find.h" Index: trunk/src_plugins/lib_gensexpr/lib_gensexpr.c =================================================================== --- trunk/src_plugins/lib_gensexpr/lib_gensexpr.c (revision 29256) +++ trunk/src_plugins/lib_gensexpr/lib_gensexpr.c (revision 29257) @@ -2,7 +2,7 @@ #include #include -#include "plugins.h" +#include int pplg_check_ver_lib_gensexpr(int ver_needed) { return 0; } Index: trunk/src_plugins/lib_gtk_common/bu_command.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_command.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/bu_command.c (revision 29257) @@ -35,13 +35,13 @@ #include "config.h" #include "bu_command.h" -#include "hidlib_conf.h" +#include #include #include "board.h" #include "crosshair.h" -#include "actions.h" +#include #include "pcb_gtk.h" #include "hid_gtk_conf.h" Index: trunk/src_plugins/lib_gtk_common/bu_command.h =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_command.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/bu_command.h (revision 29257) @@ -3,8 +3,8 @@ #include #include -#include "pcb_bool.h" -#include "global_typedefs.h" +#include +#include typedef struct pcb_gtk_command_s { GtkWidget *command_combo_box, *prompt_label; Index: trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/bu_dwg_tooltip.c (revision 29257) @@ -33,7 +33,7 @@ /* Drawing area tooltips */ #include "config.h" -#include "actions.h" +#include #include "bu_dwg_tooltip.h" #define TOOLTIP_UPDATE_DELAY 200 Index: trunk/src_plugins/lib_gtk_common/bu_menu.c =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/bu_menu.c (revision 29257) @@ -6,13 +6,13 @@ #include #include "board.h" -#include "pcb-printf.h" -#include "misc_util.h" -#include "error.h" -#include "conf.h" -#include "hidlib.h" -#include "hid_cfg.h" -#include "hid_cfg_action.h" +#include +#include +#include +#include +#include +#include +#include #include "pcb_gtk.h" #include "bu_menu.h" Index: trunk/src_plugins/lib_gtk_common/bu_menu.h =================================================================== --- trunk/src_plugins/lib_gtk_common/bu_menu.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/bu_menu.h (revision 29257) @@ -4,10 +4,10 @@ #include -#include "conf.h" -#include "hid_cfg.h" -#include "hid_cfg_input.h" -#include "conf_hid.h" +#include +#include +#include +#include #define GHID_MAIN_MENU_TYPE (ghid_main_menu_get_type ()) #define GHID_MAIN_MENU(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GHID_MAIN_MENU_TYPE, GHidMainMenu)) Index: trunk/src_plugins/lib_gtk_common/coord_conv.h =================================================================== --- trunk/src_plugins/lib_gtk_common/coord_conv.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/coord_conv.h (revision 29257) @@ -1,6 +1,6 @@ /* Coordinate conversions */ -#include "compat_misc.h" -#include "hidlib_conf.h" +#include +#include /* Px converts view->pcb, Vx converts pcb->view */ static inline int Vx(pcb_coord_t x) Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.c (revision 29257) @@ -31,17 +31,17 @@ then got reworked heavily by Tibor 'Igor2' Palinkas for pcb-rnd DAD */ #include "config.h" -#include "hidlib_conf.h" +#include #include "dlg_attribute.h" #include -#include "pcb-printf.h" -#include "hid_attrib.h" -#include "hid_dad_tree.h" -#include "hid_init.h" -#include "misc_util.h" -#include "compat_misc.h" -#include "event.h" +#include +#include +#include +#include +#include +#include +#include #include "compat.h" Index: trunk/src_plugins/lib_gtk_common/dlg_attribute.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attribute.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_attribute.h (revision 29257) @@ -1,5 +1,5 @@ #include -#include "hid.h" +#include #include "pcb_gtk.h" void *ghid_attr_dlg_new(pcb_gtk_t *gctx, const char *id, pcb_hid_attribute_t *attrs, int n_attrs, const char *title, void *caller_data, pcb_bool modal, void (*button_cb)(void *caller_data, pcb_hid_attr_ev_t ev), int defx, int defy, int minx, int miny); Index: trunk/src_plugins/lib_gtk_common/dlg_attributes.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attributes.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_attributes.c (revision 29257) @@ -32,11 +32,11 @@ #include "dlg_attributes.h" #include -#include "pcb-printf.h" -#include "hid_attrib.h" -#include "hid_init.h" -#include "misc_util.h" -#include "compat_misc.h" +#include +#include +#include +#include +#include #include "compat.h" Index: trunk/src_plugins/lib_gtk_common/dlg_attributes.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_attributes.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_attributes.h (revision 29257) @@ -1,5 +1,5 @@ #include -#include "hid.h" +#include void pcb_gtk_dlg_attributes(GtkWidget *top_window, const char *owner, pcb_attribute_list_t * attrs); Index: trunk/src_plugins/lib_gtk_common/dlg_fileselect.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_fileselect.c (revision 29257) @@ -30,12 +30,12 @@ #include #include -#include "hid.h" -#include "hid_dad.h" -#include "compat_misc.h" +#include +#include +#include #include "compat.h" -#include "event.h" -#include "safe_fs.h" +#include +#include #include "dlg_attribute.h" Index: trunk/src_plugins/lib_gtk_common/dlg_fileselect.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_fileselect.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_fileselect.h (revision 29257) @@ -1,4 +1,4 @@ -#include "global_typedefs.h" +#include #include char *pcb_gtk_fileselect(pcb_gtk_t *gctx, const char *title, const char *descr, const char *default_file, const char *default_ext, const pcb_hid_fsd_filter_t *flt, const char *history_tag, pcb_hid_fsd_flags_t flags, pcb_hid_dad_subdialog_t *sub); Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.c =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.c (revision 29257) @@ -43,14 +43,14 @@ #include "config.h" #include "dlg_topwin.h" #include "conf_core.h" -#include "hidlib.h" -#include "hidlib_conf.h" +#include +#include #include "board.h" #include "crosshair.h" -#include "pcb-printf.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include #include "compat.h" #include "bu_menu.h" Index: trunk/src_plugins/lib_gtk_common/dlg_topwin.h =================================================================== --- trunk/src_plugins/lib_gtk_common/dlg_topwin.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/dlg_topwin.h (revision 29257) @@ -5,8 +5,8 @@ #include -#include "hid_cfg.h" -#include "hid_dad.h" +#include +#include #include "pcb_gtk.h" #include "bu_menu.h" Index: trunk/src_plugins/lib_gtk_common/glue_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/glue_common.c (revision 29257) @@ -28,13 +28,13 @@ */ #include "config.h" -#include "pixmap.h" +#include #include "glue_common.h" -#include "conf.h" +#include #include "pcb_gtk.h" -#include "hidlib.h" +#include #include "dlg_topwin.h" #include "hid_gtk_conf.h" #include "in_keyboard.h" @@ -46,8 +46,8 @@ #ifdef __WIN32__ -#include "hid_init.h" -#include "compat_fs.h" +#include +#include static void ghid_win32_init(void) { Index: trunk/src_plugins/lib_gtk_common/glue_common.h =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_common.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/glue_common.h (revision 29257) @@ -1,4 +1,4 @@ -#include "hid.h" +#include #include "pcb_gtk.h" #include "../src_plugins/lib_gtk_common/dlg_topwin.h" Index: trunk/src_plugins/lib_gtk_common/glue_hid.c =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/glue_hid.c (revision 29257) @@ -4,10 +4,10 @@ #include #include "pcb_gtk.h" -#include "actions.h" +#include #include "glue_hid.h" -#include "hid_nogui.h" -#include "hid_attrib.h" +#include +#include #include "coord_conv.h" #include "in_keyboard.h" Index: trunk/src_plugins/lib_gtk_common/glue_hid.h =================================================================== --- trunk/src_plugins/lib_gtk_common/glue_hid.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/glue_hid.h (revision 29257) @@ -1,4 +1,4 @@ -#include "hid.h" +#include void ghid_glue_hid_init(pcb_hid_t *dst); int gtkhid_parse_arguments(pcb_hid_t *hid, int *argc, char ***argv); Index: trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h =================================================================== --- trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/hid_gtk_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_HID_GTK_CONF_H #define PCB_HID_GTK_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/lib_gtk_common/in_keyboard.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_keyboard.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/in_keyboard.c (revision 29257) @@ -34,8 +34,8 @@ #include #include -#include "event.h" -#include "compat_misc.h" +#include +#include #include "glue_common.h" pcb_hid_cfg_keys_t ghid_keymap; Index: trunk/src_plugins/lib_gtk_common/in_keyboard.h =================================================================== --- trunk/src_plugins/lib_gtk_common/in_keyboard.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/in_keyboard.h (revision 29257) @@ -4,7 +4,7 @@ #include #include -#include "hid_cfg_input.h" +#include #include "ui_zoompan.h" typedef enum { Index: trunk/src_plugins/lib_gtk_common/in_mouse.c =================================================================== --- trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/in_mouse.c (revision 29257) @@ -35,7 +35,7 @@ #include #include -#include "actions.h" +#include #include "board.h" #include "crosshair.h" #include "conf_core.h" Index: trunk/src_plugins/lib_gtk_common/in_mouse.h =================================================================== --- trunk/src_plugins/lib_gtk_common/in_mouse.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/in_mouse.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_GTK_IN_MOUSE_H #define PCB_GTK_IN_MOUSE_H -#include "hid_cfg_input.h" +#include #include "pcb_gtk.h" #include Index: trunk/src_plugins/lib_gtk_common/lib_gtk_common.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_common.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_common.c (revision 29257) @@ -33,7 +33,7 @@ #include "config.h" #include #include -#include "plugins.h" +#include #include "lib_gtk_config.h" int pplg_check_ver_lib_gtk_common(int ver_needed) { return 0; } Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.c =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.c (revision 29257) @@ -31,7 +31,7 @@ #include #include "lib_gtk_config.h" #include "hid_gtk_conf.h" -#include "plugins.h" +#include #include "src_plugins/lib_hid_common/place.h" static const char *lib_gtk_config_cookie = "lib_gtk_config"; Index: trunk/src_plugins/lib_gtk_common/lib_gtk_config.h =================================================================== --- trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/lib_gtk_config.h (revision 29257) @@ -1,6 +1,6 @@ -#include "hid.h" -#include "event.h" -#include "conf_hid.h" +#include +#include +#include extern conf_hid_id_t ghid_conf_id; Index: trunk/src_plugins/lib_gtk_common/pcb_gtk.h =================================================================== --- trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/pcb_gtk.h (revision 29257) @@ -28,8 +28,8 @@ #ifndef PCB_GTK_H #define PCB_GTK_H -#include "hid.h" -#include "conf.h" +#include +#include typedef struct pcb_gtk_port_s pcb_gtk_port_t; typedef struct pcb_gtk_s pcb_gtk_t; @@ -133,9 +133,9 @@ /* needed for a type in pcb_gtk_t - DO NOT ADD .h files that are not required for the structs! */ #include "../src_plugins/lib_gtk_common/dlg_topwin.h" -#include "event.h" -#include "conf_hid.h" -#include "pcb_bool.h" +#include +#include +#include typedef struct pcb_gtk_pixmap_s { pcb_pixmap_t *pxm; /* core-side pixmap (raw input image) */ Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.c =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.c (revision 29257) @@ -29,9 +29,9 @@ #include "config.h" #include "ui_zoompan.h" -#include "hidlib_conf.h" -#include "compat_misc.h" -#include "hidlib.h" +#include +#include +#include #include "glue_common.h" #include "../src_plugins/lib_hid_pcbui/util.h" Index: trunk/src_plugins/lib_gtk_common/ui_zoompan.h =================================================================== --- trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/ui_zoompan.h (revision 29257) @@ -30,7 +30,7 @@ #ifndef PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H #define PCB_LIB_GTK_COMMON_UI_ZOOMPAN_H -#include "pcb_bool.h" +#include #define SIDE_X_(hidlib, x) ((pcbhl_conf.editor.view.flip_x ? hidlib->size_x - (x) : (x))) #define SIDE_Y_(hidlib, y) ((pcbhl_conf.editor.view.flip_y ? hidlib->size_y - (y) : (y))) Index: trunk/src_plugins/lib_gtk_common/util_listener.c =================================================================== --- trunk/src_plugins/lib_gtk_common/util_listener.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/util_listener.c (revision 29257) @@ -33,9 +33,9 @@ #include #include -#include "hid.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include #include "util_listener.h" Index: trunk/src_plugins/lib_gtk_common/util_timer.h =================================================================== --- trunk/src_plugins/lib_gtk_common/util_timer.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/util_timer.h (revision 29257) @@ -1,4 +1,4 @@ -#include "hid.h" +#include #include "pcb_gtk.h" pcb_hidval_t pcb_gtk_add_timer(struct pcb_gtk_s *gctx, void (*func)(pcb_hidval_t user_data), unsigned long milliseconds, pcb_hidval_t user_data); Index: trunk/src_plugins/lib_gtk_common/util_watch.h =================================================================== --- trunk/src_plugins/lib_gtk_common/util_watch.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/util_watch.h (revision 29257) @@ -1,4 +1,4 @@ -#include "hid.h" +#include #include "pcb_gtk.h" pcb_hidval_t pcb_gtk_watch_file(pcb_gtk_t *gctx, int fd, unsigned int condition, Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 29256) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 29257) @@ -33,7 +33,7 @@ then got a major refactoring by Tibor 'Igor2' Palinkas and Alain in pcb-rnd */ #include "config.h" -#include "hidlib_conf.h" +#include #include "in_mouse.h" #include "compat.h" @@ -42,7 +42,7 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "compat_misc.h" +#include static void get_ptr(pcb_gtk_preview_t *preview, pcb_coord_t *cx, pcb_coord_t *cy, gint *xp, gint *yp); Index: trunk/src_plugins/lib_gtk_common/wt_preview.h =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.h (revision 29256) +++ trunk/src_plugins/lib_gtk_common/wt_preview.h (revision 29257) @@ -37,7 +37,7 @@ #include #include -#include "hid.h" +#include #include "ui_zoompan.h" #include "pcb_gtk.h" #include "compat.h" Index: trunk/src_plugins/lib_hid_common/act_dad.c =================================================================== --- trunk/src_plugins/lib_hid_common/act_dad.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/act_dad.c (revision 29257) @@ -33,11 +33,11 @@ #include #include #include -#include "actions.h" -#include "compat_misc.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" -#include "error.h" +#include +#include +#include +#include +#include #include "act_dad.h" Index: trunk/src_plugins/lib_hid_common/cli_history.c =================================================================== --- trunk/src_plugins/lib_hid_common/cli_history.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/cli_history.c (revision 29257) @@ -33,8 +33,8 @@ #include "cli_history.h" #include "lib_hid_common.h" -#include "safe_fs.h" -#include "paths.h" +#include +#include #define CFG dialogs_conf.plugins.lib_hid_common.cli_history Index: trunk/src_plugins/lib_hid_common/clip.h =================================================================== --- trunk/src_plugins/lib_hid_common/clip.h (revision 29256) +++ trunk/src_plugins/lib_hid_common/clip.h (revision 29257) @@ -31,7 +31,7 @@ #define PCB_CLIP_H -#include "global_typedefs.h" +#include /* Clip X,Y to the given bounding box, plus a margin. Returns pcb_true if there is something left to be drawn. */ Index: trunk/src_plugins/lib_hid_common/dialogs_conf.h =================================================================== --- trunk/src_plugins/lib_hid_common/dialogs_conf.h (revision 29256) +++ trunk/src_plugins/lib_hid_common/dialogs_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_DIALOGS_CONF_H #define PCB_DIALOGS_CONF_H -#include "conf.h" +#include /* dialog config is here because of hidlib: each hidlib user shall have its own dialogs plugin */ Index: trunk/src_plugins/lib_hid_common/dlg_comm_m.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/dlg_comm_m.c (revision 29257) @@ -29,9 +29,9 @@ action). */ #include "config.h" -#include "actions.h" +#include #include "board.h" -#include "hid_dad.h" +#include #include "xpm.h" #include "dlg_comm_m.h" #include "plug_io.h" Index: trunk/src_plugins/lib_hid_common/dlg_log.c =================================================================== --- trunk/src_plugins/lib_hid_common/dlg_log.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/dlg_log.c (revision 29257) @@ -26,11 +26,11 @@ #include "config.h" -#include "actions.h" -#include "conf_hid.h" -#include "hid_dad.h" -#include "event.h" -#include "error.h" +#include +#include +#include +#include +#include #include "dlg_log.h" Index: trunk/src_plugins/lib_hid_common/grid_menu.c =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/grid_menu.c (revision 29257) @@ -26,12 +26,12 @@ #include "config.h" -#include "conf.h" -#include "hidlib_conf.h" -#include "grid.h" -#include "event.h" -#include "hid_cfg.h" -#include "hid.h" +#include +#include +#include +#include +#include +#include #include "grid_menu.h" Index: trunk/src_plugins/lib_hid_common/grid_menu.h =================================================================== --- trunk/src_plugins/lib_hid_common/grid_menu.h (revision 29256) +++ trunk/src_plugins/lib_hid_common/grid_menu.h (revision 29257) @@ -1,5 +1,5 @@ -#include "conf.h" -#include "event.h" +#include +#include void pcb_grid_update_conf(conf_native_t *cfg, int arr_idx); void pcb_grid_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); Index: trunk/src_plugins/lib_hid_common/lead_user.c =================================================================== --- trunk/src_plugins/lib_hid_common/lead_user.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/lead_user.c (revision 29257) @@ -28,9 +28,9 @@ #include -#include "unit.h" -#include "event.h" -#include "hid.h" +#include +#include +#include #define LEAD_ARROW_LEN PCB_MM_TO_COORD(3) #define LEAD_CENTER_RAD PCB_MM_TO_COORD(0.5) Index: trunk/src_plugins/lib_hid_common/lib_hid_common.c =================================================================== --- trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/lib_hid_common.c (revision 29257) @@ -27,11 +27,11 @@ #include "config.h" #include -#include "plugins.h" -#include "conf_hid.h" -#include "event.h" +#include +#include +#include -#include "actions.h" +#include #include "grid_menu.h" #include "cli_history.h" #include "lead_user.h" Index: trunk/src_plugins/lib_hid_common/menu_helper.c =================================================================== --- trunk/src_plugins/lib_hid_common/menu_helper.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/menu_helper.c (revision 29257) @@ -35,11 +35,11 @@ #include "data.h" #include "board.h" -#include "conf.h" -#include "error.h" -#include "actions.h" -#include "hid_cfg.h" -#include "compat_misc.h" +#include +#include +#include +#include +#include #include "menu_helper.h" Index: trunk/src_plugins/lib_hid_common/place.c =================================================================== --- trunk/src_plugins/lib_hid_common/place.c (revision 29256) +++ trunk/src_plugins/lib_hid_common/place.c (revision 29257) @@ -25,12 +25,12 @@ */ #include "config.h" -#include "event.h" -#include "compat_misc.h" -#include "error.h" -#include "conf.h" +#include +#include +#include +#include #include "board.h" -#include "safe_fs.h" +#include static const char *place_cookie = "dialogs/place"; Index: trunk/src_plugins/lib_hid_common/place.h =================================================================== --- trunk/src_plugins/lib_hid_common/place.h (revision 29256) +++ trunk/src_plugins/lib_hid_common/place.h (revision 29257) @@ -1,4 +1,4 @@ -#include "conf.h" +#include void pcb_wplc_load(conf_role_t role); Index: trunk/src_plugins/lib_hid_gl/hidgl.c =================================================================== --- trunk/src_plugins/lib_hid_gl/hidgl.c (revision 29256) +++ trunk/src_plugins/lib_hid_gl/hidgl.c (revision 29257) @@ -26,7 +26,7 @@ */ #include "config.h" -#include "hidlib_conf.h" +#include #include #include @@ -34,11 +34,11 @@ #include #include -#include "grid.h" -#include "hid.h" +#include +#include #include "hidgl.h" #include "rtree.h" -#include "hidlib.h" +#include #include "draw_gl.c" Index: trunk/src_plugins/lib_hid_gl/lib_hid_gl.c =================================================================== --- trunk/src_plugins/lib_hid_gl/lib_hid_gl.c (revision 29256) +++ trunk/src_plugins/lib_hid_gl/lib_hid_gl.c (revision 29257) @@ -27,7 +27,7 @@ #include #include -#include "plugins.h" +#include int pplg_check_ver_lib_hid_gl(int ver_needed) { return 0; } Index: trunk/src_plugins/lib_hid_pcbui/act.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/act.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/act.c (revision 29257) @@ -26,14 +26,14 @@ #include "config.h" -#include "actions.h" +#include #include "board.h" -#include "compat_misc.h" -#include "conf.h" +#include +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "draw.h" -#include "hid.h" +#include #include "layer_vis.h" #include "search.h" #include "obj_subc_parent.h" Index: trunk/src_plugins/lib_hid_pcbui/infobar.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/infobar.c (revision 29257) @@ -28,7 +28,7 @@ #include "board.h" #include "conf_core.h" -#include "safe_fs.h" +#include static pcb_hidval_t infobar_timer; static int infobar_timer_active = 0; Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/layer_menu.c (revision 29257) @@ -29,14 +29,14 @@ #include "board.h" #include "data.h" #include "conf_core.h" -#include "hidlib_conf.h" -#include "event.h" +#include +#include #include "layer.h" #include "layer_ui.h" #include "layer_grp.h" -#include "pcb-printf.h" -#include "hid_cfg.h" -#include "hid.h" +#include +#include +#include #include "layer_menu.h" Index: trunk/src_plugins/lib_hid_pcbui/layer_menu.h =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layer_menu.h (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/layer_menu.h (revision 29257) @@ -1,4 +1,4 @@ -#include "event.h" +#include void pcb_layer_menu_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); void pcb_layer_menu_vis_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); Index: trunk/src_plugins/lib_hid_pcbui/layersel.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/layersel.c (revision 29257) @@ -29,19 +29,19 @@ #include #include -#include "hid.h" -#include "hid_cfg.h" -#include "hid_dad.h" +#include +#include +#include -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "event.h" +#include #include "layer.h" #include "layer_grp.h" #include "layer_ui.h" #include "layer_vis.h" -#include "hidlib_conf.h" +#include #include "layersel.h" Index: trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/lib_hid_pcbui.c (revision 29257) @@ -27,9 +27,9 @@ #include "config.h" #include -#include "plugins.h" -#include "conf_hid.h" -#include "event.h" +#include +#include +#include #include "layer_menu.h" #include "layersel.h" Index: trunk/src_plugins/lib_hid_pcbui/routest.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/routest.c (revision 29257) @@ -27,13 +27,13 @@ #include "config.h" #include "board.h" -#include "conf.h" +#include #include "conf_core.h" #include "route_style.h" -#include "event.h" -#include "hid.h" -#include "hid_cfg.h" -#include "hid_dad.h" +#include +#include +#include +#include #include "routest.h" Index: trunk/src_plugins/lib_hid_pcbui/routest.h =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest.h (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/routest.h (revision 29257) @@ -1,6 +1,6 @@ -#include "conf.h" -#include "event.h" -#include "actions.h" +#include +#include +#include void pcb_rst_update_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); void pcb_rst_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); Index: trunk/src_plugins/lib_hid_pcbui/routest_dlg.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/routest_dlg.c (revision 29257) @@ -26,7 +26,7 @@ /* included from routest.c - split for clarity */ -#include "hid_dad_tree.h" +#include typedef struct{ PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/lib_hid_pcbui/status.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/status.c (revision 29257) @@ -29,11 +29,11 @@ #include #include "board.h" -#include "hid.h" -#include "hid_cfg_input.h" -#include "hid_dad.h" +#include +#include +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "crosshair.h" #include "layer.h" #include "search.h" Index: trunk/src_plugins/lib_hid_pcbui/status.h =================================================================== --- trunk/src_plugins/lib_hid_pcbui/status.h (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/status.h (revision 29257) @@ -1,6 +1,6 @@ -#include "event.h" -#include "conf.h" -#include "actions.h" +#include +#include +#include void pcb_status_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); void pcb_status_st_update_conf(conf_native_t *cfg, int arr_idx); Index: trunk/src_plugins/lib_hid_pcbui/toolbar.c =================================================================== --- trunk/src_plugins/lib_hid_pcbui/toolbar.c (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/toolbar.c (revision 29257) @@ -29,12 +29,12 @@ #include #include -#include "hid.h" -#include "hid_cfg.h" -#include "hid_dad.h" +#include +#include +#include #include "tool.h" #include "board.h" -#include "hidlib_conf.h" +#include #include "toolbar.h" Index: trunk/src_plugins/lib_hid_pcbui/toolbar.h =================================================================== --- trunk/src_plugins/lib_hid_pcbui/toolbar.h (revision 29256) +++ trunk/src_plugins/lib_hid_pcbui/toolbar.h (revision 29257) @@ -1,5 +1,5 @@ -#include "event.h" -#include "conf.h" +#include +#include void pcb_toolbar_gui_init_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); void pcb_toolbar_reg_ev(pcb_hidlib_t *hidlib, void *user_data, int argc, pcb_event_arg_t argv[]); Index: trunk/src_plugins/lib_netmap/netmap.c =================================================================== --- trunk/src_plugins/lib_netmap/netmap.c (revision 29256) +++ trunk/src_plugins/lib_netmap/netmap.c (revision 29257) @@ -33,8 +33,8 @@ #include "data.h" #include "find.h" #include "netlist.h" -#include "pcb-printf.h" -#include "plugins.h" +#include +#include static pcb_net_t *alloc_net(pcb_netmap_t *map) { Index: trunk/src_plugins/lib_polyhelp/polyhelp.c =================================================================== --- trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 29256) +++ trunk/src_plugins/lib_polyhelp/polyhelp.c (revision 29257) @@ -31,12 +31,12 @@ #include "polyhelp.h" #include "polygon.h" -#include "plugins.h" -#include "pcb-printf.h" +#include +#include #include "obj_line.h" -#include "box.h" +#include #include "polygon_offs.h" -#include "hid_dad.h" +#include #include "topoly.h" @@ -46,9 +46,9 @@ #include "board.h" #include "data.h" #include "conf_core.h" -#include "compat_misc.h" -#include "hid_attrib.h" -#include "actions.h" +#include +#include +#include void pcb_pline_fprint_anim(FILE *f, const pcb_pline_t *pl) { Index: trunk/src_plugins/lib_polyhelp/topoly.c =================================================================== --- trunk/src_plugins/lib_polyhelp/topoly.c (revision 29256) +++ trunk/src_plugins/lib_polyhelp/topoly.c (revision 29257) @@ -31,7 +31,7 @@ #include "topoly.h" -#include "error.h" +#include #include "rtree.h" #include "data.h" #include "obj_arc.h" @@ -40,8 +40,8 @@ #include "obj_poly_draw.h" #include "polygon.h" #include "search.h" -#include "hid.h" -#include "actions.h" +#include +#include #include "funchash_core.h" #define VALID_TYPE(obj) (((obj)->type == PCB_OBJ_ARC) || ((obj)->type == PCB_OBJ_LINE)) Index: trunk/src_plugins/lib_vfs/lib_vfs.c =================================================================== --- trunk/src_plugins/lib_vfs/lib_vfs.c (revision 29256) +++ trunk/src_plugins/lib_vfs/lib_vfs.c (revision 29257) @@ -28,10 +28,10 @@ #include "board.h" #include "data.h" -#include "plugins.h" -#include "pcb-printf.h" -#include "compat_misc.h" -#include "conf.h" +#include +#include +#include +#include #include "../src_plugins/propedit/props.h" #include "../src_plugins/propedit/propsel.h" Index: trunk/src_plugins/lib_wget/lib_wget.c =================================================================== --- trunk/src_plugins/lib_wget/lib_wget.c (revision 29256) +++ trunk/src_plugins/lib_wget/lib_wget.c (revision 29257) @@ -28,9 +28,9 @@ #include -#include "pcb-printf.h" -#include "plugins.h" -#include "safe_fs.h" +#include +#include +#include #include "lib_wget.h" const char *wget_cmd = "wget -U 'pcb-rnd-fp_wget'"; Index: trunk/src_plugins/loghid/hid-logger.c =================================================================== --- trunk/src_plugins/loghid/hid-logger.c (revision 29256) +++ trunk/src_plugins/loghid/hid-logger.c (revision 29257) @@ -3,8 +3,8 @@ */ #include "config.h" #include "hid-logger.h" -#include "pcb-printf.h" -#include "color.h" +#include +#include #define ENUM_LOG_TEXT(e) case e: txt = #e; break Index: trunk/src_plugins/loghid/hid-logger.h =================================================================== --- trunk/src_plugins/loghid/hid-logger.h (revision 29256) +++ trunk/src_plugins/loghid/hid-logger.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_HID_LOGGER_H #define PCB_HID_LOGGER_H -#include "hid.h" +#include #include Index: trunk/src_plugins/loghid/loghid.c =================================================================== --- trunk/src_plugins/loghid/loghid.c (revision 29256) +++ trunk/src_plugins/loghid/loghid.c (revision 29257) @@ -32,16 +32,16 @@ * */ #include "config.h" -#include "conf.h" +#include #include "data.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" +#include #include "hid-logger.h" -#include "hid_init.h" -#include "hid_attrib.h" -#include "hid_nogui.h" +#include +#include +#include static const char *loghid_cookie = "loghid plugin"; Index: trunk/src_plugins/millpath/millpath.c =================================================================== --- trunk/src_plugins/millpath/millpath.c (revision 29256) +++ trunk/src_plugins/millpath/millpath.c (revision 29257) @@ -25,8 +25,8 @@ */ #include "config.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "toolpath.h" #include "board.h" Index: trunk/src_plugins/mincut/pcb-mincut/load.c =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/load.c (revision 29256) +++ trunk/src_plugins/mincut/pcb-mincut/load.c (revision 29257) @@ -23,7 +23,7 @@ #include "genht/htsi.h" #include "genht/hash.h" #include "graph.h" -#include "compat_misc.h" +#include /*#define DEBUG_GR*/ Index: trunk/src_plugins/mincut/pcb-mincut/solve.c =================================================================== --- trunk/src_plugins/mincut/pcb-mincut/solve.c (revision 29256) +++ trunk/src_plugins/mincut/pcb-mincut/solve.c (revision 29257) @@ -21,7 +21,7 @@ #include #include #include "solve.h" -#include "compat_misc.h" +#include /* Karger's algorithm as described in the wikipedia article http://en.wikipedia.org/wiki/Karger%27s_algorithm Index: trunk/src_plugins/mincut/rats_mincut.c =================================================================== --- trunk/src_plugins/mincut/rats_mincut.c (revision 29256) +++ trunk/src_plugins/mincut/rats_mincut.c (revision 29257) @@ -33,16 +33,16 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" -#include "event.h" +#include +#include #include "plug_io.h" #include "find.h" #include "polygon.h" #include "search.h" #include "undo.h" -#include "plugins.h" +#include #include "netlist.h" -#include "compat_misc.h" +#include #include "obj_common.h" #include "obj_subc_parent.h" @@ -49,7 +49,7 @@ #include "pcb-mincut/graph.h" #include "pcb-mincut/solve.h" -#include "conf.h" +#include #include "rats_mincut_conf.h" conf_mincut_t conf_mincut; Index: trunk/src_plugins/mincut/rats_mincut_conf.h =================================================================== --- trunk/src_plugins/mincut/rats_mincut_conf.h (revision 29256) +++ trunk/src_plugins/mincut/rats_mincut_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_MINCUT_CONF_H #define PCB_MINCUT_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/oldactions/oldactions.c =================================================================== --- trunk/src_plugins/oldactions/oldactions.c (revision 29256) +++ trunk/src_plugins/oldactions/oldactions.c (revision 29257) @@ -32,18 +32,18 @@ * */ #include "config.h" -#include "conf.h" +#include #include "data.h" -#include "event.h" +#include #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "plug_footprint.h" #include "obj_subc.h" #include "macro.h" -#include "compat_misc.h" +#include #include "netlist.h" static void conf_toggle(conf_role_t role, const char *path) Index: trunk/src_plugins/order/order.c =================================================================== --- trunk/src_plugins/order/order.c (revision 29256) +++ trunk/src_plugins/order/order.c (revision 29257) @@ -28,15 +28,15 @@ #include -#include "actions.h" +#include #include "board.h" #include "data.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "hid_dad.h" -#include "hid_cfg.h" +#include +#include +#include +#include #include "layer.h" -#include "event.h" +#include #include "order_conf.h" #include "../src_plugins/order/conf_internal.c" Index: trunk/src_plugins/order/order.h =================================================================== --- trunk/src_plugins/order/order.h (revision 29256) +++ trunk/src_plugins/order/order.h (revision 29257) @@ -28,7 +28,7 @@ #define PCB_ORDER_H #include -#include "hid_dad.h" +#include #include "../src_plugins/order/order_conf.h" extern conf_order_t conf_order; Index: trunk/src_plugins/order/order_conf.h =================================================================== --- trunk/src_plugins/order/order_conf.h (revision 29256) +++ trunk/src_plugins/order/order_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_ORDER_CONF_H #define PCB_ORDER_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/order_pcbway/order_pcbway_conf.h =================================================================== --- trunk/src_plugins/order_pcbway/order_pcbway_conf.h (revision 29256) +++ trunk/src_plugins/order_pcbway/order_pcbway_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_ORDER_PCBWAY_CONF_H #define PCB_ORDER_PCBWAY_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/order_pcbway/pcbway.c =================================================================== --- trunk/src_plugins/order_pcbway/pcbway.c (revision 29256) +++ trunk/src_plugins/order_pcbway/pcbway.c (revision 29257) @@ -33,11 +33,11 @@ #include #include "board.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "safe_fs.h" -#include "paths.h" -#include "compat_fs.h" +#include +#include +#include +#include +#include #include "../src_plugins/lib_wget/lib_wget.h" #include "../src_plugins/order/order.h" #include "order_pcbway_conf.h" Index: trunk/src_plugins/polycombine/polycombine.c =================================================================== --- trunk/src_plugins/polycombine/polycombine.c (revision 29256) +++ trunk/src_plugins/polycombine/polycombine.c (revision 29257) @@ -18,8 +18,8 @@ #include "data.h" #include "macro.h" #include "remove.h" -#include "hid.h" -#include "error.h" +#include +#include #include "rtree.h" #include "polygon.h" #include "polyarea.h" @@ -28,8 +28,8 @@ #include "find.h" #include "draw.h" #include "undo.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "obj_poly.h" static pcb_polyarea_t *original_poly(pcb_poly_t *p, pcb_bool *forward) Index: trunk/src_plugins/polystitch/polystitch.c =================================================================== --- trunk/src_plugins/polystitch/polystitch.c (revision 29256) +++ trunk/src_plugins/polystitch/polystitch.c (revision 29257) @@ -20,13 +20,13 @@ #include "data.h" #include "macro.h" #include "remove.h" -#include "hid.h" -#include "error.h" +#include +#include #include "rtree.h" #include "draw.h" #include "polygon.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "obj_poly.h" #include "obj_poly_draw.h" Index: trunk/src_plugins/propedit/propdlg.c =================================================================== --- trunk/src_plugins/propedit/propdlg.c (revision 29256) +++ trunk/src_plugins/propedit/propdlg.c (revision 29257) @@ -31,10 +31,10 @@ #include #include "board.h" -#include "actions.h" -#include "hid_dad.h" -#include "hid_dad_tree.h" -#include "conf_hid.h" +#include +#include +#include +#include #include "netlist.h" #include "props.h" Index: trunk/src_plugins/propedit/propdlg.h =================================================================== --- trunk/src_plugins/propedit/propdlg.h (revision 29256) +++ trunk/src_plugins/propedit/propdlg.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_PROPDLG_H #define PCB_PROPDLG_H -#include "actions.h" +#include extern const char pcb_acts_propedit[]; extern const char pcb_acth_propedit[]; Index: trunk/src_plugins/propedit/propedit.c =================================================================== --- trunk/src_plugins/propedit/propedit.c (revision 29256) +++ trunk/src_plugins/propedit/propedit.c (revision 29257) @@ -27,20 +27,20 @@ #include #include "board.h" #include "data.h" -#include "plugins.h" +#include #include "config.h" #include "props.h" #include "propsel.h" #include "propdlg.h" -#include "actions.h" -#include "pcb-printf.h" -#include "error.h" +#include +#include +#include #include "layer.h" #include "layer_addr.h" #include "layer_grp.h" #include "search.h" #include "crosshair.h" -#include "compat_misc.h" +#include extern pcb_layergrp_id_t pcb_actd_EditGroup_gid; Index: trunk/src_plugins/propedit/props.c =================================================================== --- trunk/src_plugins/propedit/props.c (revision 29256) +++ trunk/src_plugins/propedit/props.c (revision 29257) @@ -26,10 +26,10 @@ #include "config.h" #include "props.h" #include "propsel.h" -#include "compat_misc.h" +#include #include "board.h" -#include "pcb-printf.h" -#include "hid.h" +#include +#include #include /*#define HT_INVALID_VALUE ((pcb_propval_t){PCB_PROPT_invalid, {0}})*/ #define HT(x) htprop_ ## x Index: trunk/src_plugins/propedit/props.h =================================================================== --- trunk/src_plugins/propedit/props.h (revision 29256) +++ trunk/src_plugins/propedit/props.h (revision 29257) @@ -35,12 +35,12 @@ */ #include -#include "global_typedefs.h" +#include #include #include #include "idpath.h" -#include "color.h" +#include typedef enum { PCB_PROPT_invalid, Index: trunk/src_plugins/propedit/propsel.c =================================================================== --- trunk/src_plugins/propedit/propsel.c (revision 29256) +++ trunk/src_plugins/propedit/propsel.c (revision 29257) @@ -31,15 +31,15 @@ #include "props.h" #include "propsel.h" #include "change.h" -#include "misc_util.h" +#include #include "flag_str.h" -#include "compat_misc.h" +#include #include "undo.h" #include "rotate.h" #include "obj_pstk_inlines.h" -#include "pcb-printf.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "netlist.h" #include "obj_line_op.h" Index: trunk/src_plugins/puller/puller.c =================================================================== --- trunk/src_plugins/puller/puller.c (revision 29256) +++ trunk/src_plugins/puller/puller.c (revision 29257) @@ -64,16 +64,16 @@ #include "data.h" #include "draw.h" #include "move.h" -#include "pcb-printf.h" +#include #include "remove.h" #include "rtree.h" #include "flag_str.h" #include "undo.h" #include "layer.h" -#include "plugins.h" -#include "actions.h" -#include "misc_util.h" -#include "compat_misc.h" +#include +#include +#include +#include #include "obj_pstk_inlines.h" #include "funchash_core.h" #include "search.h" Index: trunk/src_plugins/query/query.c =================================================================== --- trunk/src_plugins/query/query.c (revision 29256) +++ trunk/src_plugins/query/query.c (revision 29257) @@ -29,17 +29,17 @@ #include "config.h" #include #include -#include "conf.h" +#include #include "data.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "hid_init.h" -#include "actions.h" -#include "compat_misc.h" +#include +#include +#include +#include #include "query.h" -#include "fptr_cast.h" +#include /******** tree helper ********/ Index: trunk/src_plugins/query/query_access.c =================================================================== --- trunk/src_plugins/query/query_access.c (revision 29256) +++ trunk/src_plugins/query/query_access.c (revision 29257) @@ -28,7 +28,7 @@ #include "config.h" #include "math_helper.h" -#include "compat_misc.h" +#include #include "board.h" #include "data.h" #include "query_access.h" Index: trunk/src_plugins/query/query_act.c =================================================================== --- trunk/src_plugins/query/query_act.c (revision 29256) +++ trunk/src_plugins/query/query_act.c (revision 29257) @@ -31,7 +31,7 @@ #include #include "config.h" #include "conf_core.h" -#include "actions.h" +#include #include "query.h" #include "query_y.h" #include "query_exec.h" @@ -41,7 +41,7 @@ #include "board.h" #include "macro.h" #include "idpath.h" -#include "compat_misc.h" +#include static const char pcb_acts_query[] = "query(dump, expr) - dry run: compile and dump an expression\n" Index: trunk/src_plugins/query/query_exec.c =================================================================== --- trunk/src_plugins/query/query_exec.c (revision 29256) +++ trunk/src_plugins/query/query_exec.c (revision 29257) @@ -32,7 +32,7 @@ #include "query.h" #include "query_exec.h" #include "query_access.h" -#include "pcb-printf.h" +#include void pcb_qry_init(pcb_qry_exec_t *ctx, pcb_qry_node_t *root, int bufno) { Index: trunk/src_plugins/query/query_l.c =================================================================== --- trunk/src_plugins/query/query_l.c (revision 29256) +++ trunk/src_plugins/query/query_l.c (revision 29257) @@ -862,10 +862,10 @@ /* Query language - compiler: lexical analyzer */ -#include "unit.h" +#include #include "query.h" #include "query_y.h" -#include "compat_misc.h" +#include #include "layer.h" static const char *pcb_qry_program, *pcb_qry_program_ptr; Index: trunk/src_plugins/query/query_l.l =================================================================== --- trunk/src_plugins/query/query_l.l (revision 29256) +++ trunk/src_plugins/query/query_l.l (revision 29257) @@ -23,10 +23,10 @@ /* Query language - compiler: lexical analyzer */ -#include "unit.h" +#include #include "query.h" #include "query_y.h" -#include "compat_misc.h" +#include #include "layer.h" static const char *pcb_qry_program, *pcb_qry_program_ptr; Index: trunk/src_plugins/query/query_y.c =================================================================== --- trunk/src_plugins/query/query_y.c (revision 29256) +++ trunk/src_plugins/query/query_y.c (revision 29257) @@ -106,10 +106,10 @@ /* Query language - compiler: grammar */ #include -#include "unit.h" +#include #include "query.h" #include "query_l.h" -#include "compat_misc.h" +#include #include "flag_str.h" #include "fields_sphash.h" Index: trunk/src_plugins/query/query_y.y =================================================================== --- trunk/src_plugins/query/query_y.y (revision 29256) +++ trunk/src_plugins/query/query_y.y (revision 29257) @@ -29,10 +29,10 @@ /* Query language - compiler: grammar */ #include -#include "unit.h" +#include #include "query.h" #include "query_l.h" -#include "compat_misc.h" +#include #include "flag_str.h" #include "fields_sphash.h" Index: trunk/src_plugins/renumber/renumber.c =================================================================== --- trunk/src_plugins/renumber/renumber.c (revision 29256) +++ trunk/src_plugins/renumber/renumber.c (revision 29257) @@ -36,17 +36,17 @@ #include "board.h" #include "data.h" #include "change.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "conf_core.h" -#include "compat_misc.h" +#include #include "netlist.h" -#include "safe_fs.h" +#include #include "macro.h" -#include "pcb-printf.h" +#include static const char pcb_acts_Renumber[] = "Renumber()\n" "Renumber(filename)"; static const char pcb_acth_Renumber[] = Index: trunk/src_plugins/renumber/renumberblock.c =================================================================== --- trunk/src_plugins/renumber/renumberblock.c (revision 29256) +++ trunk/src_plugins/renumber/renumberblock.c (revision 29257) @@ -16,12 +16,12 @@ #include "config.h" #include "board.h" -#include "actions.h" +#include #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" -#include "error.h" +#include #include "change.h" #include "conf_core.h" Index: trunk/src_plugins/report/report.c =================================================================== --- trunk/src_plugins/report/report.c (revision 29256) +++ trunk/src_plugins/report/report.c (revision 29257) @@ -33,7 +33,7 @@ #include "config.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include @@ -45,7 +45,7 @@ #include "data.h" #include "data_it.h" #include "drill.h" -#include "error.h" +#include #include "search.h" #include "rtree.h" #include "flag_str.h" @@ -53,18 +53,18 @@ #include "undo.h" #include "find.h" #include "draw.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "actions.h" -#include "misc_util.h" +#include +#include +#include +#include #include "report_conf.h" -#include "compat_misc.h" +#include #include "layer.h" #include "obj_term.h" #include "obj_pstk.h" #include "obj_pstk_inlines.h" #include "obj_subc_parent.h" -#include "hid_dad.h" +#include #include "netlist.h" #include Index: trunk/src_plugins/report/report_conf.h =================================================================== --- trunk/src_plugins/report/report_conf.h (revision 29256) +++ trunk/src_plugins/report/report_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_MINCUT_CONF_H #define PCB_MINCUT_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/rubberband_orig/rubberband.c =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband.c (revision 29256) +++ trunk/src_plugins/rubberband_orig/rubberband.c (revision 29257) @@ -40,8 +40,8 @@ #include "data.h" #include "data_it.h" #include "data_list.h" -#include "error.h" -#include "event.h" +#include +#include #include "undo.h" #include "operation.h" #include "rotate.h" @@ -53,9 +53,9 @@ #include "obj_line_draw.h" #include "obj_pstk_inlines.h" #include "route_draw.h" -#include "plugins.h" +#include #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "layer_grp.h" #include "fgeometry.h" #include "search.h" Index: trunk/src_plugins/rubberband_orig/rubberband_conf.h =================================================================== --- trunk/src_plugins/rubberband_orig/rubberband_conf.h (revision 29256) +++ trunk/src_plugins/rubberband_orig/rubberband_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_MINCUT_CONF_H #define PCB_MINCUT_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/script/c_script.c =================================================================== --- trunk/src_plugins/script/c_script.c (revision 29256) +++ trunk/src_plugins/script/c_script.c (revision 29257) @@ -34,7 +34,7 @@ #include #include -#include "fptr_cast.h" +#include static fgw_error_t fgws_c_call_script(fgw_arg_t *res, int argc, fgw_arg_t *argv) { Index: trunk/src_plugins/script/live_script.c =================================================================== --- trunk/src_plugins/script/live_script.c (revision 29256) +++ trunk/src_plugins/script/live_script.c (revision 29257) @@ -31,14 +31,14 @@ #include #include -#include "actions.h" -#include "plugins.h" -#include "hid_cfg.h" -#include "hid_dad.h" -#include "safe_fs.h" +#include +#include +#include +#include +#include #include "safe_fs_dir.h" -#include "compat_fs.h" -#include "event.h" +#include +#include #include "undo.h" #include "globalconst.h" Index: trunk/src_plugins/script/perma.c =================================================================== --- trunk/src_plugins/script/perma.c (revision 29256) +++ trunk/src_plugins/script/perma.c (revision 29257) @@ -31,7 +31,7 @@ #include -#include "hidlib.h" +#include static const char *guess_lang(const char *ext); Index: trunk/src_plugins/script/script.c =================================================================== --- trunk/src_plugins/script/script.c (revision 29256) +++ trunk/src_plugins/script/script.c (revision 29257) @@ -35,13 +35,13 @@ #include #include -#include "actions.h" -#include "plugins.h" -#include "error.h" -#include "compat_misc.h" -#include "compat_fs.h" -#include "safe_fs.h" -#include "pcb-printf.h" +#include +#include +#include +#include +#include +#include +#include #include "globalconst.h" #include "script.h" @@ -62,8 +62,8 @@ static pup_context_t script_pup; #include "c_script.c" -#include "hidlib_conf.h" -#include "compat_fs.h" +#include +#include /* dir name under dotdir for saving script persistency data */ #define SCRIPT_PERS "script_pers" Index: trunk/src_plugins/script/script_act.c =================================================================== --- trunk/src_plugins/script/script_act.c (revision 29256) +++ trunk/src_plugins/script/script_act.c (revision 29257) @@ -28,8 +28,8 @@ */ #include -#include "hid_dad.h" -#include "hid_dad_tree.h" +#include +#include #include "live_script.h" Index: trunk/src_plugins/serpentine/serpentine.c =================================================================== --- trunk/src_plugins/serpentine/serpentine.c (revision 29256) +++ trunk/src_plugins/serpentine/serpentine.c (revision 29257) @@ -33,7 +33,7 @@ #include "board.h" #include "data.h" #include "data_it.h" -#include "error.h" +#include #include "search.h" #include "tool.h" #include "rtree.h" @@ -43,9 +43,9 @@ #include "find.h" #include "draw.h" #include "draw_wireframe.h" -#include "pcb-printf.h" -#include "plugins.h" -#include "actions.h" +#include +#include +#include #include "serpentine_conf.h" #include "layer.h" #include "route.h" Index: trunk/src_plugins/serpentine/serpentine_conf.h =================================================================== --- trunk/src_plugins/serpentine/serpentine_conf.h (revision 29256) +++ trunk/src_plugins/serpentine/serpentine_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_SERPENTINE_CONF_H #define PCB_SERPENTINE_CONF_H -#include "conf.h" +#include typedef struct { const struct plugins { Index: trunk/src_plugins/shand_cmd/command.c =================================================================== --- trunk/src_plugins/shand_cmd/command.c (revision 29256) +++ trunk/src_plugins/shand_cmd/command.c (revision 29257) @@ -38,13 +38,13 @@ #include "buffer.h" #include "command.h" #include "data.h" -#include "error.h" -#include "event.h" +#include +#include #include "plug_io.h" -#include "plugins.h" -#include "actions.h" -#include "compat_misc.h" -#include "misc_util.h" +#include +#include +#include +#include #include "tool.h" static const char pcb_acts_Help[] = "h"; Index: trunk/src_plugins/shape/shape.c =================================================================== --- trunk/src_plugins/shape/shape.c (revision 29256) +++ trunk/src_plugins/shape/shape.c (revision 29257) @@ -28,16 +28,16 @@ #include "shape.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "board.h" #include "buffer.h" -#include "compat_misc.h" +#include #include "conf_core.h" #include "data.h" -#include "error.h" -#include "event.h" +#include +#include #include "layer.h" #include "math_helper.h" #include "obj_poly.h" Index: trunk/src_plugins/shape/shape.h =================================================================== --- trunk/src_plugins/shape/shape.h (revision 29256) +++ trunk/src_plugins/shape/shape.h (revision 29257) @@ -29,7 +29,7 @@ #include "board.h" #include "data.h" #include "layer.h" -#include "pcb_bool.h" +#include /* special layer: when used, the shape is always placed on the current layer */ extern pcb_layer_t *pcb_shape_current_layer; Index: trunk/src_plugins/shape/shape_dialog.c =================================================================== --- trunk/src_plugins/shape/shape_dialog.c (revision 29256) +++ trunk/src_plugins/shape/shape_dialog.c (revision 29257) @@ -1,4 +1,4 @@ -#include "hid_dad.h" +#include typedef struct { PCB_DAD_DECL_NOINIT(dlg) Index: trunk/src_plugins/sketch_route/sketch_route.c =================================================================== --- trunk/src_plugins/sketch_route/sketch_route.c (revision 29256) +++ trunk/src_plugins/sketch_route/sketch_route.c (revision 29257) @@ -32,18 +32,18 @@ #include "config.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "board.h" #include "conf_core.h" #include "data.h" -#include "event.h" +#include #include "list_common.h" #include "obj_line_list.h" #include "obj_pstk.h" #include "obj_pstk_inlines.h" #include "obj_subc_parent.h" -#include "pcb-printf.h" +#include #include "search.h" #include "tool.h" #include "layer_ui.h" Index: trunk/src_plugins/smartdisperse/smartdisperse.c =================================================================== --- trunk/src_plugins/smartdisperse/smartdisperse.c (revision 29256) +++ trunk/src_plugins/smartdisperse/smartdisperse.c (revision 29257) @@ -22,15 +22,15 @@ #include "config.h" #include "board.h" #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" #include "netlist.h" -#include "error.h" +#include #include "move.h" #include "draw.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "obj_subc.h" #include "obj_subc_parent.h" #include "obj_term.h" Index: trunk/src_plugins/stroke/stroke.c =================================================================== --- trunk/src_plugins/stroke/stroke.c (revision 29256) +++ trunk/src_plugins/stroke/stroke.c (revision 29257) @@ -32,13 +32,13 @@ #include "board.h" #include "conf_core.h" -#include "hidlib_conf.h" +#include #include "crosshair.h" -#include "actions.h" -#include "unit.h" -#include "plugins.h" +#include +#include +#include #include "stub_stroke.h" -#include "compat_misc.h" +#include #include "tool.h" #include "../src_plugins/stroke/conf_internal.c" Index: trunk/src_plugins/stroke/stroke_conf.h =================================================================== --- trunk/src_plugins/stroke/stroke_conf.h (revision 29256) +++ trunk/src_plugins/stroke/stroke_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_VENDOR_CONF_H #define PCB_VENDOR_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/src_plugins/teardrops/teardrops.c =================================================================== --- trunk/src_plugins/teardrops/teardrops.c (revision 29256) +++ trunk/src_plugins/teardrops/teardrops.c (revision 29257) @@ -19,11 +19,11 @@ #include "math_helper.h" #include "board.h" #include "data.h" -#include "hid.h" +#include #include "rtree.h" #include "undo.h" -#include "plugins.h" -#include "actions.h" +#include +#include #include "obj_pstk_inlines.h" #define MIN_LINE_LENGTH 700 Index: trunk/src_plugins/vendordrill/vendor.c =================================================================== --- trunk/src_plugins/vendordrill/vendor.c (revision 29256) +++ trunk/src_plugins/vendordrill/vendor.c (revision 29257) @@ -41,15 +41,15 @@ #include "board.h" #include "data.h" #include "draw.h" -#include "error.h" +#include #include "undo.h" -#include "plugins.h" -#include "actions.h" -#include "hid_cfg.h" +#include +#include +#include #include "vendor_conf.h" -#include "compat_misc.h" +#include #include "obj_pstk_inlines.h" -#include "event.h" +#include #include "macro.h" #include #include Index: trunk/src_plugins/vendordrill/vendor_conf.h =================================================================== --- trunk/src_plugins/vendordrill/vendor_conf.h (revision 29256) +++ trunk/src_plugins/vendordrill/vendor_conf.h (revision 29257) @@ -1,7 +1,7 @@ #ifndef PCB_VENDOR_CONF_H #define PCB_VENDOR_CONF_H -#include "conf.h" +#include typedef struct { const struct { Index: trunk/tests/librnd/librnd_test.c =================================================================== --- trunk/tests/librnd/librnd_test.c (revision 29256) +++ trunk/tests/librnd/librnd_test.c (revision 29257) @@ -1,11 +1,11 @@ -#include "unit.h" -#include "hid_init.h" -#include "hid.h" -#include "conf.h" +#include +#include +#include +#include #include "buildin.hidlib.h" -#include "compat_misc.h" -#include "plugins.h" -#include "hidlib.h" +#include +#include +#include #include "polyarea.h" /*** hidlib glue ***/ Index: trunk/tests/pcb-printf/prcli.c =================================================================== --- trunk/tests/pcb-printf/prcli.c (revision 29256) +++ trunk/tests/pcb-printf/prcli.c (revision 29257) @@ -1,8 +1,8 @@ #include #include -#include "misc_util.h" -#include "pcb-printf.h" -#include "pcb_bool.h" +#include +#include +#include int main(int argc, char *argv[]) { Index: trunk/tests/pcb-printf/prclimq.c =================================================================== --- trunk/tests/pcb-printf/prclimq.c (revision 29256) +++ trunk/tests/pcb-printf/prclimq.c (revision 29257) @@ -1,8 +1,8 @@ #include #include -#include "misc_util.h" -#include "pcb-printf.h" -#include "pcb_bool.h" +#include +#include +#include int main(int argc, char *argv[]) { Index: trunk/tests/pcb-printf/tester.c =================================================================== --- trunk/tests/pcb-printf/tester.c (revision 29256) +++ trunk/tests/pcb-printf/tester.c (revision 29257) @@ -1,7 +1,7 @@ #include #include #include "config.h" -#include "pcb-printf.h" +#include #ifdef SPEED char buff[8192]; Index: trunk/tests/strflags/tester.c =================================================================== --- trunk/tests/strflags/tester.c (revision 29256) +++ trunk/tests/strflags/tester.c (revision 29257) @@ -31,7 +31,7 @@ #include #include #include -#include "compat_misc.h" +#include #define FLAG_TEST #include "flag_str.c"