Index: trunk/tests/librnd/glue.c
===================================================================
--- trunk/tests/librnd/glue.c	(nonexistent)
+++ trunk/tests/librnd/glue.c	(revision 30271)
@@ -0,0 +1,70 @@
+/*** hidlib glue ***/
+
+const char *pcb_hidlib_default_embedded_menu = "";
+const char *pcb_conf_internal = "";
+const char *pcbhl_menu_file_paths[] = { "./", NULL };
+const char *pcbhl_menu_name_fmt = "menu.lht";
+
+const char *pcbhl_conf_userdir_path = "./";
+const char *pcphl_conf_user_path = "./conf.lht";
+
+/* hack for running from ./ without internal version of the conf */
+const char *pcbhl_conf_sysdir_path = "./";
+const char *pcbhl_conf_sys_path = "./conf.lht";
+
+const char *pcbhl_app_package = "librnd_test";
+const char *pcbhl_app_version = "0.0.0";
+const char *pcbhl_app_url = "n/a";
+
+
+typedef struct design_s {
+	pcb_hidlib_t hidlib; /* shall be the first */
+} design_t;
+
+design_t CTX;
+
+const pup_buildin_t local_buildins[] = {
+	{NULL, NULL, NULL, NULL, 0, NULL}
+};
+
+static const char *action_args[] = {
+	NULL, NULL, NULL, NULL, NULL /* terminator */
+};
+
+void conf_core_init()
+{
+	pcb_conf_reg_field_(NULL, 1, CFN_COORD, "should_never_match", "dummy", 0);
+}
+
+void pcb_hidlib_adjust_attached_objects(pcb_hidlib_t *hl)
+{
+}
+
+void *pcb_hidlib_crosshair_suspend(pcb_hidlib_t *hl)
+{
+	return NULL;
+}
+
+void pcb_hidlib_crosshair_restore(pcb_hidlib_t *hl, void *susp_data)
+{
+}
+
+void pcb_hidlib_crosshair_move_to(pcb_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot)
+{
+}
+
+void pcbhl_draw_marks(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+{
+}
+
+void pcbhl_draw_attached(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
+{
+}
+
+void pcbhl_expose_main(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *region, pcb_xform_t *xform_caller)
+{
+}
+
+void pcbhl_expose_preview(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *e)
+{
+}
Index: trunk/tests/librnd/librnd_includes.c
===================================================================
--- trunk/tests/librnd/librnd_includes.c	(revision 30270)
+++ trunk/tests/librnd/librnd_includes.c	(revision 30271)
@@ -2,6 +2,8 @@
    not part of librnd */
 #include "inc_all.h"
 
+#include "glue.c"
+
 int main(int argc, char *argv[])
 {
 	return 0;
Index: trunk/tests/librnd/librnd_test.c
===================================================================
--- trunk/tests/librnd/librnd_test.c	(revision 30270)
+++ trunk/tests/librnd/librnd_test.c	(revision 30271)
@@ -8,77 +8,8 @@
 #include <librnd/core/hidlib.h>
 #include <librnd/poly/polyarea.h>
 
-/*** hidlib glue ***/
+#include "glue.c"
 
-const char *pcb_hidlib_default_embedded_menu = "";
-const char *pcb_conf_internal = "";
-const char *pcbhl_menu_file_paths[] = { "./", NULL };
-const char *pcbhl_menu_name_fmt = "menu.lht";
-
-const char *pcbhl_conf_userdir_path = "./";
-const char *pcphl_conf_user_path = "./conf.lht";
-
-/* hack for running from ./ without internal version of the conf */
-const char *pcbhl_conf_sysdir_path = "./";
-const char *pcbhl_conf_sys_path = "./conf.lht";
-
-const char *pcbhl_app_package = "librnd_test";
-const char *pcbhl_app_version = "0.0.0";
-const char *pcbhl_app_url = "n/a";
-
-
-typedef struct design_s {
-	pcb_hidlib_t hidlib; /* shall be the first */
-} design_t;
-
-design_t CTX;
-
-const pup_buildin_t local_buildins[] = {
-	{NULL, NULL, NULL, NULL, 0, NULL}
-};
-
-static const char *action_args[] = {
-	NULL, NULL, NULL, NULL, NULL /* terminator */
-};
-
-void conf_core_init()
-{
-	pcb_conf_reg_field_(NULL, 1, CFN_COORD, "should_never_match", "dummy", 0);
-}
-
-void pcb_hidlib_adjust_attached_objects(pcb_hidlib_t *hl)
-{
-}
-
-void *pcb_hidlib_crosshair_suspend(pcb_hidlib_t *hl)
-{
-	return NULL;
-}
-
-void pcb_hidlib_crosshair_restore(pcb_hidlib_t *hl, void *susp_data)
-{
-}
-
-void pcb_hidlib_crosshair_move_to(pcb_hidlib_t *hl, pcb_coord_t abs_x, pcb_coord_t abs_y, int mouse_mot)
-{
-}
-
-void pcbhl_draw_marks(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
-{
-}
-
-void pcbhl_draw_attached(pcb_hidlib_t *hidlib, pcb_bool inhibit_drawing_mode)
-{
-}
-
-void pcbhl_expose_main(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *region, pcb_xform_t *xform_caller)
-{
-}
-
-void pcbhl_expose_preview(pcb_hid_t *hid, const pcb_hid_expose_ctx_t *e)
-{
-}
-
 /*** init test ***/
 
 static void poly_test()