diff --git a/kitty/glfw.c b/kitty/glfw.c
index 1364bcf4a..79ac0460b 100644
--- a/kitty/glfw.c
+++ b/kitty/glfw.c
@@ -377,7 +377,7 @@ make_os_window_context_current(OSWindow *w) {
 }
 
 
-void
+static inline void
 get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xdpi, double *ydpi) {
     if (w) glfwGetWindowContentScale(w, xscale, yscale);
     else {
diff --git a/kitty/graphics.c b/kitty/graphics.c
index 513c0fce7..6d2212a0e 100644
--- a/kitty/graphics.c
+++ b/kitty/graphics.c
@@ -5,7 +5,6 @@
  * Distributed under terms of the GPL3 license.
  */
 
-#include "gl.h"
 #include "graphics.h"
 #include "state.h"
 
diff --git a/kitty/graphics.h b/kitty/graphics.h
index bc0b8abca..2ecb569dd 100644
--- a/kitty/graphics.h
+++ b/kitty/graphics.h
@@ -77,8 +77,6 @@ typedef struct {
     Image *images;
     size_t count, capacity;
     ImageRenderData *render_data;
-    Image bgimage;
-    ImageRenderData bgimage_rd;
     bool layers_dirty;
     // The number of images below MIN_ZINDEX / 2, then the number of refs between MIN_ZINDEX / 2 and -1 inclusive, then the number of refs above 0 inclusive.
     size_t num_of_below_refs, num_of_negative_refs, num_of_positive_refs;
diff --git a/kitty/shaders.c b/kitty/shaders.c
index 17d9a8439..78bac9327 100644
--- a/kitty/shaders.c
+++ b/kitty/shaders.c
@@ -7,8 +7,6 @@
 
 #include "fonts.h"
 #include "gl.h"
-#include "png-reader.h"
-#include <png.h>
 #include <stddef.h>
 
 enum { CELL_PROGRAM, CELL_BG_PROGRAM, CELL_SPECIAL_PROGRAM, CELL_FG_PROGRAM, BORDERS_PROGRAM, GRAPHICS_PROGRAM, GRAPHICS_PREMULT_PROGRAM, GRAPHICS_ALPHA_MASK_PROGRAM, BLIT_PROGRAM, BGIMAGE_PROGRAM, BGIMAGE_TILED_PROGRAM, NUM_PROGRAMS };
@@ -24,7 +22,6 @@ typedef struct {
 
 static const SpriteMap NEW_SPRITE_MAP = { .xnum = 1, .ynum = 1, .last_num_of_layers = 1, .last_ynum = -1 };
 static GLint max_texture_size = 0, max_array_texture_layers = 0;
-//static uint8_t *bg_image = NULL;
 
 SPRITE_MAP_HANDLE
 alloc_sprite_map(unsigned int cell_width, unsigned int cell_height) {
diff --git a/kitty/state.h b/kitty/state.h
index 838daa8a5..3fb3952de 100644
--- a/kitty/state.h
+++ b/kitty/state.h
@@ -240,7 +240,6 @@ void send_sprite_to_gpu(FONTS_DATA_HANDLE fg, unsigned int, unsigned int, unsign
 void blank_canvas(float, color_type);
 void blank_os_window(OSWindow *);
 void set_titlebar_color(OSWindow *w, color_type color);
-void get_window_content_scale(GLFWwindow *w, float *xscale, float *yscale, double *xdpi, double *ydpi);
 FONTS_DATA_HANDLE load_fonts_data(double, double, double);
 void send_prerendered_sprites_for_window(OSWindow *w);
 #ifdef __APPLE__