diff --git a/ChangeLog b/ChangeLog
index c6601ba944fbfcf09c47617299b73675cbd92bff..9b838436c76851c2f735a5154a1571a2971af15d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 Laurielle LEA (13 July 2005) version 0.4
 - Fix bug if network is not available.
+- Fix apply skin feature
 
 Laurielle LEA (11 July 2005) version 0.4
 - Check functions return.
diff --git a/src/configurationtree.cpp b/src/configurationtree.cpp
index e885d5c15a0d8539880b0af5222139d5ef5d63f0..4a3db9e45a6c73c9104fd393c0b2a50884161c64 100644
--- a/src/configurationtree.cpp
+++ b/src/configurationtree.cpp
@@ -7,9 +7,9 @@
 #include <iostream>
 #include <string>
 
+#include "global.h"
 #include "configitem.h"
 #include "configurationtree.h"
-#include "global.h"
 
 using namespace std;
 
diff --git a/src/error.cpp b/src/error.cpp
index 6d8e736ffff98e540a83bd0a52dbdb83d02c7629..9de2b7fc7897d5c8c780fac1d2f3044aca54a42e 100644
--- a/src/error.cpp
+++ b/src/error.cpp
@@ -19,8 +19,8 @@
 
 #include <string>
 
-#include "error.h"
 #include "global.h"
+#include "error.h"
 #include "manager.h"
   
 using namespace std;
diff --git a/src/gui/qt/qtGUImainwindow.cpp b/src/gui/qt/qtGUImainwindow.cpp
index 6ad650a579bcc90f70c3f8a8e114eda998010219..4c480ecdab14e6e88160fd5fd238744549636ca9 100644
--- a/src/gui/qt/qtGUImainwindow.cpp
+++ b/src/gui/qt/qtGUImainwindow.cpp
@@ -204,10 +204,6 @@ QtGUIMainWindow::deleteButtons (void) {
 	delete  phoneKey_transf;
 	delete  phoneKey_msg;
 	delete  phoneKey_conf;
-	delete  phoneKey_line0;
-	delete  phoneKey_line1;
-	delete  phoneKey_line2;
-	delete  phoneKey_line3;
 	delete  reduce_button;
 	delete  quit_button;
 	delete  addr_book_button;
diff --git a/src/sipcall.cpp b/src/sipcall.cpp
index 10f9c1b5871f6d0966c62b64e38449d0999cab6b..334c86b8b94d050daf765ceed0cace610727566a 100644
--- a/src/sipcall.cpp
+++ b/src/sipcall.cpp
@@ -24,9 +24,9 @@
  
 #include <iostream>
 
+#include "global.h"
 #include "audio/audiocodec.h"
 #include "audio/codecDescriptor.h"
-#include "global.h"
 #include "sipcall.h"
 
 using namespace std;
diff --git a/src/sipvoiplink.cpp b/src/sipvoiplink.cpp
index 630fe166f7789d4d2b421435a6850545d8941405..592388a40380475c226cfc96bd18ca84c67aa760 100644
--- a/src/sipvoiplink.cpp
+++ b/src/sipvoiplink.cpp
@@ -30,15 +30,15 @@
 #include <string>
 #include <vector>
 
+#include "global.h"
+#include "sipvoiplink.h"
 #include "audio/audiortp.h"
 #include "audio/codecDescriptor.h"
 #include "call.h"
 #include "error.h"
 #include "eventthread.h"
-#include "global.h"
 #include "manager.h"
 #include "sipcall.h"
-#include "sipvoiplink.h"
 #include "user_cfg.h"
 #include "voIPLink.h"
  
diff --git a/src/skin.cpp b/src/skin.cpp
index eb02d22bd22ead90088864965b55543a6567802d..97d1261e5540a865d095eade9092e57e71343ed3 100644
--- a/src/skin.cpp
+++ b/src/skin.cpp
@@ -18,7 +18,6 @@
  */
 
 
-#include "global.h"
 #include "skin.h"
 
 #ifndef PROGSHAREDIR