diff --git a/include/basic.h b/include/basic.h
index 0e360b9..fa1c5c3 100644
--- a/include/basic.h
+++ b/include/basic.h
@@ -1,4 +1,4 @@
-/* $Id: basic.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
+/* $Id: basic.h,v 1.2 2003/09/23 18:54:55 stpohle Exp $ */
 /* basic types which we need everywhere */
 
 #ifndef _BC_BASIC_H_
@@ -150,7 +150,7 @@ enum _poweruptypes {
 };
 
 
-enum _special {
+enum _specials {
 	SP_nothing=0,				// player has no special
 	SP_trigger,					// triggered bomb
 	SP_row,						// bomb row
@@ -237,7 +237,7 @@ enum _mstatus {
 	MS_max
 };
 
-struct __point {
+struct {
     Sint16 x;
     Sint16 y;
 } typedef _point;
diff --git a/include/bomberclone.h b/include/bomberclone.h
index 497b0a2..13d6964 100644
--- a/include/bomberclone.h
+++ b/include/bomberclone.h
@@ -1,4 +1,4 @@
-/* $Id: bomberclone.h,v 1.1 2003/09/21 20:15:28 stpohle Exp $ */
+/* $Id: bomberclone.h,v 1.2 2003/09/23 18:54:55 stpohle Exp $ */
 /* bomberclone.h */
 
 #ifndef _BOMBERCLONE_H_
@@ -47,13 +47,13 @@
 #include "sysfunc.h"
 #include "keybinput.h"
 
-struct __playerilness {
+struct {
 	int to;  // if (to > 0) the ilness is still working
 	int data;
 } typedef _playerilness;
 
 
-struct __bomb {
+struct {
     _point pos;					// lower byte = _X Higher Byte = FX
     int firer[4];               // range of the fire for the fire for each direction
     int firerst[4];             /* just save here where the direction was going to stop (-1) 
@@ -70,7 +70,7 @@ struct __bomb {
 	
 } typedef _bomb;
 
-struct __special {
+struct {
 	int type; 					// type of the special
 	int to;						// timeout
 	int numuse;					// num of uses left
@@ -78,7 +78,7 @@ struct __special {
 								   and deleted in special_loop */
 } typedef _special;
 
-struct __player {
+struct {
 	_gfxplayer *gfx;			// pointer to the gfx information
 	int gfx_nr;					// number of the player GFX
 	
@@ -119,12 +119,12 @@ struct __player {
 } typedef _player;
 
 
-struct __serverlist {
+struct {
 	char name[255];
 } typedef _serverlist;
 
 
-struct __bomberclone {
+struct {
     char datapath[512];
 	
     _player players[MAX_PLAYERS];
@@ -161,14 +161,14 @@ struct __bomberclone {
 } typedef _bomberclone;
 
 
-struct __menu {
+struct {
     int index;
     char text[255];
 	// int type; // could be visible / disabled / grayed ?? should avoid -2 trick
 } typedef _menu;
 
 
-struct __airunaway {
+struct {
 	signed char dir;
 	signed char bestdir;
 } typedef _airunaway;