diff --git a/src/llua.h b/src/llua.h
index 91330c0b5..f901ba082 100644
--- a/src/llua.h
+++ b/src/llua.h
@@ -31,6 +31,7 @@ extern "C" {
 }
 
 #include <config.h>
+#include "geometry.h"
 
 #ifdef BUILD_MOUSE_EVENTS
 #include "mouse-events.h"
diff --git a/src/x11-settings.cc b/src/x11-settings.cc
index d8b4effa6..2772ba307 100644
--- a/src/x11-settings.cc
+++ b/src/x11-settings.cc
@@ -77,7 +77,7 @@ bool use_xpmdb_setting::set_up(lua::state &l) {
   if (!out_to_x.get(l)) return false;
 
   window.back_buffer =
-      XCreatePixmap(display, window.window, window.width + 1, window.height + 1,
+      XCreatePixmap(display, window.window, window.geometry.get_width() + 1, window.geometry.get_height() + 1,
                     DefaultDepth(display, screen));
   if (window.back_buffer != None) {
     window.drawable = window.back_buffer;
diff --git a/src/x11.cc b/src/x11.cc
index b270ffe59..6efe09087 100644
--- a/src/x11.cc
+++ b/src/x11.cc
@@ -1219,10 +1219,10 @@ void xdbe_swap_buffers() {
 void xpmdb_swap_buffers(void) {
   if (use_xpmdb.get(*state)) {
     XCopyArea(display, window.back_buffer, window.window, window.gc, 0, 0,
-              window.width, window.height, 0, 0);
+              window.geometry.get_width(), window.geometry.get_height(), 0, 0);
     XSetForeground(display, window.gc, 0);
-    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.width,
-                   window.height);
+    XFillRectangle(display, window.drawable, window.gc, 0, 0, window.geometry.get_width(),
+                   window.geometry.get_height());
     XFlush(display);
   }
 }