7 files changed, 4 insertions, 23 deletions
diff --git a/lib/DllLibbluray.h b/lib/DllLibbluray.h
index 1ce320d825..b7d9ff2272 100644
--- a/lib/DllLibbluray.h
+++ b/lib/DllLibbluray.h
@@ -18,8 +18,6 @@
  *
  */
 #pragma once
-#include "system.h"
-#ifdef HAVE_LIBBLURAY
 
 #include "DynamicDll.h"
 
@@ -196,5 +194,3 @@ public:
   static BD_DIR_H *dir_open(const char* dirname);
   static void      bluray_logger(const char* msg);
 };
-
-#endif
diff --git a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
index 65d2f88331..7c587b4c56 100644
--- a/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
+++ b/xbmc/cores/VideoPlayer/DVDInputStreams/DVDInputStreamBluray.cpp
@@ -18,7 +18,6 @@
  *
  */
 #include "system.h"
-#ifdef HAVE_LIBBLURAY
 
 #include <functional>
 
@@ -1237,5 +1236,3 @@ void CDVDInputStreamBluray::SetupPlayerSettings()
   m_dll->bd_set_player_setting_str(m_bd, BLURAY_PLAYER_CACHE_ROOT, cacheDir.c_str());
 #endif
 }
-
-#endif
diff --git a/xbmc/filesystem/BlurayDirectory.cpp b/xbmc/filesystem/BlurayDirectory.cpp
index 8bf3b62d91..95f0deb63c 100644
--- a/xbmc/filesystem/BlurayDirectory.cpp
+++ b/xbmc/filesystem/BlurayDirectory.cpp
@@ -17,8 +17,6 @@
  *  <http://www.gnu.org/licenses/>.
  *
  */
-#include "system.h"
-#ifdef HAVE_LIBBLURAY
 #include "BlurayDirectory.h"
 #include "utils/log.h"
 #include "utils/URIUtils.h"
@@ -204,4 +202,3 @@ CURL CBlurayDirectory::GetUnderlyingCURL(const CURL& url)
 }
 
 } /* namespace XFILE */
-#endif
diff --git a/xbmc/filesystem/BlurayFile.cpp b/xbmc/filesystem/BlurayFile.cpp
index 412ba51b0c..54620289e6 100644
--- a/xbmc/filesystem/BlurayFile.cpp
+++ b/xbmc/filesystem/BlurayFile.cpp
@@ -18,9 +18,6 @@
  *
  */
 
-#include "system.h"
-#ifdef HAVE_LIBBLURAY
-
 #include "BlurayFile.h"
 #include "URL.h"
 #include <assert.h>
@@ -47,4 +44,3 @@ namespace XFILE
     return host.append(filename);
   }
 } /* namespace XFILE */
-#endif
diff --git a/xbmc/settings/CMakeLists.txt b/xbmc/settings/CMakeLists.txt
index 39bd69d652..2f2eb717a6 100644
--- a/xbmc/settings/CMakeLists.txt
+++ b/xbmc/settings/CMakeLists.txt
@@ -1,6 +1,5 @@
 set(SOURCES AdvancedSettings.cpp
             AudioDSPSettings.cpp
-            DiscSettings.cpp
             DisplaySettings.cpp
             MediaSettings.cpp
             MediaSourceSettings.cpp
@@ -34,4 +33,8 @@ set(HEADERS AdvancedSettings.h
             SkinSettings.h
             VideoSettings.h)
 
+if(BLURAY_FOUND)
+  list(APPEND SOURCES DiscSettings.cpp)
+endif()
+
 core_add_library(settings)
diff --git a/xbmc/settings/DiscSettings.cpp b/xbmc/settings/DiscSettings.cpp
index 1c910e2c08..fc6049c05c 100644
--- a/xbmc/settings/DiscSettings.cpp
+++ b/xbmc/settings/DiscSettings.cpp
@@ -18,9 +18,6 @@
  *
  */
 
-#include "system.h"
-#ifdef HAVE_LIBBLURAY
-
 #include <string>
 
 #include "DiscSettings.h"
@@ -88,4 +85,3 @@ void CDiscSettings::OnSettingChanged(std::shared_ptr<const CSetting> setting)
   }
 #endif
 }
-#endif
diff --git a/xbmc/settings/DiscSettings.h b/xbmc/settings/DiscSettings.h
index fe38eea23e..2517b04773 100644
--- a/xbmc/settings/DiscSettings.h
+++ b/xbmc/settings/DiscSettings.h
@@ -29,9 +29,6 @@ enum BDPlaybackMode
   BD_PLAYBACK_MAIN_TITLE,
 };
 
-#include "system.h"
-#ifdef HAVE_LIBBLURAY
-
 #include "settings/lib/ISettingCallback.h"
 
 class DllLibbluray;
@@ -51,4 +48,3 @@ protected:
   DllLibbluray*       m_dll;
 
 };
-#endif