# 
# 
# patch "src/main.cpp"
#  from [41b0503396e76a1387e9bb95f73c58a61f49e7fd]
#    to [3f2c4768e3ad2aec14b588ab1d91178fc238af5c]
# 
# patch "src/model/Attributes.cpp"
#  from [869e9f7154de06571e5eb39175ed9930435e272e]
#    to [9d7d3c65902acf25e360a889ce7bd1b05c7a42d9]
# 
# patch "src/model/AutomateCommand.h"
#  from [4747685170358fe1099ae3e7fbbf9e9efa304dba]
#    to [acf4168b70c80fe599fc74d6bd2e64cc44412ae1]
# 
# patch "src/model/Inventory.cpp"
#  from [0308fb3498f649272b338bd0ea6c58b4bc23f7b9]
#    to [0a3df0f7ac7d000cd0e99a12746ef4a4cb959bd0]
# 
# patch "src/model/Inventory.h"
#  from [c1fe73b61caf5c03c1d45de1edb614dff62e4d37]
#    to [7ad6edb283f782e6c8d273445bf5f1b35c831ad5]
# 
# patch "src/model/InventoryItem.cpp"
#  from [b6b287272d6634902a31c13f946eaf3943c8dcb9]
#    to [86bb0a5f785013fbfab79dc0b162a8b39abd0c8b]
# 
# patch "src/model/InventoryItem.h"
#  from [b946dac9281720332fc4d922e68c5f329f5503cf]
#    to [0d19b1a17a960675f36bd1e41087197a7316f169]
# 
# patch "src/model/Select.cpp"
#  from [c430034be00524914228a031284adf7bac544710]
#    to [dc17454cfa51773295dc9cf50bf670f63dcda563]
# 
# patch "src/monotone/Monotone.cpp"
#  from [c226824f64346ffd8ee88a1a83d7238b499044ef]
#    to [db88b212d3171db74ea318d914d9a2486d43d0f9]
# 
# patch "src/monotone/Monotone.h"
#  from [901a2ee3e2759aceb0ba334fbe8fc6cde01add43]
#    to [71d6daa12c1a800ef5ca6c5599750dda3c834fb7]
# 
# patch "src/util/IconProvider.h"
#  from [936965b708ba305bec17fe6f655d09ebb4c3286b]
#    to [1b27a024f2013ffdc64131b90e2390fe3967ddcb]
# 
# patch "src/util/Settings.h"
#  from [654876106889023c29dca737ee1f0b0769abc35d]
#    to [cd9740763378997917037234ba0f3ce02f0e1d8a]
# 
# patch "src/util/StanzaParser.h"
#  from [6817ca33907934966069ead9098a0b912d7aeb01]
#    to [f8dcbbcab5e063cd2830f06cd880e920f0be7e19]
# 
# patch "src/view/Guitone.cpp"
#  from [fa55a14466d1bcaacda65e58a5906435538020af]
#    to [8e4bdb3cabefc97142f9ae6a9f67b705fcc32e04]
# 
# patch "src/view/Guitone.h"
#  from [e5db27aa3fa18109257cce092ff3f8b22c7e6ae1]
#    to [0e2919d85d18a4fab517820f7bee97aa7a4d1047]
# 
# patch "src/view/InventoryView.cpp"
#  from [00083467ab62cf570c44eca40363e151046be5a5]
#    to [df7b80811e13e8b4fcce64000642bef16bf8c48e]
# 
# patch "src/view/InventoryView.h"
#  from [6b77249c47a57de6396cbf148c9e3e2d13c1b6fc]
#    to [8b3986b9a58118e1f929b14465b2b4a7227853ac]
# 
# patch "src/view/Splitter.h"
#  from [64f1308a209d484b832325bf8f3ad7847f9ca630]
#    to [10eaac494e2011e87c469d90ea73e584e2e5a87e]
# 
# patch "src/view/TreeView.cpp"
#  from [3fed528b1ae9f72cfe90380641e9a9f96872f212]
#    to [1eeff5b24327fe11b3b9152881f5f5b789ac974a]
# 
# patch "src/view/TreeView.h"
#  from [9ef98c2db2fb4207f0bb466a3816c5a27624f440]
#    to [91b3758772b3ad8e038f31bb1e46693aaf05b70e]
# 
# patch "src/view/dialogs/Preferences.cpp"
#  from [1649bd6ccc4ddbdb0e609df075bf0aa2583b434c]
#    to [8be0f915b0116d8e52014ad6e94c750634c2e084]
# 
# patch "src/view/dialogs/SwitchWorkspaceRevision.cpp"
#  from [047540bae1d4d5ee09ac4a674e0c685a5ad0a659]
#    to [90124578b08ddf3d7cf83e3404b664dc753795af]
# 
============================================================
--- src/main.cpp	41b0503396e76a1387e9bb95f73c58a61f49e7fd
+++ src/main.cpp	3f2c4768e3ad2aec14b588ab1d91178fc238af5c
@@ -20,6 +20,10 @@
 
 #include "view/Guitone.h"
 
