12 files changed, 21 insertions, 21 deletions
diff --git a/src/base/arena.c b/src/base/arena.c
index effbff4..4658e08 100644
--- a/src/base/arena.c
+++ b/src/base/arena.c
@@ -14,8 +14,8 @@
 
 #ifndef PUBLIC_SERVER
 #    include "hotKey.h"
-#    include "world.h"
-#    include "setting.h"
+#    include "screen_world.h"
+#    include "screen_setting.h"
 #    include "layer.h"
 #endif
 
diff --git a/src/base/gun.c b/src/base/gun.c
index d357349..27f88bd 100644
--- a/src/base/gun.c
+++ b/src/base/gun.c
@@ -19,7 +19,7 @@
 #endif
 #ifndef PUBLIC_SERVER
 #    include "interface.h"
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 #ifdef PUBLIC_SERVER
 #    include "publicServer.h"
diff --git a/src/base/item.c b/src/base/item.c
index 75074bc..822d6b4 100644
--- a/src/base/item.c
+++ b/src/base/item.c
@@ -19,8 +19,8 @@
 #    include "radar.h"
 #    include "layer.h"
 
-#    include "world.h"
-#    include "setting.h"
+#    include "screen_world.h"
+#    include "screen_setting.h"
 
 #    ifndef NO_SOUND
 #        include "sound.h"
diff --git a/src/base/net_multiplayer.c b/src/base/net_multiplayer.c
index cb9ca59..f59b3b2 100644
--- a/src/base/net_multiplayer.c
+++ b/src/base/net_multiplayer.c
@@ -15,8 +15,8 @@
 #include "udp.h"
 
 #ifndef PUBLIC_SERVER
-#    include "setting.h"
-#    include "choiceArena.h"
+#    include "screen_setting.h"
+#    include "screen_choiceArena.h"
 
 #    include "screen.h"
 #    include "client.h"
diff --git a/src/base/proto.c b/src/base/proto.c
index f927dfa..606dd33 100644
--- a/src/base/proto.c
+++ b/src/base/proto.c
@@ -21,11 +21,11 @@
 #include "serverSendMsg.h"
 
 #ifndef PUBLIC_SERVER
-#    include "world.h"
-#    include "setting.h"
-#    include "choiceArena.h"
-#    include "analyze.h"
-#    include "downArena.h"
+#    include "screen_world.h"
+#    include "screen_setting.h"
+#    include "screen_choiceArena.h"
+#    include "screen_analyze.h"
+#    include "screen_downArena.h"
 #    include "client.h"
 #    include "term.h"
 #    include "radar.h"
diff --git a/src/base/proto.h b/src/base/proto.h
index 8cd7568..590317b 100644
--- a/src/base/proto.h
+++ b/src/base/proto.h
@@ -18,9 +18,9 @@
 #    include "net_multiplayer.h"
 
 #    ifndef PUBLIC_SERVER
-#        include "world.h"
-#        include "setting.h"
-#        include "choiceArena.h"
+#        include "screen_world.h"
+#        include "screen_setting.h"
+#        include "screen_choiceArena.h"
 #        include "client.h"
 #    endif
 
diff --git a/src/base/server.c b/src/base/server.c
index 5f16ef7..2112927 100644
--- a/src/base/server.c
+++ b/src/base/server.c
@@ -33,7 +33,7 @@
 #include "downServer.h"
 
 #ifndef PUBLIC_SERVER
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/serverSendMsg.c b/src/base/serverSendMsg.c
index e38975f..e7d1c09 100644
--- a/src/base/serverSendMsg.c
+++ b/src/base/serverSendMsg.c
@@ -11,7 +11,7 @@
 #include "serverSendMsg.h"
 
 #ifndef PUBLIC_SERVER
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 static void addMsgClient(client_t * p, char *msg, int type, int id)
diff --git a/src/base/shot.c b/src/base/shot.c
index 306527b..977ccb4 100644
--- a/src/base/shot.c
+++ b/src/base/shot.c
@@ -14,7 +14,7 @@
 #ifndef PUBLIC_SERVER
 #    include "image.h"
 #    include "layer.h"
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/tcp_server.c b/src/base/tcp_server.c
index de5ac39..b781fb5 100644
--- a/src/base/tcp_server.c
+++ b/src/base/tcp_server.c
@@ -30,7 +30,7 @@
 #include "index.h"
 
 #ifndef PUBLIC_SERVER
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/tux.c b/src/base/tux.c
index 5bb2305..746679d 100644
--- a/src/base/tux.c
+++ b/src/base/tux.c
@@ -28,7 +28,7 @@
 #        include "sound.h"
 #    endif
 
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER
diff --git a/src/base/udp_server.c b/src/base/udp_server.c
index fc65d19..a469a3a 100644
--- a/src/base/udp_server.c
+++ b/src/base/udp_server.c
@@ -30,7 +30,7 @@
 #include "index.h"
 
 #ifndef PUBLIC_SERVER
-#    include "world.h"
+#    include "screen_world.h"
 #endif
 
 #ifdef PUBLIC_SERVER