diff --git a/bomberclone.prj b/bomberclone.prj
index 7fa64db..115567d 100644
--- a/bomberclone.prj
+++ b/bomberclone.prj
@@ -101,7 +101,10 @@ module.include.files=\
 	ogcache-client.h\
 	udp.h\
 	flyingitems.h\
-	keyb.h
+	keyb.h\
+	bomb.h\
+	player.h\
+	single.h
 
 module.source.name=src
 module.source.type=
diff --git a/include/Makefile.am b/include/Makefile.am
index cfd0bfd..af65418 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -23,6 +23,9 @@ bomberclone_include_DATA = \
 	ogcache-client.h\
 	udp.h \
 	flyingitems.h \
-	keyb.h
+	keyb.h \
+	player.h \
+	bomb.h \
+	single.h
 
 EXTRA_DIST = $(bomberclone_include_DATA)
diff --git a/include/basic.h b/include/basic.h
index 4ad2038..031b00a 100644
--- a/include/basic.h
+++ b/include/basic.h
@@ -1,4 +1,4 @@
-/* $Id: basic.h,v 1.21 2004/03/23 21:02:20 stpohle Exp $ */
+/* $Id: basic.h,v 1.22 2004/04/03 14:48:42 stpohle Exp $ */
 /* basic types which we need everywhere */
 
 #ifndef _BC_BASIC_H_
@@ -145,70 +145,6 @@ enum _poweruptypes {
 };
 
 
-enum _specials {
-	SP_nothing=0,				// player has no special
-	SP_trigger,					// triggered bomb
-	SP_row,						// bomb row
-	SP_push,					// push bombs
-	SP_moved,					// moved bombs
-	SP_liquid,					// liquid bombs
-	SP_kick,					// kick bombs
-	
-	SP_max,						// just to know how many types there are
-	SP_clear					// needed to let the server know we removed the special
-};
-
-
-
-enum _playerillnestype {
-    PI_keys = 0,                // switch keys
-    PI_range,                   // set exploding range to 1
-    PI_slow,                    // sets speed to 6
-    PI_fast,                    // sets speed to 150
-    PI_bomb,                    // player is dropping bombs permanently
-    PI_nobomb,                  // player cannot drop a bomb or only 1 bomb
-
-    PI_max                      // just to know what is the last number
-};
-
-
-enum _bombstate {
-    BS_off = 0,
-    BS_ticking,
-    BS_exploding,
-	BS_trigger
-};
-
-
-enum _bombmode {
-	BM_normal = 0,
-	BM_pushed,
-	BM_moving,
-	BM_liquid,
-	BM_kicked
-};
-
-
-enum _playerstateflags {		//     not Set    |   Set
-    PSF_used = 1,               // Player Unused  | Player Used
-    PSF_net = 2,                // Local Player   | Network Player
-    PSF_alife = 4,              // Player is Dead | Player is Alife
-    PSF_playing = 8,            // Watching Player| Playing Player -- as long as one don't delete
-	PSF_ai = 16,				//                | AI Player
-	PSF_respawn = 32			//                | Player is Respawning
-};
-
-#define PSFM_used (PSF_used + PSF_playing)
-#define PSFM_alife (PSF_used + PSF_alife + PSF_playing)
-#define PS_IS_dead(__ps) (((__ps) & (PSFM_alife + PSF_respawn)) == (PSFM_used))
-#define PS_IS_respawn(__ps) (((__ps) & (PSFM_alife + PSF_respawn)) == (PSFM_used + PSF_respawn))
-#define PS_IS_alife(__ps) (((__ps) & (PSFM_alife)) == (PSFM_alife))
-#define PS_IS_netplayer(__ps) (((__ps) & (PSF_net)) != 0)
-#define PS_IS_playing(__ps) (((__ps) & (PSFM_used)) == (PSFM_used))
-#define PS_IS_used(__ps) (((__ps) & (PSFM_used)) != 0)
-#define PS_IS_aiplayer(__ps) ((((__ps) & (PSFM_used)) != 0) && (((__ps) & (PSF_ai)) == PSF_ai))
-
-
 enum _direction {               // to handle directions better
     left = 0,
     right,
diff --git a/include/bomb.h b/include/bomb.h
new file mode 100644
index 0000000..d7fcddb
--- /dev/null
+++ b/include/bomb.h
@@ -0,0 +1,58 @@
+/* $Id: bomb.h,v 1.1 2004/04/03 14:48:42 stpohle Exp $
+ * bomb include file
+ */
+
+#ifndef _BOMB_H_
+#define _BOMB_H_
+
+
+enum _bombstate {
+    BS_off = 0,
+    BS_ticking,
+    BS_exploding,
+	BS_trigger
+};
+
+
+enum _bombmode {
+	BM_normal = 0,
+	BM_pushed,
+	BM_moving,
+	BM_liquid,
+	BM_kicked
+};
+
+
+struct {
+    _pointf pos;				// lower byte = _X Higher Byte = FX
+	struct __bomb_id {			// save the bomb id
+		signed char p;			// playernumber of this bomb
+		signed char b;			// bombnumber of this bomb
+	} id;
+    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) 
+								if the exp is still growing */
+    float to;                     // timeout in ms after dropping the bomb. (loops * 0.0005sec)
+    float frame;                  // frame of the animation
+    unsigned char r;            // range of the bomb
+    unsigned char state;        // state of the bomb BS_*
+	unsigned char mode;			// mode of the bomb BM_*
+    int ex_nr;                  // explosion number
+	_point dest;				// destination to move the bomb to
+	float speed;				// bomb moving speed
+} typedef _bomb;
+
+
+
+// for the bomb..
+extern int bomb_loop ();
+extern void bomb_explode (_bomb *bomb, int net);
+extern inline void bomb_action (_bomb *bomb);
+extern void bomb_move (_bomb *bomb);
+extern void get_bomb_on (float x, float y, _point bombs[]);
+extern void do_explosion (_bomb *bomb);
+extern void restore_explosion (_bomb * bomb);
+extern int explosion_check_field (int x, int y, _bomb *bomb);
+
+
+#endif
diff --git a/include/bomberclone.h b/include/bomberclone.h
index 6cb1fe3..59a4661 100644
--- a/include/bomberclone.h
+++ b/include/bomberclone.h
@@ -1,4 +1,4 @@
-/* $Id: bomberclone.h,v 1.24 2004/04/03 13:55:29 stpohle Exp $ */
+/* $Id: bomberclone.h,v 1.25 2004/04/03 14:48:42 stpohle Exp $ */
 /* bomberclone.h */
 
 #ifndef _BOMBERCLONE_H_
