/* pld drivers
  */
-extern pld_driver_t virtex2_pld;
+extern struct pld_driver virtex2_pld;
 
-static pld_driver_t *pld_drivers[] =
+static struct pld_driver *pld_drivers[] =
 {
        &virtex2_pld,
        NULL,
 
 #define __PLD_DEVICE_COMMAND(name) \
                COMMAND_HELPER(name, struct pld_device_s *pld)
 
-typedef struct pld_driver_s
+struct pld_driver
 {
        char *name;
        __PLD_DEVICE_COMMAND((*pld_device_command));
        int (*register_commands)(struct command_context_s *cmd_ctx);
        int (*load)(struct pld_device_s *pld_device, const char *filename);
-} pld_driver_t;
+};
 
 #define PLD_DEVICE_COMMAND_HANDLER(name) static __PLD_DEVICE_COMMAND(name)
 
 typedef struct pld_device_s
 {
-       pld_driver_t *driver;
+       struct pld_driver *driver;
        void *driver_priv;
        struct pld_device_s *next;
 } pld_device_t;
 
        return ERROR_OK;
 }
 
-pld_driver_t virtex2_pld = {
+struct pld_driver virtex2_pld = {
                .name = "virtex2",
                .register_commands = &virtex2_register_commands,
                .pld_device_command = &virtex2_pld_device_command,