Common subdirectories: ./src.orig/context and ./src/context
Common subdirectories: ./src.orig/faderwidget and ./src/faderwidget
Common subdirectories: ./src.orig/iconloader and ./src/iconloader
diff -u ./src.orig/lastfm.cpp ./src/lastfm.cpp
--- ./src.orig/lastfm.cpp	2012-02-09 16:43:20.000000000 -0200
+++ ./src/lastfm.cpp	2012-04-21 21:40:13.533451199 -0300
@@ -1,6 +1,6 @@
 #include "lastfm.h"
 #include "datautils.h"
-#include "../networkaccess.h"
+#include "networkaccess.h"
 #include "lastfmlogindialog.h"
 #include "mainwindow.h"
 #include "constants.h"
diff -u ./src.orig/mediaview.cpp ./src/mediaview.cpp
--- ./src.orig/mediaview.cpp	2012-02-09 16:43:20.000000000 -0200
+++ ./src/mediaview.cpp	2012-04-21 21:40:04.204451823 -0300
@@ -1,7 +1,7 @@
 #include "mediaview.h"
 #include "model/track.h"
 #include "model/artist.h"
-#include "../mainwindow.h"
+#include "mainwindow.h"
 #include "droparea.h"
 #include "minisplitter.h"
 #include "constants.h"
Common subdirectories: ./src.orig/model and ./src/model