Index: trunk/src/conf_hid.h
===================================================================
--- trunk/src/conf_hid.h	(revision 5620)
+++ trunk/src/conf_hid.h	(revision 5621)
@@ -47,7 +47,7 @@
 /* Call the local callback of a native item */
 #define conf_hid_local_cb(native, cb) \
 do { \
-	int __n__; \
+	unsigned int __n__; \
 	for(__n__ = 0; __n__ < vtp0_len(&((native)->hid_callbacks)); __n__++) { \
 		const conf_hid_callbacks_t *cbs = (native)->hid_callbacks.array[__n__]; \
 		if ((cbs != NULL) && (cbs->cb != NULL)) \
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 5620)
+++ trunk/src/data.h	(revision 5621)
@@ -40,7 +40,7 @@
 /* Generic container object that can hold subcircuits with layer-global
    objects (e.g. vias and rats) and layer-locals (lines, arcs) */
 struct pcb_data_s {
-	int LayerN;                        /* number of layers in this board */
+	pcb_cardinal_t LayerN;                        /* number of layers in this board */
 	pinlist_t Via;
 	elementlist_t Element;
 /**/
Index: trunk/src_plugins/hid_gtk/gui-config.c
===================================================================
--- trunk/src_plugins/hid_gtk/gui-config.c	(revision 5620)
+++ trunk/src_plugins/hid_gtk/gui-config.c	(revision 5621)
@@ -1473,7 +1473,7 @@
 void config_layers_save(GtkButton *widget, save_ctx_t *ctx)
 {
 	gchar *s;
-	int n;
+	pcb_cardinal_t n;
 	const char *paths[] = {
 		"design/groups",
 		"design/default_layer_name",