97 files changed, 91 insertions, 91 deletions
diff --git a/bitcoin.pro b/bitcoin.pro
index 7758376f7c..dd9ea7ff33 100644
--- a/bitcoin.pro
+++ b/bitcoin.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 TARGET =
 DEPENDPATH += .
-INCLUDEPATH += gui/include core/include cryptopp/include json/include
+INCLUDEPATH += src src/json src/cryptopp src/qt
 unix:LIBS += -lssl -lboost_system -lboost_filesystem -lboost_program_options -lboost_thread -ldb_cxx
 macx:DEFINES += __WXMAC_OSX__ MSG_NOSIGNAL=0
 
@@ -11,97 +11,97 @@ QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wno-invalid-offsetof -
 # WINDOWS defines, -DSSL, look at build system
 
 # Input
-DEPENDPATH += gui/include core/include cryptopp/include core/include json/include
-HEADERS += gui/include/bitcoingui.h \
-    gui/include/transactiontablemodel.h \
-    gui/include/addresstablemodel.h \
-    gui/include/optionsdialog.h \
-    gui/include/sendcoinsdialog.h \
-    gui/include/addressbookdialog.h \
-    gui/include/aboutdialog.h \
-    gui/include/editaddressdialog.h \
-    gui/include/bitcoinaddressvalidator.h \
-    core/include/base58.h \
-    core/include/bignum.h \
-    core/include/util.h \
-    core/include/uint256.h \
-    core/include/serialize.h \
-    cryptopp/include/cryptopp/stdcpp.h \
-    cryptopp/include/cryptopp/smartptr.h \
-    cryptopp/include/cryptopp/simple.h \
-    cryptopp/include/cryptopp/sha.h \
-    cryptopp/include/cryptopp/secblock.h \
-    cryptopp/include/cryptopp/pch.h \
-    cryptopp/include/cryptopp/misc.h \
-    cryptopp/include/cryptopp/iterhash.h \
-    cryptopp/include/cryptopp/cryptlib.h \
-    cryptopp/include/cryptopp/cpu.h \
-    cryptopp/include/cryptopp/config.h \
-    core/include/strlcpy.h \
-    core/include/main.h \
-    core/include/net.h \
-    core/include/key.h \
-    core/include/db.h \
-    core/include/script.h \
-    core/include/noui.h \
-    core/include/init.h \
-    core/include/headers.h \
-    core/include/irc.h \
-    json/include/json/json_spirit_writer_template.h \
-    json/include/json/json_spirit_writer.h \
-    json/include/json/json_spirit_value.h \
-    json/include/json/json_spirit_utils.h \
-    json/include/json/json_spirit_stream_reader.h \
-    json/include/json/json_spirit_reader_template.h \
-    json/include/json/json_spirit_reader.h \
-    json/include/json/json_spirit_error_position.h \
-    json/include/json/json_spirit.h \
-    core/include/rpc.h \
-    gui/include/clientmodel.h \
-    gui/include/guiutil.h \
-    gui/include/transactionrecord.h \
-    gui/include/guiconstants.h \
-    gui/include/optionsmodel.h \
-    gui/include/monitoreddatamapper.h \
-    core/include/externui.h \
-    gui/include/transactiondesc.h \
-    gui/include/transactiondescdialog.h
-SOURCES += gui/src/bitcoin.cpp gui/src/bitcoingui.cpp \
-    gui/src/transactiontablemodel.cpp \
-    gui/src/addresstablemodel.cpp \
-    gui/src/optionsdialog.cpp \
-    gui/src/sendcoinsdialog.cpp \
-    gui/src/addressbookdialog.cpp \
-    gui/src/aboutdialog.cpp \
-    gui/src/editaddressdialog.cpp \
-    gui/src/bitcoinaddressvalidator.cpp \
-    cryptopp/src/sha.cpp \
-    cryptopp/src/cpu.cpp \
-    core/src/util.cpp \
-    core/src/script.cpp \
-    core/src/main.cpp \
-    core/src/init.cpp \
-    core/src/rpc.cpp \
-    core/src/net.cpp \
-    core/src/irc.cpp \
-    core/src/db.cpp \
-    json/src/json_spirit_writer.cpp \
-    json/src/json_spirit_value.cpp \
-    json/src/json_spirit_reader.cpp \
-    gui/src/clientmodel.cpp \
-    gui/src/guiutil.cpp \
-    gui/src/transactionrecord.cpp \
-    gui/src/optionsmodel.cpp \
-    gui/src/monitoreddatamapper.cpp \
-    gui/src/transactiondesc.cpp \
-    gui/src/transactiondescdialog.cpp
+DEPENDPATH += src/qt src src/cryptopp src json/include
+HEADERS += src/qt/bitcoingui.h \
+    src/qt/transactiontablemodel.h \
+    src/qt/addresstablemodel.h \
+    src/qt/optionsdialog.h \
+    src/qt/sendcoinsdialog.h \
+    src/qt/addressbookdialog.h \
+    src/qt/aboutdialog.h \
+    src/qt/editaddressdialog.h \
+    src/qt/bitcoinaddressvalidator.h \
+    src/base58.h \
+    src/bignum.h \
+    src/util.h \
+    src/uint256.h \
+    src/serialize.h \
+    src/cryptopp/stdcpp.h \
+    src/cryptopp/smartptr.h \
+    src/cryptopp/simple.h \
+    src/cryptopp/sha.h \
+    src/cryptopp/secblock.h \
+    src/cryptopp/pch.h \
+    src/cryptopp/misc.h \
+    src/cryptopp/iterhash.h \
+    src/cryptopp/cryptlib.h \
+    src/cryptopp/cpu.h \
+    src/cryptopp/config.h \
+    src/strlcpy.h \
+    src/main.h \
+    src/net.h \
+    src/key.h \
+    src/db.h \
+    src/script.h \
+    src/noui.h \
+    src/init.h \
+    src/headers.h \
+    src/irc.h \
+    src/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer.h \
+    src/json/json_spirit_value.h \
+    src/json/json_spirit_utils.h \
+    src/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_reader_template.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 \
+    src/qt/guiconstants.h \
+    src/qt/optionsmodel.h \
+    src/qt/monitoreddatamapper.h \
+    src/externui.h \
+    src/qt/transactiondesc.h \
+    src/qt/transactiondescdialog.h
+SOURCES += src/qt/bitcoin.cpp src/qt/bitcoingui.cpp \
+    src/qt/transactiontablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
+    src/qt/optionsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
+    src/qt/addressbookdialog.cpp \
+    src/qt/aboutdialog.cpp \
+    src/qt/editaddressdialog.cpp \
+    src/qt/bitcoinaddressvalidator.cpp \
+    src/cryptopp/sha.cpp \
+    src/cryptopp/cpu.cpp \
+    src/util.cpp \
+    src/script.cpp \
+    src/main.cpp \
+    src/init.cpp \
+    src/rpc.cpp \
+    src/net.cpp \
+    src/irc.cpp \
+    src/db.cpp \
+    src/json/json_spirit_writer.cpp \
+    src/json/json_spirit_value.cpp \
+    src/json/json_spirit_reader.cpp \
+    src/qt/clientmodel.cpp \
+    src/qt/guiutil.cpp \
+    src/qt/transactionrecord.cpp \
+    src/qt/optionsmodel.cpp \
+    src/qt/monitoreddatamapper.cpp \
+    src/qt/transactiondesc.cpp \
+    src/qt/transactiondescdialog.cpp
 
 RESOURCES += \
