Index: trunk/src/board.h
===================================================================
--- trunk/src/board.h	(revision 4754)
+++ trunk/src/board.h	(revision 4755)
@@ -100,7 +100,7 @@
 	LibraryType NetlistLib[NUM_NETLISTS];
 	rats_patch_line_t *NetlistPatches, *NetlistPatchLast;
 	AttributeListType Attributes;
-	DataTypePtr Data;							/* entire database */
+	pcb_data_t *Data;							/* entire database */
 
 	pcb_bool is_footprint;						/* If set, the user has loaded a footprint, not a pcb. */
 
Index: trunk/src/buffer.c
===================================================================
--- trunk/src/buffer.c	(revision 4754)
+++ trunk/src/buffer.c	(revision 4755)
@@ -336,10 +336,10 @@
 /* ---------------------------------------------------------------------------
  * creates a new paste buffer
  */
-DataTypePtr CreateNewBuffer(void)
+pcb_data_t *CreateNewBuffer(void)
 {
-	DataTypePtr data;
-	data = (DataTypePtr) calloc(1, sizeof(DataType));
+	pcb_data_t *data;
+	data = (pcb_data_t *) calloc(1, sizeof(pcb_data_t));
 	data->pcb = (pcb_board_t *) PCB;
 	return data;
 }
@@ -586,7 +586,7 @@
  * moves the passed object to the passed buffer and removes it
  * from its original place
  */
-void *MoveObjectToBuffer(DataTypePtr Destination, DataTypePtr Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *MoveObjectToBuffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 
@@ -600,7 +600,7 @@
 /* ----------------------------------------------------------------------
  * Adds the passed object to the passed buffer
  */
-void *CopyObjectToBuffer(DataTypePtr Destination, DataTypePtr Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *CopyObjectToBuffer(pcb_data_t *Destination, pcb_data_t *Src, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 
Index: trunk/src/buffer.h
===================================================================
--- trunk/src/buffer.h	(revision 4754)
+++ trunk/src/buffer.h	(revision 4755)
@@ -34,7 +34,7 @@
 struct pcb_buffer_s {								/* information about the paste buffer */
 	Coord X, Y;										/* offset */
 	BoxType BoundingBox;
-	DataTypePtr Data;							/* data; not all members of pcb_board_t */
+	pcb_data_t *Data;							/* data; not all members of pcb_board_t */
 	/* are used */
 };
 
@@ -52,13 +52,13 @@
 void MirrorBuffer(BufferTypePtr);
 void InitBuffers(void);
 void UninitBuffers(void);
-void *MoveObjectToBuffer(DataTypePtr, DataTypePtr, int, void *, void *, void *);
-void *CopyObjectToBuffer(DataTypePtr, DataTypePtr, int, void *, void *, void *);
+void *MoveObjectToBuffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *);
+void *CopyObjectToBuffer(pcb_data_t *, pcb_data_t *, int, void *, void *, void *);
 
 /* This action is called from ActionElementAddIf() */
 int LoadFootprint(int argc, const char **argv, Coord x, Coord y);
 
-DataTypePtr CreateNewBuffer(void);
+pcb_data_t *CreateNewBuffer(void);
 
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/data.c
===================================================================
--- trunk/src/data.c	(revision 4754)
+++ trunk/src/data.c	(revision 4755)
@@ -178,7 +178,7 @@
 /* ---------------------------------------------------------------------------
  * free memory used by data struct
  */
-void FreeDataMemory(DataType * data)
+void FreeDataMemory(pcb_data_t * data)
 {
 	LayerTypePtr layer;
 	int i;
@@ -249,13 +249,13 @@
 	if (data->rat_tree)
 		r_destroy_tree(&data->rat_tree);
 	/* clear struct */
-	memset(data, 0, sizeof(DataType));
+	memset(data, 0, sizeof(pcb_data_t));
 }
 
 /* ---------------------------------------------------------------------------
  * returns pcb_true if data area is empty
  */
-pcb_bool IsDataEmpty(DataTypePtr Data)
+pcb_bool IsDataEmpty(pcb_data_t *Data)
 {
 	pcb_bool hasNoObjects;
 	pcb_cardinal_t i;
@@ -271,7 +271,7 @@
  * gets minimum and maximum coordinates
  * returns NULL if layout is empty
  */
-BoxTypePtr GetDataBoundingBox(DataTypePtr Data)
+BoxTypePtr GetDataBoundingBox(pcb_data_t *Data)
 {
 	static BoxType box;
 	/* FIX ME: use r_search to do this much faster */
Index: trunk/src/data.h
===================================================================
--- trunk/src/data.h	(revision 4754)
+++ trunk/src/data.h	(revision 4755)
@@ -121,8 +121,8 @@
 	pcb_via_cb_t vcb
 );
 
-void FreeDataMemory(DataTypePtr);
-pcb_bool IsDataEmpty(DataTypePtr);
-BoxTypePtr GetDataBoundingBox(DataTypePtr Data);
+void FreeDataMemory(pcb_data_t *);
+pcb_bool IsDataEmpty(pcb_data_t *);
+BoxTypePtr GetDataBoundingBox(pcb_data_t *Data);
 
 #endif
Index: trunk/src/find_drc.c
===================================================================
--- trunk/src/find_drc.c	(revision 4754)
+++ trunk/src/find_drc.c	(revision 4755)
@@ -223,7 +223,7 @@
 }
 
 /* DRC clearance callback */
-static r_dir_t drc_callback(DataTypePtr data, LayerTypePtr layer, PolygonTypePtr polygon, int type, void *ptr1, void *ptr2)
+static r_dir_t drc_callback(pcb_data_t *data, LayerTypePtr layer, PolygonTypePtr polygon, int type, void *ptr1, void *ptr2)
 {
 	const char *message;
 	Coord x, y;
Index: trunk/src/global_typedefs.h
===================================================================
--- trunk/src/global_typedefs.h	(revision 4754)
+++ trunk/src/global_typedefs.h	(revision 4755)
@@ -25,7 +25,7 @@
 #include "config.h"
 
 typedef struct pcb_board_s pcb_board_t;
-typedef struct pcb_data_s  DataType, *DataTypePtr;
+typedef struct pcb_data_s pcb_data_t;
 typedef struct pcb_layer_group_s  LayerGroupType, *LayerGroupTypePtr;
 typedef struct pcb_layer_s LayerType, *LayerTypePtr;
 typedef struct pcb_buffer_s BufferType, *BufferTypePtr;
Index: trunk/src/layer.c
===================================================================
--- trunk/src/layer.c	(revision 4754)
+++ trunk/src/layer.c	(revision 4755)
@@ -158,7 +158,7 @@
 /* ---------------------------------------------------------------------------
  * returns the layer number for the passed pointer
  */
-int GetLayerNumber(DataTypePtr Data, LayerTypePtr Layer)
+int GetLayerNumber(pcb_data_t *Data, LayerTypePtr Layer)
 {
 	int i;
 
Index: trunk/src/layer.h
===================================================================
--- trunk/src/layer.h	(revision 4754)
+++ trunk/src/layer.h	(revision 4755)
@@ -68,7 +68,7 @@
 
 int ParseGroupString(const char *, LayerGroupTypePtr, int /* LayerN */ );
 
-int GetLayerNumber(DataTypePtr, LayerTypePtr);
+int GetLayerNumber(pcb_data_t *, LayerTypePtr);
 int GetLayerGroupNumberByPointer(LayerTypePtr);
 int GetLayerGroupNumberByNumber(pcb_cardinal_t);
 int GetGroupOfLayer(int);
Index: trunk/src/obj_any.h
===================================================================
--- trunk/src/obj_any.h	(revision 4754)
+++ trunk/src/obj_any.h	(revision 4755)
@@ -96,7 +96,7 @@
 	union {
 		void         *any;
 		LayerType    *layer;
-		DataType     *data;
+		pcb_data_t     *data;
 		ElementType  *element;
 	} parent;
 	gdl_elem_t link;
Index: trunk/src/obj_elem.c
===================================================================
--- trunk/src/obj_elem.c	(revision 4754)
+++ trunk/src/obj_elem.c	(revision 4755)
@@ -59,7 +59,7 @@
 /*** allocation ***/
 
 /* get next slot for an element, allocates memory if necessary */
-ElementType *GetElementMemory(DataType * data)
+ElementType *GetElementMemory(pcb_data_t * data)
 {
 	ElementType *new_obj;
 
@@ -391,7 +391,7 @@
 	return (pcb_true);
 }
 
-void FreeRotateElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord X, Coord Y, double cosa, double sina, Angle angle)
+void FreeRotateElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord X, Coord Y, double cosa, double sina, Angle angle)
 {
 	/* solder side objects need a different orientation */
 
@@ -481,7 +481,7 @@
 }
 
 /* changes the layout-name of an element */
-char *ChangeElementText(pcb_board_t * pcb, DataType * data, ElementTypePtr Element, int which, char *new_name)
+char *ChangeElementText(pcb_board_t * pcb, pcb_data_t * data, ElementTypePtr Element, int which, char *new_name)
 {
 	char *old = Element->Name[which].TextString;
 
@@ -506,7 +506,7 @@
 }
 
 /* copies data from one element to another and creates the destination; if necessary */
-ElementTypePtr CopyElementLowLevel(DataTypePtr Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy)
+ElementTypePtr CopyElementLowLevel(pcb_data_t *Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy)
 {
 	int i;
 	/* release old memory if necessary */
@@ -562,7 +562,7 @@
 }
 
 /* creates an new element; memory is allocated if needed */
-ElementTypePtr CreateNewElement(DataTypePtr Data, ElementTypePtr Element,
+ElementTypePtr CreateNewElement(pcb_data_t *Data, ElementTypePtr Element,
 	FontTypePtr PCBFont, FlagType Flags, char *Description, char *NameOnPCB,
 	char *Value, Coord TextX, Coord TextY, pcb_uint8_t Direction,
 	int TextScale, FlagType TextFlags, pcb_bool uniqueName)
@@ -662,7 +662,7 @@
 }
 
 /* mirrors the coordinates of an element; an additional offset is passed */
-void MirrorElementCoordinates(DataTypePtr Data, ElementTypePtr Element, Coord yoff)
+void MirrorElementCoordinates(pcb_data_t *Data, ElementTypePtr Element, Coord yoff)
 {
 	r_delete_element(Data, Element);
 	ELEMENTLINE_LOOP(Element);
@@ -716,7 +716,7 @@
 }
 
 /* sets the bounding box of an elements */
-void SetElementBoundingBox(DataTypePtr Data, ElementTypePtr Element, FontTypePtr Font)
+void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, FontTypePtr Font)
 {
 	BoxTypePtr box, vbox;
 
@@ -879,7 +879,7 @@
 
 /* make a unique name for the name on board
  * this can alter the contents of the input string */
-char *UniqueElementName(DataTypePtr Data, char *Name)
+char *UniqueElementName(pcb_data_t *Data, char *Name)
 {
 	pcb_bool unique = pcb_true;
 	/* null strings are ok */
@@ -902,7 +902,7 @@
 	}
 }
 
-void r_delete_element(DataType * data, ElementType * element)
+void r_delete_element(pcb_data_t * data, ElementType * element)
 {
 	r_delete_entry(data->element_tree, (BoxType *) element);
 	PIN_LOOP(element);
@@ -991,7 +991,7 @@
 }
 
 /* moves a element by +-X and +-Y */
-void MoveElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord DX, Coord DY)
+void MoveElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord DX, Coord DY)
 {
 	if (Data)
 		r_delete_entry(Data->element_tree, (BoxType *) Element);
@@ -1059,7 +1059,7 @@
 }
 
 /* rotate an element in 90 degree steps */
