6 files changed, 11 insertions, 5 deletions
diff --git a/desktop/cookie_manager.c b/desktop/cookie_manager.c
index 800e97ddf..c0ca16128 100644
--- a/desktop/cookie_manager.c
+++ b/desktop/cookie_manager.c
@@ -22,13 +22,15 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
-#include "content/urldb.h"
-#include "desktop/cookie_manager.h"
-#include "desktop/treeview.h"
 #include "utils/messages.h"
 #include "utils/utils.h"
 #include "utils/log.h"
+#include "content/urldb.h"
+
+#include "desktop/cookie_manager.h"
+#include "desktop/treeview.h"
 
 enum cookie_manager_field {
 	COOKIE_M_NAME,
diff --git a/desktop/global_history.c b/desktop/global_history.c
index ebccfc6b6..7d679e5a2 100644
--- a/desktop/global_history.c
+++ b/desktop/global_history.c
@@ -18,6 +18,7 @@
 
 
 #include <stdlib.h>
+#include <string.h>
 
 #include "utils/messages.h"
 #include "utils/utils.h"
diff --git a/desktop/hotlist.c b/desktop/hotlist.c
index aa4370e96..f0eda841b 100644
--- a/desktop/hotlist.c
+++ b/desktop/hotlist.c
@@ -19,6 +19,7 @@
 
 #include <assert.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include <dom/dom.h>
 #include <dom/bindings/hubbub/parser.h>
diff --git a/desktop/sslcert_viewer.c b/desktop/sslcert_viewer.c
index d465af8d6..20b90bf6c 100644
--- a/desktop/sslcert_viewer.c
+++ b/desktop/sslcert_viewer.c
@@ -486,6 +486,9 @@ void sslcert_viewer_redraw(struct sslcert_session_data *ssl_d,
 		int x, int y, struct rect *clip,
 		const struct redraw_context *ctx)
 {
+	assert(ssl_d != NULL &&
+	       "sslcert_viewer_redraw() given bad session data");
+
 	treeview_redraw(ssl_d->tree, x, y, clip, ctx);
 }
 
diff --git a/desktop/tree.c b/desktop/tree.c
index a17230bc5..15118c3d2 100644
--- a/desktop/tree.c
+++ b/desktop/tree.c
@@ -212,8 +212,6 @@ static bool treeview_test_redraw(struct tree *tree, int x, int y,
 
 	switch (tree->flags) {
 	case TREE_SSLCERT:
-		assert(ssl_current_session != NULL &&
-			"Can't use sslcert window after sslcert_viewer_fini()");
 		sslcert_viewer_redraw(ssl_current_session, x, y, &clip, ctx);
 		return true;
 	case TREE_COOKIES:
diff --git a/desktop/treeview.h b/desktop/treeview.h
index b5de3e713..0b5bbbbd9 100644
--- a/desktop/treeview.h
+++ b/desktop/treeview.h
@@ -26,6 +26,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "desktop/mouse.h"
 #include "desktop/core_window.h"
 #include "desktop/textinput.h"
 #include "utils/types.h"