-    gui/bitcoin.qrc
+    src/qt/bitcoin.qrc
 
 FORMS += \
-    gui/forms/sendcoinsdialog.ui \
-    gui/forms/addressbookdialog.ui \
-    gui/forms/aboutdialog.ui \
-    gui/forms/editaddressdialog.ui \
-    gui/forms/transactiondescdialog.ui
+    src/qt/forms/sendcoinsdialog.ui \
+    src/qt/forms/addressbookdialog.ui \
+    src/qt/forms/aboutdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
+    src/qt/forms/transactiondescdialog.ui
diff --git a/core/include/base58.h b/src/base58.h
index 580bd3fc63..580bd3fc63 100644
--- a/core/include/base58.h
+++ b/src/base58.h
diff --git a/core/include/bignum.h b/src/bignum.h
index 5b4c78e7fa..5b4c78e7fa 100644
--- a/core/include/bignum.h
+++ b/src/bignum.h
diff --git a/cryptopp/include/cryptopp/config.h b/src/cryptopp/config.h
index 0737027f41..0737027f41 100644
--- a/cryptopp/include/cryptopp/config.h
+++ b/src/cryptopp/config.h
diff --git a/cryptopp/src/cpu.cpp b/src/cryptopp/cpu.cpp
index d36d3253ae..d36d3253ae 100644
--- a/cryptopp/src/cpu.cpp
+++ b/src/cryptopp/cpu.cpp
diff --git a/cryptopp/include/cryptopp/cpu.h b/src/cryptopp/cpu.h
index 113b8a1f3b..113b8a1f3b 100644
--- a/cryptopp/include/cryptopp/cpu.h
+++ b/src/cryptopp/cpu.h
diff --git a/cryptopp/include/cryptopp/cryptlib.h b/src/cryptopp/cryptlib.h
index 1461af7b7b..1461af7b7b 100644
--- a/cryptopp/include/cryptopp/cryptlib.h
+++ b/src/cryptopp/cryptlib.h
diff --git a/cryptopp/include/cryptopp/iterhash.h b/src/cryptopp/iterhash.h
index 0e2a147728..0e2a147728 100644
--- a/cryptopp/include/cryptopp/iterhash.h
+++ b/src/cryptopp/iterhash.h
diff --git a/cryptopp/include/cryptopp/misc.h b/src/cryptopp/misc.h
index 5258e2abca..5258e2abca 100644
--- a/cryptopp/include/cryptopp/misc.h
+++ b/src/cryptopp/misc.h
diff --git a/cryptopp/include/cryptopp/pch.h b/src/cryptopp/pch.h
index 418c39076d..418c39076d 100644
--- a/cryptopp/include/cryptopp/pch.h
+++ b/src/cryptopp/pch.h
diff --git a/cryptopp/include/cryptopp/secblock.h b/src/cryptopp/secblock.h
index 6433f97349..6433f97349 100644
--- a/cryptopp/include/cryptopp/secblock.h
+++ b/src/cryptopp/secblock.h
diff --git a/cryptopp/src/sha.cpp b/src/cryptopp/sha.cpp
index 1ff6c0b45c..1ff6c0b45c 100644
--- a/cryptopp/src/sha.cpp
+++ b/src/cryptopp/sha.cpp
diff --git a/cryptopp/include/cryptopp/sha.h b/src/cryptopp/sha.h
index 8d0dbfcac7..8d0dbfcac7 100644
--- a/cryptopp/include/cryptopp/sha.h
+++ b/src/cryptopp/sha.h
diff --git a/cryptopp/include/cryptopp/simple.h b/src/cryptopp/simple.h
index 8b13789179..8b13789179 100644
--- a/cryptopp/include/cryptopp/simple.h
+++ b/src/cryptopp/simple.h
diff --git a/cryptopp/include/cryptopp/smartptr.h b/src/cryptopp/smartptr.h
index fa0daec3df..fa0daec3df 100644
--- a/cryptopp/include/cryptopp/smartptr.h
+++ b/src/cryptopp/smartptr.h
diff --git a/cryptopp/include/cryptopp/stdcpp.h b/src/cryptopp/stdcpp.h
index 9a468ab61e..9a468ab61e 100644
--- a/cryptopp/include/cryptopp/stdcpp.h
+++ b/src/cryptopp/stdcpp.h
diff --git a/core/src/db.cpp b/src/db.cpp
index 52c0f5b4c3..52c0f5b4c3 100644
--- a/core/src/db.cpp
+++ b/src/db.cpp
diff --git a/core/include/db.h b/src/db.h
index 9826194ed0..9826194ed0 100644
--- a/core/include/db.h
+++ b/src/db.h
diff --git a/core/include/externui.h b/src/externui.h
index e58ccc2242..e58ccc2242 100644
--- a/core/include/externui.h
+++ b/src/externui.h
diff --git a/core/include/headers.h b/src/headers.h
index 33aeef3383..33aeef3383 100644
--- a/core/include/headers.h
+++ b/src/headers.h
diff --git a/core/src/init.cpp b/src/init.cpp
index f7a1ce9ef1..f7a1ce9ef1 100644
--- a/core/src/init.cpp
+++ b/src/init.cpp
diff --git a/core/include/init.h b/src/init.h
index 61b2728576..61b2728576 100644
--- a/core/include/init.h
+++ b/src/init.h
diff --git a/core/src/irc.cpp b/src/irc.cpp
index a76374d143..a76374d143 100644
--- a/core/src/irc.cpp
+++ b/src/irc.cpp
diff --git a/core/include/irc.h b/src/irc.h
index 18e53597f6..18e53597f6 100644
--- a/core/include/irc.h
+++ b/src/irc.h
diff --git a/json/include/json/json_spirit.h b/src/json/json_spirit.h
index ac1879d5b3..ac1879d5b3 100644
--- a/json/include/json/json_spirit.h
+++ b/src/json/json_spirit.h
diff --git a/json/include/json/json_spirit_error_position.h b/src/json/json_spirit_error_position.h
index 17208507df..17208507df 100644
--- a/json/include/json/json_spirit_error_position.h
+++ b/src/json/json_spirit_error_position.h
diff --git a/json/src/json_spirit_reader.cpp b/src/json/json_spirit_reader.cpp
index 3469bf17af..3469bf17af 100644
--- a/json/src/json_spirit_reader.cpp
+++ b/src/json/json_spirit_reader.cpp
diff --git a/json/include/json/json_spirit_reader.h b/src/json/json_spirit_reader.h
index 96494a9789..96494a9789 100644
--- a/json/include/json/json_spirit_reader.h
+++ b/src/json/json_spirit_reader.h
diff --git a/json/include/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h
index 4dec00e6c9..4dec00e6c9 100644
--- a/json/include/json/json_spirit_reader_template.h
+++ b/src/json/json_spirit_reader_template.h
diff --git a/json/include/json/json_spirit_stream_reader.h b/src/json/json_spirit_stream_reader.h
index 7e59c9adc2..7e59c9adc2 100644
--- a/json/include/json/json_spirit_stream_reader.h
+++ b/src/json/json_spirit_stream_reader.h
diff --git a/json/include/json/json_spirit_utils.h b/src/json/json_spirit_utils.h
index 553e3b96a4..553e3b96a4 100644
--- a/json/include/json/json_spirit_utils.h
+++ b/src/json/json_spirit_utils.h
diff --git a/json/src/json_spirit_value.cpp b/src/json/json_spirit_value.cpp
index 2d7236855d..2d7236855d 100644
--- a/json/src/json_spirit_value.cpp
+++ b/src/json/json_spirit_value.cpp
diff --git a/json/include/json/json_spirit_value.h b/src/json/json_spirit_value.h
index 7e83a2a7e3..7e83a2a7e3 100644
--- a/json/include/json/json_spirit_value.h
+++ b/src/json/json_spirit_value.h
diff --git a/json/src/json_spirit_writer.cpp b/src/json/json_spirit_writer.cpp
index 32dfeb2c6c..32dfeb2c6c 100644
--- a/json/src/json_spirit_writer.cpp
+++ b/src/json/json_spirit_writer.cpp
diff --git a/json/include/json/json_spirit_writer.h b/src/json/json_spirit_writer.h
index 52e14068e7..52e14068e7 100644
--- a/json/include/json/json_spirit_writer.h
+++ b/src/json/json_spirit_writer.h
diff --git a/json/include/json/json_spirit_writer_template.h b/src/json/json_spirit_writer_template.h
index 28c49ddc64..28c49ddc64 100644
--- a/json/include/json/json_spirit_writer_template.h
+++ b/src/json/json_spirit_writer_template.h
diff --git a/core/include/key.h b/src/key.h
index c973d6eb82..c973d6eb82 100644
--- a/core/include/key.h
+++ b/src/key.h
diff --git a/core/src/main.cpp b/src/main.cpp
index 0456041ee5..0456041ee5 100644
--- a/core/src/main.cpp
+++ b/src/main.cpp
diff --git a/core/include/main.h b/src/main.h
index 8d9b39f718..8d9b39f718 100644
--- a/core/include/main.h
+++ b/src/main.h
diff --git a/core/src/net.cpp b/src/net.cpp
index 39360a334c..39360a334c 100644
--- a/core/src/net.cpp
+++ b/src/net.cpp
diff --git a/core/include/net.h b/src/net.h
index d1ded87232..d1ded87232 100644
--- a/core/include/net.h
+++ b/src/net.h
diff --git a/core/include/noui.h b/src/noui.h
index afb19526c1..afb19526c1 100644
--- a/core/include/noui.h
+++ b/src/noui.h
diff --git a/gui/src/aboutdialog.cpp b/src/qt/aboutdialog.cpp
index 13347961dd..13347961dd 100644
--- a/gui/src/aboutdialog.cpp
+++ b/src/qt/aboutdialog.cpp
diff --git a/gui/include/aboutdialog.h b/src/qt/aboutdialog.h
index 827cc741c3..827cc741c3 100644
--- a/gui/include/aboutdialog.h
+++ b/src/qt/aboutdialog.h
diff --git a/gui/src/addressbookdialog.cpp b/src/qt/addressbookdialog.cpp
index 90950a6441..90950a6441 100644
--- a/gui/src/addressbookdialog.cpp
+++ b/src/qt/addressbookdialog.cpp
diff --git a/gui/include/addressbookdialog.h b/src/qt/addressbookdialog.h
index bf7c2a65a6..bf7c2a65a6 100644
--- a/gui/include/addressbookdialog.h
+++ b/src/qt/addressbookdialog.h
diff --git a/gui/src/addresstablemodel.cpp b/src/qt/addresstablemodel.cpp
index 91b87fb7f1..91b87fb7f1 100644
--- a/gui/src/addresstablemodel.cpp
+++ b/src/qt/addresstablemodel.cpp
diff --git a/gui/include/addresstablemodel.h b/src/qt/addresstablemodel.h
index 8799414334..8799414334 100644
--- a/gui/include/addresstablemodel.h
+++ b/src/qt/addresstablemodel.h
diff --git a/gui/src/bitcoin.cpp b/src/qt/bitcoin.cpp
index e003267426..e003267426 100644
--- a/gui/src/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
diff --git a/gui/bitcoin.qrc b/src/qt/bitcoin.qrc
index 80904b341c..80904b341c 100644
--- a/gui/bitcoin.qrc
+++ b/src/qt/bitcoin.qrc
diff --git a/gui/src/bitcoinaddressvalidator.cpp b/src/qt/bitcoinaddressvalidator.cpp
index 761a266933..761a266933 100644
--- a/gui/src/bitcoinaddressvalidator.cpp
+++ b/src/qt/bitcoinaddressvalidator.cpp
diff --git a/gui/include/bitcoinaddressvalidator.h b/src/qt/bitcoinaddressvalidator.h
index 73f6ea1f61..73f6ea1f61 100644
--- a/gui/include/bitcoinaddressvalidator.h
+++ b/src/qt/bitcoinaddressvalidator.h
diff --git a/gui/src/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index c08476cec3..c08476cec3 100644
--- a/gui/src/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
diff --git a/gui/include/bitcoingui.h b/src/qt/bitcoingui.h
index 96452ef18b..96452ef18b 100644
--- a/gui/include/bitcoingui.h
+++ b/src/qt/bitcoingui.h
diff --git a/gui/src/clientmodel.cpp b/src/qt/clientmodel.cpp
index 97391e0938..97391e0938 100644
--- a/gui/src/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
diff --git a/gui/include/clientmodel.h b/src/qt/clientmodel.h
index 09d1fc921e..09d1fc921e 100644
--- a/gui/include/clientmodel.h
+++ b/src/qt/clientmodel.h
diff --git a/gui/src/editaddressdialog.cpp b/src/qt/editaddressdialog.cpp
index dd0541760b..dd0541760b 100644
--- a/gui/src/editaddressdialog.cpp
+++ b/src/qt/editaddressdialog.cpp
diff --git a/gui/include/editaddressdialog.h b/src/qt/editaddressdialog.h
index 6f396d0457..6f396d0457 100644
--- a/gui/include/editaddressdialog.h
+++ b/src/qt/editaddressdialog.h
diff --git a/gui/forms/aboutdialog.ui b/src/qt/forms/aboutdialog.ui
index 45915c85bf..45915c85bf 100644
--- a/gui/forms/aboutdialog.ui
+++ b/src/qt/forms/aboutdialog.ui
diff --git a/gui/forms/addressbookdialog.ui b/src/qt/forms/addressbookdialog.ui
index 2b3c69fb97..2b3c69fb97 100644
--- a/gui/forms/addressbookdialog.ui
+++ b/src/qt/forms/addressbookdialog.ui
diff --git a/gui/forms/editaddressdialog.ui b/src/qt/forms/editaddressdialog.ui
index f0ba28a854..f0ba28a854 100644
--- a/gui/forms/editaddressdialog.ui
+++ b/src/qt/forms/editaddressdialog.ui
diff --git a/gui/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui
index 595b7f40ff..595b7f40ff 100644
--- a/gui/forms/sendcoinsdialog.ui
+++ b/src/qt/forms/sendcoinsdialog.ui
diff --git a/gui/forms/transactiondescdialog.ui b/src/qt/forms/transactiondescdialog.ui
index 2f70a38214..2f70a38214 100644
--- a/gui/forms/transactiondescdialog.ui
+++ b/src/qt/forms/transactiondescdialog.ui
diff --git a/gui/include/guiconstants.h b/src/qt/guiconstants.h
index cdd1a74d98..cdd1a74d98 100644
--- a/gui/include/guiconstants.h
+++ b/src/qt/guiconstants.h
diff --git a/gui/src/guiutil.cpp b/src/qt/guiutil.cpp
index a81cc14fe8..a81cc14fe8 100644
--- a/gui/src/guiutil.cpp
+++ b/src/qt/guiutil.cpp
diff --git a/gui/include/guiutil.h b/src/qt/guiutil.h
index 748e29bf37..748e29bf37 100644
--- a/gui/include/guiutil.h
+++ b/src/qt/guiutil.h
diff --git a/gui/src/monitoreddatamapper.cpp b/src/qt/monitoreddatamapper.cpp
index e70aa7ebf6..e70aa7ebf6 100644
--- a/gui/src/monitoreddatamapper.cpp
+++ b/src/qt/monitoreddatamapper.cpp
diff --git a/gui/include/monitoreddatamapper.h b/src/qt/monitoreddatamapper.h
index 4dd2d1a86a..4dd2d1a86a 100644
--- a/gui/include/monitoreddatamapper.h
+++ b/src/qt/monitoreddatamapper.h
diff --git a/gui/src/optionsdialog.cpp b/src/qt/optionsdialog.cpp
index d46b48fb29..d46b48fb29 100644
--- a/gui/src/optionsdialog.cpp
+++ b/src/qt/optionsdialog.cpp
diff --git a/gui/include/optionsdialog.h b/src/qt/optionsdialog.h
index 07e85297d5..07e85297d5 100644
--- a/gui/include/optionsdialog.h
+++ b/src/qt/optionsdialog.h
diff --git a/gui/src/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 1528fdf697..1528fdf697 100644
--- a/gui/src/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
diff --git a/gui/include/optionsmodel.h b/src/qt/optionsmodel.h
index 0124e2ab47..0124e2ab47 100644
--- a/gui/include/optionsmodel.h
+++ b/src/qt/optionsmodel.h
diff --git a/gui/res/icons/address-book.png b/src/qt/res/icons/address-book.png
index abfb3c3a51..abfb3c3a51 100644
--- a/gui/res/icons/address-book.png
+++ b/src/qt/res/icons/address-book.png
diff --git a/gui/res/icons/bitcoin.png b/src/qt/res/icons/bitcoin.png
index 09520aca23..09520aca23 100644
--- a/gui/res/icons/bitcoin.png
+++ b/src/qt/res/icons/bitcoin.png
diff --git a/gui/res/icons/quit.png b/src/qt/res/icons/quit.png
index fb510fbea6..fb510fbea6 100644
--- a/gui/res/icons/quit.png
+++ b/src/qt/res/icons/quit.png
diff --git a/gui/res/icons/send.png b/src/qt/res/icons/send.png
index 0ba5359d7b..0ba5359d7b 100644
--- a/gui/res/icons/send.png
+++ b/src/qt/res/icons/send.png
diff --git a/gui/res/icons/toolbar.png b/src/qt/res/icons/toolbar.png
index f2dcb20636..f2dcb20636 100644
--- a/gui/res/icons/toolbar.png
+++ b/src/qt/res/icons/toolbar.png
diff --git a/gui/res/images/about.png b/src/qt/res/images/about.png
index c9ab9511ef..c9ab9511ef 100644
--- a/gui/res/images/about.png
+++ b/src/qt/res/images/about.png
diff --git a/gui/src/sendcoinsdialog.cpp b/src/qt/sendcoinsdialog.cpp
index 721ab14108..721ab14108 100644
--- a/gui/src/sendcoinsdialog.cpp
+++ b/src/qt/sendcoinsdialog.cpp
diff --git a/gui/include/sendcoinsdialog.h b/src/qt/sendcoinsdialog.h
index f73c38d63a..f73c38d63a 100644
--- a/gui/include/sendcoinsdialog.h
+++ b/src/qt/sendcoinsdialog.h
diff --git a/gui/src/transactiondesc.cpp b/src/qt/transactiondesc.cpp
index 4d8a55e99a..4d8a55e99a 100644
--- a/gui/src/transactiondesc.cpp
+++ b/src/qt/transactiondesc.cpp
diff --git a/gui/include/transactiondesc.h b/src/qt/transactiondesc.h
index 5a85949341..5a85949341 100644
--- a/gui/include/transactiondesc.h
+++ b/src/qt/transactiondesc.h
diff --git a/gui/src/transactiondescdialog.cpp b/src/qt/transactiondescdialog.cpp
index 3bd4808cb6..3bd4808cb6 100644
--- a/gui/src/transactiondescdialog.cpp
+++ b/src/qt/transactiondescdialog.cpp
diff --git a/gui/include/transactiondescdialog.h b/src/qt/transactiondescdialog.h
index 4f8f754b2b..4f8f754b2b 100644
--- a/gui/include/transactiondescdialog.h
+++ b/src/qt/transactiondescdialog.h
diff --git a/gui/src/transactionrecord.cpp b/src/qt/transactionrecord.cpp
index 6c1f3a5e58..6c1f3a5e58 100644
--- a/gui/src/transactionrecord.cpp
+++ b/src/qt/transactionrecord.cpp
diff --git a/gui/include/transactionrecord.h b/src/qt/transactionrecord.h
index c082fffe9c..c082fffe9c 100644
--- a/gui/include/transactionrecord.h
+++ b/src/qt/transactionrecord.h
diff --git a/gui/src/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index 8fe1839930..8fe1839930 100644
--- a/gui/src/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
diff --git a/gui/include/transactiontablemodel.h b/src/qt/transactiontablemodel.h
index 5974c0e7fe..5974c0e7fe 100644
--- a/gui/include/transactiontablemodel.h
+++ b/src/qt/transactiontablemodel.h
diff --git a/core/src/rpc.cpp b/src/rpc.cpp
index 530bef4a43..530bef4a43 100644
--- a/core/src/rpc.cpp
+++ b/src/rpc.cpp
diff --git a/core/include/rpc.h b/src/rpc.h
index 48a7b8a8a6..48a7b8a8a6 100644
--- a/core/include/rpc.h
+++ b/src/rpc.h
diff --git a/core/src/script.cpp b/src/script.cpp
index 97334ca0a0..97334ca0a0 100644
--- a/core/src/script.cpp
+++ b/src/script.cpp
diff --git a/core/include/script.h b/src/script.h
index 22a6020dce..22a6020dce 100644
--- a/core/include/script.h
+++ b/src/script.h
diff --git a/core/include/serialize.h b/src/serialize.h
index 0d66d6a956..0d66d6a956 100644
--- a/core/include/serialize.h
+++ b/src/serialize.h
diff --git a/core/include/strlcpy.h b/src/strlcpy.h
index d4d1908e7a..d4d1908e7a 100644
--- a/core/include/strlcpy.h
+++ b/src/strlcpy.h
diff --git a/core/include/uint256.h b/src/uint256.h
index 14feb1683d..14feb1683d 100644
--- a/core/include/uint256.h
+++ b/src/uint256.h
diff --git a/core/src/util.cpp b/src/util.cpp
index 6199109289..6199109289 100644
--- a/core/src/util.cpp
+++ b/src/util.cpp
diff --git a/core/include/util.h b/src/util.h
index 32a98e6264..32a98e6264 100644
--- a/core/include/util.h
+++ b/src/util.h