-void RotateElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord X, Coord Y, unsigned Number)
+void RotateElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord X, Coord Y, unsigned Number)
 {
 	/* solder side objects need a different orientation */
 
Index: trunk/src/obj_elem.h
===================================================================
--- trunk/src/obj_elem.h	(revision 4754)
+++ trunk/src/obj_elem.h	(revision 4755)
@@ -49,7 +49,7 @@
 	gdl_elem_t link;
 };
 
-ElementType *GetElementMemory(DataType * data);
+ElementType *GetElementMemory(pcb_data_t * data);
 void RemoveFreeElement(ElementType * data);
 void FreeElementMemory(ElementType * element);
 LineType *GetElementLineMemory(ElementType *Element);
@@ -59,24 +59,24 @@
 int LoadFootprintByName(BufferTypePtr Buffer, const char *Footprint);
 pcb_bool SmashBufferElement(BufferTypePtr Buffer);
 pcb_bool ConvertBufferToElement(BufferTypePtr Buffer);
-void FreeRotateElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord X, Coord Y, double cosa, double sina, Angle angle);
+void FreeRotateElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord X, Coord Y, double cosa, double sina, Angle angle);
 pcb_bool ChangeElementSide(ElementTypePtr Element, Coord yoff);
 pcb_bool ChangeSelectedElementSide(void);
-ElementTypePtr CopyElementLowLevel(DataTypePtr Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy);
-void SetElementBoundingBox(DataTypePtr Data, ElementTypePtr Element, FontTypePtr Font);
-char *UniqueElementName(DataTypePtr Data, char *Name);
-void r_delete_element(DataType * data, ElementType * element);
+ElementTypePtr CopyElementLowLevel(pcb_data_t *Data, ElementTypePtr Dest, ElementTypePtr Src, pcb_bool uniqueName, Coord dx, Coord dy);
+void SetElementBoundingBox(pcb_data_t *Data, ElementTypePtr Element, FontTypePtr Font);
+char *UniqueElementName(pcb_data_t *Data, char *Name);
+void r_delete_element(pcb_data_t * data, ElementType * element);
 
 /* Return a relative rotation for an element, useful only for
    comparing two similar footprints.  */
 int ElementOrientation(ElementType * e);
 
