4 files changed, 14 insertions, 21 deletions
diff --git a/src/plugins/Input/flac/decoder_flac.cpp b/src/plugins/Input/flac/decoder_flac.cpp
index b2a895bca..6f6b8d734 100644
--- a/src/plugins/Input/flac/decoder_flac.cpp
+++ b/src/plugins/Input/flac/decoder_flac.cpp
@@ -19,10 +19,10 @@
  ***************************************************************************/
 
 
-#include "constants.h"
-#include "buffer.h"
-#include "output.h"
-#include "recycler.h"
+#include <qmmp/constants.h>
+#include <qmmp/buffer.h>
+#include <qmmp/output.h>
+#include <qmmp/recycler.h>
 
 #include <QObject>
 #include <QIODevice>
diff --git a/src/plugins/Input/flac/decoder_flac.h b/src/plugins/Input/flac/decoder_flac.h
index 4c85176ed..277348349 100644
--- a/src/plugins/Input/flac/decoder_flac.h
+++ b/src/plugins/Input/flac/decoder_flac.h
@@ -18,12 +18,10 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef __decoder_flac_h
-#define __decoder_flac_h
+#ifndef DECODER_FLAC_H
+#define DECODER_FLAC_H
 
-class DecoderOgg;
-
-#include "decoder.h"
+#include <qmmp/decoder.h>
 
 #include <FLAC/all.h>
 
diff --git a/src/plugins/Input/flac/decoderflacfactory.h b/src/plugins/Input/flac/decoderflacfactory.h
index 586bc3b33..3e4beb5a8 100644
--- a/src/plugins/Input/flac/decoderflacfactory.h
+++ b/src/plugins/Input/flac/decoderflacfactory.h
@@ -25,10 +25,10 @@
 #include <QIODevice>
 #include <QWidget>
 
-#include <decoder.h>
-#include <output.h>
-#include <decoderfactory.h>
-#include <filetag.h>
+#include <qmmp/decoder.h>
+#include <qmmp/output.h>
+#include <qmmp/decoderfactory.h>
+#include <qmmp/filetag.h>
 
 
 
diff --git a/src/plugins/Input/flac/flac.pro b/src/plugins/Input/flac/flac.pro
index 4ab46c296..864380533 100644
--- a/src/plugins/Input/flac/flac.pro
+++ b/src/plugins/Input/flac/flac.pro
@@ -1,8 +1,3 @@
-# ???? ?????? ? KDevelop ?????????? qmake.
-# ------------------------------------------- 
-# ?????????? ???????????? ???????? ???????? ???????: ./Plugins/Input/flac
-# ???? - ??????????:  
-
 include(../../plugins.pri)
 
 FORMS += detailsdialog.ui 
@@ -12,11 +7,11 @@ HEADERS += decoderflacfactory.h \
 SOURCES += decoder_flac.cpp \
            decoderflacfactory.cpp \
            detailsdialog.cpp
-	   
+
 TARGET=$$PLUGINS_PREFIX/Input/flac
 QMAKE_CLEAN =$$PLUGINS_PREFIX/Input/libflac.so
-   	
-INCLUDEPATH += ../../../qmmp
+
+INCLUDEPATH += ../../../
 CONFIG += release \
 warn_on \
 plugin \