+#include <QApplication>
+#include <QLocale>
+#include <QTranslator>
+
 int main(int argc, char** argv)
 {
     QApplication app(argc,argv);
============================================================
--- src/model/Attributes.cpp	869e9f7154de06571e5eb39175ed9930435e272e
+++ src/model/Attributes.cpp	9d7d3c65902acf25e360a889ce7bd1b05c7a42d9
@@ -23,6 +23,8 @@
 #include "../monotone/Monotone.h"
 #include "../util/StanzaParser.h"
 
+#include <QSortFilterProxyModel>
+
 Attributes::Attributes(QObject *parent) 
     : AutomateCommand(parent)
 {
============================================================
--- src/model/AutomateCommand.h	4747685170358fe1099ae3e7fbbf9e9efa304dba
+++ src/model/AutomateCommand.h	acf4168b70c80fe599fc74d6bd2e64cc44412ae1
@@ -21,6 +21,8 @@
 #ifndef AUTOMATE_COMMAND_H
 #define AUTOMATE_COMMAND_H
 
+#include <QAbstractItemModel>
+
 /*
  * Unfortunately Qt4's signal/slot handling does not allow multiple
  * inheritance, thus we need to derive from the abstract model here
============================================================
--- src/model/Inventory.cpp	0308fb3498f649272b338bd0ea6c58b4bc23f7b9
+++ src/model/Inventory.cpp	0a3df0f7ac7d000cd0e99a12746ef4a4cb959bd0
@@ -23,6 +23,8 @@
 #include "../monotone/Monotone.h"
 #include "../util/IconProvider.h"
 
+#include <QApplication>
+
 Inventory::Inventory(QObject *parent) : AutomateCommand(parent), 
 modelPresent(false)
 {
============================================================
--- src/model/Inventory.h	c1fe73b61caf5c03c1d45de1edb614dff62e4d37
+++ src/model/Inventory.h	7ad6edb283f782e6c8d273445bf5f1b35c831ad5
@@ -22,11 +22,12 @@
 #define INVENTORY_H
 
 #include "AutomateCommand.h"
+#include <QDir>
+#include <QRegExp>
 
 class InventoryItem;
 class Monotone;
 class IconProvider;
-class QRegExp;
 
 class Inventory : public AutomateCommand 
 {
============================================================
--- src/model/InventoryItem.cpp	b6b287272d6634902a31c13f946eaf3943c8dcb9
+++ src/model/InventoryItem.cpp	86bb0a5f785013fbfab79dc0b162a8b39abd0c8b
@@ -20,6 +20,8 @@
 
 #include "InventoryItem.h"
 
+#include <QStringList>
+
 const int InventoryItem::RenamedFrom = 1;
 const int InventoryItem::RenamedTo = 2;
 const int InventoryItem::Added = 4;
============================================================
--- src/model/InventoryItem.h	b946dac9281720332fc4d922e68c5f329f5503cf
+++ src/model/InventoryItem.h	0d19b1a17a960675f36bd1e41087197a7316f169
@@ -21,7 +21,7 @@
 #ifndef INVENTORY_ITEM_H
 #define INVENTORY_ITEM_H
 
-#include <QObject>
+#include <QVariant>
 
 class InventoryItem : public QObject
 {
============================================================
--- src/model/Select.cpp	c430034be00524914228a031284adf7bac544710
+++ src/model/Select.cpp	dc17454cfa51773295dc9cf50bf670f63dcda563
@@ -21,6 +21,8 @@
 #include "Select.h"
 #include "../monotone/Monotone.h"
 
+#include <QApplication>
+
 Select::Select(QObject *parent) 
     : AutomateCommand(parent)
 {
============================================================
--- src/monotone/Monotone.cpp	c226824f64346ffd8ee88a1a83d7238b499044ef
+++ src/monotone/Monotone.cpp	db88b212d3171db74ea318d914d9a2486d43d0f9
@@ -22,6 +22,8 @@
 #include "../model/AutomateCommand.h"
 #include "../util/Settings.h"
 
+#include <QTextStream>
+
 Monotone* Monotone::instance = 0;
 
 const QString Monotone::RequiredVersion = "0.29";
@@ -161,11 +163,11 @@ bool Monotone::triggerCommand(AutomateCo
 		lastCaller, SLOT(parseOutput(AutomateCommand*))
     );
     
-	// QProcess in QT4 dosen't have a writeToStdin().
+	// QProcess in QT4 doesn't have a writeToStdin().
 	// So we need the following QTextStream
 	QTextStream streamStdIn(process);
 
-	// Write our finalCmd to mtn's StdIn
+	// Write our finalCmd to mtn's stdin
 	streamStdIn << finalCmd;
 
 	return true;
============================================================
--- src/monotone/Monotone.h	901a2ee3e2759aceb0ba334fbe8fc6cde01add43
+++ src/monotone/Monotone.h	71d6daa12c1a800ef5ca6c5599750dda3c834fb7
@@ -21,7 +21,9 @@
 #ifndef MONOTONE_H
 #define MONOTONE_H
 
-class AutomateCommand;
+#include "../model/AutomateCommand.h"
+#include <QProcess>
+#include <QDir>
 
 class Monotone : public QObject
 {
============================================================
--- src/util/IconProvider.h	936965b708ba305bec17fe6f655d09ebb4c3286b
+++ src/util/IconProvider.h	1b27a024f2013ffdc64131b90e2390fe3967ddcb
@@ -21,6 +21,8 @@
 #ifndef ICONPROVIDER_H
 #define ICONPROVIDER_H
 
+#include <QIcon>
+
 class InventoryItem;
 
 class IconProvider
============================================================
--- src/util/Settings.h	654876106889023c29dca737ee1f0b0769abc35d
+++ src/util/Settings.h	cd9740763378997917037234ba0f3ce02f0e1d8a
@@ -21,11 +21,9 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-//
-// Forward class declarations
-//
-class QSettings;
-class QSize;
+#include <QSettings>
+#include <QSize>
+#include <QHeaderView>
 
 class Settings : public QSettings
 {
============================================================
--- src/util/StanzaParser.h	6817ca33907934966069ead9098a0b912d7aeb01
+++ src/util/StanzaParser.h	f8dcbbcab5e063cd2830f06cd880e920f0be7e19
@@ -21,6 +21,8 @@
 #ifndef STANZA_PARSER_H
 #define STANZA_PARSER_H
 
+#include <QStringList>
+
 typedef struct {
     QString sym;
     QStringList vals;
============================================================
--- src/view/Guitone.cpp	fa55a14466d1bcaacda65e58a5906435538020af
+++ src/view/Guitone.cpp	8e4bdb3cabefc97142f9ae6a9f67b705fcc32e04
@@ -32,6 +32,12 @@
 #include "../view/dialogs/KeyManagment.h"
 #include "../util/Settings.h"
 
+#include <QMessageBox>
+#include <QStatusBar>
+#include <QMenuBar>
+#include <QFileDialog>
+#include <QCloseEvent>
+
 Guitone::Guitone()
     : QMainWindow()
 {
============================================================
--- src/view/Guitone.h	e5db27aa3fa18109257cce092ff3f8b22c7e6ae1
+++ src/view/Guitone.h	0e2919d85d18a4fab517820f7bee97aa7a4d1047
@@ -21,11 +21,11 @@
 #ifndef GUITONE_H
 #define GUITONE_H
 
-class QMenu;
-class QToolBar;
-class QListView;
-class QMainWindow;
+#include <QMenu>
+#include <QMainWindow>
 
+class QModelIndex;
+
 class Inventory;
 class Attributes;
 class InventoryProxyModel;
============================================================
--- src/view/InventoryView.cpp	00083467ab62cf570c44eca40363e151046be5a5
+++ src/view/InventoryView.cpp	df7b80811e13e8b4fcce64000642bef16bf8c48e
@@ -22,6 +22,10 @@
 #include "../util/Settings.h"
 #include "../model/InventoryItem.h"
 
+#include <QMenu>
+#include <QContextMenuEvent>
+#include <QHeaderView>
+
 InventoryView::InventoryView(QWidget* parent, Type type_, QString objName)
 : TreeView(parent, objName), type(type_)
 {
============================================================
--- src/view/InventoryView.h	6b77249c47a57de6396cbf148c9e3e2d13c1b6fc
+++ src/view/InventoryView.h	8b3986b9a58118e1f929b14465b2b4a7227853ac
@@ -22,8 +22,8 @@
 #define INVENTORY_VIEW_H
 
 #include "TreeView.h"
+#include <QAction>
 
-class QAction;
 class InventoryItem;
 
 class InventoryView : public TreeView
============================================================
--- src/view/Splitter.h	64f1308a209d484b832325bf8f3ad7847f9ca630
+++ src/view/Splitter.h	10eaac494e2011e87c469d90ea73e584e2e5a87e
@@ -21,6 +21,8 @@
 #ifndef SPLITTER_H
 #define SPLITTER_H
 
+#include <QSplitter>
+
 class Splitter : public QSplitter
 {
 	Q_OBJECT
============================================================
--- src/view/TreeView.cpp	3fed528b1ae9f72cfe90380641e9a9f96872f212
+++ src/view/TreeView.cpp	1eeff5b24327fe11b3b9152881f5f5b789ac974a
@@ -22,6 +22,8 @@
 #include "stable.h"
 #include "../util/Settings.h"
 
+#include <QHeaderView>
+
 TreeView::TreeView(QWidget* parent)
 : QTreeView(parent)
 {
============================================================
--- src/view/TreeView.h	9ef98c2db2fb4207f0bb466a3816c5a27624f440
+++ src/view/TreeView.h	91b3758772b3ad8e038f31bb1e46693aaf05b70e
@@ -21,6 +21,8 @@
 #ifndef TREE_VIEW_H
 #define TREE_VIEW_H
 
+#include <QTreeView>
+
 class TreeView : public QTreeView
 {
 	Q_OBJECT
============================================================
--- src/view/dialogs/Preferences.cpp	1649bd6ccc4ddbdb0e609df075bf0aa2583b434c
+++ src/view/dialogs/Preferences.cpp	8be0f915b0116d8e52014ad6e94c750634c2e084
@@ -22,6 +22,10 @@
 #include "../../util/Settings.h"
 #include "../../monotone/Monotone.h"
 
+#include <QFileDialog>
+#include <QMessageBox>
+#include <QHeaderView>
+
 Preferences::Preferences(QWidget* parent)
     : QDialog(parent)
 {
============================================================
--- src/view/dialogs/SwitchWorkspaceRevision.cpp	047540bae1d4d5ee09ac4a674e0c685a5ad0a659
+++ src/view/dialogs/SwitchWorkspaceRevision.cpp	90124578b08ddf3d7cf83e3404b664dc753795af
@@ -22,6 +22,9 @@
 #include "../../model/Select.h"
 #include "../../model/Certs.h"
 
+#include <QMessageBox>
+#include <QHeaderView>
+
 SwitchWorkspaceRevision::SwitchWorkspaceRevision(QWidget* parent)
     : QDialog(parent)
 {