diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
index 539c326447..40c0ded6ce 100644
--- a/bitcoin-qt.pro
+++ b/bitcoin-qt.pro
@@ -1,19 +1,20 @@
 TEMPLATE = app
 TARGET =
-DEPENDPATH += .
 INCLUDEPATH += src src/json src/cryptopp src/qt
 DEFINES += QT_GUI
+# DEFINES += SSL
+CONFIG += no_include_pwd
 
 # for boost 1.37, add -mt to the boost libraries
 unix:LIBS += -lssl -lcrypto -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx
 macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0 BOOST_FILESYSTEM_VERSION=3
 macx:LIBS += -lboost_thread-mt
+windows:DEFINES += __WXMSW__
+windows:LIBS += -lssl -lcrypto -lboost_system-mgw44-mt-1_43 -lboost_filesystem-mgw44-mt-1_43 -lboost_program_options-mgw44-mt-1_43 -lboost_thread-mgw44-mt-1_43 -ldb_cxx -lws2_32 -lgdi32
 
 # disable quite some warnings because bitcoin core "sins" a lot
 QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -Wno-unused-variable -Wno-unused-parameter -Wno-sign-compare -Wno-char-subscripts  -Wno-unused-value -Wno-sequence-point -Wno-parentheses -Wno-unknown-pragmas -Wno-switch
 
-# TODO: WINDOWS defines, -DSSL
-
 # Input
 DEPENDPATH += src/qt src src/cryptopp src json/include
 HEADERS += src/qt/bitcoingui.h \
@@ -60,7 +61,6 @@ HEADERS += src/qt/bitcoingui.h \
     src/json/json_spirit_reader.h \
     src/json/json_spirit_error_position.h \
     src/json/json_spirit.h \
-    src/rpc.h \
     src/qt/clientmodel.h \
     src/qt/guiutil.h \
     src/qt/transactionrecord.h \
@@ -75,7 +75,8 @@ HEADERS += src/qt/bitcoingui.h \
     src/keystore.h \
     src/qt/transactionfilterproxy.h \
     src/qt/transactionview.h \
-    src/qt/walletmodel.h
+    src/qt/walletmodel.h \
+    src/bitcoinrpc.h
 SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/qt/transactiontablemodel.cpp \
     src/qt/addresstablemodel.cpp \
@@ -91,7 +92,6 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/script.cpp \
     src/main.cpp \
     src/init.cpp \
-    src/rpc.cpp \
     src/net.cpp \
     src/irc.cpp \
     src/db.cpp \
@@ -111,7 +111,8 @@ SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
     src/keystore.cpp \
     src/qt/transactionfilterproxy.cpp \
     src/qt/transactionview.cpp \
-    src/qt/walletmodel.cpp
+    src/qt/walletmodel.cpp \
+    src/bitcoinrpc.cpp
 
 RESOURCES += \
     src/qt/bitcoin.qrc
diff --git a/src/rpc.cpp b/src/bitcoinrpc.cpp
similarity index 100%
rename from src/rpc.cpp
rename to src/bitcoinrpc.cpp
diff --git a/src/rpc.h b/src/bitcoinrpc.h
similarity index 100%
rename from src/rpc.h
rename to src/bitcoinrpc.h
diff --git a/src/init.cpp b/src/init.cpp
index e4605a2b42..cac921e2b2 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -3,7 +3,7 @@
 // file license.txt or http://www.opensource.org/licenses/mit-license.php.
 #include "headers.h"
 #include "db.h"
-#include "rpc.h"
+#include "bitcoinrpc.h"
 #include "net.h"
 #include "init.h"
 #include "strlcpy.h"
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 397af5fd38..78a20c51c0 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -113,21 +113,23 @@ int main(int argc, char *argv[])
     {
         if(AppInit2(argc, argv))
         {
-            BitcoinGUI window;
-            ClientModel clientModel(pwalletMain);
-            WalletModel walletModel(pwalletMain);
-            guiref = &window;
-            window.setClientModel(&clientModel);
-            window.setWalletModel(&walletModel);
+            {
+                // Put this in a block, so that BitcoinGUI is cleaned up properly before
+                // calling shutdown.
+                BitcoinGUI window;
+                ClientModel clientModel(pwalletMain);
+                WalletModel walletModel(pwalletMain);
+                guiref = &window;
+                window.setClientModel(&clientModel);
+                window.setWalletModel(&walletModel);
 
-            window.show();
+                window.show();
 
-            int retval = app.exec();
+                app.exec();
 
-            guiref = 0;
+                guiref = 0;
+            }
             Shutdown(NULL);
-
-            return retval;
         }
         else
         {
@@ -138,4 +140,5 @@ int main(int argc, char *argv[])
     } catch (...) {
         PrintException(NULL, "Runaway exception");
     }
+    return 0;
 }
diff --git a/src/qt/forms/addressbookdialog.ui b/src/qt/forms/addressbookdialog.ui
index 12ecb13651..66f1076afb 100644
--- a/src/qt/forms/addressbookdialog.ui
+++ b/src/qt/forms/addressbookdialog.ui
@@ -100,19 +100,6 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
      <item>
       <widget class="QPushButton" name="newAddressButton">
        <property name="toolTip">
@@ -155,6 +142,19 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QDialogButtonBox" name="buttonBox">
        <property name="sizePolicy">
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
index c68532b87c..31b28024df 100644
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -1,6 +1,7 @@
 #include "guiutil.h"
 #include "bitcoinaddressvalidator.h"
-#include "util.h"
+
+#include "headers.h"
 
 #include <QString>
 #include <QDateTime>
diff --git a/src/qt/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index bb2537a479..809e473060 100644
--- a/src/qt/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
@@ -1,7 +1,8 @@
 #include <transactiondesc.h>
 
 #include "guiutil.h"
-#include "main.h"
+
+#include "headers.h"
 #include "qtui.h"
 
 #include <QString>