diff --git a/src/gui/channellist.h b/src/gui/channellist.h
index 34e33d7c6..31bb61fec 100644
--- a/src/gui/channellist.h
+++ b/src/gui/channellist.h
@@ -35,7 +35,7 @@
 
 #include <driver/framebuffer.h>
 #include <gui/widget/menue.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <system/lastchannel.h>
 
 #include <sectionsdclient/sectionsdclient.h>
diff --git a/src/gui/components/cc.h b/src/gui/components/cc.h
index 9e4dd3da2..730f7b8c2 100644
--- a/src/gui/components/cc.h
+++ b/src/gui/components/cc.h
@@ -29,7 +29,7 @@
 #include <driver/framebuffer.h>
 #include <gui/color.h>
 #include <gui/customcolor.h>
-#include "textbox.h"
+#include <gui/widget/textbox.h>
 #include <vector>
 #include <string>
 
diff --git a/src/gui/imageinfo.h b/src/gui/imageinfo.h
index 170820f88..e4ca0ec92 100644
--- a/src/gui/imageinfo.h
+++ b/src/gui/imageinfo.h
@@ -28,7 +28,7 @@
 #include <gui/widget/menue.h>
 #include <system/localize.h>
 #include <driver/framebuffer.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 
 
 class CImageInfo : public CMenuTarget
diff --git a/src/gui/streaminfo2.h b/src/gui/streaminfo2.h
index 014353695..e6a8f2359 100644
--- a/src/gui/streaminfo2.h
+++ b/src/gui/streaminfo2.h
@@ -26,7 +26,7 @@
 #include <gui/widget/menue.h>
 
 #include <driver/framebuffer.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
 #include <gui/widget/progressbar.h>
 #include <zapit/femanager.h>
 
diff --git a/src/gui/test_menu.h b/src/gui/test_menu.h
index 7b582286e..7e7fa47f9 100644
--- a/src/gui/test_menu.h
+++ b/src/gui/test_menu.h
@@ -31,7 +31,7 @@
 
 #include <gui/widget/menue.h>
 #include <gui/widget/icons.h>
-#include <gui/widget/components.h>
+#include <gui/components/cc.h>
  #define TEST_MENU
 
 #include <string>