@@ -49,81 +49,6 @@
 #include "sysfunc.h"
 #include "keybinput.h"
 
-struct {
-	float to;  // if (to > 0) the ilness is still working
-	int datai;		// hold a integer data (like number of something..)
-	float dataf;	// hold a float data (speed and so on)
-} typedef _playerilness;
-
-
-struct {
-    _pointf pos;				// lower byte = _X Higher Byte = FX
-	struct __bomb_id {			// save the bomb id
-		signed char p;			// playernumber of this bomb
-		signed char b;			// bombnumber of this bomb
-	} id;
-    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) 
-								if the exp is still growing */
-    float to;                     // timeout in ms after dropping the bomb. (loops * 0.0005sec)
-    float frame;                  // frame of the animation
-    unsigned char r;            // range of the bomb
-    unsigned char state;        // state of the bomb BS_*
-	unsigned char mode;			// mode of the bomb BM_*
-    int ex_nr;                  // explosion number
-	_point dest;				// destination to move the bomb to
-	float speed;				// bomb moving speed
-} typedef _bomb;
-
-struct {
-	int type; 					// type of the special
-	float to;						// timeout
-	int numuse;					// num of uses left
-	int use;					/* currently used set by special_use 
-								   and deleted in special_loop */
-} typedef _special;
-
-
-struct {
-	_gfxplayer *gfx;			// pointer to the gfx information
-	int gfx_nr;					// number of the player GFX
-	
-    float frame;                // step of the animation (only integer part will shown)
-	float illframe;
-
-    _pointf pos;                // position on the field
-    _pointf old;				// the old position
-	float tunnelto;				/* timeout for dont show and move player
-							   	   needed on the tunnel effect */
-	
-    signed char d;              // direction
-    signed char m;              // player is moving ?
-    signed char old_m;          // to save the old state..
-	signed char keyf_bomb;		// flag for the bomb key
-	signed char keyf_special;	// flag for the special key
-
-    int bombs_n;                // maximal number of bombs for the player
-	int bomb_lastex;			// number of the bomb which explode the last time
-    _bomb bombs[MAX_BOMBS];     // number of bombs who are ticking.
-    int range;                  // range of the bombs
-	float speed;				// how fast we can go (0 = slow, 1 = normal... 3 = fastest)
-	float stepsleft;			// distance to walk on the next stepmove_player
-	int collect_shoes;
-	_playerilness ill[PI_max];  // all possible types
-	_special special;			// special the player has
-	
-    char name[LEN_PLAYERNAME];  // name oder name[0] == 0
-    unsigned char state;        // status of the player
-    signed char in_nr;          // number of the connected player entry
-
-    int points;                 // points
-	int wins;					// wins
-    signed char dead_by;        // player who killed this player
-	
-	_net_player net;			// holds all important network data
-} typedef _player;
-
-
 struct {
 	char name[255];
 } typedef _serverlist;
