diff --git a/src/driver/pictureviewer/pictureviewer.cpp b/src/driver/pictureviewer/pictureviewer.cpp
index 73377915f..d3f8820a2 100644
--- a/src/driver/pictureviewer/pictureviewer.cpp
+++ b/src/driver/pictureviewer/pictureviewer.cpp
@@ -560,9 +560,11 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
 
 		// add neccessary paths to v_path
 		v_path.clear();
+#ifdef ENABLE_LCD4LINUX
 		if (lcd4l_mode)
 			v_path.push_back(g_settings.lcd4l_logodir);
 		v_path.push_back(g_settings.logo_hdd_dir);
+#endif
 		if (g_settings.logo_hdd_dir != LOGODIR_VAR)
 			v_path.push_back(LOGODIR_VAR);
 		if (g_settings.logo_hdd_dir != LOGODIR)
@@ -663,9 +665,11 @@ bool CPictureViewer::GetLogoName(const uint64_t &ChannelID, const std::string &C
 
 		for (size_t f = 0; f < v_file.size(); f++)
 		{
+#ifdef ENABLE_LCD4LINUX
 			// process g_settings.lcd4l_logodir
 			if (lcd4l_mode)
 				v_path.push_back(g_settings.lcd4l_logodir + "/" + v_file[f] + fileType[i]);
+#endif
 			// process g_settings.logo_hdd_dir
 			v_path.push_back(g_settings.logo_hdd_dir + "/" + v_file[f] + fileType[i]);
 			// process LOGODIR_VAR
diff --git a/src/gui/osd_setup.cpp b/src/gui/osd_setup.cpp
index 793dba0b5..0d3589923 100644
--- a/src/gui/osd_setup.cpp
+++ b/src/gui/osd_setup.cpp
@@ -68,9 +68,11 @@
 
 #include <hardware/video.h>
 
+#ifdef ENABLE_LCD4LINUX
 // lcd4l-support
 #include "driver/lcd4l.h"
 extern CLCD4l *LCD4l;
+#endif
 
 extern CRemoteControl * g_RemoteControl;
 
@@ -1578,10 +1580,12 @@ bool COsdSetup::changeNotify(const neutrino_locale_t OptionName, void * data)
 		CVolumeHelper::getInstance()->refresh();
 		return false;
 	}
+#ifdef ENABLE_LCD4LINUX
 	else if (ARE_LOCALES_EQUAL(OptionName, LOCALE_CHANNELLIST_SHOW_EVENTLOGO))
 	{
 		LCD4l->ResetParseID();
 	}
+#endif
 	else if ((ARE_LOCALES_EQUAL(OptionName, LOCALE_MISCSETTINGS_INFOCLOCK)) ||
 		 (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SIZE_HEIGHT)) ||
 		 (ARE_LOCALES_EQUAL(OptionName, LOCALE_CLOCK_SECONDS))) {