6 files changed, 11 insertions, 5 deletions
diff --git a/desktop/browser_window.c b/desktop/browser_window.c
index 546198f88..32247062e 100644
--- a/desktop/browser_window.c
+++ b/desktop/browser_window.c
@@ -27,6 +27,7 @@
 #include "utils/config.h"
 
 #include <stdlib.h>
+#include <string.h>
 #include <math.h>
 #include <nsutils/time.h>
 
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a4532fefa..a141d7d23 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -19,6 +19,7 @@
 #include <stdlib.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <string.h>
 
 #include "utils/config.h"
 #include "utils/errors.h"
diff --git a/desktop/search.c b/desktop/search.c
index d4abfed92..e21f520a6 100644
--- a/desktop/search.c
+++ b/desktop/search.c
@@ -26,7 +26,7 @@
 #include <stdbool.h>
 
 #include "utils/errors.h"
-#include "content/content.h"
+#include "content/textsearch.h"
 #include "netsurf/types.h"
 #include "netsurf/browser_window.h"
 
diff --git a/desktop/search.h b/desktop/search.h
index baf382e77..c39d1d8a3 100644
--- a/desktop/search.h
+++ b/desktop/search.h
@@ -16,11 +16,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _NETSURF_DESKTOP_SEARCH_H_
-#define _NETSURF_DESKTOP_SEARCH_H_
+/**
+ * \file
+ * Browseing window text search interface
+ */
 
-#include <ctype.h>
-#include <string.h>
+#ifndef NETSURF_DESKTOP_SEARCH_H_
+#define NETSURF_DESKTOP_SEARCH_H_
 
 struct browser_window;
 
diff --git a/desktop/searchweb.c b/desktop/searchweb.c
index 2c0873de5..597b8fffe 100644
--- a/desktop/searchweb.c
+++ b/desktop/searchweb.c
@@ -22,6 +22,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils/utils.h"
 #include "utils/log.h"
diff --git a/desktop/selection.c b/desktop/selection.c
index 417a504b3..332e9dafa 100644
--- a/desktop/selection.c
+++ b/desktop/selection.c
@@ -23,6 +23,7 @@
  */
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "netsurf/clipboard.h"
 #include "netsurf/browser_window.h"