diff --git a/client.c b/client.c
index c2bb5e7cc..590de4f00 100644
--- a/client.c
+++ b/client.c
@@ -382,7 +382,7 @@ manage(Display *disp, DC *drawcontext, Window w, XWindowAttributes *wa, awesome_
     c->oldborder = wa->border_width;
     c->display = disp;
     c->phys_screen = get_phys_screen(c->display, c->screen);
-    screen_info = get_screen_info(c->display, c->screen, NULL, &i);
+    screen_info = get_screen_info(c->display, c->screen, NULL);
     if(c->w == screen_info[c->screen].width && c->h == screen_info[c->screen].height)
     {
         c->x = 0;
diff --git a/event.c b/event.c
index 04ca64cca..8563600ed 100644
--- a/event.c
+++ b/event.c
@@ -60,7 +60,7 @@ movemouse(Client * c, awesome_config *awesomeconf)
     XEvent ev;
     ScreenInfo *si;
 
-    si = get_screen_info(c->display, c->screen, NULL, &x1);
+    si = get_screen_info(c->display, c->screen, NULL);
 
     ocx = nx = c->x;
     ocy = ny = c->y;
@@ -271,7 +271,7 @@ void
 handle_event_configurenotify(XEvent * e, awesome_config *awesomeconf)
 {
     XConfigureEvent *ev = &e->xconfigure;
-    int screen, dummy;
+    int screen;
     ScreenInfo *si;
 
     for(screen = 0; screen < ScreenCount(e->xany.display); screen++)
@@ -282,7 +282,7 @@ handle_event_configurenotify(XEvent * e, awesome_config *awesomeconf)
             DisplayWidth(e->xany.display, screen) = ev->width;
             DisplayHeight(e->xany.display, screen) = ev->height;
 
-            si = get_screen_info(e->xany.display, screen, NULL, &dummy);
+            si = get_screen_info(e->xany.display, screen, NULL);
             XFreePixmap(e->xany.display, awesomeconf[screen].statusbar.drawable);
             awesomeconf[screen].statusbar.drawable = XCreatePixmap(e->xany.display, RootWindow(e->xany.display, screen),
                                                                    si[screen].width,
diff --git a/layout.c b/layout.c
index 921acf8cd..124abf0ac 100644
--- a/layout.c
+++ b/layout.c
@@ -224,8 +224,7 @@ uicb_togglemax(Display *disp,
                awesome_config *awesomeconf,
                const char *arg __attribute__ ((unused)))
 {
-    int dummy;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar, &dummy);
+    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 
     maximize(si[awesomeconf->screen].x_org, si[awesomeconf->screen].y_org,
              si[awesomeconf->screen].width - 2 * awesomeconf->borderpx,
@@ -240,8 +239,7 @@ uicb_toggleverticalmax(Display *disp,
                        awesome_config *awesomeconf,
                        const char *arg __attribute__ ((unused)))
 {
-    int dummy;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar, &dummy);
+    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 
     if(sel)
         maximize(sel->x, si[awesomeconf->screen].y_org,
@@ -257,8 +255,7 @@ uicb_togglehorizontalmax(Display *disp,
                          awesome_config *awesomeconf,
                          const char *arg __attribute__ ((unused)))
 {
-    int dummy;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar, &dummy);
+    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 
     if(sel)
         maximize(si[awesomeconf->screen].x_org, sel->y,
diff --git a/layouts/max.c b/layouts/max.c
index 15668e9fd..780b873a4 100644
--- a/layouts/max.c
+++ b/layouts/max.c
@@ -30,8 +30,7 @@ void
 layout_max(Display *disp, awesome_config *awesomeconf)
 {
     Client *c;
-    int screen_number = 0;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar, &screen_number);
+    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
 
     for(c = clients; c; c = c->next)
         if(IS_TILED(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags))
diff --git a/layouts/tile.c b/layouts/tile.c
index b91f9f199..64e0ee483 100644
--- a/layouts/tile.c
+++ b/layouts/tile.c
@@ -101,12 +101,11 @@ _tile(Display *disp, awesome_config *awesomeconf, const Bool right)
     /* master size */
     unsigned int mw = 0, mh = 0;
     int n, i, masterwin = 0, otherwin = 0;
-    int screen_numbers = 1;
     int real_ncols = 1, win_by_col = 1, current_col = 0;
     ScreenInfo *screens_info = NULL;
     Client *c;
 
-    screens_info = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar, &screen_numbers);
+    screens_info = get_screen_info(disp, awesomeconf->screen, &awesomeconf->statusbar);
  
     for(n = 0, c = clients; c; c = c->next)
         if(IS_TILED(c, awesomeconf->screen, awesomeconf->tags, awesomeconf->ntags))
diff --git a/screen.c b/screen.c
index f0e6e7bbd..e541d1087 100644
--- a/screen.c
+++ b/screen.c
@@ -34,30 +34,26 @@ extern Client *sel, *clients;
  * \return ScreenInfo struct array with all screens info
  */
 ScreenInfo *
-get_screen_info(Display *disp, int screen, Statusbar *statusbar, int *screen_number)
+get_screen_info(Display *disp, int screen, Statusbar *statusbar)
 {
-    int i, fake_screen_number = 0;
+    int i, screen_number = 0;
     ScreenInfo *si;
 
     if(XineramaIsActive(disp))
-    {
-        si = XineramaQueryScreens(disp, screen_number);
-        fake_screen_number = *screen_number;
-    }
+        si = XineramaQueryScreens(disp, &screen_number);
     else
     {
         /* emulate Xinerama info but only fill the screen we want */
-        *screen_number =  1;
         si = p_new(ScreenInfo, screen + 1);
         si[screen].width = DisplayWidth(disp, screen);
         si[screen].height = DisplayHeight(disp, screen);
         si[screen].x_org = 0;
         si[screen].y_org = 0;
-        fake_screen_number = screen + 1;
+        screen_number = screen + 1;
     }
 
     if(statusbar)
-        for(i = 0; i < fake_screen_number; i++)
+        for(i = 0; i < screen_number; i++)
         {
             if(statusbar->position == BarTop 
                || statusbar->position == BarBot)
@@ -101,15 +97,15 @@ int
 get_screen_bycoord(Display *disp, int x, int y)
 {
     ScreenInfo *si;
-    int screen_number, i;
+    int i;
 
     /* don't waste our time */
     if(!XineramaIsActive(disp))
         return DefaultScreen(disp);
 
-    si = get_screen_info(disp, 0, NULL, &screen_number);
+    si = get_screen_info(disp, 0, NULL);
 
-    for(i = 0; i < screen_number; i++)
+    for(i = 0; i < get_screen_count(disp); i++)
         if(x >= si[i].x_org && x < si[i].x_org + si[i].width
            && y >= si[i].y_org && y < si[i].y_org + si[i].height)
         {
@@ -163,7 +159,7 @@ move_client_to_screen(Client *c, awesome_config *acf_new, Bool doresize)
     for(i = 0; i < acf_new->ntags; i++)
         c->tags[i] = acf_new->tags[i].selected;
     
-    si = get_screen_info(c->display, c->screen, &acf_new->statusbar, &i);
+    si = get_screen_info(c->display, c->screen, &acf_new->statusbar);
     c->rx = si[c->screen].x_org;
     c->ry = si[c->screen].y_org;
     if(doresize)
@@ -176,8 +172,7 @@ move_mouse_pointer_to_screen(Display *disp, int screen)
 {
     if(XineramaIsActive(disp))
     {
-        int dummy;
-        ScreenInfo *si = get_screen_info(disp, screen, NULL, &dummy);
+        ScreenInfo *si = get_screen_info(disp, screen, NULL);
         XWarpPointer(disp, None, DefaultRootWindow(disp), 0, 0, 0, 0, si[screen].x_org, si[screen].y_org);
         XFree(si);
     }
diff --git a/screen.h b/screen.h
index fe8ce7c12..a80c5d8a5 100644
--- a/screen.h
+++ b/screen.h
@@ -28,7 +28,7 @@
 
 typedef XineramaScreenInfo ScreenInfo;
 
-ScreenInfo * get_screen_info(Display *, int, Statusbar *, int *);
+ScreenInfo * get_screen_info(Display *, int, Statusbar *);
 ScreenInfo * get_display_info(Display *, int, Statusbar *);
 int get_screen_bycoord(Display *, int, int);
 int get_screen_count(Display *);
diff --git a/statusbar.c b/statusbar.c
index 05211f105..8978a8174 100644
--- a/statusbar.c
+++ b/statusbar.c
@@ -51,7 +51,7 @@ void
 drawstatusbar(Display *disp, DC *drawcontext, awesome_config * awesomeconf)
 {
     int x, i;
-    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, NULL, &i);
+    ScreenInfo *si = get_screen_info(disp, awesomeconf->screen, NULL);
 
     drawcontext->x = drawcontext->y = 0;
     for(i = 0; i < awesomeconf->ntags; i++)
@@ -108,14 +108,14 @@ void
 initstatusbar(Display *disp, int screen, DC *drawcontext, Statusbar *statusbar)
 {
     XSetWindowAttributes wa;
-    int screen_number, phys_screen;
+    int phys_screen;
     ScreenInfo *si;
 
     phys_screen = get_phys_screen(disp, screen);
 
     statusbar->screen = screen;
 
-    si = get_screen_info(disp, screen, NULL, &screen_number);
+    si = get_screen_info(disp, screen, NULL);
 
     wa.event_mask = SubstructureRedirectMask | SubstructureNotifyMask
         | EnterWindowMask | LeaveWindowMask | StructureNotifyMask;
@@ -140,8 +140,7 @@ void
 updatebarpos(Display *disp, Statusbar statusbar)
 {
     XEvent ev;
-    int dummy;
-    ScreenInfo *si = get_screen_info(disp, statusbar.screen, NULL, &dummy);
+    ScreenInfo *si = get_screen_info(disp, statusbar.screen, NULL);
 
     switch (statusbar.position)
     {