cleaned up code structure a bit

7 files changed, 33 insertions, 33 deletions

diff --git a/src/engine/client/client.c b/src/engine/client/ec_client.c
index 646ca4b4..78e7877c 100644
--- a/src/engine/client/client.c
+++ b/src/engine/client/ec_client.c
@@ -6,19 +6,19 @@
 #include <stdio.h>
 #include <math.h>
 
-#include <engine/system.h>
-#include <engine/engine.h>
-#include <engine/interface.h>
-#include "ui.h"
-
-#include <engine/protocol.h>
-#include <engine/snapshot.h>
-#include <engine/compression.h>
-#include <engine/network.h>
-#include <engine/config.h>
-#include <engine/packer.h>
-#include <engine/memheap.h>
-#include <engine/datafile.h>
+#include <engine/e_system.h>
+#include <engine/e_engine.h>
+#include <engine/e_interface.h>
+#include "ec_ui.h"
+
+#include <engine/e_protocol.h>
+#include <engine/e_snapshot.h>
+#include <engine/e_compression.h>
+#include <engine/e_network.h>
+#include <engine/e_config.h>
+#include <engine/e_packer.h>
+#include <engine/e_memheap.h>
+#include <engine/e_datafile.h>
 
 #include <mastersrv/mastersrv.h>
 
diff --git a/src/engine/client/gfx.c b/src/engine/client/ec_gfx.c
index c61f0cb1..cd1f690b 100644
--- a/src/engine/client/gfx.c
+++ b/src/engine/client/ec_gfx.c
@@ -2,11 +2,11 @@
 #include <engine/external/glfw/include/GL/glfw.h>
 #include <engine/external/pnglite/pnglite.h>
 
-#include <engine/system.h>
-#include <engine/interface.h>
-#include <engine/engine.h>
-#include <engine/config.h>
-#include <engine/keys.h>
+#include <engine/e_system.h>
+#include <engine/e_interface.h>
+#include <engine/e_engine.h>
+#include <engine/e_config.h>
+#include <engine/e_keys.h>
 
 #include <string.h>
 #include <stdio.h>
diff --git a/src/engine/client/inp.c b/src/engine/client/ec_inp.c
index 7ffb7f3f..0366cff5 100644
--- a/src/engine/client/inp.c
+++ b/src/engine/client/ec_inp.c
@@ -2,9 +2,9 @@
 #include <string.h>
 #include <engine/external/glfw/include/GL/glfw.h>
 
-#include <engine/system.h>
-#include <engine/interface.h>
-#include <engine/config.h>
+#include <engine/e_system.h>
+#include <engine/e_interface.h>
+#include <engine/e_config.h>
 
 static int keyboard_state[2][1024]; /* TODO: fix this!! */
 static int keyboard_current = 0;
diff --git a/src/engine/client/snd.c b/src/engine/client/ec_snd.c
index aa155c0c..89e18cb8 100644
--- a/src/engine/client/snd.c
+++ b/src/engine/client/ec_snd.c
@@ -1,7 +1,7 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/system.h>
-#include <engine/interface.h>
-#include <engine/config.h>
+#include <engine/e_system.h>
+#include <engine/e_interface.h>
+#include <engine/e_config.h>
 
 #include <engine/external/portaudio/portaudio.h>
 #include <engine/external/wavpack/wavpack.h>
diff --git a/src/engine/client/srvbrowse.c b/src/engine/client/ec_srvbrowse.c
index 9fbbc2a0..9fc5ec02 100644
--- a/src/engine/client/srvbrowse.c
+++ b/src/engine/client/ec_srvbrowse.c
@@ -1,9 +1,9 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/system.h>
-#include <engine/network.h>
-#include <engine/interface.h>
-#include <engine/config.h>
-#include <engine/memheap.h>
+#include <engine/e_system.h>
+#include <engine/e_network.h>
+#include <engine/e_interface.h>
+#include <engine/e_config.h>
+#include <engine/e_memheap.h>
 
 #include <mastersrv/mastersrv.h>
 
diff --git a/src/engine/client/ui.c b/src/engine/client/ec_ui.c
index 9486b2c1..5ba9c0d9 100644
--- a/src/engine/client/ui.c
+++ b/src/engine/client/ec_ui.c
@@ -1,8 +1,8 @@
 /* copyright (c) 2007 magnus auvinen, see licence.txt for more info */
-#include <engine/system.h>
-#include <engine/interface.h>
-#include <engine/config.h>
-#include "ui.h"
+#include <engine/e_system.h>
+#include <engine/e_interface.h>
+#include <engine/e_config.h>
+#include "ec_ui.h"
 
 /********************************************************
  UI                                                      
diff --git a/src/engine/client/ui.h b/src/engine/client/ec_ui.h
index 15c63b90..15c63b90 100644
--- a/src/engine/client/ui.h
+++ b/src/engine/client/ec_ui.h