Index: trunk/src/Makefile.in
===================================================================
--- trunk/src/Makefile.in	(revision 26847)
+++ trunk/src/Makefile.in	(revision 26848)
@@ -560,7 +560,7 @@
 # rndlib: corner case: some headers are not derived from the objects
 sub /local/pcb/HDRS_HIDLIB {hid_dlg.h } {}
 sub /local/pcb/HDRS_HIDLIB {polygon1.h } {}
-append /local/pcb/HDRS_HIDLIB {hid.h polyarea.h global_typedefs.h layer.h globalconst.h }
+append /local/pcb/HDRS_HIDLIB {hid.h polyarea.h global_typedefs.h globalconst.h }
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/dom_[^ ]*.h } {}
 gsub /local/pcb/HDRS_3RDLIB {../src_3rd/liblihata/tree_[^ ]*.h } {}
 append /local/pcb/HDRS_3RDLIB {../src_3rd/genvector/genvector_impl.h ../src_3rd/genvector/genvector_undef.h }
Index: trunk/src/draw.h
===================================================================
--- trunk/src/draw.h	(revision 26847)
+++ trunk/src/draw.h	(revision 26848)
@@ -31,6 +31,7 @@
 
 #include "config.h"
 #include "hid.h"
+#include "layer.h"
 
 /* holds information about output window */
 typedef struct {
Index: trunk/src/hid.h
===================================================================
--- trunk/src/hid.h	(revision 26847)
+++ trunk/src/hid.h	(revision 26848)
@@ -8,7 +8,7 @@
 #include "error.h"
 #include "global_typedefs.h"
 #include "attrib.h"
-#include "layer.h"
+#include "box.h"
 
 /* attribute dialog properties */
 typedef enum pcb_hat_property_e {
Index: trunk/src/hid_attrib.h
===================================================================
--- trunk/src/hid_attrib.h	(revision 26847)
+++ trunk/src/hid_attrib.h	(revision 26848)
@@ -1,6 +1,7 @@
 #ifndef PCB_HID_ATTRIB_H
 #define PCB_HID_ATTRIB_H
 
+#include <genlist/gendlist.h>
 #include "hid.h"
 #include "color.h"
 
Index: trunk/src_plugins/loghid/hid-logger.c
===================================================================
--- trunk/src_plugins/loghid/hid-logger.c	(revision 26847)
+++ trunk/src_plugins/loghid/hid-logger.c	(revision 26848)
@@ -4,6 +4,7 @@
 #include "config.h"
 #include "hid-logger.h"
 #include "pcb-printf.h"
+#include "color.h"
 
 #define ENUM_LOG_TEXT(e) case e: txt = #e; break