Index: gui/gui.pro
===================================================================
--- gui/gui.pro	(revision 73)
+++ gui/gui.pro	(working copy)
@@ -10,8 +10,10 @@
 QT = gui core
 CONFIG += qt warn_on console debug
 proxy.commands = @$(MAKE) -C ../proxy shared
-QMAKE_EXTRA_TARGETS += proxy
-PRE_TARGETDEPS += proxy
+QPropertyEditor.commands = @$(QMAKE) src/QPropertyEditor/QPropertyEditor.pro; \
+                           $(MAKE) -C src/QPropertyEditor
+QMAKE_EXTRA_TARGETS += proxy QPropertyEditor
+PRE_TARGETDEPS += proxy QPropertyEditor
 HEADERS += src/wpsdrawer.h \
  ../proxy/src/api.h \
  ../proxy/src/defs.h \
Index: gui/src/wpsdrawer.h
===================================================================
--- gui/src/wpsdrawer.h	(revision 73)
+++ gui/src/wpsdrawer.h	(working copy)
@@ -4,8 +4,8 @@
 #include <QWidget>
 #include <QPixmap>
 #include "api.h"
-#include "qmp3state.h"
-#include "qwpsstate.h"
+#include "QMp3State.h"
+#include "QWpsState.h"
 //
 
 typedef int (*pfwps_init)(const char* buff,struct proxy_api *api, bool isfile);
Index: proxy/src/mods/misc.c
===================================================================
--- proxy/src/mods/misc.c	(revision 73)
+++ proxy/src/mods/misc.c	(working copy)
@@ -34,7 +34,7 @@
 #include "string.h"
 #include "dir.h"
 #include "lcd-remote.h"
-#include "errno.h"
+#include <errno.h>
 #include "system.h"
 #include "timefuncs.h"
 #include "screens.h"
Index: proxy/src/checkwps.c
===================================================================
--- proxy/src/checkwps.c	(revision 73)
+++ proxy/src/checkwps.c	(working copy)
@@ -3,7 +3,7 @@
 
 bool debug_wps = true;
 int wps_verbose_level = 0;
-int errno;
+int _errno;
 pfdebugf dbgf = 0;
 
 static char pluginbuf[PLUGIN_BUFFER_SIZE];
@@ -49,7 +49,7 @@
     int count = 0;
     int num_read = 0;
 
-    errno = 0;
+    _errno = 0;
 
     while (count < buffer_size)
     {
@@ -71,7 +71,7 @@
 
     buffer[MIN(count, buffer_size - 1)] = 0;
 
-    return errno ? -1 : num_read;
+    return _errno ? -1 : num_read;
 }
 
 void* plugin_get_buffer(size_t *buffer_size)
Index: proxy/Makefile
===================================================================
--- proxy/Makefile	(revision 73)
+++ proxy/Makefile	(working copy)
@@ -76,7 +76,7 @@
 
 build-linux: src/proxy.c  $(COMMON)
 	@echo CC [$(TARGET)]
-	@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" $(COMMON) src/proxy.c -fPIC -o proxy_$(MODEL).o -Wl,"-soname libproxy_$(MODEL).so.1,-olibproxy_$(MODEL).so.1"
+	@$(CC) $(INCLUDE) $(CFLAGS) -D$(TARGET) -DTARGET_MODEL=\"$(MODEL)\" -shared -Wl,-soname,libproxy_$(MODEL).so,-olibproxy_$(MODEL).so -fPIC $(COMMON) src/proxy.c
 
 clean: clean-$(OS)
 
@@ -95,5 +95,5 @@
 
 shared-linux: src/proxy.c $(COMMON)
 	@echo CC [IRIVER_H10_5GB]
-	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" $(COMMON) src/proxy.c -fPIC -o proxy.o -Wl,"-soname libproxy.so.1,-olibproxy.so.1"
-	@$(COPY) libproxy.so.1 ../gui/bin/libproxy.so.1
+	@$(CC) $(INCLUDE) $(CFLAGS) -DIRIVER_H10_5GB -DTARGET_MODEL=\"h10_5gb\" -shared -Wl,-soname,libproxy.so,-olibproxy.so -fPIC $(COMMON) src/proxy.c
+	@$(COPY) libproxy.so ../gui/bin/libproxy.so
Index: proxy/buildall.sh
===================================================================
--- proxy/buildall.sh	(revision 73)
+++ proxy/buildall.sh	(working copy)
@@ -1,7 +1,7 @@
-#!/bin/sh
-cat targets.txt | (
-    while read target model
-    do
-        make MODEL=$model TARGET=$target build
-    done
-)
+#!/bin/sh
+cat targets.txt | (
+    while read target model
+    do
+        make MODEL=$model TARGET=$target build
+    done
+)