Index: src_plugins/io_mentor_cell/io_mentor_cell.c
===================================================================
--- src_plugins/io_mentor_cell/io_mentor_cell.c	(revision 8885)
+++ src_plugins/io_mentor_cell/io_mentor_cell.c	(revision 8886)
@@ -26,9 +26,7 @@
 #include "config.h"
 #include "plugins.h"
 #include "plug_io.h"
-#include "write.h"
 #include "read.h"
-#include "read_net.h"
 
 static pcb_plug_io_t io_mentor_cell;
 static const char *mentor_cell_cookie = "mentor_cell plugin";
Index: src_plugins/io_mentor_cell/read.c
===================================================================
--- src_plugins/io_mentor_cell/read.c	(revision 8885)
+++ src_plugins/io_mentor_cell/read.c	(revision 8886)
@@ -23,12 +23,21 @@
  *
  */
 
+#include "config.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "board.h"
+#include "conf_core.h"
+#include "plug_io.h"
+
 typedef struct {
 	FILE *f;
-	pcb_board_t *pcb
+	pcb_board_t *pcb;
 } hkp_ctx_t;
 
-int io_mentor_cell_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *fn, conf_role_t settings_dest)
+int io_mentor_cell_read_pcb(pcb_plug_io_t *pctx, pcb_board_t *pcb, const char *fn, conf_role_t settings_dest)
 {
 	hkp_ctx_t ctx;
 
Index: src_plugins/io_mentor_cell/read.h
===================================================================
--- src_plugins/io_mentor_cell/read.h	(nonexistent)
+++ src_plugins/io_mentor_cell/read.h	(revision 8886)
@@ -0,0 +1,2 @@
+int io_mentor_cell_read_pcb(pcb_plug_io_t *ctx, pcb_board_t *pcb, const char *fn, conf_role_t settings_dest);
+int io_mentor_cell_test_parse_pcb(pcb_plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, FILE *f);