    checkpoints.cpp \
    init.cpp \
    leveldbwrapper.cpp \
-@@ -304,7 +316,7 @@ bitcoind_LDADD = \
+@@ -304,8 +315,7 @@ bitcoind_LDADD = \
  if ENABLE_WALLET
  bitcoind_LDADD += libbitcoin_wallet.a
  endif
 -bitcoind_SOURCES = bitcoind.cpp
+-#
 +bitcoind_SOURCES = bitcoin-main.cpp
- #
  
  if TARGET_WINDOWS
-@@ -380,6 +392,7 @@ if USE_LIBSECP256K1
+ bitcoind_SOURCES += bitcoind-res.rc
+@@ -380,6 +390,7 @@ if USE_LIBSECP256K1
  libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la
  endif
  endif

     # All windows code is PIC, forcing it on just adds useless compile warnings
     AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"])
     AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
@@ -418,6 +427,17 @@ if test x$use_hardening != xno; then
   OBJCXXFLAGS="$CXXFLAGS"
 fi
 

     CWalletDB *pwalletdbEncryption;
 
     //! the current wallet version: clients below this version are not able to load the wallet
@@ -206,6 +204,7 @@ public:
     bool CanSupportFeature(enum WalletFeature wf) { AssertLockHeld(cs_wallet); return nWalletMaxVersion >= wf; }
 
     void AvailableCoins(std::vector<COutput>& vCoins, bool fOnlyConfirmed=true, const CCoinControl *coinControl = NULL) const;
