optimized qmake files

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7030 90c681e8-e032-0410-971d-27865f9a5e38

69 files changed, 28 insertions, 450 deletions

diff --git a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
index 16ee5dcfc..8e6612e47 100644
--- a/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
+++ b/src/plugins/CommandLineOptions/IncDecVolumeOption/IncDecVolumeOption.pro
@@ -8,18 +8,12 @@ TARGET =$$PLUGINS_PREFIX/CommandLineOptions/incdecvolumeoption
 QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libincdecvolumeoption.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/CommandLineOptions
 INSTALLS += target
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 HEADERS += incdecvolumeoption.h
diff --git a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
index fd1522a17..c6f26b781 100644
--- a/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
+++ b/src/plugins/CommandLineOptions/PlayListOption/PlayListOption.pro
@@ -8,18 +8,12 @@ TARGET =$$PLUGINS_PREFIX/CommandLineOptions/playlistoption
 QMAKE_CLEAN =$$PLUGINS_PREFIX/CommandLineOptions/libplaylistoption.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/CommandLineOptions
 INSTALLS += target
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 HEADERS += playlistoption.h
diff --git a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
index 5c63eb0e4..a3cbd7c92 100644
--- a/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
+++ b/src/plugins/CommandLineOptions/SeekOption/SeekOption.pro
@@ -8,18 +8,12 @@ TARGET = $$PLUGINS_PREFIX/CommandLineOptions/seekoption
 QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libseekoption.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/CommandLineOptions
 INSTALLS += target
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 HEADERS += seekoption.h
diff --git a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
index d988e1f35..8d9943f3e 100644
--- a/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
+++ b/src/plugins/CommandLineOptions/StatusOption/StatusOption.pro
@@ -8,18 +8,12 @@ TARGET = $$PLUGINS_PREFIX/CommandLineOptions/statusoption
 QMAKE_CLEAN = $$PLUGINS_PREFIX/CommandLineOptions/libstatusoption.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/CommandLineOptions
 INSTALLS += target
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 HEADERS += statusoption.h
diff --git a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro
index 424ca252f..d84f8b86e 100644
--- a/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro
+++ b/src/plugins/CommandLineOptions/UninstallOption/UninstallOption.pro
@@ -7,28 +7,9 @@ plugin  \
 TARGET = $$PLUGINS_PREFIX/CommandLineOptions/uninstalloption
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../bin
 
-TRANSLATIONS = translations/uninstall_plugin_cs.ts \
-               translations/uninstall_plugin_de.ts \
-               translations/uninstall_plugin_pl.ts \
-               translations/uninstall_plugin_ru.ts \
-               translations/uninstall_plugin_uk_UA.ts \
-               translations/uninstall_plugin_zh_TW.ts \
-               translations/uninstall_plugin_zh_CN.ts \
-               translations/uninstall_plugin_it.ts \
-               translations/uninstall_plugin_tr.ts \
-               translations/uninstall_plugin_lt.ts \
-               translations/uninstall_plugin_nl.ts \
-               translations/uninstall_plugin_ja.ts \
-               translations/uninstall_plugin_es.ts \
-               translations/uninstall_plugin_sr_BA.ts \
-               translations/uninstall_plugin_sr_RS.ts
 RESOURCES = translations/translations.qrc
 
-
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui0 -lqmmp0
 
 HEADERS += uninstalloption.h
diff --git a/src/plugins/Effect/bs2b/bs2b.pro b/src/plugins/Effect/bs2b/bs2b.pro
index c4dd9419d..388e26348 100644
--- a/src/plugins/Effect/bs2b/bs2b.pro
+++ b/src/plugins/Effect/bs2b/bs2b.pro
@@ -10,22 +10,17 @@ SOURCES += bs2bplugin.cpp \
 
 TARGET =$$PLUGINS_PREFIX/Effect/bs2b
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
 
@@ -35,6 +30,5 @@ unix {
 }
 
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lbs2b
 }
diff --git a/src/plugins/Effect/crossfade/crossfade.pro b/src/plugins/Effect/crossfade/crossfade.pro
index 7298a4939..df93c9b73 100644
--- a/src/plugins/Effect/crossfade/crossfade.pro
+++ b/src/plugins/Effect/crossfade/crossfade.pro
@@ -10,21 +10,16 @@ SOURCES += crossfadeplugin.cpp \
 
 TARGET =$$PLUGINS_PREFIX/Effect/crossfade
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
 
@@ -33,7 +28,6 @@ unix {
 }
 
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0
 }
 
diff --git a/src/plugins/Effect/ladspa/ladspa.pro b/src/plugins/Effect/ladspa/ladspa.pro
index 59f18dacd..383c76de1 100644
--- a/src/plugins/Effect/ladspa/ladspa.pro
+++ b/src/plugins/Effect/ladspa/ladspa.pro
@@ -14,12 +14,10 @@ SOURCES += ladspahost.cpp \
     ladspabutton.cpp
 TARGET = $$PLUGINS_PREFIX/Effect/ladspa
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Effect/libladspa.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include
@@ -27,7 +25,6 @@ LIBS += -lqmmp \
 linux-g++|linux-g++-32|linux-g++-64:LIBS += -ldl
 
 RESOURCES = translations/translations.qrc
-isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Effect
 INSTALLS += target
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Effect/soxr/soxr.pro b/src/plugins/Effect/soxr/soxr.pro
index 3c703bbbf..49e03b78f 100644
--- a/src/plugins/Effect/soxr/soxr.pro
+++ b/src/plugins/Effect/soxr/soxr.pro
@@ -10,7 +10,6 @@ SOURCES += soxresampler.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Effect/soxr
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Effect/libsoxr.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin
 
@@ -19,19 +18,14 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
     CONFIG += link_pkgconfig
     PKGCONFIG += soxr
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp -L/usr/lib -I/usr/include
 }
 
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lsoxr
 }
 
diff --git a/src/plugins/Effect/stereo/stereo.pro b/src/plugins/Effect/stereo/stereo.pro
index c89c2309d..4e605e39e 100644
--- a/src/plugins/Effect/stereo/stereo.pro
+++ b/src/plugins/Effect/stereo/stereo.pro
@@ -10,21 +10,16 @@ SOURCES += stereoplugin.cpp \
 
 TARGET =$$PLUGINS_PREFIX/Effect/stereo
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 FORMS += settingsdialog.ui
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/Effect
     INSTALLS += target
 
