Cleanup includes

diff --git a/src/config.c b/src/config.c
index fbfadc0c9fb9941543bf8fe018d393082c3474ab..d0c4a9f1322545d2e9b87591a195d8ac6c82bdd0 100644 (file)
--- a/src/config.c
+++ b/src/config.c
@@ -24,15 +24,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-//#include <process.h>
-//#include <dos.h>
 #include "config.h"
 #include "vga.h"
 #include "error.h"
 #include "sound.h"
-#include "keyb.h"
 #include "files.h"
-#include "memory.h"
 #include "view.h"
 #include "player.h"
 #include "my.h"

diff --git a/src/dots.c b/src/dots.c
index ddb39a28ab069f83ae44af07623cf9e62baea3ce..d89b9d6122fd359742141cf17d219cbeaa99e2df 100644 (file)
--- a/src/dots.c
+++ b/src/dots.c
@@ -21,14 +21,8 @@
 */
 
 #include "glob.h"
-//#include <stdio.h>
 #include <stdlib.h>
-#include "files.h"
-#include "memory.h"
 #include "vga.h"
-#include "error.h"
-#include "keyb.h"
-#include "sound.h"
 #include "view.h"
 #include "dots.h"
 #include "misc.h"

diff --git a/src/error.c b/src/error.c
index 26a8f123890d1467c39b8f92cf8837e9c4d4f957..0e3e2afebbe0c5978cf3bbbc931fd52a1f7e3b72 100644 (file)
--- a/src/error.c
+++ b/src/error.c
@@ -23,20 +23,15 @@
 #include "glob.h"
 #include <stdio.h>
 #include <string.h>
-//#include <conio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include "keyb.h"
 #include "sound.h"
 #include "vga.h"
 #include "memory.h"
-#include "files.h"
 #include "error.h"
 #include "config.h"
 
