diff --git a/src/config.c b/src/config.c
index 7c7eb22..5424b6f 100644
--- a/src/config.c
+++ b/src/config.c
@@ -128,7 +128,7 @@ name_to_uint_t mouse_button_list[] =
      {"5", Button5 },
 };
 
-void
+static void
 mouse_section(MouseBinding mb[], struct conf_sec **sec)
 {
      int n;
@@ -143,7 +143,7 @@ mouse_section(MouseBinding mb[], struct conf_sec **sec)
      }
 }
 
-void
+static void
 conf_misc_section(void)
 {
      int pad = 12;
@@ -180,7 +180,7 @@ conf_misc_section(void)
      return;
 }
 
-void
+static void
 conf_bar_section(void)
 {
      struct conf_sec *bar, **mouse, *selbar, *systray;
@@ -238,7 +238,7 @@ conf_bar_section(void)
      return;
 }
 
-void
+static void
 conf_root_section(void)
 {
      struct conf_sec *root, **mouse;
@@ -260,7 +260,7 @@ conf_root_section(void)
      return;
 }
 
-void
+static void
 conf_client_section(void)
 {
      int i, j;
@@ -383,7 +383,7 @@ conf_client_section(void)
      return;
 }
 
-void
+static void
 conf_layout_section(void)
 {
      int i;
@@ -461,7 +461,7 @@ conf_layout_section(void)
      return;
 }
 
-void
+static void
 conf_tag_section(void)
 {
      int i, j, k, l = 0, m, n, sc, count, bar_pos;
@@ -613,7 +613,7 @@ conf_tag_section(void)
      return;
 }
 
-void
+static void
 conf_rule_section(void)
 {
      int i;
@@ -644,7 +644,7 @@ conf_rule_section(void)
      return;
 }
 
-void
+static void
 conf_menu_section(void)
 {
      char *tmp2;
@@ -705,7 +705,7 @@ conf_menu_section(void)
      return;
 }
 
-void
+static void
 conf_launcher_section(void)
 {
      int i;
@@ -731,7 +731,7 @@ conf_launcher_section(void)
      return;
 }
 
-void
+static void
 conf_keybind_section(void)
 {
      int i;
diff --git a/src/getinfo.c b/src/getinfo.c
index b4e2928..a00806c 100644
--- a/src/getinfo.c
+++ b/src/getinfo.c
@@ -42,7 +42,7 @@ uchar *ret;
 
 /** Get information about tag (current, list, names)
  */
-void
+static void
 getinfo_tag(void)
 {
      int tag = 0;
@@ -82,7 +82,7 @@ getinfo_tag(void)
 
 /** Get information about screens
  */
-void
+static void
 getinfo_screen(void)
 {
      int screen = 1;
@@ -108,7 +108,7 @@ getinfo_screen(void)
 
 /** Get current layout name
  */
-void
+static void
 getinfo_layout(void)
 {
      char *layout = NULL;
@@ -129,7 +129,7 @@ getinfo_layout(void)
 
 /** Get information about current mwfact
  */
-void
+static void
 getinfo_mwfact(void)
 {
      char *mwfact = NULL;
@@ -150,7 +150,7 @@ getinfo_mwfact(void)
 
 /** Get information about current nmaster
  */
-void
+static void
 getinfo_nmaster(void)
 {
      int nmaster = 1;
diff --git a/src/init.c b/src/init.c
index 21b01e0..436f1d0 100644
--- a/src/init.c
+++ b/src/init.c
@@ -55,32 +55,9 @@ const func_name_list_t layout_list[] =
      { NULL, NULL }
 };
 
-/** Init WMFS
-*/
-void
-init(void)
-{
-     /* First init */
-     ewmh_init_hints();
-     init_conf();
-     init_gc();
-     init_font();
-     init_cursor();
-     init_key();
-     init_root();
-     screen_init_geo();
-     infobar_init();
-     systray_acquire();
-     init_status();
-     ewmh_update_current_tag_prop();
-     grabkeys();
-
-     return;
-}
-
 /** Init the font
 */
-void
+static void
 init_font(void)
 {
      font = XftFontOpenName(dpy, SCREEN, conf.font);
@@ -100,7 +77,7 @@ init_font(void)
 
 /** Init the graphic context
 */
-void
+static void
 init_gc(void)
 {
      XGCValues gcv;
@@ -127,7 +104,7 @@ init_gc(void)
 
 /** Init WMFS cursor
 */
-void
+static void
 init_cursor(void)
 {
      cursor[CurNormal]      = XCreateFontCursor(dpy, XC_left_ptr);
@@ -141,7 +118,7 @@ init_cursor(void)
 
 /** Init key modifier
 */
-void
+static void
 init_key(void)
 {
      int i, j;
@@ -160,7 +137,7 @@ init_key(void)
 
 /** Init root Window
 */
-void
+static void
 init_root(void)
 {
      XSetWindowAttributes at;
@@ -183,7 +160,7 @@ init_root(void)
 
 /** Init statustext shell script
   */
-void
+static void
 init_status(void)
 {
      struct stat st;
@@ -218,3 +195,26 @@ init_status(void)
      return;
 }
 
+/** Init WMFS
+*/
+void
+init(void)
+{
+     /* First init */
+     ewmh_init_hints();
+     init_conf();
+     init_gc();
+     init_font();
+     init_cursor();
+     init_key();
+     init_root();
+     screen_init_geo();
+     infobar_init();
+     systray_acquire();
+     init_status();
+     ewmh_update_current_tag_prop();
+     grabkeys();
+
+     return;
+}
+
diff --git a/src/wmfs.h b/src/wmfs.h
index 843d12e..89aa47c 100644
--- a/src/wmfs.h
+++ b/src/wmfs.h
@@ -400,20 +400,8 @@ Bool uicb_checklayout(uicb_t);
 
 /* init.c */
 void init(void);
-void init_root(void);
-void init_font(void);
-void init_gc(void);
-void init_cursor(void);
-void init_key(void);
-void init_geometry(void);
-void init_status(void);
 
 /* getinfo.c */
-void getinfo_tag(void);
-void getinfo_screen(void);
-void getinfo_layout(void);
-void getinfo_mwfact(void);
-void getinfo_nmaster(void);
 void getinfo(char *info);
 
 /* viwmfs.c */