diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H
index 68d04aa9e..e2ecdd095 100644
--- a/FL/Fl_Help_View.H
+++ b/FL/Fl_Help_View.H
@@ -26,6 +26,8 @@
 #include "Fl.H"
 #include "Fl_Group.H"
 #include "Fl_Scrollbar.H"
+#include <FL/fl_draw.H>   // this is no longer needed here, but external source code seems to rely on it
+#include <FL/filename.H>  // this is no longer needed here, but external source code seems to rely on it
 
 //
 // System and C++ header files
diff --git a/test/unittests.cxx b/test/unittests.cxx
index 6ffa24fb3..0e38022ff 100644
--- a/test/unittests.cxx
+++ b/test/unittests.cxx
@@ -35,6 +35,7 @@
 #include <FL/fl_draw.H>               // fl_text_extents()
 #include <FL/fl_string_functions.h>   // fl_strdup()
 #include <FL/fl_ask.H>                // fl_message()
+#include <FL/filename.H>              // fl_filename_name
 #include <stdlib.h>                   // malloc, free
 
 class Ut_Main_Window *mainwin = NULL;