diff --git a/src/gui/moviebrowser.cpp b/src/gui/moviebrowser.cpp
index 219d90c2f..243a870e2 100644
--- a/src/gui/moviebrowser.cpp
+++ b/src/gui/moviebrowser.cpp
@@ -47,6 +47,8 @@
 #include <config.h>
 #endif
 
+#include <global.h>
+
 #include <algorithm>
 #include <cstdlib>
 #include "moviebrowser.h"
diff --git a/src/gui/movieinfo.cpp b/src/gui/movieinfo.cpp
index 373bf5da4..004a573bc 100644
--- a/src/gui/movieinfo.cpp
+++ b/src/gui/movieinfo.cpp
@@ -46,6 +46,8 @@
 #include <config.h>
 #endif
 
+#include <global.h>
+
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
diff --git a/src/gui/widget/listframe.cpp b/src/gui/widget/listframe.cpp
index a124d993a..b5c79b107 100644
--- a/src/gui/widget/listframe.cpp
+++ b/src/gui/widget/listframe.cpp
@@ -49,6 +49,8 @@
 #include <config.h>
 #endif
 
+#include <global.h>
+
 #include "stdlib.h"
 #include "listframe.h"
 #include <gui/widget/icons.h>
diff --git a/src/gui/widget/listframe.h b/src/gui/widget/listframe.h
index bbabc1b59..0f5a40195 100644
--- a/src/gui/widget/listframe.h
+++ b/src/gui/widget/listframe.h
@@ -44,8 +44,8 @@
 	   Nov 2005		Günther	initial implementation
 ****************************************************************************/
 
-#if !defined(LISTFRAME_H_)
-#define LISTFRAME_H_
+#ifndef __LISTFRAME_H__
+#define __LISTFRAME_H__
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
diff --git a/src/gui/widget/msgbox.cpp b/src/gui/widget/msgbox.cpp
index 704d7a77e..032b4877e 100644
--- a/src/gui/widget/msgbox.cpp
+++ b/src/gui/widget/msgbox.cpp
@@ -48,6 +48,8 @@
 #include <config.h>
 #endif
 
+#include <global.h>
+
 #include "msgbox.h"
 
 #include <gui/widget/icons.h>
diff --git a/src/gui/widget/textbox.cpp b/src/gui/widget/textbox.cpp
index bba0b0d63..938633d2d 100644
--- a/src/gui/widget/textbox.cpp
+++ b/src/gui/widget/textbox.cpp
@@ -55,6 +55,8 @@
 #include <config.h>
 #endif
 
+#include <global.h>
+
 #include "textbox.h"
 #include <gui/widget/icons.h>
 
diff --git a/src/gui/widget/textbox.h b/src/gui/widget/textbox.h
index b639b75b9..09338c6d2 100644
--- a/src/gui/widget/textbox.h
+++ b/src/gui/widget/textbox.h
@@ -59,8 +59,9 @@
 #include <string>
 #include <vector>
 
-#include <global.h>
 #include <driver/fb_window.h>
+#include <gui/color.h>
+#include <gui/customcolor.h>
 
 #define TRACE  printf
 #define TRACE_1 printf