Index: draw_png.c
===================================================================
--- draw_png.c	(revision 36222)
+++ draw_png.c	(revision 36223)
@@ -41,13 +41,8 @@
 #include <librnd/core/color.h>
 #include <librnd/core/color_cache.h>
 #include <librnd/core/error.h>
-#include <librnd/core/misc_util.h>
-#include <librnd/core/compat_misc.h>
 #include <librnd/core/plugins.h>
-#include <librnd/core/safe_fs.h>
-
 #include <librnd/core/hid.h>
-#include <librnd/core/hid_nogui.h>
 
 #include <gd.h>
 
Index: draw_png.h
===================================================================
--- draw_png.h	(revision 36222)
+++ draw_png.h	(revision 36223)
@@ -26,6 +26,8 @@
   *    mailing list: pcb-rnd (at) list.repo.hu (send "subscribe")
   */
 
+#include <librnd/core/color_cache.h>
+
 typedef struct color_struct {
 	int c;                   /* the descriptor used by the gd library */
 	unsigned int r, g, b, a; /* so I can figure out what rgb value c refers to */
Index: png.c
===================================================================
--- png.c	(revision 36222)
+++ png.c	(revision 36223)
@@ -41,8 +41,6 @@
 #include <math.h>
 
 #include "board.h"
-#include <librnd/core/color.h>
-#include <librnd/core/color_cache.h>
 #include "data.h"
 #include "draw.h"
 #include <librnd/core/error.h>