diff --git a/src/client.c b/src/client.c
index 0a9bb30..b1e6f71 100644
--- a/src/client.c
+++ b/src/client.c
@@ -88,7 +88,7 @@ client_detach(Client *c)
 /** Get the next client
  *\return The next client or NULL
  */
-Client*
+static Client*
 client_get_next(void)
 {
      Client *c = NULL;
@@ -109,7 +109,7 @@ client_get_next(void)
 /** Get the previous client
  *\return The previous client or NULL
  */
-Client*
+static Client*
 client_get_prev(void)
 {
      Client *c = NULL, *d;
@@ -135,7 +135,7 @@ client_get_prev(void)
   *\param pos Position (Left/Right/Top/Bottom
   *\return Client found
 */
-Client*
+static Client*
 client_get_next_with_direction(Position pos)
 {
      Client *c = NULL;
@@ -322,7 +322,7 @@ uicb_client_focus_bottom(uicb_t cmd)
 /** Set the client c above
   *\param c Client pointer
 */
-void
+static void
 client_above(Client *c)
 {
      XRectangle geo;
@@ -664,6 +664,8 @@ client_map(Client *c)
      return;
 }
 
+static void client_set_rules(Client *c);
+
 /** Manage a client with a window and his attributes
  * \param w Cient's futur Window
  * \param wa XWindowAttributes pointer, Window w attributes
@@ -1037,7 +1039,7 @@ client_swap(Client *c1, Client *c2)
 /** Set the wanted tag or autofree/max of a client
  *\param c Client pointer
 */
-void
+static void
 client_set_rules(Client *c)
 {
      XClassHint xch;
@@ -1352,7 +1354,7 @@ client_unmap(Client *c)
  *\param c Client pointer
  *\param s Screen id
  */
-void
+static void
 client_set_screen(Client *c, int s)
 {
      int os;
@@ -1489,6 +1491,8 @@ uicb_ignore_next_client_rules(uicb_t cmd)
      return;
 }
 
+static void uicb_client_select(uicb_t cmd);
+
 /** Show clientlist menu
  *\param cmd uicb_t type
  */
@@ -1551,7 +1555,7 @@ uicb_clientlist(uicb_t cmd)
 /** Select client
  *\param cmd uicb_t type clientlist index
  */
-void
+static void
 uicb_client_select(uicb_t cmd)
 {
      int i;
diff --git a/src/config.c b/src/config.c
index 2d7c74d..68119c0 100644
--- a/src/config.c
+++ b/src/config.c
@@ -100,7 +100,7 @@ const func_name_list_t func_list[] =
      {NULL, NULL}
 };
 
-key_name_list_t key_list[] =
+static key_name_list_t key_list[] =
 {
      {"Control", ControlMask },
      {"Shift",   ShiftMask },
@@ -115,7 +115,7 @@ key_name_list_t key_list[] =
      {NULL,      NoSymbol }
 };
 
-name_to_uint_t mouse_button_list[] =
+static name_to_uint_t mouse_button_list[] =
 {
      {"Button1", Button1 },
      {"Button2", Button2 },
diff --git a/src/draw.c b/src/draw.c
index d4a59c4..b2a80ad 100644
--- a/src/draw.c
+++ b/src/draw.c
@@ -32,6 +32,10 @@
 
 #include "wmfs.h"
 
+#ifdef HAVE_IMLIB
+static void draw_image(Drawable dr, int x, int y, int w, int h, char *name);
+#endif /* HAVE_IMLIB */
+
 void
 draw_text(Drawable d, int x, int y, char* fg, char *str)
 {
diff --git a/src/event.c b/src/event.c
index 4ca0dff..b38b428 100644
--- a/src/event.c
+++ b/src/event.c
@@ -35,7 +35,7 @@
 /** ButtonPress handle event
  * \param ev XButtonEvent pointer
 */
-void
+static void
 buttonpress(XButtonEvent *ev)
 {
      Client *c;
@@ -162,7 +162,7 @@ buttonpress(XButtonEvent *ev)
 /* ClientMessage handle event
  *\param ev XClientMessageEvent pointer
 */
-void
+static void
 clientmessageevent(XClientMessageEvent *ev)
 {
      Client *c;
@@ -289,7 +289,7 @@ clientmessageevent(XClientMessageEvent *ev)
 /** ConfigureRequesthandle events
  * \param ev XConfigureRequestEvent pointer
 */
-void
+static void
 configureevent(XConfigureRequestEvent *ev)
 {
      XWindowChanges wc;
@@ -342,7 +342,7 @@ configureevent(XConfigureRequestEvent *ev)
 /** DestroyNotify handle event
  * \param ev XDestroyWindowEvent pointer
 */
-void
+static void
 destroynotify(XDestroyWindowEvent *ev)
 {
      Client *c;
@@ -366,7 +366,7 @@ destroynotify(XDestroyWindowEvent *ev)
 /** EnterNotify handle event
  * \param ev XCrossingEvent pointer
 */
-void
+static void
 enternotify(XCrossingEvent *ev)
 {
      Client *c;
@@ -399,7 +399,7 @@ enternotify(XCrossingEvent *ev)
 /** ExposeEvent handle event
  * \param ev XExposeEvent pointer
 */
-void
+static void
 expose(XExposeEvent *ev)
 {
      Client *c;
@@ -430,7 +430,7 @@ expose(XExposeEvent *ev)
  * \param ev XFocusChangeEvent pointer
  * \return
 */
-void
+static void
 focusin(XFocusChangeEvent *ev)
 {
      if(sel && ev->window != sel->win)
@@ -463,7 +463,7 @@ grabkeys(void)
 /** KeyPress handle event
  * \param ev XKeyPressedEvent pointer
 */
-void
+static void
 keypress(XKeyPressedEvent *ev)
 {
      int i;
@@ -483,7 +483,7 @@ keypress(XKeyPressedEvent *ev)
 /** MappingNotify handle event
  * \param ev XMappingEvent pointer
 */
-void
+static void
 mappingnotify(XMappingEvent *ev)
 {
      XRefreshKeyboardMapping(ev);
@@ -497,7 +497,7 @@ mappingnotify(XMappingEvent *ev)
 /** MapNotify handle event
   * \param ev XMapEvent pointer
   */
-void
+static void
 mapnotify(XMapEvent *ev)
 {
      Client *c;
@@ -520,7 +520,7 @@ mapnotify(XMapEvent *ev)
 /** MapRequest handle event
  * \param ev XMapRequestEvent pointer
 */
-void
+static void
 maprequest(XMapRequestEvent *ev)
 {
      XWindowAttributes at;
@@ -543,7 +543,7 @@ maprequest(XMapRequestEvent *ev)
 /** PropertyNotify handle event
  * \param ev XPropertyEvent pointer
 */
-void
+static void
 propertynotify(XPropertyEvent *ev)
 {
      Client *c;
@@ -597,7 +597,7 @@ propertynotify(XPropertyEvent *ev)
 /** XReparentEvent handle event
  * \param ev XReparentEvent pointer
  */
-void
+static void
 reparentnotify(XReparentEvent *ev)
 {
      (void)ev;
@@ -608,7 +608,7 @@ reparentnotify(XReparentEvent *ev)
 /** SelectionClearEvent handle event
  * \param ev XSelectionClearEvent pointer
  */
-void
+static void
 selectionclearevent(XSelectionClearEvent *ev)
 {
      /* Getting selection if lost it */
@@ -623,7 +623,7 @@ selectionclearevent(XSelectionClearEvent *ev)
 /** UnmapNotify handle event
  * \param ev XUnmapEvent pointer
  */
-void
+static void
 unmapnotify(XUnmapEvent *ev)
 {
      Client *c;
diff --git a/src/infobar.c b/src/infobar.c
index c97b262..4156355 100644
--- a/src/infobar.c
+++ b/src/infobar.c
@@ -135,6 +135,8 @@ infobar_init(void)
      return;
 }
 
+static void infobar_draw_layout(int sc);
+
 /** Draw the Infobar
  *\param sc Screen number
 */
@@ -153,7 +155,7 @@ infobar_draw(int sc)
 /** Draw the layout button in the InfoBar
  *\param sc Screen number
  */
-void
+static void
 infobar_draw_layout(int sc)
 {
      if(!conf.layout_placement)
diff --git a/src/launcher.c b/src/launcher.c
index 3aa32f3..2df2160 100644
--- a/src/launcher.c
+++ b/src/launcher.c
@@ -35,7 +35,7 @@
 static char *complete_on_command(char*, size_t);
 static char *complete_on_files(char*, size_t);
 
-void
+static void
 launcher_execute(Launcher *launcher)
 {
      BarWindow *bw;
diff --git a/src/layout.c b/src/layout.c
index e29ecdd..5cea3c2 100644
--- a/src/layout.c
+++ b/src/layout.c
@@ -168,7 +168,7 @@ maxlayout(int screen)
  * \param c Client pointer
  * \return a client pointer
 */
-Client*
+static Client*
 tiled_client(int screen, Client *c)
 {
      for(;c && ((c->flags & MaxFlag)
@@ -235,7 +235,7 @@ uicb_set_nmaster(uicb_t cmd)
 
 /** Grid layout function
 */
-void
+static void
 grid(int screen, Bool horizontal)
 {
      Client *c;
@@ -300,7 +300,7 @@ grid(int screen, Bool horizontal)
 /** Multi tile function
  * \param type Postion type { Top, Bottom, Left, Right }
 */
-void
+static void
 multi_tile(int screen, Position type)
 {
      Client *c;
@@ -430,7 +430,7 @@ multi_tile(int screen, Position type)
  * \param screen Screen to execute this function
  * \param horizont To specify the mirror mode (vertical/horizontal)
  */
-void
+static void
 mirror(int screen, Bool horizontal)
 {
      Client *c;
diff --git a/src/menu.c b/src/menu.c
index 8ded5ee..1301353 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -32,6 +32,14 @@
 
 #include "wmfs.h"
 
+static Bool menu_activate_item(Menu *menu, int i);
+static Bool menu_get_checkstring_needed(MenuItem *mi, int nitem);
+static Bool menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[]);
+static Bool menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[]);
+static int menu_get_longer_string(MenuItem *mi, int nitem);
+static void menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[], int chcklen);
+static void menu_focus_item(Menu *menu, int item, BarWindow *winitem[]);
+
 void
 menu_init(Menu *menu, char *name, int nitem, uint bg_f, char *fg_f, uint bg_n, char *fg_n)
 {
@@ -122,7 +130,7 @@ menu_draw(Menu menu, int x, int y)
      return;
 }
 
-Bool
+static Bool
 menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
 {
      int i, c = 0;
@@ -208,7 +216,7 @@ menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[])
      return quit;
 }
 
-Bool
+static Bool
 menu_activate_item(Menu *menu, int i)
 {
      int j, x, y;
@@ -239,7 +247,7 @@ menu_activate_item(Menu *menu, int i)
      return False;
 }
 
-void
+static void
 menu_focus_item(Menu *menu, int item, BarWindow *winitem[])
 {
      int i;
@@ -268,7 +276,7 @@ menu_focus_item(Menu *menu, int item, BarWindow *winitem[])
      return;
 }
 
-void
+static void
 menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[], int chcklen)
 {
      int x;
@@ -299,7 +307,7 @@ menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[], int chcklen)
      return;
 }
 
-int
+static int
 menu_get_longer_string(MenuItem *mi, int nitem)
 {
      int i, w, l = 0;
@@ -350,7 +358,7 @@ menu_clear(Menu *menu)
      return;
 }
 
-Bool
+static Bool
 menu_get_checkstring_needed(MenuItem *mi, int nitem)
 {
      (void)mi;
diff --git a/src/mouse.c b/src/mouse.c
index 3d75f1f..cb042c6 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -34,7 +34,7 @@
 
 /** Draw the border when a client in dragging/resizing with mouse
  */
-void
+static void
 mouse_dragborder(XRectangle geo, GC g)
 {
      XDrawRectangle(dpy, ROOT, g,
@@ -49,7 +49,7 @@ mouse_dragborder(XRectangle geo, GC g)
 /** Move a client in tile grid with the mouse
  *\param c Client double pointer
  */
-void
+static void
 mouse_move_tile_client(Client **c)
 {
      Client *sc;
@@ -76,7 +76,7 @@ mouse_move_tile_client(Client **c)
 /** Move a client from one tag to another with dah mouse
  *\param c client pointer
  */
-void
+static void
 mouse_move_tag_client(Client *c)
 {
      Window w;
@@ -110,7 +110,7 @@ mouse_move_tag_client(Client *c)
 /** Move the client with the mouse
  * \param c Client pointer
 */
-void
+static void
 mouse_move(Client *c)
 {
      int ocx, ocy, mx, my;
diff --git a/src/status.c b/src/status.c
index ea78f17..e052b43 100644
--- a/src/status.c
+++ b/src/status.c
@@ -38,7 +38,7 @@
   *\param str String
   *\return n Length of r
   */
-int
+static int
 statustext_rectangle(StatusRec *r, char *str)
 {
      char as;
@@ -62,7 +62,7 @@ statustext_rectangle(StatusRec *r, char *str)
   *\param str String
   *\return n Length of g
   */
-int
+static int
 statustext_graph(StatusGraph *g, char *str)
 {
      char as, c, *p;
@@ -112,7 +112,7 @@ statustext_graph(StatusGraph *g, char *str)
   *\param str String
   *\return n Length of s
   */
-int
+static int
 statustext_text(StatusText *s, char *str)
 {
      char as;
@@ -135,7 +135,7 @@ statustext_text(StatusText *s, char *str)
   *\param sc Screen
   *\param str String
   */
-void
+static void
 statustext_normal(int sc, char *str)
 {
      char strwc[MAXSTATUS] = { 0 };
diff --git a/src/tag.c b/src/tag.c
index 5e89d61..473ff4a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -303,6 +303,9 @@ uicb_tag_last(uicb_t cmd)
      return;
 }
 
+static void tag_swap(int s, int t1, int t2);
+static void remove_old_last_tag(int selscreen);
+
 /** Keep that tag the last one
   *\param cmd uicb_t type unused
 */
@@ -471,7 +474,7 @@ uicb_tag_toggle_additional(uicb_t cmd)
   *\param t1 Tag 1
   *\param t2 Tag 2
 */
-void
+static void
 tag_swap(int s, int t1, int t2)
 {
      Client *c;
@@ -552,7 +555,7 @@ uicb_tag_swap_previous(uicb_t cmd)
   *\param s Screen number
   *\param name New tag name
 */
-void
+static void
 tag_new(int s, char *name)
 {
      char * displayedName;
@@ -623,7 +626,7 @@ uicb_tag_new(uicb_t cmd)
   *\param s Screen number
   *\param tag Tag number
 */
-void
+static void
 tag_delete(int s, int tag)
 {
      Tag t;
@@ -719,7 +722,7 @@ uicb_tag_rename(uicb_t cmd)
 /**
   *\param selscreen int
 */
-void
+static void
 remove_old_last_tag(int selscreen)
 {
      int i;
diff --git a/src/viwmfs.c b/src/viwmfs.c
index a8fc7dd..7b9baf3 100644
--- a/src/viwmfs.c
+++ b/src/viwmfs.c
@@ -32,7 +32,7 @@
 
 #include "wmfs.h"
 
-vicmd_to_uicb vicmd[] =
+static vicmd_to_uicb vicmd[] =
 {
      {"r",       "reload"},
      {"q",       "quit"},
@@ -62,7 +62,7 @@ vicmd_to_uicb vicmd[] =
      {"tf",      "toggle_free"},
 };
 
-void
+static void
 viwmfs_help(void)
 {
      size_t i;
diff --git a/src/wmfs.c b/src/wmfs.c
index 800efe3..3821890 100644
--- a/src/wmfs.c
+++ b/src/wmfs.c
@@ -159,7 +159,7 @@ wait_childs_and_status(void)
      pthread_mutex_unlock(&mtx);
 }
 
-void *
+static void *
 thread_status(void *arg)
 {
      (void)arg;
@@ -186,7 +186,7 @@ thread_status(void *arg)
 
 /** WMFS main loop.
  */
-void
+static void
 mainloop(void)
 {
      XEvent ev;
@@ -227,7 +227,7 @@ uicb_quit(uicb_t cmd)
 /** Scan if there are windows on X
  *  for manage it
 */
-void
+static void
 scan(void)
 {
      uint n;
@@ -374,7 +374,7 @@ exec_uicb_function(char *func, char *cmd)
 /** Set statustext
  *\param str Statustext string
 */
-void
+static void
 set_statustext(int s, char *str)
 {
      int i;
@@ -410,7 +410,7 @@ set_statustext(int s, char *str)
 
 /** Update status script by ewmh hint
   */
-void
+static void
 update_status(void)
 {
      if(!check_wmfs_running())
diff --git a/src/wmfs.h b/src/wmfs.h
index e3ad539..09d31d2 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -138,16 +138,11 @@ void draw_image_ofset_text(Drawable d, int x, int y, char* fg, char *str, int x_
 void draw_rectangle(Drawable dr, int x, int y, uint w, uint h, uint color);
 void draw_graph(Drawable dr, int x, int y, uint w, uint h, uint color, char *data);
 
-#ifdef HAVE_IMLIB
-void draw_image(Drawable dr, int x, int y, int w, int h, char *name);
-#endif /* HAVE_IMLIB */
-
 ushort textw(char *text);
 
 /* infobar.c */
 void infobar_init(void);
 void infobar_draw(int sc);
-void infobar_draw_layout(int sc);
 void infobar_draw_selbar(int sc);
 void infobar_draw_taglist(int sc);
 void infobar_update_taglist(int sc);
@@ -161,11 +156,7 @@ void uicb_toggle_tagautohide(uicb_t);
 void client_attach(Client *c);
 void client_configure(Client *c);
 void client_detach(Client *c);
-void client_above(Client *c);
 void client_focus(Client *c);
-Client* client_get_next(void);
-Client* client_get_prev(void);
-Client* client_get_next_with_direction(Position pos);
 /* client_gb_*() {{{ */
 Client* client_gb_win(Window w);
 Client* client_gb_frame(Window w);
@@ -189,7 +180,6 @@ void client_unhide(Client *c);
 void client_focus_next(Client *c);
 void client_unmanage(Client *c);
 void client_unmap(Client *c);
-void client_set_rules(Client *c);
 void client_update_attributes(Client *c);
 void client_urgent(Client *c, Bool u);
 void uicb_client_raise(uicb_t);
@@ -208,7 +198,6 @@ void uicb_client_move(uicb_t cmd);
 void uicb_client_resize(uicb_t cmd);
 void uicb_ignore_next_client_rules(uicb_t cmd);
 void uicb_clientlist(uicb_t cmd);
-void uicb_client_select(uicb_t cmd);
 Bool uicb_checkclist(uicb_t);
 void uicb_client_ignore_tag(uicb_t);
 
@@ -238,46 +227,20 @@ void init_conf(void);
 uint color_shade(uint, double);
 
 /* event.c */
-void buttonpress(XButtonEvent *ev);
-void configureevent(XConfigureRequestEvent *ev);
-void clientmessageevent(XClientMessageEvent *ev);
-void destroynotify(XDestroyWindowEvent *ev);
-void enternotify(XCrossingEvent *ev);
-void expose(XExposeEvent *ev);
-void focusin(XFocusChangeEvent *ev);
 void grabkeys(void);
-void keypress(XKeyPressedEvent *ev);
-void mappingnotify(XMappingEvent *ev);
-void mapnotify(XMapEvent *ev);
-void maprequest(XMapRequestEvent *ev);
-void reparentnotify(XReparentEvent *ev);
-void selectionclearevent(XSelectionClearEvent *ev);
-void propertynotify(XPropertyEvent *ev);
-void unmapnotify(XUnmapEvent *ev);
 void getevent(XEvent ev);
 
 /* menu.c */
 void menu_init(Menu *menu, char *name, int nitem, uint bg_f, char *fg_f, uint bg_n, char *fg_n);
 void menu_new_item(MenuItem *mi, char *name, void *func, char *cmd);
 void menu_draw(Menu menu, int x, int y);
-Bool menu_manage_event(XEvent *ev, Menu *menu, BarWindow *winitem[]);
-Bool menu_activate_item(Menu *menu, int i);
-void menu_focus_item(Menu *menu, int item, BarWindow *winitem[]);
-void menu_draw_item_name(Menu *menu, int item, BarWindow *winitem[], int chcklen);
-int menu_get_longer_string(MenuItem *mi, int nitem);
 void uicb_menu(uicb_t cmd);
 void menu_clear(Menu *menu);
-Bool menu_get_checkstring_needed(MenuItem *mi, int nitem);
 
 /* launcher.c */
-void launcher_execute(Launcher *launcher);
 void uicb_launcher(uicb_t);
 
 /* mouse.c */
-void mouse_dragborder(XRectangle geo, GC g);
-void mouse_move_tile_client(Client **c);
-void mouse_move_tag_client(Client *c);
-void mouse_move(Client *c);
 void mouse_resize(Client *c);
 void mouse_grabbuttons(Client *c, Bool focused);
 void uicb_mouse_move(uicb_t);
@@ -328,18 +291,14 @@ void uicb_tagtransfert_prev(uicb_t);
 void uicb_tag_urgent(uicb_t cmd);
 void tag_additional(int sc, int tag, int adtag);
 void uicb_tag_toggle_additional(uicb_t);
-void tag_swap(int s, int t1, int t2);
 void uicb_tag_swap(uicb_t);
 void uicb_tag_swap_next(uicb_t);
 void uicb_tag_swap_previous(uicb_t);
-void tag_new(int s, char *name);
 void uicb_tag_new(uicb_t);
-void tag_delete(int s, int tag);
 void uicb_tag_del(uicb_t);
 void uicb_tag_rename(uicb_t cmd);
 void uicb_tag_last(uicb_t cmd);
 void uicb_tag_stay_last(uicb_t cmd);
-void remove_old_last_tag(int selscreen);
 
 /* screen.c */
 int screen_count(void);
@@ -354,10 +313,6 @@ void uicb_screen_prev(uicb_t);
 void uicb_screen_prev_sel(uicb_t);
 
 /* status.c */
-int statustext_rectangle(StatusRec *r, char *str);
-int statustext_graph(StatusGraph *g, char *str);
-int statustext_text(StatusText *s, char *str);
-void statustext_normal(int sc, char *str);
 void statustext_handle(int sc, char *str);
 
 /* systray.c */
@@ -375,9 +330,7 @@ void arrange(int screen, Bool update_layout);
 void freelayout(int screen);
 void layoutswitch(Bool b);
 void maxlayout(int screen);
-Client *tiled_client(int screen, Client *c);
 /* tile {{{ */
- void grid(int screen, Bool horizontal);
  void tile(int screen);
  void tile_left(int screen);
  void tile_top(int screen);
@@ -415,12 +368,8 @@ int errorhandler(Display *d, XErrorEvent *event);
 int errorhandlerdummy(Display *d, XErrorEvent *event);
 void quit(void);
 void *thread_process(void *arg);
-void mainloop(void);
-void scan(void);
 Bool check_wmfs_running(void);
 void exec_uicb_function(char *func, char *cmd);
-void set_statustext(int s, char *str);
-void update_status(void);
 void handle_signal(int signum);
 void uicb_quit(uicb_t);
 void uicb_reload(uicb_t);