diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7a9a7ce1..988d617b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -245,6 +245,7 @@ if(UNIX AND NOT APPLE)
   if(X11_Xrender_FOUND)
     set(FLTK_LIBRARIES ${FLTK_LIBRARIES} ${X11_Xrender_LIB})
   endif()
+  set(FLTK_LIBRARIES ${FLTK_LIBRARIES} png dl) # needed by Linux Mint
 endif()
 
 # Check for GNUTLS library
diff --git a/tests/perf/fbperf.cxx b/tests/perf/fbperf.cxx
index a19ee479..661a58dd 100644
--- a/tests/perf/fbperf.cxx
+++ b/tests/perf/fbperf.cxx
@@ -20,6 +20,7 @@
 #include <sys/time.h>
 
 #include <FL/Fl.H>
+#include <FL/x.H>
 #include <FL/Fl_Window.H>
 #include <FL/fl_draw.H>
 
diff --git a/vncviewer/Viewport.cxx b/vncviewer/Viewport.cxx
index cd613279..fcb91879 100644
--- a/vncviewer/Viewport.cxx
+++ b/vncviewer/Viewport.cxx
@@ -68,6 +68,7 @@
 
 #include "PlatformPixelBuffer.h"
 
+#include <FL/x.H>
 #include <FL/fl_draw.H>
 #include <FL/fl_ask.H>