diff --git a/src/compat.h b/src/compat.h
index 5e491bc..e70d7ad 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -13,6 +13,7 @@
 #endif
 #define FD_SETSIZE 1024 // max number of fds in fd_set
 #include <winsock2.h>
+#include <windows.h>
 #include <mswsock.h>
 #include <ws2tcpip.h>
 #else
diff --git a/src/crypter.cpp b/src/crypter.cpp
index 32baabd..1bba1dc 100644
--- a/src/crypter.cpp
+++ b/src/crypter.cpp
@@ -6,9 +6,12 @@
 #include <openssl/evp.h>
 #include <vector>
 #include <string>
+
+/*
 #ifdef WIN32
 #include <windows.h>
 #endif
+*/
 
 #include "crypter.h"
 
diff --git a/src/key.cpp b/src/key.cpp
index 8912ae0..e534417 100644
--- a/src/key.cpp
+++ b/src/key.cpp
@@ -2,13 +2,12 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
+#include "Gost.h"
+#include "key.h"
+
 #include <openssl/ecdsa.h>
 #include <openssl/rand.h>
 #include <openssl/obj_mac.h>
-#include "Gost.h" 
-
-#include "key.h"
-
 
 // anonymous namespace with local implementation code (OpenSSL interaction)
 namespace {
diff --git a/src/noui.cpp b/src/noui.cpp
index cffdb6c..960c7b3 100644
--- a/src/noui.cpp
+++ b/src/noui.cpp
@@ -32,6 +32,7 @@ static bool noui_ThreadSafeMessageBox(const std::string& message, const std::str
     return false;
 }
 
+/* // Never used:
 static void noui_ThreadSafeShowGeneratedI2PAddress(const std::string& caption, const std::string& pub, const std::string& priv, const std::string& b32, const std::string& configFileName)
 {
     std::string msg = "\nIf you want to use a permanent I2P-address you have to set a \'mydestination\' option in the configuration file:\n";
@@ -50,6 +51,7 @@ static void noui_ThreadSafeShowGeneratedI2PAddress(const std::string& caption, c
     printf("%s: %s\n", caption.c_str(), msg.c_str());
     fprintf(stderr, "%s: %s\n", caption.c_str(), msg.c_str());
 }
+*/
 
 static bool noui_ThreadSafeAskFee(int64 /*nFeeRequired*/)
 {
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp
index 3a9eeaf..97b7b01 100644
--- a/src/rpcnet.cpp
+++ b/src/rpcnet.cpp
@@ -2,8 +2,8 @@
 // Distributed under the MIT/X11 software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include "net.h"
 #include "bitcoinrpc.h"
+#include "net.h"
 
 using namespace json_spirit;
 using namespace std;