@@ -33,6 +28,5 @@ unix {
 }
 
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0
 }
diff --git a/src/plugins/Engines/mplayer/mplayer.pro b/src/plugins/Engines/mplayer/mplayer.pro
index 5f6575c45..a51de2a0b 100644
--- a/src/plugins/Engines/mplayer/mplayer.pro
+++ b/src/plugins/Engines/mplayer/mplayer.pro
@@ -9,16 +9,13 @@ SOURCES += mplayerengine.cpp \
     mplayermetadatamodel.cpp
 TARGET = $$PLUGINS_PREFIX/Engines/mplayer
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Engines/libmplayer.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -L/usr/lib
 
 RESOURCES = translations/translations.qrc
-isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Engines
 INSTALLS += target
 FORMS += settingsdialog.ui
diff --git a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
index dd30694b6..a17e19c10 100644
--- a/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
+++ b/src/plugins/FileDialogs/QmmpFileDialog/QmmpFileDialog.pro
@@ -1,7 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
-
 TARGET =$$PLUGINS_PREFIX/FileDialogs/qmmpfiledialog
 
 
@@ -18,14 +16,9 @@ CONFIG += warn_on plugin
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES += translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/FileDialogs
     INSTALLS += target
 
@@ -35,5 +28,4 @@ unix {
 
 win32 {
     LIBS += -lqmmpui0 -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
diff --git a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
index 51e0f9e9c..c341e3fff 100644
--- a/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
+++ b/src/plugins/FileDialogs/TwoPanelFileDialog/TwoPanelFileDialog.pro
@@ -1,7 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
-
 TARGET =$$PLUGINS_PREFIX/FileDialogs/twopanelfiledialog
 
 
@@ -18,14 +16,9 @@ CONFIG += warn_on plugin
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES += translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/FileDialogs
     INSTALLS += target
 
@@ -35,5 +28,4 @@ unix {
 
 win32 {
     LIBS += -lqmmpui0 -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
diff --git a/src/plugins/General/converter/converter.pro b/src/plugins/General/converter/converter.pro
index 6808448b7..938601bb7 100644
--- a/src/plugins/General/converter/converter.pro
+++ b/src/plugins/General/converter/converter.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -10,19 +9,15 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libconverter.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
 PKGCONFIG += taglib
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc presets.qrc
+
 unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/copypaste/copypaste.pro b/src/plugins/General/copypaste/copypaste.pro
index ca77c3d2f..6610a4f2f 100644
--- a/src/plugins/General/copypaste/copypaste.pro
+++ b/src/plugins/General/copypaste/copypaste.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcopypaste.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
-unix : LIBS += -lqmmpui -lqmmp
+unix:LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
-win32 : LIBS += -lqmmpui0 -lqmmp0
+win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/covermanager/covermanager.pro b/src/plugins/General/covermanager/covermanager.pro
index 72caa1482..311798b3b 100644
--- a/src/plugins/General/covermanager/covermanager.pro
+++ b/src/plugins/General/covermanager/covermanager.pro
@@ -2,8 +2,6 @@ include(../../plugins.pri)
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
-win32:QMAKE_LIBDIR += ../../../../bin
 TARGET = $$PLUGINS_PREFIX/General/covermanager
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libcovermanager.so
 TRANSLATIONS = translations/covermanager_plugin_cs.ts \
@@ -24,8 +22,7 @@ TRANSLATIONS = translations/covermanager_plugin_cs.ts \
 
 RESOURCES = translations/translations.qrc \
             images/cm_images.qrc
-unix { 
-    isEmpty(LIB_DIR):LIB_DIR = /lib
+unix {
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
@@ -37,9 +34,8 @@ SOURCES += covermanagerfactory.cpp \
     coverwidget.cpp \
     covermanager.cpp
 QT += network
-INCLUDEPATH += ../../../
+
 unix:LIBS += -lqmmpui \
     -lqmmp
 win32:LIBS += -lqmmpui0 \
     -lqmmp0
-FORMS += 
diff --git a/src/plugins/General/fileops/fileops.pro b/src/plugins/General/fileops/fileops.pro
index c03a7f81c..e132670f9 100644
--- a/src/plugins/General/fileops/fileops.pro
+++ b/src/plugins/General/fileops/fileops.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libfileops.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
 unix : LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
 win32 : LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/gnomehotkey/gnomehotkey.pro b/src/plugins/General/gnomehotkey/gnomehotkey.pro
index 1c693f1b7..429c92848 100644
--- a/src/plugins/General/gnomehotkey/gnomehotkey.pro
+++ b/src/plugins/General/gnomehotkey/gnomehotkey.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/gnomehotkey
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libgnomehotkey.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -26,6 +22,4 @@ HEADERS += gnomehotkeyfactory.h \
 SOURCES += gnomehotkeyfactory.cpp \
     mediakeys.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
diff --git a/src/plugins/General/hal/hal.pro b/src/plugins/General/hal/hal.pro
index 0ba95a02b..083042183 100644
--- a/src/plugins/General/hal/hal.pro
+++ b/src/plugins/General/hal/hal.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/hal
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhal.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += halfactory.cpp \
            haldevice.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/hotkey/hotkey.pro b/src/plugins/General/hotkey/hotkey.pro
index f166ebae1..438c981e6 100644
--- a/src/plugins/General/hotkey/hotkey.pro
+++ b/src/plugins/General/hotkey/hotkey.pro
@@ -10,7 +10,6 @@ TARGET = $$PLUGINS_PREFIX/General/hotkey
 

 

 TEMPLATE = lib

-QMAKE_LIBDIR += ../../../../lib

 

 RESOURCES = translations/translations.qrc

 

@@ -30,16 +29,9 @@ SOURCES += hotkeyfactory.cpp \
 FORMS += settingsdialog.ui \

          hotkeydialog.ui

 

-

-INCLUDEPATH += ../../../../src

-

 unix {

-    isEmpty(LIB_DIR){

-        LIB_DIR = /lib

-    }

     target.path = $$LIB_DIR/qmmp/General

     INSTALLS += target

-    QMAKE_LIBDIR += ../../../../lib

     QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libhotkey.so

     PKGCONFIG += x11

     DEFINES += HAVE_XKBLIB_H

@@ -47,7 +39,5 @@ unix {
 }

 

 win32 {

-    QMAKE_LIBDIR += ../../../../bin

     LIBS += -lqmmpui0 -lqmmp0

 }

-

diff --git a/src/plugins/General/kdenotify/kdenotify.pro b/src/plugins/General/kdenotify/kdenotify.pro
index 49d0acbcd..7de78438b 100644
--- a/src/plugins/General/kdenotify/kdenotify.pro
+++ b/src/plugins/General/kdenotify/kdenotify.pro
@@ -2,7 +2,6 @@
 # Project created by QtCreator 2009-10-14T17:55:38
 # -------------------------------------------------
 include(../../plugins.pri)
-INCLUDEPATH += ../../../../src
 QT += dbus
 CONFIG += warn_on \
     plugin
@@ -10,12 +9,10 @@ unix:TARGET = $$PLUGINS_PREFIX/General/kdenotify
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libkdenotify.so
 TEMPLATE = lib
 unix {
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/lyrics/lyrics.pro b/src/plugins/General/lyrics/lyrics.pro
index ccb4f3ca8..88336bd95 100644
--- a/src/plugins/General/lyrics/lyrics.pro
+++ b/src/plugins/General/lyrics/lyrics.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,13 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/liblyrics.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
-unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
+
+unix {
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/mpris/mpris.pro b/src/plugins/General/mpris/mpris.pro
index 096bce200..934d2fbb5 100644
--- a/src/plugins/General/mpris/mpris.pro
+++ b/src/plugins/General/mpris/mpris.pro
@@ -9,19 +9,11 @@ TARGET =$$PLUGINS_PREFIX/General/mpris
 QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libmpris.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
-#FORMS += settingsdialog.ui
-
-#RESOURCES += images/images.qrc
-
 
 HEADERS += mprisfactory.h \
            mpris.h  \
@@ -39,6 +31,4 @@ SOURCES += mprisfactory.cpp \
            mpris2/root2object.cpp \
            mpris2/player2object.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
diff --git a/src/plugins/General/notifier/notifier.pro b/src/plugins/General/notifier/notifier.pro
index 3cff90fa1..5e33b5fd3 100644
--- a/src/plugins/General/notifier/notifier.pro
+++ b/src/plugins/General/notifier/notifier.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,22 +8,17 @@ unix:QMAKE_CLEAN =$$PLUGINS_PREFIX/General/libnotifier.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = notifier_images.qrc \
             translations/translations.qrc
 
 unix {
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-    CONFIG += link_pkgconfig
-    PKGCONFIG += x11
-}
-target.path = $$LIB_DIR/qmmp/General
-INSTALLS += target
+  CONFIG += link_pkgconfig
+  PKGCONFIG += x11
+  target.path = $$LIB_DIR/qmmp/General
+  INSTALLS += target
 }
 
 HEADERS += notifierfactory.h \
diff --git a/src/plugins/General/rgscan/rgscan.pro b/src/plugins/General/rgscan/rgscan.pro
index 462d26c22..fd8656de2 100644
--- a/src/plugins/General/rgscan/rgscan.pro
+++ b/src/plugins/General/rgscan/rgscan.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -10,17 +9,12 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/librgscan.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0 -ltag.dll
 
 RESOURCES = translations/translations.qrc
 unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 PKGCONFIG += taglib
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
diff --git a/src/plugins/General/scrobbler/scrobbler.pro b/src/plugins/General/scrobbler/scrobbler.pro
index ff34ea725..16931c7a1 100644
--- a/src/plugins/General/scrobbler/scrobbler.pro
+++ b/src/plugins/General/scrobbler/scrobbler.pro
@@ -2,14 +2,11 @@ include(../../plugins.pri)
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
-win32:QMAKE_LIBDIR += ../../../../bin
 TARGET = $$PLUGINS_PREFIX/General/scrobbler
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libscrobbler.so
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
@@ -26,7 +23,6 @@ SOURCES += scrobblerfactory.cpp \
     scrobblercache.cpp \
     scrobbler.cpp
 QT += network
-INCLUDEPATH += ../../../
 unix:LIBS += -lqmmpui \
     -lqmmp
 win32:LIBS += -lqmmpui0 \
diff --git a/src/plugins/General/statusicon/statusicon.pro b/src/plugins/General/statusicon/statusicon.pro
index 3da40e0b6..4228d60f6 100644
--- a/src/plugins/General/statusicon/statusicon.pro
+++ b/src/plugins/General/statusicon/statusicon.pro
@@ -1,5 +1,4 @@
 include(../../plugins.pri)
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
     plugin
 unix:TARGET = $$PLUGINS_PREFIX/General/statusicon
@@ -7,19 +6,16 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstatusicon.so
 win32:TARGET = $$PLUGINS_PREFIX/General/statusicon
 TEMPLATE = lib
 unix {
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmpui \
         -lqmmp
 }
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmpui0 \
         -lqmmp0
 }
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/streambrowser/streambrowser.pro b/src/plugins/General/streambrowser/streambrowser.pro
index abf3fcd26..1bf1235de 100644
--- a/src/plugins/General/streambrowser/streambrowser.pro
+++ b/src/plugins/General/streambrowser/streambrowser.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,13 @@ unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libstreambrowser.so
 
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
-unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
+
+unix {
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 }
diff --git a/src/plugins/General/trackchange/trackchange.pro b/src/plugins/General/trackchange/trackchange.pro
index cc88f1ba6..f5b0264e1 100644
--- a/src/plugins/General/trackchange/trackchange.pro
+++ b/src/plugins/General/trackchange/trackchange.pro
@@ -1,6 +1,5 @@
 include(../../plugins.pri)
 
-INCLUDEPATH += ../../../../src
 CONFIG += warn_on \
 plugin
 
@@ -9,17 +8,12 @@ unix : QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libtrackchange.so
 
 
 TEMPLATE = lib
-unix : QMAKE_LIBDIR += ../../../../lib
 unix : LIBS += -lqmmpui -lqmmp
 
-win32 : QMAKE_LIBDIR += ../../../../bin
 win32 : LIBS += -lqmmpui0 -lqmmp0
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/General
     INSTALLS += target
 }
diff --git a/src/plugins/General/udisks/udisks.pro b/src/plugins/General/udisks/udisks.pro
index c6c906c29..b3f1c8d41 100644
--- a/src/plugins/General/udisks/udisks.pro
+++ b/src/plugins/General/udisks/udisks.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/udisks
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += udisksfactory.cpp \
            udisksdevice.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/General/udisks2/udisks2.pro b/src/plugins/General/udisks2/udisks2.pro
index 7e76eb3f0..484229668 100644
--- a/src/plugins/General/udisks2/udisks2.pro
+++ b/src/plugins/General/udisks2/udisks2.pro
@@ -9,13 +9,9 @@ TARGET = $$PLUGINS_PREFIX/General/udisks2
 QMAKE_CLEAN = $$PLUGINS_PREFIX/General/libudisks2.so
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/General
 INSTALLS += target
 
@@ -32,8 +28,6 @@ SOURCES += udisks2factory.cpp \
            udisks2device.cpp \
            settingsdialog.cpp
 
-INCLUDEPATH += ../../../../src
-
 LIBS += -lqmmpui -lqmmp
 
 FORMS += settingsdialog.ui
diff --git a/src/plugins/Input/aac/aac.pro b/src/plugins/Input/aac/aac.pro
index b5759e714..25be00d73 100644
--- a/src/plugins/Input/aac/aac.pro
+++ b/src/plugins/Input/aac/aac.pro
@@ -10,12 +10,10 @@ SOURCES += decoder_aac.cpp \
     aacmetadatamodel.cpp
 TARGET = $$PLUGINS_PREFIX/Input/aac
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libaac.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -lfaad \
     -L/usr/lib \
@@ -23,6 +21,5 @@ LIBS += -lqmmp \
 PKGCONFIG += taglib
 
 RESOURCES = translations/translations.qrc
-isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Input
 INSTALLS += target
diff --git a/src/plugins/Input/archive/archive.pro b/src/plugins/Input/archive/archive.pro
index 55c5d06dc..d10d22e8c 100644
--- a/src/plugins/Input/archive/archive.pro
+++ b/src/plugins/Input/archive/archive.pro
@@ -16,32 +16,22 @@ SOURCES += \
 
 TARGET=$$PLUGINS_PREFIX/Input/archive
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libarchive taglib
     QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libarc.so
 }
 
 win32 {
-#    HEADERS += ../../../../src/qmmp/metadatamodel.h \
-#               ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -larchive -ltag
 }
diff --git a/src/plugins/Input/cdaudio/cdaudio.pro b/src/plugins/Input/cdaudio/cdaudio.pro
index 903202edf..dbd9cfcac 100644
--- a/src/plugins/Input/cdaudio/cdaudio.pro
+++ b/src/plugins/Input/cdaudio/cdaudio.pro
@@ -7,8 +7,6 @@ SOURCES += decoder_cdaudio.cpp \
            decodercdaudiofactory.cpp \
            settingsdialog.cpp
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
@@ -22,12 +20,8 @@ RESOURCES = translations/translations.qrc
 FORMS += settingsdialog.ui
 
 unix {
-  QMAKE_LIBDIR += ../../../../lib
   LIBS += -lqmmp -L/usr/lib  -I/usr/include
   PKGCONFIG += libcdio libcdio_cdda libcdio_paranoia libcddb
-  isEmpty(LIB_DIR) {
-    LIB_DIR = /lib
-  }
   target.path = $$LIB_DIR/qmmp/Input
   QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libcdaudio.so
   INSTALLS += target
@@ -36,6 +30,5 @@ unix {
 win32 {
   HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-  QMAKE_LIBDIR += ../../../../bin
   LIBS += -lqmmp0 -lcdio -lcdio_paranoia -lcdio_cdda  -lm -lwinmm -mwindows -liconv -lcddb -lws2_32
 }
diff --git a/src/plugins/Input/cue/cue.pro b/src/plugins/Input/cue/cue.pro
index 1685a98f3..141f4576c 100644
--- a/src/plugins/Input/cue/cue.pro
+++ b/src/plugins/Input/cue/cue.pro
@@ -14,17 +14,14 @@ win32:HEADERS += ../../../../src/qmmp/decoder.h \
     ../../../../src/qmmp/statehandler.h
 TARGET = $$PLUGINS_PREFIX/Input/cue
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libcue.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
 unix{
-   QMAKE_LIBDIR += ../../../../lib
    LIBS += -lqmmp -L/usr/lib
 }
 
 win32{
-   QMAKE_LIBDIR += ../../../../bin
    LIBS += -lqmmp0
 }
 
@@ -38,7 +35,6 @@ contains(CONFIG, WITH_ENCA){
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 }
diff --git a/src/plugins/Input/ffmpeg/ffmpeg.pro b/src/plugins/Input/ffmpeg/ffmpeg.pro
index 32fefa1d3..fa779ece7 100644
--- a/src/plugins/Input/ffmpeg/ffmpeg.pro
+++ b/src/plugins/Input/ffmpeg/ffmpeg.pro
@@ -11,10 +11,6 @@ SOURCES += decoder_ffmpeg.cpp \
     ffmpegmetadatamodel.cpp \
     replaygainreader.cpp
 
-INCLUDEPATH += ../../../
-
-
-
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
@@ -23,12 +19,10 @@ TEMPLATE = lib
 TARGET = $$PLUGINS_PREFIX/Input/ffmpeg
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg.so
     LIBS += -lqmmp
-    QMAKE_LIBDIR += ../../../../lib
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
@@ -36,7 +30,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll
 }
 
diff --git a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
index 1e92b1976..ff4e0ff31 100644
--- a/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
+++ b/src/plugins/Input/ffmpeg_legacy/ffmpeg_legacy.pro
@@ -9,9 +9,6 @@ SOURCES += decoder_ffmpeg.cpp \
     settingsdialog.cpp \
     ffmpegmetadatamodel.cpp
 
-INCLUDEPATH += ../../../
-
-
 
 CONFIG += warn_on \
     plugin \
@@ -21,12 +18,10 @@ TEMPLATE = lib
 TARGET = $$PLUGINS_PREFIX/Input/ffmpeg_legacy
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libffmpeg_legacy.so
     LIBS += -lqmmp
-    QMAKE_LIBDIR += ../../../../lib
     PKGCONFIG += libavcodec libavformat libavutil
 }
 
@@ -34,7 +29,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lavcodec.dll -lavformat.dll -lavutil.dll
 }
 
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index e412b1eb4..9f2119db6 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -12,17 +12,14 @@ SOURCES += decoder_flac.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/flac
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
     PKGCONFIG += taglib flac
@@ -33,6 +30,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lflac -logg -ltag.dll -lm
 }
diff --git a/src/plugins/Input/gme/gme.pro b/src/plugins/Input/gme/gme.pro
index a204c134a..5ee416910 100644
--- a/src/plugins/Input/gme/gme.pro
+++ b/src/plugins/Input/gme/gme.pro
@@ -10,7 +10,6 @@ SOURCES += decoder_gme.cpp \
     settingsdialog.cpp
 TARGET = $$PLUGINS_PREFIX/Input/gme
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libgme.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
@@ -18,10 +17,8 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix{
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp \
       -L/usr/lib \
       -L/usr/local/lib \
@@ -33,7 +30,6 @@ unix{
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lgme.dll
 }
 
diff --git a/src/plugins/Input/mad/mad.pro b/src/plugins/Input/mad/mad.pro
index e7d9156db..4881bf66b 100644
--- a/src/plugins/Input/mad/mad.pro
+++ b/src/plugins/Input/mad/mad.pro
@@ -14,8 +14,6 @@ SOURCES += decoder_mad.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/mad
 
-INCLUDEPATH += ../../../
-
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
@@ -23,11 +21,9 @@ TEMPLATE = lib
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp -lmad
     PKGCONFIG += taglib mad
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmad.so
@@ -36,6 +32,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmad -ltag.dll
 }
diff --git a/src/plugins/Input/modplug/modplug.pro b/src/plugins/Input/modplug/modplug.pro
index dc2d5a9bb..87674b31d 100644
--- a/src/plugins/Input/modplug/modplug.pro
+++ b/src/plugins/Input/modplug/modplug.pro
@@ -14,21 +14,17 @@ TARGET = $$PLUGINS_PREFIX/Input/modplug
 
 DEFINES += HAVE_STDINT_H \
     HAVE_INTTYPES_H
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libmodplug
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmodplug.so
@@ -37,7 +33,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmodplug
     DEFINES -= UNICODE
 }
diff --git a/src/plugins/Input/mpc/mpc.pro b/src/plugins/Input/mpc/mpc.pro
index 93ed9df2c..3044da310 100644
--- a/src/plugins/Input/mpc/mpc.pro
+++ b/src/plugins/Input/mpc/mpc.pro
@@ -8,16 +8,13 @@ SOURCES += decoder_mpc.cpp \
     mpcmetadatamodel.cpp
 TARGET = $$PLUGINS_PREFIX/Input/mpc
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -30,7 +27,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lmpcdec -ltag.dll
     #DEFINES += MPC_OLD_API
 }
diff --git a/src/plugins/Input/opus/opus.pro b/src/plugins/Input/opus/opus.pro
index 3276e6f7b..98d2b7cbd 100644
--- a/src/plugins/Input/opus/opus.pro
+++ b/src/plugins/Input/opus/opus.pro
@@ -16,18 +16,14 @@ SOURCES += decoder_opus.cpp \
     tdebug.cpp
 TARGET = $$PLUGINS_PREFIX/Input/opus
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
-
 unix {
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -39,6 +35,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lopusfile -lopus -ltag.dll -lm
 }
diff --git a/src/plugins/Input/sid/sid.pro b/src/plugins/Input/sid/sid.pro
index f31bb1707..d4661caa2 100644
--- a/src/plugins/Input/sid/sid.pro
+++ b/src/plugins/Input/sid/sid.pro
@@ -14,7 +14,6 @@ FORMS += \
 
 TARGET = $$PLUGINS_PREFIX/Input/sid
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libsid.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
           plugin \
           link_pkgconfig
@@ -23,10 +22,8 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix{
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += libsidplayfp
 }
@@ -34,6 +31,5 @@ unix{
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lsidplayfp.dll
 }
diff --git a/src/plugins/Input/sndfile/sndfile.pro b/src/plugins/Input/sndfile/sndfile.pro
index c583386e5..0033f2fd5 100644
--- a/src/plugins/Input/sndfile/sndfile.pro
+++ b/src/plugins/Input/sndfile/sndfile.pro
@@ -7,24 +7,18 @@ SOURCES += decoder_sndfile.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Input/sndfile
 
-
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
-
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += sndfile
     QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libsndfile.so
@@ -33,6 +27,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lsndfile -lflac -lvorbisenc -lvorbis -logg
 }