@@ -178,7 +103,6 @@ struct {
 
 
 extern _bomberclone bman;
-extern _player *players;
 extern Uint32 timestamp;
 extern float timefactor;
 extern float timediff;
@@ -207,45 +131,6 @@ extern void stonelist_add (int x, int y);
 extern void stonelist_del ();
 extern void stonelist_draw ();
 
-// everything what is declared in players.c
-extern void dead_playerani ();
-extern void draw_player (_player * player);
-extern void restore_players_screen ();
-extern void player_move (int pl_nr);
-extern float stepmove_player (int pl_nr);
-extern void player_drop_bomb (int pl_nr);
-extern void get_player_on (float x, float y, int pl_nr[]);
-extern void player_died (_player * player, signed char dead_by);
-extern void draw_players ();
-extern void player_animation (_player * player);
-extern int check_field (short int x, short int y);
-extern int check_exfield (short int x, short int y);
-extern void player_calcpos ();
-extern void player_set_ilness (_player * p, int t, float new_to);
-extern void player_clear_ilness (_player *p, int type);
-extern void player_ilness_loop (int plnr);
-extern void player_check_powerup (int p_nr);
-extern void player_set_gfx (_player *p, signed char gfx_nr);
-extern int player_findfreebomb (_player *player);
-extern int player_checkpos (int x, int y);
-extern void player_checkdeath (int pnr);
-extern void player_check (int pl_nr);
-
-// for the playerinput handling
-extern void playerinput_loop (int pl_nr);
-extern void playerinput_keyb_loop (int pl_nr);
-extern inline void playerinput_keyb_read (int pk_offset, int pl_nr);
-
-// for the bomb..
-extern int bomb_loop ();
-extern void bomb_explode (_bomb *bomb, int net);
-extern inline void bomb_action (_bomb *bomb);
-extern void bomb_move (_bomb *bomb);
-extern void get_bomb_on (float x, float y, _point bombs[]);
-extern void do_explosion (_bomb *bomb);
-extern void restore_explosion (_bomb * bomb);
-extern int explosion_check_field (int x, int y, _bomb *bomb);
-
 // configuration
 extern void config_init (int argc, char **argv);
 extern void config_menu ();
@@ -264,25 +149,6 @@ extern void debug_ingameinfo();
 extern void d_printsdlrect (char *text, SDL_Rect *rect);
 
 
-// single.c
-extern void single_game_new ();
-extern void single_create_ai (int num_players);
-extern void single_delete_ai (int num_players);
-extern void	single_loop();
-extern void single_playergame ();
-extern void single_menu ();
-extern int single_select_player ();
-extern int ai_choosedir (int dir, int nearbomb, int oldpos);
-extern inline int ai_invertdir (int dir);
-extern inline int ai_checkpos (_player * pl, _point * pos);
-extern int ai_findnearbombs (_point pos);
-extern int ai_findbestbombdir (_point pos, int dir, int range);
-extern int ai_bombpoints (_point pos, int range);
-extern _airunaway ai_runawayfrom (_point p, int nearbomb, signed char norecursive);
-extern int ai_checkfield (int x, int y);
-extern int ai_easyrunaway (_point p);
-
-
 // special.c
 extern void special_use (int p_nr);
 extern void special_pickup (int p_nr, int s_type);
diff --git a/include/keyb.h b/include/keyb.h
index 4ecfee4..a4f885d 100644
--- a/include/keyb.h
+++ b/include/keyb.h
@@ -1,6 +1,9 @@
 /* $:ID $
  * keyboard handling */
 
+#ifndef _KEYB_H_
+#define _KEYB_H_
+
 enum _bcplayerkeys {
 	BCPK_up = 0,
 	BCPK_down,
@@ -36,3 +39,6 @@ extern void keyb_config ();
 extern void keyb_configreset ();
 extern void keyb_init ();
 extern void keyb_loop (SDL_Event *event);
+
+
+#endif
diff --git a/include/packets.h b/include/packets.h
index 58faf77..06262c5 100644
--- a/include/packets.h
+++ b/include/packets.h
@@ -1,6 +1,12 @@
-/* network packets.. */
+/* $Id: packets.h,v 1.23 2004/04/03 14:48:42 stpohle Exp $
+ * network packets.. */
+
+#ifndef _PACKETS_H_
+#define _PACKETS_H_
 
 #include "flyingitems.h"
+#include "player.h"
+#include "bomb.h"
 
 
 /* All known Packettypes for the game. All types before PKG_field are
@@ -389,3 +395,5 @@ extern int rscache_getcurlen ();
 extern void rscache_loop ();
 
 extern struct _resend_cache resend_cache;
+
+#endif
diff --git a/include/player.h b/include/player.h
new file mode 100644
index 0000000..fcd38cf
--- /dev/null
+++ b/include/player.h
@@ -0,0 +1,146 @@
+/* $Id: player.h,v 1.1 2004/04/03 14:48:42 stpohle Exp $
+ * playerinclude file
+ */
+
+#ifndef _PLAYER_H_
+#define _PLAYER_H_
+
+#include "bomb.h"
+
+enum _specials {
+	SP_nothing=0,				// player has no special
+	SP_trigger,					// triggered bomb
+	SP_row,						// bomb row
+	SP_push,					// push bombs
+	SP_moved,					// moved bombs
+	SP_liquid,					// liquid bombs
+	SP_kick,					// kick bombs
+	
+	SP_max,						// just to know how many types there are
+	SP_clear					// needed to let the server know we removed the special
+};
+
+
+
+enum _playerillnestype {
+    PI_keys = 0,                // switch keys
+    PI_range,                   // set exploding range to 1
+    PI_slow,                    // sets speed to 6
+    PI_fast,                    // sets speed to 150
+    PI_bomb,                    // player is dropping bombs permanently
+    PI_nobomb,                  // player cannot drop a bomb or only 1 bomb
+
+    PI_max                      // just to know what is the last number
+};
+
+
+enum _playerstateflags {		//     not Set    |   Set
+    PSF_used = 1,               // Player Unused  | Player Used
+    PSF_net = 2,                // Local Player   | Network Player
+    PSF_alife = 4,              // Player is Dead | Player is Alife
+    PSF_playing = 8,            // Watching Player| Playing Player -- as long as one don't delete
+	PSF_ai = 16,				//                | AI Player
+	PSF_respawn = 32			//                | Player is Respawning
+};
+
+#define PSFM_used (PSF_used + PSF_playing)
+#define PSFM_alife (PSF_used + PSF_alife + PSF_playing)
+#define PS_IS_dead(__ps) (((__ps) & (PSFM_alife + PSF_respawn)) == (PSFM_used))
+#define PS_IS_respawn(__ps) (((__ps) & (PSFM_alife + PSF_respawn)) == (PSFM_used + PSF_respawn))
+#define PS_IS_alife(__ps) (((__ps) & (PSFM_alife)) == (PSFM_alife))
+#define PS_IS_netplayer(__ps) (((__ps) & (PSF_net)) != 0)
+#define PS_IS_playing(__ps) (((__ps) & (PSFM_used)) == (PSFM_used))
+#define PS_IS_used(__ps) (((__ps) & (PSFM_used)) != 0)
+#define PS_IS_aiplayer(__ps) ((((__ps) & (PSFM_used)) != 0) && (((__ps) & (PSF_ai)) == PSF_ai))
+
+
+struct {
+	float to;  // if (to > 0) the ilness is still working
+	int datai;		// hold a integer data (like number of something..)
+	float dataf;	// hold a float data (speed and so on)
+} typedef _playerilness;
+
+
+struct {
+	int type; 					// type of the special
+	float to;						// timeout
+	int numuse;					// num of uses left
+	int use;					/* currently used set by special_use 
+								   and deleted in special_loop */
+} typedef _special;
+
+
+struct {
+	_gfxplayer *gfx;			// pointer to the gfx information
+	int gfx_nr;					// number of the player GFX
+	
+    float frame;                // step of the animation (only integer part will shown)
+	float illframe;
+
+    _pointf pos;                // position on the field
+    _pointf old;				// the old position
+	float tunnelto;				/* timeout for dont show and move player
+							   	   needed on the tunnel effect */
+	
+    signed char d;              // direction
+    signed char m;              // player is moving ?
+    signed char old_m;          // to save the old state..
+	signed char keyf_bomb;		// flag for the bomb key
+	signed char keyf_special;	// flag for the special key
+
+    int bombs_n;                // maximal number of bombs for the player
+	int bomb_lastex;			// number of the bomb which explode the last time
+    _bomb bombs[MAX_BOMBS];     // number of bombs who are ticking.
+    int range;                  // range of the bombs
+	float speed;				// how fast we can go (0 = slow, 1 = normal... 3 = fastest)
+	float stepsleft;			// distance to walk on the next stepmove_player
+	int collect_shoes;
+	_playerilness ill[PI_max];  // all possible types
+	_special special;			// special the player has
+	
+    char name[LEN_PLAYERNAME];  // name oder name[0] == 0
+    unsigned char state;        // status of the player
+    signed char in_nr;          // number of the connected player entry
+
+    int points;                 // points
+	int wins;					// wins
+    signed char dead_by;        // player who killed this player
+	
+	_net_player net;			// holds all important network data
+} typedef _player;
+
+// everything what is declared in players.c
+extern _player *players;
+
+extern void dead_playerani ();
+extern void draw_player (_player * player);
+extern void restore_players_screen ();
+extern void player_move (int pl_nr);
+extern float stepmove_player (int pl_nr);
+extern void player_drop_bomb (int pl_nr);
+extern void get_player_on (float x, float y, int pl_nr[]);
+extern void player_died (_player * player, signed char dead_by);
+extern void draw_players ();
+extern void player_animation (_player * player);
+extern int check_field (short int x, short int y);
+extern int check_exfield (short int x, short int y);
+extern void player_calcpos ();
+extern void player_set_ilness (_player * p, int t, float new_to);
+extern void player_clear_ilness (_player *p, int type);
+extern void player_ilness_loop (int plnr);
+extern void player_check_powerup (int p_nr);
+extern void player_set_gfx (_player *p, signed char gfx_nr);
+extern int player_findfreebomb (_player *player);
+extern int player_checkpos (int x, int y);
+extern void player_checkdeath (int pnr);
+extern void player_check (int pl_nr);
+
+// for the playerinput handling
+extern void playerinput_loop (int pl_nr);
+extern void playerinput_keyb_loop (int pl_nr);
+extern inline void playerinput_keyb_read (int pk_offset, int pl_nr);
+
+/* playermenu.c */
+extern void player_menu ();
+
+#endif
diff --git a/include/single.h b/include/single.h
new file mode 100644
index 0000000..7a53914
--- /dev/null
+++ b/include/single.h
@@ -0,0 +1,20 @@
+/* $Id: single.h,v 1.1 2004/04/03 14:48:42 stpohle Exp $
+ * single player */
+ 
+// single.c
+extern void single_game_new ();
+extern void single_create_ai (int num_players);
+extern void single_delete_ai (int num_players);
+extern void	single_loop();
+extern void single_playergame ();
+extern void single_menu ();
+extern int single_select_player ();
+extern int ai_choosedir (int dir, int nearbomb, int oldpos);
+extern inline int ai_invertdir (int dir);
+extern inline int ai_checkpos (_player * pl, _point * pos);
+extern int ai_findnearbombs (_point pos);
+extern int ai_findbestbombdir (_point pos, int dir, int range);
+extern int ai_bombpoints (_point pos, int range);
+extern _airunaway ai_runawayfrom (_point p, int nearbomb, signed char norecursive);
+extern int ai_checkfield (int x, int y);
+extern int ai_easyrunaway (_point p);
diff --git a/src/bomb.c b/src/bomb.c
index aa9080c..ceafd20 100644
--- a/src/bomb.c
+++ b/src/bomb.c
@@ -1,7 +1,9 @@
-/* $Id: bomb.c,v 1.55 2004/02/05 21:32:18 stpohle Exp $ */
+/* $Id: bomb.c,v 1.56 2004/04/03 14:48:42 stpohle Exp $ */
 /* everything what have to do with the bombs */
 
 #include "bomberclone.h"
+#include "player.h"
+#include "bomb.h"
 #include <math.h>
 
 void
diff --git a/src/configuration.c b/src/configuration.c
index 0259653..d472fe8 100644
--- a/src/configuration.c
+++ b/src/configuration.c
@@ -1,4 +1,5 @@
-/* configuration */
+/* $Id: configuration.c,v 1.53 2004/04/03 14:48:42 stpohle Exp $
+ * configuration */
 
 #include <SDL.h>
 
diff --git a/src/field.c b/src/field.c
index 762ca75..7f7cc72 100644
--- a/src/field.c
+++ b/src/field.c
@@ -1,8 +1,10 @@
-/* $Id: field.c,v 1.55 2004/02/07 18:17:50 stpohle Exp $ */
+/* $Id: field.c,v 1.56 2004/04/03 14:48:43 stpohle Exp $ */
 /* field.c - procedures which are needed to control the field */
 
 #include "bomberclone.h"
 #include "map.h"
+#include "bomb.h"
+#include "player.h"
 
 static _point fieldani[MAX_FIELDANIMATION];
 static _point stonelist[MAX_STONESTODRAW]; // keep all stones to draw
diff --git a/src/flyingitems.c b/src/flyingitems.c
index 13d9866..95c1dc5 100644
--- a/src/flyingitems.c
+++ b/src/flyingitems.c
@@ -1,7 +1,8 @@
-/* $Id: flyingitems.c,v 1.3 2004/02/11 21:46:48 stpohle Exp $ */
+/* $Id: flyingitems.c,v 1.4 2004/04/03 14:48:43 stpohle Exp $ */
 
 #include "bomberclone.h"
 #include "flyingitems.h"
+#include "player.h"
 
 _flyingitem flitems [FLITEMS_MAXITEMS];
 _flyingitem *flitems_first = NULL;
diff --git a/src/game.c b/src/game.c
index 316a858..06158dd 100644
--- a/src/game.c
+++ b/src/game.c
@@ -1,4 +1,4 @@
-/* $Id: game.c,v 1.81 2004/04/03 13:55:30 stpohle Exp $ 
+/* $Id: game.c,v 1.82 2004/04/03 14:48:43 stpohle Exp $ 
   game.c - procedures for the game. */
 
 #include <string.h>
@@ -12,6 +12,7 @@
 #include "flyingitems.h"
 #include "menu.h"
 #include "keyb.h"
+#include "single.h"
 
 extern int blitdb_nr,
   blitrects_nr;
diff --git a/src/help.c b/src/help.c
index 28fe18d..40b6e2d 100644
--- a/src/help.c
+++ b/src/help.c
@@ -1,9 +1,10 @@
-/* $Id: help.c,v 1.8 2004/02/08 00:57:15 stpohle Exp $ 
+/* $Id: help.c,v 1.9 2004/04/03 14:48:43 stpohle Exp $ 
  * Display complex help text and information screen about the game
  */
 
 #include "bomberclone.h"
 #include "menu.h"
+#include "player.h"
 
 enum _help_page {
 	HP_howto0 = 0,
diff --git a/src/main.c b/src/main.c
index 114c8a5..38a5e27 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,11 +1,12 @@
-/* $Id: main.c,v 1.23 2004/02/07 13:35:28 stpohle Exp $ */
+/* $Id: main.c,v 1.24 2004/04/03 14:48:43 stpohle Exp $ */
 
 #include "basic.h"
 #include "bomberclone.h"
 #include "network.h"
 #include "gfx.h"
 #include "menu.h"
-
+#include "player.h"
+#include "single.h"
 
 _bomberclone bman;              // Holds GameData
 _player *players;   			// holds all Playerdata
diff --git a/src/map.c b/src/map.c
index 67bf2f9..eadaea5 100644
--- a/src/map.c
+++ b/src/map.c
@@ -1,7 +1,8 @@
-/* $Id: map.c,v 1.25 2004/03/23 21:02:21 stpohle Exp $ */
+/* $Id: map.c,v 1.26 2004/04/03 14:48:43 stpohle Exp $ */
 /* map handling, like generate and load maps. */
 
 #include "bomberclone.h"
+#include "player.h"
 
 _map map;
 
diff --git a/src/multiwait.c b/src/multiwait.c
index 7905aae..6fd7844 100644
--- a/src/multiwait.c
+++ b/src/multiwait.c
@@ -9,6 +9,7 @@
 #include "gfx.h"
 #include "chat.h"
 #include "menu.h"
+#include "single.h"
 
 extern int UpdateRects_nr;
 extern int blitdb_nr;
diff --git a/src/player.c b/src/player.c
index f45f4d6..ddeffc7 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1,4 +1,4 @@
-/* $Id: player.c,v 1.82 2004/04/03 13:55:30 stpohle Exp $
+/* $Id: player.c,v 1.83 2004/04/03 14:48:43 stpohle Exp $
  * player.c - everything what have to do with the player */
 
 #include <SDL.h>
@@ -6,6 +6,8 @@
 #include "network.h"
 #include "sound.h"
 #include "flyingitems.h"
+#include "player.h"
+#include "bomb.h"
 
 void
 draw_player (_player * player)
diff --git a/src/playerinput.c b/src/playerinput.c
index 4829ddd..c2e38ba 100644
--- a/src/playerinput.c
+++ b/src/playerinput.c
@@ -1,4 +1,4 @@
-/* $Id: playerinput.c,v 1.1 2004/04/03 13:55:30 stpohle Exp $
+/* $Id: playerinput.c,v 1.2 2004/04/03 14:48:43 stpohle Exp $
  * playerinput 
  * 
  * the playerinput system will only set some values and flags of the player
@@ -14,6 +14,7 @@
 
 
 #include "bomberclone.h"
+#include "player.h"
 #include "keyb.h"
 #include "chat.h"
 
diff --git a/src/single.c b/src/single.c
index 96231a4..831df60 100644
--- a/src/single.c
+++ b/src/single.c
@@ -1,9 +1,11 @@
-/* $Id: single.c,v 1.61 2004/04/03 13:55:30 stpohle Exp $ */
+/* $Id: single.c,v 1.62 2004/04/03 14:48:43 stpohle Exp $ */
 /* single player */
 
 #include "basic.h"
 #include "bomberclone.h"
 #include "menu.h"
+#include "player.h"
+#include "single.h"
 
 void
 single_game_new ()
diff --git a/src/special.c b/src/special.c
index e31ac58..9aeccb9 100644
--- a/src/special.c
+++ b/src/special.c
@@ -1,8 +1,10 @@
-/* $Id: special.c,v 1.33 2004/02/11 21:46:48 stpohle Exp $ */
+/* $Id: special.c,v 1.34 2004/04/03 14:48:43 stpohle Exp $ */
 /* special.c - procedues to control the specials */
 
 #include "bomberclone.h"
 #include "basic.h"
+#include "player.h"
+#include "bomb.h"
 
 void
 special_trigger (int p_nr)