giant header overhaul which removes all the stupid one line function prototype headers and e_mod_main.h headers that contain nothing but unnecessary module api prototypes

SVN revision: 79908

4 files changed, 2 insertions, 28 deletions

diff --git a/src/modules/winlist/e_int_config_winlist.h b/src/modules/winlist/e_int_config_winlist.h
deleted file mode 100644
index 5461e57c65..0000000000
--- a/src/modules/winlist/e_int_config_winlist.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifdef E_TYPEDEFS
-#else
-#ifndef E_INT_CONFIG_WINLIST_H
-#define E_INT_CONFIG_WINLIST_H
-
-E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
-
-#endif
-#endif
diff --git a/src/modules/winlist/e_mod_main.h b/src/modules/winlist/e_mod_main.h
index d1920c23ed..f5c2592889 100644
--- a/src/modules/winlist/e_mod_main.h
+++ b/src/modules/winlist/e_mod_main.h
@@ -1,22 +1,11 @@
 #ifndef E_MOD_MAIN_H
 #define E_MOD_MAIN_H
 
-#define E_TYPEDEFS 1
 #include "e_winlist.h"
-#include "e_int_config_winlist.h"
-
-#undef E_TYPEDEFS
-#include "e_winlist.h"
-#include "e_int_config_winlist.h"
 
 extern const char *_winlist_act;
 extern E_Action *_act_winlist;
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
+E_Config_Dialog *e_int_config_winlist(E_Container *con, const char *params __UNUSED__);
 /**
  * @addtogroup Optional_Control
  * @{
diff --git a/src/modules/winlist/e_winlist.c b/src/modules/winlist/e_winlist.c
index 34f1372874..44dee55671 100644
--- a/src/modules/winlist/e_winlist.c
+++ b/src/modules/winlist/e_winlist.c
@@ -1,5 +1,5 @@
 #include "e.h"
-#include "e_winlist.h"
+#include "e_mod_main.h"
 
 /* local subsystem functions */
 typedef struct _E_Winlist_Win E_Winlist_Win;
diff --git a/src/modules/winlist/e_winlist.h b/src/modules/winlist/e_winlist.h
index ae7b614e4b..a7f634447c 100644
--- a/src/modules/winlist/e_winlist.h
+++ b/src/modules/winlist/e_winlist.h
@@ -1,11 +1,6 @@
-#ifdef E_TYPEDEFS
-
-#else
 #ifndef E_WINLIST_H
 #define E_WINLIST_H
 
-#include "e_mod_main.h"
-
 int e_winlist_init(void);
 int e_winlist_shutdown(void);
 
@@ -26,4 +21,3 @@ void e_winlist_up(E_Zone *zone);
 void e_winlist_modifiers_set(int mod);
 
 #endif
-#endif