diff --git a/src/plugins/Input/vorbis/vorbis.pro b/src/plugins/Input/vorbis/vorbis.pro
index 1e841171c..bb6357522 100644
--- a/src/plugins/Input/vorbis/vorbis.pro
+++ b/src/plugins/Input/vorbis/vorbis.pro
@@ -10,17 +10,14 @@ SOURCES += decoder_vorbis.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/vorbis
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty (LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
@@ -32,7 +29,6 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lvorbisfile -lvorbis -logg -ltag.dll -lm
     LD_FLAGS += -no-undefined
 }
diff --git a/src/plugins/Input/wavpack/wavpack.pro b/src/plugins/Input/wavpack/wavpack.pro
index b8b4b28b9..1439c2b71 100644
--- a/src/plugins/Input/wavpack/wavpack.pro
+++ b/src/plugins/Input/wavpack/wavpack.pro
@@ -12,21 +12,17 @@ SOURCES += decoder_wavpack.cpp \
     replaygainreader.cpp
 TARGET = $$PLUGINS_PREFIX/Input/wavpack
 
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Input
     INSTALLS += target
 
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp
     PKGCONFIG += wavpack
     QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwavpack.so
@@ -35,6 +31,5 @@ unix {
 win32 {
     HEADERS += ../../../../src/qmmp/metadatamodel.h \
                ../../../../src/qmmp/decoderfactory.h
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lwavpack
 }
diff --git a/src/plugins/Input/wildmidi/wildmidi.pro b/src/plugins/Input/wildmidi/wildmidi.pro
index 566489524..2c1dc2f5a 100644
--- a/src/plugins/Input/wildmidi/wildmidi.pro
+++ b/src/plugins/Input/wildmidi/wildmidi.pro
@@ -10,17 +10,14 @@ SOURCES += decoder_wildmidi.cpp \
     settingsdialog.cpp
 TARGET = $$PLUGINS_PREFIX/Input/wildmidi
 QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libwildmidi.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp \
     -L/usr/lib \
     -I/usr/include \
     -lWildMidi
 
 RESOURCES = translations/translations.qrc
-isEmpty (LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Input
 INSTALLS += target
diff --git a/src/plugins/Output/alsa/alsa.pro b/src/plugins/Output/alsa/alsa.pro
index 6ad5edfae..e72daa88c 100644
--- a/src/plugins/Output/alsa/alsa.pro
+++ b/src/plugins/Output/alsa/alsa.pro
@@ -10,9 +10,6 @@ SOURCES += outputalsa.cpp \
 TARGET=$$PLUGINS_PREFIX/Output/alsa
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libalsa.so
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
-
 CONFIG += warn_on \
 thread \
 plugin \
@@ -26,9 +23,5 @@ FORMS += settingsdialog.ui
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/directsound/directsound.pro b/src/plugins/Output/directsound/directsound.pro
index 755579379..7978c5d12 100644
--- a/src/plugins/Output/directsound/directsound.pro
+++ b/src/plugins/Output/directsound/directsound.pro
@@ -11,9 +11,6 @@ HEADERS += ../../../../src/qmmp/output.h
 
 TARGET=$$PLUGINS_PREFIX/Output/directsound
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../bin
-
 CONFIG += warn_on \
 thread \
 plugin
@@ -23,9 +20,5 @@ LIBS += -lqmmp0 -ldxguid -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/jack/jack.pro b/src/plugins/Output/jack/jack.pro
index 543fd0f4e..a05818341 100644
--- a/src/plugins/Output/jack/jack.pro
+++ b/src/plugins/Output/jack/jack.pro
@@ -15,8 +15,6 @@ contains(CONFIG, WITH_NEW_JACK){
     DEFINES += JACK_NEW_API
 }
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
 CONFIG += warn_on \
 thread \
 plugin \
@@ -27,9 +25,5 @@ PKGCONFIG += jack soxr
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/null/null.pro b/src/plugins/Output/null/null.pro
index 4d0d98601..d0ee70a59 100644
--- a/src/plugins/Output/null/null.pro
+++ b/src/plugins/Output/null/null.pro
@@ -9,9 +9,6 @@ SOURCES += outputnullfactory.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Output/null
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
-
 CONFIG += warn_on \
 thread \
 plugin
@@ -21,10 +18,6 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty (LIB_DIR){
-    LIB_DIR = /lib
-    }
-
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
     LIBS += -lqmmp
@@ -33,5 +26,4 @@ unix {
 
 win32 {
     LIBS += -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
diff --git a/src/plugins/Output/oss/oss.pro b/src/plugins/Output/oss/oss.pro
index 4f8c9a695..050970aea 100644
--- a/src/plugins/Output/oss/oss.pro
+++ b/src/plugins/Output/oss/oss.pro
@@ -5,7 +5,6 @@ HEADERS += outputossfactory.h \
            outputoss.h \
            settingsdialog.h
 
-
 SOURCES += outputossfactory.cpp \
            outputoss.cpp \
            settingsdialog.cpp
@@ -13,9 +12,6 @@ SOURCES += outputossfactory.cpp \
 TARGET=$$PLUGINS_PREFIX/Output/oss
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss.so
 
-
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
 CONFIG += warn_on \
 thread \
 plugin
@@ -26,9 +22,6 @@ TEMPLATE = lib
 LIBS += -lqmmp
 
 RESOURCES = translations/translations.qrc
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
 
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/oss4/oss4.pro b/src/plugins/Output/oss4/oss4.pro
index 145a5aeff..c26a8ffaf 100644
--- a/src/plugins/Output/oss4/oss4.pro
+++ b/src/plugins/Output/oss4/oss4.pro
@@ -14,38 +14,16 @@ TARGET=$$PLUGINS_PREFIX/Output/oss4
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/liboss4.so
 
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
 CONFIG += warn_on \
 thread \
 plugin
 
 DEFINES += HAVE_SYS_SOUNDCARD_H
-INCLUDEPATH += /usr/lib/oss/include
 
 TEMPLATE = lib
 LIBS += -lqmmp
 
-TRANSLATIONS = translations/oss4_plugin_cs.ts \
-               translations/oss4_plugin_de.ts \
-               translations/oss4_plugin_zh_CN.ts \
-               translations/oss4_plugin_zh_TW.ts \
-               translations/oss4_plugin_ru.ts \
-               translations/oss4_plugin_pl.ts \
-               translations/oss4_plugin_uk_UA.ts \
-               translations/oss4_plugin_it.ts \
-               translations/oss4_plugin_tr.ts \
-               translations/oss4_plugin_lt.ts \
-               translations/oss4_plugin_nl.ts \
-               translations/oss4_plugin_ja.ts \
-               translations/oss4_plugin_es.ts \
-               translations/oss4_plugin_sr_BA.ts \
-               translations/oss4_plugin_sr_RS.ts
-
 RESOURCES = translations/translations.qrc
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
 
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/pulseaudio/pulseaudio.pro b/src/plugins/Output/pulseaudio/pulseaudio.pro
index 3b507bf9d..8f02159ac 100644
--- a/src/plugins/Output/pulseaudio/pulseaudio.pro
+++ b/src/plugins/Output/pulseaudio/pulseaudio.pro
@@ -10,9 +10,6 @@ SOURCES += outputpulseaudiofactory.cpp \
 TARGET=$$PLUGINS_PREFIX/Output/pulseaudio
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Output/libpulseaudio.so
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
-
 CONFIG += warn_on \
 thread \
 plugin \
@@ -25,9 +22,5 @@ PKGCONFIG += libpulse-simple
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/qtmultimedia/qtmultimedia.pro b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
index f9e92d75d..f4adeef2f 100644
--- a/src/plugins/Output/qtmultimedia/qtmultimedia.pro
+++ b/src/plugins/Output/qtmultimedia/qtmultimedia.pro
@@ -14,9 +14,6 @@ SOURCES += outputqtmultimediafactory.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Output/qtmultimedia
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
-
 CONFIG += warn_on \
 thread \
 plugin
@@ -26,10 +23,6 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty (LIB_DIR){
-    LIB_DIR = /lib
-    }
-
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
     LIBS += -lqmmp
@@ -38,5 +31,4 @@ unix {
 
 win32 {
     LIBS += -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
diff --git a/src/plugins/Output/shout/shout.pro b/src/plugins/Output/shout/shout.pro
index 61cfe73aa..04bef93e4 100644
--- a/src/plugins/Output/shout/shout.pro
+++ b/src/plugins/Output/shout/shout.pro
@@ -12,9 +12,6 @@ SOURCES += outputshoutfactory.cpp \
 
 TARGET=$$PLUGINS_PREFIX/Output/shout
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../lib
-
 CONFIG += warn_on \
 thread \
 plugin \
@@ -25,10 +22,6 @@ TEMPLATE = lib
 RESOURCES = translations/translations.qrc
 
 unix {
-    isEmpty (LIB_DIR){
-    LIB_DIR = /lib
-    }
-
     target.path = $$LIB_DIR/qmmp/Output
     INSTALLS += target
     LIBS += -lqmmp
@@ -38,7 +31,6 @@ unix {
 
 win32 {
     LIBS += -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
 
 FORMS += \
diff --git a/src/plugins/Output/wasapi/wasapi.pro b/src/plugins/Output/wasapi/wasapi.pro
index 1f042951c..0fc92073c 100644
--- a/src/plugins/Output/wasapi/wasapi.pro
+++ b/src/plugins/Output/wasapi/wasapi.pro
@@ -11,9 +11,6 @@ HEADERS += ../../../../src/qmmp/output.h
 
 TARGET=$$PLUGINS_PREFIX/Output/wasapi
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../bin
-
 CONFIG += warn_on \
 thread \
 plugin
@@ -23,9 +20,5 @@ LIBS += -lqmmp0 -lstrmiids -ldmoguids -lmsdmo -lole32 -loleaut32 -luuid -lgdi32
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/Output/waveout/waveout.pro b/src/plugins/Output/waveout/waveout.pro
index 35f77d82c..94a6d264c 100644
--- a/src/plugins/Output/waveout/waveout.pro
+++ b/src/plugins/Output/waveout/waveout.pro
@@ -11,9 +11,6 @@ HEADERS += ../../../../src/qmmp/output.h
 
 TARGET=$$PLUGINS_PREFIX/Output/waveout
 
-INCLUDEPATH += ../../../
-QMAKE_LIBDIR += ../../../../bin
-
 CONFIG += warn_on \
 thread \
 plugin
@@ -23,9 +20,5 @@ LIBS += -lqmmp0 -lwinmm
 
 RESOURCES = translations/translations.qrc
 
-isEmpty (LIB_DIR){
-LIB_DIR = /lib
-}
-
 target.path = $$LIB_DIR/qmmp/Output
 INSTALLS += target
diff --git a/src/plugins/PlayListFormats/m3u/m3u.pro b/src/plugins/PlayListFormats/m3u/m3u.pro
index b275eaa7d..b07ed85b6 100644
--- a/src/plugins/PlayListFormats/m3u/m3u.pro
+++ b/src/plugins/PlayListFormats/m3u/m3u.pro
@@ -7,18 +7,12 @@ plugin  \
 TARGET =$$PLUGINS_PREFIX/PlayListFormats/m3uplaylistformat
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
-
-INCLUDEPATH += ../../../../src
 
 HEADERS += m3uplaylistformat.h
 
 SOURCES += m3uplaylistformat.cpp
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
@@ -28,5 +22,4 @@ unix {
 
 win32 {
     LIBS += -lqmmpui0
-    QMAKE_LIBDIR += ../../../../bin
 }
diff --git a/src/plugins/PlayListFormats/pls/pls.pro b/src/plugins/PlayListFormats/pls/pls.pro
index 553220d37..1e6809acc 100644
--- a/src/plugins/PlayListFormats/pls/pls.pro
+++ b/src/plugins/PlayListFormats/pls/pls.pro
@@ -6,20 +6,13 @@ plugin  \
 
 TARGET =$$PLUGINS_PREFIX/PlayListFormats/plsplaylistformat
 
-
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
-
-INCLUDEPATH += ../../../../src
 
 SOURCES += plsplaylistformat.cpp
 
 HEADERS += plsplaylistformat.h
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
@@ -29,6 +22,5 @@ unix {
 
 win32 {
     LIBS += -lqmmpui0
-    QMAKE_LIBDIR += ../../../../bin
 }
 
diff --git a/src/plugins/PlayListFormats/xspf/xspf.pro b/src/plugins/PlayListFormats/xspf/xspf.pro
index 63e064944..28ba5b736 100644
--- a/src/plugins/PlayListFormats/xspf/xspf.pro
+++ b/src/plugins/PlayListFormats/xspf/xspf.pro
@@ -6,19 +6,12 @@ plugin  \
 
 TARGET =$$PLUGINS_PREFIX/PlayListFormats/xspfplaylistformat
 
-
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
-
-INCLUDEPATH += ../../../../src
 
 SOURCES += xspfplaylistformat.cpp
 HEADERS += xspfplaylistformat.h
 
 unix {
-    isEmpty(LIB_DIR){
-        LIB_DIR = /lib
-    }
     target.path = $$LIB_DIR/qmmp/PlayListFormats
     INSTALLS += target
 
@@ -28,6 +21,5 @@ unix {
 
 win32 {
     LIBS += -lqmmpui0 -lqmmp0
-    QMAKE_LIBDIR += ../../../../bin
 }
 
diff --git a/src/plugins/Transports/http/http.pro b/src/plugins/Transports/http/http.pro
index c844c52ce..38495d18c 100644
--- a/src/plugins/Transports/http/http.pro
+++ b/src/plugins/Transports/http/http.pro
@@ -13,22 +13,18 @@ win32:HEADERS += ../../../../src/qmmp/inputsource.h \
     ../../../../src/qmmp/inputsourcefactory.h
 TARGET = $$PLUGINS_PREFIX/Transports/http
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libhttp.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
 unix {
-    QMAKE_LIBDIR += ../../../../lib
     LIBS += -lqmmp \
         -L/usr/lib
     PKGCONFIG += libcurl
-    isEmpty(LIB_DIR):LIB_DIR = /lib
     target.path = $$LIB_DIR/qmmp/Transports
     INSTALLS += target
 }
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 \
         -lcurldll
 }
diff --git a/src/plugins/Transports/mms/mms.pro b/src/plugins/Transports/mms/mms.pro
index e676a62ac..ab130f465 100644
--- a/src/plugins/Transports/mms/mms.pro
+++ b/src/plugins/Transports/mms/mms.pro
@@ -13,16 +13,13 @@ win32:HEADERS += ../../../../src/qmmp/inputsource.h \
     ../../../../src/qmmp/inputsourcefactory.h
 TARGET = $$PLUGINS_PREFIX/Transports/mms
 unix:QMAKE_CLEAN = $$PLUGINS_PREFIX/Input/libmms.so
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
     plugin \
     link_pkgconfig
 TEMPLATE = lib
 
-QMAKE_LIBDIR += ../../../../lib
 LIBS += -lqmmp -L/usr/lib
 PKGCONFIG += libmms
-isEmpty(LIB_DIR):LIB_DIR = /lib
 target.path = $$LIB_DIR/qmmp/Transports
 INSTALLS += target
 
diff --git a/src/plugins/Ui/qsui/qsui.pro b/src/plugins/Ui/qsui/qsui.pro
index fa90da976..bc4c703e9 100644
--- a/src/plugins/Ui/qsui/qsui.pro
+++ b/src/plugins/Ui/qsui/qsui.pro
@@ -88,20 +88,11 @@ CONFIG += warn_on \
 TARGET = $$PLUGINS_PREFIX/Ui/qsui
 
 unix{
-  QMAKE_LIBDIR += ../../../../lib
   LIBS += -lqmmpui -lqmmp
-  isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-  }  
-
   target.path = $$LIB_DIR/qmmp/Ui
   INSTALLS += target
 }
 
 win32{
-   QMAKE_LIBDIR += ../../../../bin
    LIBS += -lqmmpui0 -lqmmp0
-   INCLUDEPATH += ../../ ./
 }
-
-INCLUDEPATH += ../../../
diff --git a/src/plugins/Ui/skinned/skinned.pro b/src/plugins/Ui/skinned/skinned.pro
index 80f271ca8..cae04e4b3 100644
--- a/src/plugins/Ui/skinned/skinned.pro
+++ b/src/plugins/Ui/skinned/skinned.pro
@@ -111,16 +111,13 @@ SOURCES += mainwindow.cpp \
     horizontalslider.cpp
 
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmpui -lqmmp
 
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmpui0 -lqmmp0
 
 CONFIG += warn_on \
           plugin
 
-
 TARGET = $$PLUGINS_PREFIX/Ui/skinned
 
 unix:LIBS += -lqmmp -lqmmpui
@@ -128,17 +125,11 @@ win32:LIBS += -lqmmp0 -lqmmpui0
 
 RESOURCES = resources/resources.qrc glare/glare.qrc
 
-unix{
-isEmpty(LIB_DIR){
-LIB_DIR = /lib
-}
-
+unix {
 target.path = $$LIB_DIR/qmmp/Ui
 INSTALLS += target
 CONFIG += link_pkgconfig
 PKGCONFIG += x11
 }
 
-INCLUDEPATH += ../../../
-
 RESOURCES += translations/translations.qrc
diff --git a/src/plugins/Visual/analyzer/analyzer.pro b/src/plugins/Visual/analyzer/analyzer.pro
index 935d4982e..e88229c5e 100644
--- a/src/plugins/Visual/analyzer/analyzer.pro
+++ b/src/plugins/Visual/analyzer/analyzer.pro
@@ -17,14 +17,10 @@ SOURCES += analyzer.cpp \
            colorwidget.cpp \
            settingsdialog.cpp
 win32:HEADERS += ../../../../src/qmmp/visual.h
-win32:INCLUDEPATH += ./
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin
 TEMPLATE = lib
-unix:QMAKE_LIBDIR += ../../../../lib
 unix:LIBS += -lqmmp -L/usr/lib -I/usr/include
-win32:QMAKE_LIBDIR += ../../../../bin
 win32:LIBS += -lqmmp0
 
 TRANSLATIONS = translations/analyzer_plugin_cs.ts \
@@ -45,9 +41,6 @@ TRANSLATIONS = translations/analyzer_plugin_cs.ts \
 
 RESOURCES = translations/translations.qrc
 unix{
-isEmpty(LIB_DIR){
-    LIB_DIR = /lib
-}
 target.path = $$LIB_DIR/qmmp/Visual
 INSTALLS += target
 }
diff --git a/src/plugins/Visual/projectm/projectm.pro b/src/plugins/Visual/projectm/projectm.pro
index 983b62592..b24dabc5b 100644
--- a/src/plugins/Visual/projectm/projectm.pro
+++ b/src/plugins/Visual/projectm/projectm.pro
@@ -15,13 +15,11 @@ SOURCES += projectmplugin.cpp \
            visualprojectmfactory.cpp \
            projectmwidget.cpp \
     projectmwrapper.cpp
-INCLUDEPATH += ../../../
 CONFIG += warn_on \
 plugin \
 link_pkgconfig
 
 TEMPLATE = lib
-QMAKE_LIBDIR += ../../../../lib
 QT += opengl
 
 TRANSLATIONS = translations/projectm_plugin_cs.ts \
@@ -43,7 +41,6 @@ RESOURCES = translations/translations.qrc
 
 unix {
   PKGCONFIG += libprojectM
-  isEmpty(LIB_DIR):LIB_DIR = /lib
   target.path = $$LIB_DIR/qmmp/Visual
   INSTALLS += target
   LIBS += -lqmmp -L/usr/lib -I/usr/include
@@ -59,6 +56,5 @@ unix {
 }
 
 win32 {
-    QMAKE_LIBDIR += ../../../../bin
     LIBS += -lqmmp0 -lprojectM.dll
 }
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 27608e92c..34482fb6b 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -1,4 +1,15 @@
 include(../../qmmp.pri)
-unix:PLUGINS_PREFIX=../../../../lib/qmmp
-win32:PLUGINS_PREFIX=../../../../../bin/plugins
-INCLUDEPATH += ../../../qmmp
+INCLUDEPATH += ../../../qmmp ../../../
+QMAKE_LIBDIR += ../../../../lib
+
+win32 {
+  QMAKE_LIBDIR += ../../../../bin
+  PLUGINS_PREFIX=../../../../../bin/plugins
+}
+
+unix {
+    isEmpty(LIB_DIR){
+        LIB_DIR = /lib
+    }
+    PLUGINS_PREFIX=../../../../lib/qmmp
+}