-#include <SDL.h>
-
-
 void close_all(void) {
   S_done();
   S_donemusic();

diff --git a/src/files.c b/src/files.c
index bc6abd937019f0423658c761db7b8bc7b8c2f572..220d72cd254e4e9957ef83d5ff325aad2c4b4a83 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -22,24 +22,16 @@
 
 #include "glob.h"
 #include <stdio.h>
-//#include <conio.h>
-//#include <dos.h>
 #include <string.h>
 #include <stdlib.h>
-//#include <sys\stat.h>
-#include "vga.h"
+#include <sys/stat.h>
 #include "error.h"
-#include "sound.h"
-//#include "snddrv.h"
-#include "memory.h"
 #include "view.h"
 #include "items.h"
 #include "switch.h"
 #include "files.h"
 #include "map.h"
 
-#include <sys/stat.h>
-
 char *S_getinfo(void);
 
 extern void *snd_drv;

diff --git a/src/fx.c b/src/fx.c
index 7212a8ac4c13fdd2a070854609203b326094e1cd..8a38050cf9bfc7789bae981efaa0e6791fe09298 100644 (file)
--- a/src/fx.c
+++ b/src/fx.c
@@ -20,12 +20,10 @@
 */
 
 #include "glob.h"
-//#include <io.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "vga.h"
-#include "error.h"
 #include "view.h"
 #include "fx.h"
 #include "misc.h"

diff --git a/src/game.c b/src/game.c
index 194365ecc3a739663131a9eedb7c5f5b87a8705c..f2f346304fc0193487d953b2f553e0a53f636fd9 100644 (file)
--- a/src/game.c
+++ b/src/game.c
@@ -27,7 +27,6 @@
 #include "files.h"
 #include "memory.h"
 #include "vga.h"
-#include "error.h"
 #include "keyb.h"
 #include "sound.h"
 #include "view.h"

diff --git a/src/items.c b/src/items.c
index 5910fa5b04db00d82e9529fcb4bf31bd52180d44..06230c9c7f949bf83952a3697da60fbd654351a0 100644 (file)
--- a/src/items.c
+++ b/src/items.c
@@ -21,12 +21,8 @@
 */
 
 #include "glob.h"
-//#include <stdio.h>
 #include <stdlib.h>
-#include "vga.h"
 #include "error.h"
-#include "sound.h"
-#include "files.h"
 #include "view.h"
 #include "items.h"
 #include "fx.h"
@@ -34,7 +30,6 @@
 #include "monster.h"
 #include "things.h"
 #include "misc.h"
-#include "memory.h"
 #include "map.h"
 
 extern map_block_t blk;

diff --git a/src/main.c b/src/main.c
index 50387ff9569990323880d872d55ffb8298652315..2fc47cebd02be20d242e6d82622bb2f822497f85 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -22,11 +22,7 @@
 
 #include "glob.h"
 #include <stdio.h>
-///#include <process.h>
 #include <stdarg.h>
-///#include <conio.h>
-//#include <time.h>
-///#include <dos.h>
 #include <stdlib.h>
 #include <string.h>
 #include "error.h"
@@ -39,7 +35,6 @@
 #include "view.h"
 #include "menu.h"
 #include "player.h"
-#include "misc.h"
 #include "my.h"
 
 #include <SDL.h>

diff --git a/src/miscc.c b/src/miscc.c
index 13359cd39ccb63d1707e2091cc14861a12eaa702..4fd6353f0c4feadb1d101572052e082b8850346c 100644 (file)
--- a/src/miscc.c
+++ b/src/miscc.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include "files.h"
 #include "memory.h"
-#include "error.h"
 #include "vga.h"
 #include "sound.h"
 #include "view.h"

diff --git a/src/monster.c b/src/monster.c
index 5cf27f446e180fe3fe8d6b4d14e20052f830feba..98b909ebf803eea40342235b1c98770727e85c84 100644 (file)
--- a/src/monster.c
+++ b/src/monster.c
@@ -21,12 +21,10 @@
 */
 
 #include "glob.h"
-//#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "vga.h"
 #include "files.h"
-#include "error.h"
 #include "view.h"
 #include "bmap.h"
 #include "dots.h"

diff --git a/src/my.c b/src/my.c
index 08877e98cc0e8edf835d80565694f5854ff6f27a..c7fe41cc48e123680241b4f7015448e83dd90134 100644 (file)
--- a/src/my.c
+++ b/src/my.c
@@ -22,7 +22,6 @@
 
 #include <SDL.h>
 #include "glob.h"
-#include "keyb.h"
 #include "error.h"
 #include <stdio.h>
 

diff --git a/src/player.c b/src/player.c
index 06bf44e85210d3f7a14c66a05fd86a60b5da1e96..fd1080a4a49a52e34b738f06af873b8ded08d86e 100644 (file)
--- a/src/player.c
+++ b/src/player.c
@@ -23,10 +23,7 @@
 #include "glob.h"
 #include <stdlib.h>
 #include <string.h>
-#include "files.h"
-#include "memory.h"
 #include "vga.h"
-#include "error.h"
 #include "keyb.h"
 #include "view.h"
 #include "dots.h"

diff --git a/src/smoke.c b/src/smoke.c
index 577e402b58c794f8356eca0871e44d22b9d1ad0a..4ec8117a26a12bff82048fc138da3f7eed9b5d43 100644 (file)
--- a/src/smoke.c
+++ b/src/smoke.c
@@ -22,11 +22,7 @@
 
 #include "glob.h"
 #include <stdlib.h>
-#include "files.h"
-#include "memory.h"
 #include "vga.h"
-#include "error.h"
-#include "sound.h"
 #include "view.h"
 #include "smoke.h"
 #include "fx.h"

diff --git a/src/sound.c b/src/sound.c
index 12c5c7fe91948b6588075a1c0f70c994fe383a07..de334340c50f820be2065c5339790bd586cae71e 100644 (file)
--- a/src/sound.c
+++ b/src/sound.c
@@ -21,7 +21,6 @@
 */
 
 #include "glob.h"
-#include "files.h"
 #include "sound.h"
 #include "error.h"
 #include <SDL.h>

diff --git a/src/switch.c b/src/switch.c
index 51e6eb0e042c03a260b63cfd2a1e98c933ca4a7c..cc418b8bc5287bf7291fe8612e680fe2ff9e6e83 100644 (file)
--- a/src/switch.c
+++ b/src/switch.c
@@ -22,7 +22,6 @@
 
 #include "glob.h"
 #include <string.h>
-#include "files.h"
 #include "view.h"
 #include "bmap.h"
 #include "switch.h"

diff --git a/src/weapons.c b/src/weapons.c
index 4ccc73b28ef61c7d127977105267c1cc2cbefbd7..b778a0ec96c484a448264ae979454c9a9e0b70a7 100644 (file)
--- a/src/weapons.c
+++ b/src/weapons.c
@@ -22,10 +22,6 @@
 
 #include "glob.h"
 #include <stdlib.h>
-//#include <io.h>
-#include "vga.h"
-#include "error.h"
-#include "sound.h"
 #include "view.h"
 #include "bmap.h"
 #include "dots.h"