diff --git a/server/drivers/CFontz.c b/server/drivers/CFontz.c
index d181380..c86a319 100644
--- a/server/drivers/CFontz.c
+++ b/server/drivers/CFontz.c
@@ -55,8 +55,8 @@ typedef enum {
 	bigchar		/* big characters */
 } CGmode;
 
-
-typedef struct driver_private_data {
+/** private data for the \c CFontz driver */
+typedef struct CFontz_private_data {
 	char device[200];
 
 	int fd;
diff --git a/server/drivers/CFontz633.c b/server/drivers/CFontz633.c
index 5b321d6..b2e6390 100644
--- a/server/drivers/CFontz633.c
+++ b/server/drivers/CFontz633.c
@@ -84,7 +84,8 @@ typedef enum {
 } CGmode;
 
 
-typedef struct driver_private_data {
+/** private data for the \c CFonts633 driver */
+typedef struct CFontz633_private_data {
 	char device[200];
 
 	int fd;
diff --git a/server/drivers/CFontzPacket.c b/server/drivers/CFontzPacket.c
index ca5cfc5..8985156 100644
--- a/server/drivers/CFontzPacket.c
+++ b/server/drivers/CFontzPacket.c
@@ -116,7 +116,8 @@ typedef enum {
 } CGmode;
 
 
-typedef struct driver_private_data {
+/** private data for the \c CFontzPacket driver */
+typedef struct CFontzPacket_private_data {
 	char device[200];
 
 	int fd;
diff --git a/server/drivers/CwLnx.c b/server/drivers/CwLnx.c
index 1457304..b1fa739 100644
--- a/server/drivers/CwLnx.c
+++ b/server/drivers/CwLnx.c
@@ -86,7 +86,8 @@ typedef enum {
 } CGmode;
 
 
-typedef struct driver_private_data {
+/** private data for the \c CwLnx driver */
+typedef struct CwLnx_private_data {
 	int fd;
 
 	int have_keypad;
diff --git a/server/drivers/IOWarrior.h b/server/drivers/IOWarrior.h
index 20bc5d9..0584c73 100644
--- a/server/drivers/IOWarrior.h
+++ b/server/drivers/IOWarrior.h
@@ -80,7 +80,8 @@ typedef struct cgram_cache {
 } CGram;
 
 
-typedef struct driver_private_data {
+/** private data for the \c IOWarrior driver */
+typedef struct IOWarrior_private_data {
   char manufacturer[LCD_MAX_WIDTH+1];
   char product[LCD_MAX_WIDTH+1];
   char serial[LCD_MAX_WIDTH+1];
diff --git a/server/drivers/MD8800.c b/server/drivers/MD8800.c
index 56be95b..d06eaa6 100644
--- a/server/drivers/MD8800.c
+++ b/server/drivers/MD8800.c
@@ -192,7 +192,8 @@
 #define DEFAULT_OFF_BRIGHTNESS	300
 #define DEFAULT_ON_BRIGHTNESS	1000
 
-typedef struct driver_private_data {
+/** private data for the \c MD8800 driver */
+typedef struct MD8800_private_data {
 	char device[200];
 	int fd;
 	int speed;
diff --git a/server/drivers/NoritakeVFD.c b/server/drivers/NoritakeVFD.c
index b7d39b5..6531e5b 100644
--- a/server/drivers/NoritakeVFD.c
+++ b/server/drivers/NoritakeVFD.c
@@ -75,7 +75,8 @@ typedef enum {
 	bignum,		/* big numbers */
 } CGmode;
 
-typedef struct driver_private_data {
+/** private data for the \c NoritakeVFD driver */
+typedef struct NoritakeVFD_private_data {
 	char device[200];
 	int fd;
 	int speed;
diff --git a/server/drivers/bayrad.c b/server/drivers/bayrad.c
index 92988cc..98b45b4 100644
--- a/server/drivers/bayrad.c
+++ b/server/drivers/bayrad.c
@@ -48,7 +48,8 @@
 ////////////////////// Base "class" to derive from ///////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-typedef struct driver_private_data {
+/** private data for the \c bayrad driver */
+typedef struct bayrad_private_data {
   char device[256];
   int speed;
   int fd;
diff --git a/server/drivers/curses_drv.c b/server/drivers/curses_drv.c
index 11d5f3e..b78f25c 100644
--- a/server/drivers/curses_drv.c
+++ b/server/drivers/curses_drv.c
@@ -105,7 +105,7 @@ Different implementations of (n)curses available on:
 
 
 /** private data structure for the \c curses driver */
-typedef struct driver_private_data {
+typedef struct curses_private_data {
 	WINDOW *win;
 
 	int current_color_pair;
diff --git a/server/drivers/ea65.c b/server/drivers/ea65.c
index 196c177..878c1a9 100644
--- a/server/drivers/ea65.c
+++ b/server/drivers/ea65.c
@@ -38,7 +38,9 @@
 #include "report.h"
 #include "lcd_lib.h"
 
-typedef struct driver_private_data {
+
+/** private data for the \c ea65 driver */
+typedef struct EA65_private_data {
         int fd;
         int brightness;
         int offbrightness;
diff --git a/server/drivers/g15.h b/server/drivers/g15.h
index a77a088..78d0903 100644
--- a/server/drivers/g15.h
+++ b/server/drivers/g15.h
@@ -26,7 +26,8 @@
 #include <libg15render.h>
 #include "lcd.h"
 
-typedef struct driver_private_data {
+/** private data for the \c g15 driver */
+typedef struct g15_private_data {
 	/* dimensions */
 	int width, height;
 	int cellwidth, cellheight;
diff --git a/server/drivers/glk.c b/server/drivers/glk.c
index de68a0b..0472625 100644
--- a/server/drivers/glk.c
+++ b/server/drivers/glk.c
@@ -47,7 +47,8 @@
 //////////////////// Matrix Orbital Graphical Driver /////////////////////
 //////////////////////////////////////////////////////////////////////////
 
-typedef struct driver_private_data {
+/** private data for the \c glk driver */
+typedef struct glk_private_data {
   char device[256];
   GLKDisplay *fd;
   speed_t speed;
diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h
index 4cb17bc..e3b2b22 100644
--- a/server/drivers/hd44780-low.h
+++ b/server/drivers/hd44780-low.h
@@ -96,7 +96,8 @@ typedef struct ConnectionMapping {
 } ConnectionMapping;
 
 
-typedef struct driver_private_data {
+/** private data for the \c hd44780 driver */
+typedef struct hd44780_private_data {
 	// parallel connection typeS
 	unsigned int port;		/* parallel port */
 
diff --git a/server/drivers/i2500vfd.c b/server/drivers/i2500vfd.c
index 3457d92..feab37d 100644
--- a/server/drivers/i2500vfd.c
+++ b/server/drivers/i2500vfd.c
@@ -58,7 +58,8 @@
 #define CELLWIDTH	6
 #define CELLHEIGHT	8
 
-typedef struct driver_private_data {
+/** private data for the \c i2500vfd driver */
+typedef struct i2500vfd_private_data {
     struct ftdi_context ftdi;
     unsigned char *framebuf;
     int changed;
diff --git a/server/drivers/irmanin.h b/server/drivers/irmanin.h
index 0b7b42e..80ad82f 100644
--- a/server/drivers/irmanin.h
+++ b/server/drivers/irmanin.h
@@ -6,7 +6,8 @@ typedef struct _codemap {
 	const char *lcdproc;
 } CodeMap;
 
-typedef struct driver_private_data {
+/** private data for the \c irman driver */
+typedef struct irmanin_private_data {
 	char device[256];
 	char config[256];
 	char *portname;
diff --git a/server/drivers/irtrans.c b/server/drivers/irtrans.c
index c263d75..cbdd6b6 100644
--- a/server/drivers/irtrans.c
+++ b/server/drivers/irtrans.c
@@ -55,7 +55,9 @@
 
 // Variables
 // TODO init
-typedef struct driver_private_data {
+
+/** private data for the \c irtrans driver */
+typedef struct irtrans_private_data {
     int width;
     int height;
     int socket;
diff --git a/server/drivers/joy.c b/server/drivers/joy.c
index f2b072b..4d97f5e 100644
--- a/server/drivers/joy.c
+++ b/server/drivers/joy.c
@@ -44,8 +44,8 @@
 #define JOY_DEFAULT_BUTTONMAP	"BDACEFGHIJKLMNOP"
 
 
-
-typedef struct driver_private_data {
+/** private data for the \c joy driver */
+typedef struct joy_private_data {
 	char device[256];
 	int fd;
 
diff --git a/server/drivers/lb216.c b/server/drivers/lb216.c
index f955360..f8ba259 100644
--- a/server/drivers/lb216.c
+++ b/server/drivers/lb216.c
@@ -44,7 +44,8 @@ typedef enum {
         beat = 8
 } custom_type;
 
-typedef struct driver_private_data {
+/** private data for the \c lb216 driver */
+typedef struct LB216_private_data {
 	char device[256];
 	int speed;
 	int fd;
diff --git a/server/drivers/lcdm001.c b/server/drivers/lcdm001.c
index ecc9c0f..0383bc1 100644
--- a/server/drivers/lcdm001.c
+++ b/server/drivers/lcdm001.c
@@ -64,7 +64,8 @@
 //#include "configfile.h"
 
 
-typedef struct driver_private_data {
+/** private data for the \c lcdm001 driver */
+typedef struct lcdm001_private_data {
 	char device[200];
 	int fd;
 	int speed;
diff --git a/server/drivers/lircin.c b/server/drivers/lircin.c
index 66b44de..7f544e8 100644
--- a/server/drivers/lircin.c
+++ b/server/drivers/lircin.c
@@ -45,6 +45,8 @@
 
 #include "report.h"
 
+
+/** private data for the \c lirc driver */
 typedef struct lircin_private_data {
 	char *lircrc;
 	char *prog;
diff --git a/server/drivers/ms6931.c b/server/drivers/ms6931.c
index 09715ec..2ffb017 100644
--- a/server/drivers/ms6931.c
+++ b/server/drivers/ms6931.c
@@ -50,7 +50,8 @@
 #include "server/configfile.h"
 */
 
-typedef struct driver_private_data {
+/** private data for the \c ms6931 driver */
+typedef struct ms6931_private_data {
 	char device[200];
 	int fd;
 	unsigned char *framebuf;
diff --git a/server/drivers/mtc_s16209x.c b/server/drivers/mtc_s16209x.c
index 305d19b..8677245 100644
--- a/server/drivers/mtc_s16209x.c
+++ b/server/drivers/mtc_s16209x.c
@@ -91,7 +91,8 @@ typedef enum {
 } custom_type;
 
 
-typedef struct driver_private_data {
+/** private data for the \c mtc_s16209x driver */
+typedef struct MTC_S16209X_private_data {
   char device[256];
   int fd;
   char framebuf[2][16];
diff --git a/server/drivers/mx5000.h b/server/drivers/mx5000.h
index 1a96720..ddab220 100644
--- a/server/drivers/mx5000.h
+++ b/server/drivers/mx5000.h
@@ -30,7 +30,8 @@
 #define DEFAULT_DEVICE      "/dev/hiddev0"
 #define DEFAULT_WAIT        1000
 
-typedef struct driver_private_data {
+/** private data for the \c mx5000 driver */
+typedef struct mx5000_private_data {
     char device[200];
     int wait;
     int fd;	
diff --git a/server/drivers/sed1520.c b/server/drivers/sed1520.c
index cc93173..339fe88 100644
--- a/server/drivers/sed1520.c
+++ b/server/drivers/sed1520.c
@@ -64,7 +64,8 @@
 #include "report.h"
 
 
-typedef struct driver_private_data {
+/** private data for the \c sed1520 driver */
+typedef struct sed1520_private_data {
     unsigned int port;
 
     unsigned char *framebuf;
diff --git a/server/drivers/serialVFD.h b/server/drivers/serialVFD.h
index e02238c..138545e 100644
--- a/server/drivers/serialVFD.h
+++ b/server/drivers/serialVFD.h
@@ -72,7 +72,8 @@ MODULE_EXPORT void serialVFD_num (Driver *drvthis, int x, int num);
 MODULE_EXPORT int serialVFD_get_free_chars (Driver *drvthis);
 MODULE_EXPORT const char * serialVFD_get_info( Driver *drvthis );
 
-typedef struct driver_private_data {
+/** private data for the \c serialVFD driver */
+typedef struct serialVFD_private_data {
 	int use_parallel;		// use parallel?
 	unsigned short port;		// Port in parallel mode
 	char device[200];		// Device in serial mode
diff --git a/server/drivers/shuttleVFD.c b/server/drivers/shuttleVFD.c
index 44a4715..59e9f75 100644
--- a/server/drivers/shuttleVFD.c
+++ b/server/drivers/shuttleVFD.c
@@ -45,8 +45,8 @@ MODULE_EXPORT int supports_multiple = 0;
 MODULE_EXPORT char *symbol_prefix = "shuttleVFD_";
 
 
-// Private data
-typedef struct driver_private_data {
+/** private data for the \c shuttleVFD driver */
+typedef struct shuttleVFD_private_data {
   usb_dev_handle *dev;
   int width;
   int height;
diff --git a/server/drivers/stv5730.c b/server/drivers/stv5730.c
index 7154191..f7a150c 100644
--- a/server/drivers/stv5730.c
+++ b/server/drivers/stv5730.c
@@ -80,7 +80,8 @@
 #define STV5730_COL_SBACK	2
 
 
-typedef struct driver_private_data {
+/** private data for the \c stv5730 driver */
+typedef struct stv5730_private_data {
     unsigned int port;
     unsigned int charattrib;
     unsigned int flags;
diff --git a/server/drivers/svgalib_drv.h b/server/drivers/svgalib_drv.h
index cbbb662..ab11f18 100644
--- a/server/drivers/svgalib_drv.h
+++ b/server/drivers/svgalib_drv.h
@@ -11,7 +11,8 @@
 #define CELLWIDTH	6
 #define CELLHEIGHT	8
 
-typedef struct driver_private_data {
+/** private data for the \c svga driver */
+typedef struct svga_private_data {
 	int mode;
 
 	int width, height;
diff --git a/server/drivers/t6963.c b/server/drivers/t6963.c
index 3ffbe72..b563a73 100644
--- a/server/drivers/t6963.c
+++ b/server/drivers/t6963.c
@@ -36,7 +36,8 @@
 
 //extern int debug_level;
 
-typedef struct driver_private_data {
+/** private data for the \c t6963 driver */
+typedef struct t6963_private_data {
 	u16 port;
 	u16 display_mode;
 	u8  *display_buffer1;
diff --git a/server/drivers/text.c b/server/drivers/text.c
index 87537ce..9a2e40d 100644
--- a/server/drivers/text.c
+++ b/server/drivers/text.c
@@ -37,13 +37,14 @@
 //#include "drv_base.h"
 
 
-/* private data structure */
-typedef struct driver_private_data {
+/* private data structure for the \c text driver */
+typedef struct text_private_data {
 	int width;
 	int height;
 	char *framebuf;
 } PrivateData;
 
+
 /* Vars for the server core */
 MODULE_EXPORT char *api_version = API_VERSION;
 MODULE_EXPORT int stay_in_foreground = 0;
diff --git a/server/drivers/tyan_lcdm.h b/server/drivers/tyan_lcdm.h
index 05e90d6..5612e19 100644
--- a/server/drivers/tyan_lcdm.h
+++ b/server/drivers/tyan_lcdm.h
@@ -58,7 +58,8 @@ typedef struct cgram_cache {
 } CGram;
 
 
-typedef struct driver_private_data {
+/** private data for the \c tyan driver */
+typedef struct tyan_lcdm_private_data {
 	char device[200];
 	int speed;
 	int fd;
diff --git a/server/drivers/wirz-sli.c b/server/drivers/wirz-sli.c
index 829e247..55bf09b 100644
--- a/server/drivers/wirz-sli.c
+++ b/server/drivers/wirz-sli.c
@@ -35,7 +35,8 @@ typedef enum {
 	beat = 8
 } custom_type;
 
-typedef struct driver_private_data {
+/** private data for the \c sli driver */
+typedef struct sli_private_data {
 	char device[256];
 	int speed;
 	int fd;
diff --git a/server/drivers/xosdlib_drv.h b/server/drivers/xosdlib_drv.h
index 2a55a51..39f6ec5 100644
--- a/server/drivers/xosdlib_drv.h
+++ b/server/drivers/xosdlib_drv.h
@@ -14,12 +14,11 @@
 #define CELLWIDTH	6
 #define CELLHEIGHT	8
 
-typedef struct driver_private_data {
-	/* xosd handle */
-	xosd *osd;
+/** private data for the \c xosd driver */
+typedef struct xosd_private_data {
+	xosd *osd;		/**< xosd handle */
 
-	/* xosd properties */
-	char font[256];
+	char font[256];		/**< xosd font properties */
 
 	/* dimensions */
 	int width, height;