-void MoveElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord DX, Coord DY);
+void MoveElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord DX, Coord DY);
 void *RemoveElement(ElementTypePtr Element);
-void RotateElementLowLevel(DataTypePtr Data, ElementTypePtr Element, Coord X, Coord Y, unsigned Number);
-void MirrorElementCoordinates(DataTypePtr Data, ElementTypePtr Element, Coord yoff);
+void RotateElementLowLevel(pcb_data_t *Data, ElementTypePtr Element, Coord X, Coord Y, unsigned Number);
+void MirrorElementCoordinates(pcb_data_t *Data, ElementTypePtr Element, Coord yoff);
 
-ElementTypePtr CreateNewElement(DataTypePtr Data, ElementTypePtr Element,
+ElementTypePtr CreateNewElement(pcb_data_t *Data, ElementTypePtr Element,
 	FontTypePtr PCBFont, FlagType Flags, char *Description, char *NameOnPCB,
 	char *Value, Coord TextX, Coord TextY, pcb_uint8_t Direction,
 	int TextScale, FlagType TextFlags, pcb_bool uniqueName);
@@ -93,7 +93,7 @@
 /* Change the specified text on an element, either on the board (give
    PCB, PCB->Data) or in a buffer (give NULL, Buffer->Data).  The old
    string is returned, and must be properly freed by the caller.  */
-char *ChangeElementText(pcb_board_t * pcb, DataType * data, ElementTypePtr Element, int which, char *new_name);
+char *ChangeElementText(pcb_board_t * pcb, pcb_data_t * data, ElementTypePtr Element, int which, char *new_name);
 
 
 /* ---------------------------------------------------------------------------
Index: trunk/src/obj_pinvia.c
===================================================================
--- trunk/src/obj_pinvia.c	(revision 4754)
+++ trunk/src/obj_pinvia.c	(revision 4755)
@@ -47,7 +47,7 @@
 /*** allocation ***/
 
 /* get next slot for a via, allocates memory if necessary */
-PinType *GetViaMemory(DataType * data)
+PinType *GetViaMemory(pcb_data_t * data)
 {
 	PinType *new_obj;
 
@@ -85,7 +85,7 @@
 /*** utility ***/
 
 /* creates a new via */
-PinTypePtr CreateNewVia(DataTypePtr Data, Coord X, Coord Y, Coord Thickness, Coord Clearance, Coord Mask, Coord DrillingHole, const char *Name, FlagType Flags)
+PinTypePtr CreateNewVia(pcb_data_t *Data, Coord X, Coord Y, Coord Thickness, Coord Clearance, Coord Mask, Coord DrillingHole, const char *Name, FlagType Flags)
 {
 	PinTypePtr Via;
 
@@ -195,7 +195,7 @@
 
 
 
-void pcb_add_via(DataType *Data, PinType *Via)
+void pcb_add_via(pcb_data_t *Data, PinType *Via)
 {
 	SetPinBoundingBox(Via);
 	if (!Data->via_tree)
Index: trunk/src/obj_pinvia.h
===================================================================
--- trunk/src/obj_pinvia.h	(revision 4754)
+++ trunk/src/obj_pinvia.h	(revision 4755)
@@ -42,14 +42,14 @@
 };
 
 
-PinType *GetViaMemory(DataType * data);
+PinType *GetViaMemory(pcb_data_t * data);
 void RemoveFreeVia(PinType * data);
 PinType *GetPinMemory(ElementType * element);
 void RemoveFreePin(PinType * data);
 
-PinTypePtr CreateNewVia(DataTypePtr Data, Coord X, Coord Y, Coord Thickness, Coord Clearance, Coord Mask, Coord DrillingHole, const char *Name, FlagType Flags);
+PinTypePtr CreateNewVia(pcb_data_t *Data, Coord X, Coord Y, Coord Thickness, Coord Clearance, Coord Mask, Coord DrillingHole, const char *Name, FlagType Flags);
 PinTypePtr CreateNewPin(ElementTypePtr Element, Coord X, Coord Y, Coord Thickness, Coord Clearance, Coord Mask, Coord DrillingHole, char *Name, char *Number, FlagType Flags);
-void pcb_add_via(DataType *Data, PinType *Via);
+void pcb_add_via(pcb_data_t *Data, PinType *Via);
 void SetPinBoundingBox(PinTypePtr Pin);
 pcb_bool ChangeHole(PinTypePtr Via);
 
Index: trunk/src/obj_rat.c
===================================================================
--- trunk/src/obj_rat.c	(revision 4754)
+++ trunk/src/obj_rat.c	(revision 4755)
@@ -51,7 +51,7 @@
 
 /*** allocation ***/
 /* get next slot for a Rat, allocates memory if necessary */
-RatType *GetRatMemory(DataType *data)
+RatType *GetRatMemory(pcb_data_t *data)
 {
 	RatType *new_obj;
 
@@ -69,7 +69,7 @@
 
 /*** utility ***/
 /* creates a new rat-line */
-RatTypePtr CreateNewRat(DataTypePtr Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags)
+RatTypePtr CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags)
 {
 	RatTypePtr Line = GetRatMemory(Data);
 
Index: trunk/src/obj_rat.h
===================================================================
--- trunk/src/obj_rat.h	(revision 4754)
+++ trunk/src/obj_rat.h	(revision 4755)
@@ -38,10 +38,10 @@
 };
 
 
-RatType *GetRatMemory(DataType *data);
+RatType *GetRatMemory(pcb_data_t *data);
 void RemoveFreeRat(RatType *data);
 
-RatTypePtr CreateNewRat(DataTypePtr Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags);
+RatTypePtr CreateNewRat(pcb_data_t *Data, Coord X1, Coord Y1, Coord X2, Coord Y2, pcb_cardinal_t group1, pcb_cardinal_t group2, Coord Thickness, FlagType Flags);
 pcb_bool DeleteRats(pcb_bool selected);
 
 #endif
Index: trunk/src/operation.h
===================================================================
--- trunk/src/operation.h	(revision 4754)
+++ trunk/src/operation.h	(revision 4755)
@@ -37,7 +37,7 @@
 typedef struct {
 	pcb_board_t *pcb;
 	int extraflg;
-	DataType *dst, *src;
+	pcb_data_t *dst, *src;
 } pcb_opctx_buffer_t;
 
 typedef struct {
@@ -85,7 +85,7 @@
 
 typedef struct {
 	pcb_board_t *pcb;
-	DataTypePtr destroy_target;
+	pcb_data_t *destroy_target;
 	pcb_bool bulk;                /* don't draw if part of a bulk operation */
 } pcb_opctx_remove_t;
 
Index: trunk/src/plug_io.c
===================================================================
--- trunk/src/plug_io.c	(revision 4754)
+++ trunk/src/plug_io.c	(revision 4755)
@@ -143,7 +143,7 @@
 	return res;
 }
 
-int ParseElement(DataTypePtr Ptr, const char *name)
+int ParseElement(pcb_data_t *Ptr, const char *name)
 {
 	int res = -1;
 
@@ -234,7 +234,7 @@
 	return res;
 }
 
-int WriteElementData(FILE *f, DataTypePtr e, const char *fmt)
+int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt)
 {
 	int res, newfmt = 0;
 	plug_io_t *p = e->loader;
Index: trunk/src/plug_io.h
===================================================================
--- trunk/src/plug_io.h	(revision 4754)
+++ trunk/src/plug_io.h	(revision 4755)
@@ -62,7 +62,7 @@
 	int (*parse_pcb)(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
 
 	/* Attempt to load an element from Filename to Ptr. Return 0 on success. */
-	int (*parse_element)(plug_io_t *ctx, DataTypePtr Ptr, const char *name);
+	int (*parse_element)(plug_io_t *ctx, pcb_data_t *Ptr, const char *name);
 
 	/* Attempt to load fonts from a file. Return 0 on success. */
 	int (*parse_font)(plug_io_t *ctx, FontTypePtr Ptr, const char *Filename);
@@ -72,7 +72,7 @@
 	int (*write_buffer)(plug_io_t *ctx, FILE *f, BufferType *buff);
 
 	/* Write element data to a file. Return 0 on success. */
-	int (*write_element)(plug_io_t *ctx, FILE *f, DataTypePtr e);
+	int (*write_element)(plug_io_t *ctx, FILE *f, pcb_data_t *e);
 
 	/* Write PCB to f; there's a copy of the file we are going to
 	   "overwrite", named in old_filename and the new file name we are
@@ -92,10 +92,10 @@
 
 /********** hook wrappers **********/
 int ParsePCB(pcb_board_t *Ptr, const char *Filename, const char *fmt, int load_settings);
-int ParseElement(DataTypePtr Ptr, const char *name);
+int ParseElement(pcb_data_t *Ptr, const char *name);
 int ParseFont(FontTypePtr Ptr, char *Filename);
 int WriteBuffer(FILE *f, BufferType *buff, const char *fmt);
-int WriteElementData(FILE *f, DataTypePtr e, const char *fmt);
+int WriteElementData(FILE *f, pcb_data_t *e, const char *fmt);
 
 /********** common function used to be part of file.[ch] and friends **********/
 FILE *CheckAndOpenFile(const char *, pcb_bool, pcb_bool, pcb_bool *, pcb_bool *);
Index: trunk/src/polygon.c
===================================================================
--- trunk/src/polygon.c	(revision 4754)
+++ trunk/src/polygon.c	(revision 4755)
@@ -774,7 +774,7 @@
 }
 
 /* remove the pin clearance from the polygon */
-static int SubtractPin(DataType * d, PinType * pin, LayerType * l, PolygonType * p)
+static int SubtractPin(pcb_data_t * d, PinType * pin, LayerType * l, PolygonType * p)
 {
 	POLYAREA *np;
 	pcb_cardinal_t i;
@@ -849,7 +849,7 @@
 
 struct cpInfo {
 	const BoxType *other;
-	DataType *data;
+	pcb_data_t *data;
 	LayerType *layer;
 	PolygonType *polygon;
 	pcb_bool solder;
@@ -988,7 +988,7 @@
 	return R_DIR_FOUND_CONTINUE;
 }
 
-static int Group(DataTypePtr Data, pcb_cardinal_t layer)
+static int Group(pcb_data_t *Data, pcb_cardinal_t layer)
 {
 	pcb_cardinal_t i, j;
 	for (i = 0; i < max_group; i++)
@@ -998,7 +998,7 @@
 	return i;
 }
 
-static int clearPoly(DataTypePtr Data, LayerTypePtr Layer, PolygonType * polygon, const BoxType * here, Coord expand)
+static int clearPoly(pcb_data_t *Data, LayerTypePtr Layer, PolygonType * polygon, const BoxType * here, Coord expand)
 {
 	int r = 0, seen;
 	BoxType region;
@@ -1171,7 +1171,7 @@
 
 static pcb_bool inhibit = pcb_false;
 
-int InitClip(DataTypePtr Data, LayerTypePtr layer, PolygonType * p)
+int InitClip(pcb_data_t *Data, LayerTypePtr layer, PolygonType * p)
 {
 	if (inhibit)
 		return 0;
@@ -1389,11 +1389,11 @@
 	int type;
 	void *ptr1, *ptr2;
 	LayerTypePtr layer;
-	DataTypePtr data;
-	r_dir_t (*callback) (DataTypePtr, LayerTypePtr, PolygonTypePtr, int, void *, void *);
+	pcb_data_t *data;
+	r_dir_t (*callback) (pcb_data_t *, LayerTypePtr, PolygonTypePtr, int, void *, void *);
 };
 
-static r_dir_t subtract_plow(DataTypePtr Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2)
+static r_dir_t subtract_plow(pcb_data_t *Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2)
 {
 	if (!Polygon->Clipped)
 		return 0;
@@ -1423,7 +1423,7 @@
 	return R_DIR_NOT_FOUND;
 }
 
-static r_dir_t add_plow(DataTypePtr Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2)
+static r_dir_t add_plow(pcb_data_t *Data, LayerTypePtr Layer, PolygonTypePtr Polygon, int type, void *ptr1, void *ptr2)
 {
 	switch (type) {
 	case PCB_TYPE_PIN:
@@ -1457,8 +1457,8 @@
 }
 
 int
-PlowsPolygon(DataType * Data, int type, void *ptr1, void *ptr2,
-						 r_dir_t (*call_back) (DataTypePtr data, LayerTypePtr lay, PolygonTypePtr poly, int type, void *ptr1, void *ptr2))
+PlowsPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2,
+						 r_dir_t (*call_back) (pcb_data_t *data, LayerTypePtr lay, PolygonTypePtr poly, int type, void *ptr1, void *ptr2))
 {
 	BoxType sb = ((PinTypePtr) ptr2)->BoundingBox;
 	int r = 0, seen;
@@ -1540,7 +1540,7 @@
 	return r;
 }
 
-void RestoreToPolygon(DataType * Data, int type, void *ptr1, void *ptr2)
+void RestoreToPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2)
 {
 	if (type == PCB_TYPE_POLYGON)
 		InitClip(PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2);
@@ -1548,7 +1548,7 @@
 		PlowsPolygon(Data, type, ptr1, ptr2, add_plow);
 }
 
-void ClearFromPolygon(DataType * Data, int type, void *ptr1, void *ptr2)
+void ClearFromPolygon(pcb_data_t * Data, int type, void *ptr1, void *ptr2)
 {
 	if (type == PCB_TYPE_POLYGON)
 		InitClip(PCB->Data, (LayerTypePtr) ptr1, (PolygonTypePtr) ptr2);
@@ -1798,7 +1798,7 @@
 /* Convert a POLYAREA (and all linked POLYAREA) to
  * raw PCB polygons on the given layer.
  */
-void PolyToPolygonsOnLayer(DataType * Destination, LayerType * Layer, POLYAREA * Input, FlagType Flags)
+void PolyToPolygonsOnLayer(pcb_data_t * Destination, LayerType * Layer, POLYAREA * Input, FlagType Flags)
 {
 	PolygonType *Polygon;
 	POLYAREA *pa;
Index: trunk/src/polygon.h
===================================================================
--- trunk/src/polygon.h	(revision 4754)
+++ trunk/src/polygon.h	(revision 4755)
@@ -62,8 +62,8 @@
 void ClosePolygon(void);
 void CopyAttachedPolygonToLayer(void);
 int PolygonHoles(PolygonType * ptr, const BoxType * range, int (*callback) (PLINE *, void *user_data), void *user_data);
-int PlowsPolygon(DataType *, int, void *, void *,
-								 r_dir_t (*callback) (DataTypePtr, LayerTypePtr, PolygonTypePtr, int, void *, void *));
+int PlowsPolygon(pcb_data_t *, int, void *, void *,
+								 r_dir_t (*callback) (pcb_data_t *, LayerTypePtr, PolygonTypePtr, int, void *, void *));
 void ComputeNoHoles(PolygonType * poly);
 POLYAREA *ContourToPoly(PLINE *);
 POLYAREA *PolygonToPoly(PolygonType *);
@@ -75,9 +75,9 @@
 POLYAREA *PinPoly(PinType * l, Coord thick, Coord clear);
 POLYAREA *BoxPolyBloated(BoxType * box, Coord radius);
 void frac_circle(PLINE *, Coord, Coord, Vector, int);
-int InitClip(DataType * d, LayerType * l, PolygonType * p);
-void RestoreToPolygon(DataType *, int, void *, void *);
-void ClearFromPolygon(DataType *, int, void *, void *);
+int InitClip(pcb_data_t * d, LayerType * l, PolygonType * p);
+void RestoreToPolygon(pcb_data_t *, int, void *, void *);
+void ClearFromPolygon(pcb_data_t *, int, void *, void *);
 
 pcb_bool IsPointInPolygon(Coord, Coord, Coord, PolygonTypePtr);
 pcb_bool IsPointInPolygonIgnoreHoles(Coord, Coord, PolygonTypePtr);
@@ -85,7 +85,7 @@
 pcb_bool isects(POLYAREA *, PolygonTypePtr, pcb_bool);
 pcb_bool MorphPolygon(LayerTypePtr, PolygonTypePtr);
 void NoHolesPolygonDicer(PolygonType * p, const BoxType * clip, void (*emit) (PLINE *, void *), void *user_data);
-void PolyToPolygonsOnLayer(DataType *, LayerType *, POLYAREA *, FlagType);
+void PolyToPolygonsOnLayer(pcb_data_t *, LayerType *, POLYAREA *, FlagType);
 
 void square_pin_factors(int style, double *xm, double *ym);
 
Index: trunk/src/remove.c
===================================================================
--- trunk/src/remove.c	(revision 4754)
+++ trunk/src/remove.c	(revision 4755)
@@ -120,7 +120,7 @@
  * remove object as referred by pointers and type
  * allocated memory is destroyed assumed to already be erased
  */
-void *DestroyObject(DataTypePtr Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
+void *DestroyObject(pcb_data_t *Target, int Type, void *Ptr1, void *Ptr2, void *Ptr3)
 {
 	pcb_opctx_t ctx;
 
Index: trunk/src/remove.h
===================================================================
--- trunk/src/remove.h	(revision 4754)
+++ trunk/src/remove.h	(revision 4755)
@@ -41,6 +41,6 @@
 void RemovePCB(pcb_board_t *);
 pcb_bool RemoveSelected(void);
 void *RemoveObject(int, void *, void *, void *);
-void *DestroyObject(DataTypePtr, int, void *, void *, void *);
+void *DestroyObject(pcb_data_t *, int, void *, void *, void *);
 
 #endif
Index: trunk/src/search.c
===================================================================
--- trunk/src/search.c	(revision 4754)
+++ trunk/src/search.c	(revision 4755)
@@ -1128,7 +1128,7 @@
  * the results.
  * A type value is returned too which is PCB_TYPE_NONE if no objects has been found.
  */
-int SearchObjectByID(DataTypePtr Base, void **Result1, void **Result2, void **Result3, int ID, int type)
+int SearchObjectByID(pcb_data_t *Base, void **Result1, void **Result2, void **Result3, int ID, int type)
 {
 	if (type == PCB_TYPE_LINE || type == PCB_TYPE_LINE_POINT) {
 		ALLLINE_LOOP(Base);
@@ -1303,7 +1303,7 @@
  * searches for an element by its board name.
  * The function returns a pointer to the element, NULL if not found
  */
-ElementTypePtr SearchElementByName(DataTypePtr Base, const char *Name)
+ElementTypePtr SearchElementByName(pcb_data_t *Base, const char *Name)
 {
 	ElementTypePtr result = NULL;
 
Index: trunk/src/search.h
===================================================================
--- trunk/src/search.h	(revision 4754)
+++ trunk/src/search.h	(revision 4755)
@@ -157,7 +157,7 @@
 int SearchObjectByLocation(unsigned, void **, void **, void **, Coord, Coord, Coord);
 int SearchScreen(Coord, Coord, int, void **, void **, void **);
 int SearchScreenGridSlop(Coord, Coord, int, void **, void **, void **);
-int SearchObjectByID(DataTypePtr, void **, void **, void **, int, int);
-ElementTypePtr SearchElementByName(DataTypePtr, const char *);
+int SearchObjectByID(pcb_data_t *, void **, void **, void **, int, int);
+ElementTypePtr SearchElementByName(pcb_data_t *, const char *);
 
 #endif
Index: trunk/src/undo.c
===================================================================
--- trunk/src/undo.c	(revision 4754)
+++ trunk/src/undo.c	(revision 4755)
@@ -141,7 +141,7 @@
 /* ---------------------------------------------------------------------------
  * some local variables
  */
-static DataTypePtr RemoveList = NULL;	/* list of removed objects */
+static pcb_data_t *RemoveList = NULL;	/* list of removed objects */
 static UndoListTypePtr UndoList = NULL;	/* list of operations */
 static int Serial = 1,					/* serial number */
 	SavedSerial;
Index: trunk/src_plugins/autocrop/autocrop.c
===================================================================
--- trunk/src_plugins/autocrop/autocrop.c	(revision 4754)
+++ trunk/src_plugins/autocrop/autocrop.c	(revision 4755)
@@ -61,7 +61,7 @@
 #include "box.h"
 #include "hid_actions.h"
 
-static void *MyMoveViaLowLevel(DataType * Data, PinType * Via, Coord dx, Coord dy)
+static void *MyMoveViaLowLevel(pcb_data_t * Data, PinType * Via, Coord dx, Coord dy)
 {
 	if (Data) {
 		RestoreToPolygon(Data, PCB_TYPE_VIA, Via, Via);
@@ -75,7 +75,7 @@
 	return Via;
 }
 
-static void *MyMoveLineLowLevel(DataType * Data, LayerType * Layer, LineType * Line, Coord dx, Coord dy)
+static void *MyMoveLineLowLevel(pcb_data_t * Data, LayerType * Layer, LineType * Line, Coord dx, Coord dy)
 {
 	if (Data) {
 		RestoreToPolygon(Data, PCB_TYPE_LINE, Layer, Line);
@@ -89,7 +89,7 @@
 	return Line;
 }
 
-static void *MyMoveArcLowLevel(DataType * Data, LayerType * Layer, ArcType * Arc, Coord dx, Coord dy)
+static void *MyMoveArcLowLevel(pcb_data_t * Data, LayerType * Layer, ArcType * Arc, Coord dx, Coord dy)
 {
 	if (Data) {
 		RestoreToPolygon(Data, PCB_TYPE_ARC, Layer, Arc);
@@ -103,7 +103,7 @@
 	return Arc;
 }
 
-static void *MyMovePolygonLowLevel(DataType * Data, LayerType * Layer, PolygonType * Polygon, Coord dx, Coord dy)
+static void *MyMovePolygonLowLevel(pcb_data_t * Data, LayerType * Layer, PolygonType * Polygon, Coord dx, Coord dy)
 {
 	if (Data) {
 		r_delete_entry(Layer->polygon_tree, (BoxType *) Polygon);
Index: trunk/src_plugins/hid_lesstif/menu.c
===================================================================
--- trunk/src_plugins/hid_lesstif/menu.c	(revision 4754)
+++ trunk/src_plugins/hid_lesstif/menu.c	(revision 4755)
@@ -87,7 +87,7 @@
 	if (!layer_button_list)
 		return 0;
 	if (PCB && PCB->Data) {
-		DataType *d = PCB->Data;
+		pcb_data_t *d = PCB->Data;
 		for (i = 0; i < MAX_LAYER; i++)
 			fg_colors[i] = lesstif_parse_color(d->Layer[i].Color);
 		fg_colors[LB_SILK] = lesstif_parse_color(PCB->ElementColor);
Index: trunk/src_plugins/io_kicad/write.c
===================================================================
--- trunk/src_plugins/io_kicad/write.c	(revision 4754)
+++ trunk/src_plugins/io_kicad/write.c	(revision 4755)
@@ -46,7 +46,7 @@
  */
 
 /* generates a line by line listing of the elements being saved */
-static int io_kicad_write_element_index(FILE * FP, DataTypePtr Data);
+static int io_kicad_write_element_index(FILE * FP, pcb_data_t *Data);
 
 /* generates text for the kicad layer provided  */
 static char * kicad_sexpr_layer_to_text(int layer);
@@ -460,7 +460,7 @@
 /* ---------------------------------------------------------------------------
  * writes (eventually) de-duplicated list of element names in kicad legacy format module $INDEX
  */
-static int io_kicad_write_element_index(FILE * FP, DataTypePtr Data)
+static int io_kicad_write_element_index(FILE * FP, pcb_data_t *Data)
 {
 	gdl_iterator_t eit;
 	ElementType *element;
@@ -502,7 +502,7 @@
 */
 
 
-int write_kicad_layout_vias(FILE * FP, DataTypePtr Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation)
+int write_kicad_layout_vias(FILE * FP, pcb_data_t *Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation)
 {
 	gdl_iterator_t it;
 	PinType *via;
@@ -789,7 +789,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a .mod library
  */
-int io_kicad_write_element(plug_io_t *ctx, FILE * FP, DataTypePtr Data)
+int io_kicad_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 
 
@@ -1033,7 +1033,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a layout .brd file
  */
-int write_kicad_layout_elements(FILE * FP, pcb_board_t *Layout, DataTypePtr Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation)
+int write_kicad_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation)
 {
 
 	gdl_iterator_t eit;
Index: trunk/src_plugins/io_kicad/write.h
===================================================================
--- trunk/src_plugins/io_kicad/write.h	(revision 4754)
+++ trunk/src_plugins/io_kicad/write.h	(revision 4755)
@@ -29,12 +29,12 @@
 #include <stdio.h>
 #include "data.h"
 
-int io_kicad_write_element(plug_io_t *ctx, FILE * FP, DataTypePtr Data);
+int io_kicad_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
 int io_kicad_write_buffer(plug_io_t *ctx, FILE * FP, BufferType *buff);
 int io_kicad_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
 int write_kicad_module_header(FILE * FP, pcb_cardinal_t indentation);
 int write_kicad_layout_header(FILE * FP, pcb_cardinal_t indentation);
-int write_kicad_layout_vias(FILE * FP, DataTypePtr Data, Coord MaxWidth, 										Coord MaxHeight, pcb_cardinal_t indentation);
+int write_kicad_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, 										Coord MaxHeight, pcb_cardinal_t indentation);
 int write_kicad_layout_tracks(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
 						Coord MaxWidth, Coord MaxHeight, pcb_cardinal_t indentation);
 int write_kicad_layout_arcs(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
@@ -42,6 +42,6 @@
 int write_kicad_layout_text(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
 						Coord xOffset, Coord yOffset, pcb_cardinal_t indentation);
 int write_kicad_equipotential_netlists(FILE * FP, pcb_board_t *Layout, pcb_cardinal_t indentation);
-int write_kicad_layout_elements(FILE * FP, pcb_board_t *Layout, DataTypePtr Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation);
+int write_kicad_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset, pcb_cardinal_t indentation);
 int write_kicad_layout_polygons(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,								Coord xOffset, Coord yOffset, pcb_cardinal_t indentation);
 
Index: trunk/src_plugins/io_kicad_legacy/write.c
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.c	(revision 4754)
+++ trunk/src_plugins/io_kicad_legacy/write.c	(revision 4755)
@@ -46,7 +46,7 @@
  */
 
 /* generates a line by line listing of the elements being saved */
-static int io_kicad_legacy_write_element_index(FILE * FP, DataTypePtr Data);
+static int io_kicad_legacy_write_element_index(FILE * FP, pcb_data_t *Data);
 
 /* generates a default via drill size for the layout */
 static int write_kicad_legacy_layout_via_drill_size(FILE * FP);
@@ -463,7 +463,7 @@
 /* ---------------------------------------------------------------------------
  * writes (eventually) de-duplicated list of element names in kicad legacy format module $INDEX
  */
-static int io_kicad_legacy_write_element_index(FILE * FP, DataTypePtr Data)
+static int io_kicad_legacy_write_element_index(FILE * FP, pcb_data_t *Data)
 {
 	gdl_iterator_t eit;
 	ElementType *element;
@@ -505,7 +505,7 @@
 */
 
 
-int write_kicad_legacy_layout_vias(FILE * FP, DataTypePtr Data, Coord xOffset, Coord yOffset)
+int write_kicad_legacy_layout_vias(FILE * FP, pcb_data_t *Data, Coord xOffset, Coord yOffset)
 {
 	gdl_iterator_t it;
 	PinType *via;
@@ -749,7 +749,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a .mod library
  */
-int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, DataTypePtr Data)
+int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 
 
@@ -988,7 +988,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data in kicad legacy format for use in a layout .brd file
  */
-int write_kicad_legacy_layout_elements(FILE * FP, pcb_board_t *Layout, DataTypePtr Data, Coord xOffset, Coord yOffset)
+int write_kicad_legacy_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset)
 {
 
 	gdl_iterator_t eit;
Index: trunk/src_plugins/io_kicad_legacy/write.h
===================================================================
--- trunk/src_plugins/io_kicad_legacy/write.h	(revision 4754)
+++ trunk/src_plugins/io_kicad_legacy/write.h	(revision 4755)
@@ -29,12 +29,12 @@
 #include <stdio.h>
 #include "data.h"
 
-int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, DataTypePtr Data);
+int io_kicad_legacy_write_element(plug_io_t *ctx, FILE * FP, pcb_data_t *Data);
 int io_kicad_legacy_write_buffer(plug_io_t *ctx, FILE * FP, BufferType *buff);
 int io_kicad_legacy_write_pcb(plug_io_t *ctx, FILE * FP, const char *old_filename, const char *new_filename, pcb_bool emergency);
 int write_kicad_legacy_module_header(FILE * FP);
 int write_kicad_legacy_layout_header(FILE * FP);
-int write_kicad_legacy_layout_vias(FILE * FP, DataTypePtr Data, Coord MaxWidth, Coord MaxHeight);
+int write_kicad_legacy_layout_vias(FILE * FP, pcb_data_t *Data, Coord MaxWidth, Coord MaxHeight);
 int write_kicad_legacy_layout_tracks(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
 						Coord MaxWidth, Coord MaxHeight);
 int write_kicad_legacy_layout_arcs(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
@@ -42,6 +42,6 @@
 int write_kicad_legacy_layout_text(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,
 						Coord xOffset, Coord yOffset);
 int write_kicad_legacy_equipotential_netlists(FILE * FP, pcb_board_t *Layout);
-int write_kicad_legacy_layout_elements(FILE * FP, pcb_board_t *Layout, DataTypePtr Data, Coord xOffset, Coord yOffset);
+int write_kicad_legacy_layout_elements(FILE * FP, pcb_board_t *Layout, pcb_data_t *Data, Coord xOffset, Coord yOffset);
 int write_kicad_legacy_layout_polygons(FILE * FP, pcb_cardinal_t number, LayerTypePtr layer,								Coord xOffset, Coord yOffset);
 
Index: trunk/src_plugins/io_lihata/read.c
===================================================================
--- trunk/src_plugins/io_lihata/read.c	(revision 4754)
+++ trunk/src_plugins/io_lihata/read.c	(revision 4755)
@@ -377,7 +377,7 @@
 	return 0;
 }
 
-static int parse_rat(DataType *dt, lht_node_t *obj)
+static int parse_rat(pcb_data_t *dt, lht_node_t *obj)
 {
 	RatType rat, *new_rat;
 
@@ -529,7 +529,7 @@
 	return 0;
 }
 
-static int parse_data_layer(pcb_board_t *pcb, DataType *dt, lht_node_t *grp, int layer_id)
+static int parse_data_layer(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *grp, int layer_id)
 {
 	lht_node_t *n, *lst;
 	lht_dom_iterator_t it;
@@ -565,7 +565,7 @@
 	return 0;
 }
 
-static int parse_data_layers(pcb_board_t *pcb, DataType *dt, lht_node_t *grp)
+static int parse_data_layers(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *grp)
 {
 	int id;
 	lht_node_t *n;
@@ -580,7 +580,7 @@
 }
 
 /* If el == NULL and dt != NULL it is a via (for now). */
-static int parse_pin(DataType *dt, ElementType *el, lht_node_t *obj, Coord dx, Coord dy)
+static int parse_pin(pcb_data_t *dt, ElementType *el, lht_node_t *obj, Coord dx, Coord dy)
 {
 	PinType *via;
 
@@ -648,7 +648,7 @@
 }
 
 
-static int parse_element(pcb_board_t *pcb, DataType *dt, lht_node_t *obj)
+static int parse_element(pcb_board_t *pcb, pcb_data_t *dt, lht_node_t *obj)
 {
 	ElementType *elem = GetElementMemory(dt);
 	lht_node_t *lst, *n;
@@ -694,7 +694,7 @@
 	return 0;
 }
 
-static int parse_data_objects(pcb_board_t *pcb_for_font, DataType *dt, lht_node_t *grp)
+static int parse_data_objects(pcb_board_t *pcb_for_font, pcb_data_t *dt, lht_node_t *grp)
 {
 	lht_node_t *n;
 	lht_dom_iterator_t it;
@@ -714,14 +714,14 @@
 	return 0;
 }
 
-static DataType *parse_data(pcb_board_t *pcb, lht_node_t *nd)
+static pcb_data_t *parse_data(pcb_board_t *pcb, lht_node_t *nd)
 {
-	DataType *dt;
+	pcb_data_t *dt;
 	lht_node_t *grp;
 	if (nd->type != LHT_HASH)
 		return NULL;
 
-	dt = calloc(sizeof(DataType), 1);
+	dt = calloc(sizeof(pcb_data_t), 1);
 
 	grp = lht_dom_hash_get(nd, "layers");
 	if ((grp != NULL) && (grp->type == LHT_LIST))
Index: trunk/src_plugins/io_lihata/write.c
===================================================================
--- trunk/src_plugins/io_lihata/write.c	(revision 4754)
+++ trunk/src_plugins/io_lihata/write.c	(revision 4755)
@@ -418,7 +418,7 @@
 }
 
 
-static lht_node_t *build_data_layer(DataType *data, LayerType *layer, int layer_group)
+static lht_node_t *build_data_layer(pcb_data_t *data, LayerType *layer, int layer_group)
 {
 	lht_node_t *obj, *grp;
 	LineType *li;
@@ -467,7 +467,7 @@
 	return obj;
 }
 
-static lht_node_t *build_data_layers(DataType *data)
+static lht_node_t *build_data_layers(pcb_data_t *data)
 {
 	int n;
 	lht_node_t *layers;
@@ -481,7 +481,7 @@
 }
 
 
-static lht_node_t *build_data(DataType *data)
+static lht_node_t *build_data(pcb_data_t *data)
 {
 	lht_node_t *grp, *ndt;
 	PinType *pi;
Index: trunk/src_plugins/io_pcb/file.c
===================================================================
--- trunk/src_plugins/io_pcb/file.c	(revision 4754)
+++ trunk/src_plugins/io_pcb/file.c	(revision 4755)
@@ -69,7 +69,7 @@
 static void WritePCBInfoHeader(FILE *);
 static void WritePCBDataHeader(FILE *);
 static void WritePCBFontData(FILE *);
-static void WriteViaData(FILE *, DataTypePtr);
+static void WriteViaData(FILE *, pcb_data_t *);
 static void WritePCBRatData(FILE *);
 static void WriteLayerData(FILE *, pcb_cardinal_t, LayerTypePtr);
 
@@ -292,7 +292,7 @@
 /* ---------------------------------------------------------------------------
  * writes via data
  */
-static void WriteViaData(FILE * FP, DataTypePtr Data)
+static void WriteViaData(FILE * FP, pcb_data_t *Data)
 {
 	gdl_iterator_t it;
 	PinType *via;
@@ -366,7 +366,7 @@
 /* ---------------------------------------------------------------------------
  * writes element data
  */
-int io_pcb_WriteElementData(plug_io_t *ctx, FILE * FP, DataTypePtr Data)
+int io_pcb_WriteElementData(plug_io_t *ctx, FILE * FP, pcb_data_t *Data)
 {
 	gdl_iterator_t eit;
 	LineType *line;
@@ -541,7 +541,7 @@
  */
 
 extern pcb_board_t *yyPCB;
-extern DataTypePtr yyData;
+extern pcb_data_t *yyData;
 extern FontTypePtr yyFont;
 
 void PreLoadElementPCB()
Index: trunk/src_plugins/io_pcb/file.h
===================================================================
--- trunk/src_plugins/io_pcb/file.h	(revision 4754)
+++ trunk/src_plugins/io_pcb/file.h	(revision 4755)
@@ -48,7 +48,7 @@
 } io_pcb_ctx_t;
 
 int io_pcb_WriteBuffer(plug_io_t *ctx, FILE *f, BufferType *buff);
-int io_pcb_WriteElementData(plug_io_t *ctx, FILE *f, DataTypePtr);
+int io_pcb_WriteElementData(plug_io_t *ctx, FILE *f, pcb_data_t *);
 int io_pcb_WritePCB(plug_io_t *ctx, FILE *f, const char *old_filename, const char *new_filename, pcb_bool emergency);
 
 void PreLoadElementPCB(void);
Index: trunk/src_plugins/io_pcb/parse_common.h
===================================================================
--- trunk/src_plugins/io_pcb/parse_common.h	(revision 4754)
+++ trunk/src_plugins/io_pcb/parse_common.h	(revision 4755)
@@ -35,7 +35,7 @@
 #include "plug_io.h"
 
 int io_pcb_ParsePCB(plug_io_t *ctx, pcb_board_t *Ptr, const char *Filename, conf_role_t settings_dest);
-int io_pcb_ParseElement(plug_io_t *ctx, DataTypePtr, const char *);
+int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *, const char *);
 int io_pcb_ParseFont(plug_io_t *ctx, FontTypePtr, const char *);
 
 #endif
Index: trunk/src_plugins/io_pcb/parse_l.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.c	(revision 4754)
+++ trunk/src_plugins/io_pcb/parse_l.c	(revision 4755)
@@ -708,7 +708,7 @@
 
 const char			*yyfilename;	/* in this file */
 pcb_board_t *	yyPCB;			/* used by parser */
-DataTypePtr		yyData;
+pcb_data_t *	yyData;
 ElementTypePtr		yyElement;
 FontTypePtr		yyFont;
 conf_role_t yy_settings_dest;
@@ -2455,7 +2455,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a single element file
  */
-int io_pcb_ParseElement(plug_io_t *ctx, DataTypePtr Ptr, const char *name)
+int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
 {
 	FILE *f;
 	int ret;
Index: trunk/src_plugins/io_pcb/parse_l.l
===================================================================
--- trunk/src_plugins/io_pcb/parse_l.l	(revision 4754)
+++ trunk/src_plugins/io_pcb/parse_l.l	(revision 4755)
@@ -74,7 +74,7 @@
 
 const char			*yyfilename;	/* in this file */
 pcb_board_t *	yyPCB;			/* used by parser */
-DataTypePtr		yyData;
+pcb_data_t *	yyData;
 ElementTypePtr		yyElement;
 FontTypePtr		yyFont;
 conf_role_t yy_settings_dest;
@@ -314,7 +314,7 @@
 /* ---------------------------------------------------------------------------
  * initializes LEX and calls parser for a single element file
  */
-int io_pcb_ParseElement(plug_io_t *ctx, DataTypePtr Ptr, const char *name)
+int io_pcb_ParseElement(plug_io_t *ctx, pcb_data_t *Ptr, const char *name)
 {
 	FILE *f;
 	int ret;
Index: trunk/src_plugins/io_pcb/parse_y.c
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.c	(revision 4754)
+++ trunk/src_plugins/io_pcb/parse_y.c	(revision 4755)
@@ -129,7 +129,7 @@
 
 extern	char			*yytext;		/* defined by LEX */
 extern	pcb_board_t *	yyPCB;
-extern	DataTypePtr		yyData;
+extern	pcb_data_t *	yyData;
 extern	ElementTypePtr	yyElement;
 extern	FontTypePtr		yyFont;
 extern	int				pcb_lineno;		/* linenumber */
Index: trunk/src_plugins/io_pcb/parse_y.y
===================================================================
--- trunk/src_plugins/io_pcb/parse_y.y	(revision 4754)
+++ trunk/src_plugins/io_pcb/parse_y.y	(revision 4755)
@@ -66,7 +66,7 @@
 
 extern	char			*yytext;		/* defined by LEX */
 extern	pcb_board_t *	yyPCB;
-extern	DataTypePtr		yyData;
+extern	pcb_data_t *	yyData;
 extern	ElementTypePtr	yyElement;
 extern	FontTypePtr		yyFont;
 extern	int				pcb_lineno;		/* linenumber */
Index: trunk/src_plugins/report/drill.c
===================================================================
--- trunk/src_plugins/report/drill.c	(revision 4754)
+++ trunk/src_plugins/report/drill.c	(revision 4755)
@@ -101,7 +101,7 @@
 	return a->DrillSize - b->DrillSize;
 }
 
-DrillInfoTypePtr GetDrillInfo(DataTypePtr top)
+DrillInfoTypePtr GetDrillInfo(pcb_data_t *top)
 {
 	DrillInfoTypePtr AllDrills;
 	DrillTypePtr Drill = NULL;
Index: trunk/src_plugins/report/drill.h
===================================================================
--- trunk/src_plugins/report/drill.h	(revision 4754)
+++ trunk/src_plugins/report/drill.h	(revision 4755)
@@ -47,7 +47,7 @@
 	DrillTypePtr Drill;						/* plated holes */
 } DrillInfoType, *DrillInfoTypePtr;
 
-DrillInfoTypePtr GetDrillInfo(DataTypePtr);
+DrillInfoTypePtr GetDrillInfo(pcb_data_t *);
 void FreeDrillInfo(DrillInfoTypePtr);
 void RoundDrillInfo(DrillInfoTypePtr, int);
 DrillTypePtr GetDrillInfoDrillMemory(DrillInfoTypePtr);