Diff Tenebrix (debian build)

diff --git a/src/headers.h b/src/headers.h
index 02dba30..1093bf2 100644
--- a/src/headers.h
+++ b/src/headers.h
@@ -26,8 +26,8 @@
 #define BSD 1
 #endif
 #endif
-#ifdef GUI
 #include <wx/wx.h>
+#ifdef GUI
 #include <wx/stdpaths.h>
 #include <wx/snglinst.h>
 #include <wx/utils.h>
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
index 78a20c5..e68b51a 100644
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -90,11 +90,11 @@ void MainFrameRepaint()

 /*
    Translate string to current locale using Qt.
- */
 std::string _(const char* psz)
 {
     return QCoreApplication::translate("bitcoin-core", psz).toStdString();
 }
+ */

 int main(int argc, char *argv[])
 {
diff --git a/src/qtui.h b/src/qtui.h
index a3b9eb0..a3a6dc1 100644
--- a/src/qtui.h
+++ b/src/qtui.h
@@ -8,7 +8,9 @@
 #include <boost/function/function0.hpp>
 #include "wallet.h"

+/* conflicts
 typedef void wxWindow;
+*/
 #define wxYES                   0x00000002
 #define wxOK                    0x00000004
 #define wxNO                    0x00000008
@@ -43,6 +45,8 @@ extern bool ThreadSafeAskFee(int64 nFeeRequired, const std::string& strCaption,
 extern void CalledSetStatusBar(const std::string& strText, int nField);
 extern void UIThreadCall(boost::function0<void> fn);
 extern void MainFrameRepaint();
+/* conflicts
 extern std::string _(const char* psz);
+*/

 #endif
diff --git a/src/rpc.cpp b/src/rpc.cpp
index 4b7bb86..7d4188b 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -1933,7 +1933,9 @@ void ThreadRPCServer2(void* parg)

     if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
     {
+
         string strWhatAmI = "To use bitcoind";
+   /* Skip for now, restore that later
         if (mapArgs.count("-server"))
             strWhatAmI = strprintf(_("To use the %s option"), "\"-server\"");
         else if (mapArgs.count("-daemon"))
@@ -1943,6 +1945,7 @@ void ThreadRPCServer2(void* parg)
               "If the file does not exist, create it with owner-readable-only file permissions.\n"),
                 strWhatAmI.c_str(),
                 GetConfigFile().c_str());
+   */
         CreateThread(Shutdown, NULL);
         return;
     }
@@ -2105,11 +2108,14 @@ void ThreadRPCServer2(void* parg)

 Object CallRPC(const string& strMethod, const Array& params)
 {
-    if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "")
+    if (mapArgs["-rpcuser"] == "" && mapArgs["-rpcpassword"] == "") {
+   /* Skip for now, restrore that later
         throw runtime_error(strprintf(
             _("You must set rpcpassword=<password> in the configuration file:\n%s\n"
               "If the file does not exist, create it with owner-readable-only file permissions."),
                 GetConfigFile().c_str()));
+   */
+    }

     // Connect to localhost
     bool fUseSSL = GetBoolArg("-rpcssl");