Suggested changes to headers cleanup

sipa · sipa · commit 0762f57854af · 2013-11-10T12:20:36.000+01:00
diff --git a/src/db.h b/src/db.h
@@ -21,12 +21,10 @@ class CAddrMan;
 struct CBlockLocator;
 class CDiskBlockIndex;
 class COutPoint;
-class CWallet;
 
 extern unsigned int nWalletDBUpdated;
 
 void ThreadFlushWalletDB(const std::string& strWalletFile);
-bool BackupWallet(const CWallet& wallet, const std::string& strDest);
 
 
 class CDBEnv
diff --git a/src/main.cpp b/src/main.cpp
@@ -10,14 +10,12 @@
 #include "chainparams.h"
 #include "checkpoints.h"
 #include "checkqueue.h"
-#include "db.h"
 #include "init.h"
 #include "net.h"
 #include "txdb.h"
 #include "txmempool.h"
 #include "ui_interface.h"
 #include "util.h"
-#include "wallet.h"
 
 #include <inttypes.h>
 #include <stdint.h>
@@ -33,9 +31,6 @@ using namespace boost;
 // Global state
 //
 
-CCriticalSection cs_setpwalletRegistered;
-set<CWallet*> setpwalletRegistered;
-
 CCriticalSection cs_main;
 
 CTxMemPool mempool;
diff --git a/src/main.h b/src/main.h
@@ -28,15 +28,9 @@
 #include <utility>
 #include <vector>
 
-class CBlock;
 class CBlockIndex;
 class CBloomFilter;
 class CInv;
-class CKeyItem;
-class CNode;
-class CNodeSignals;
-class CReserveKey;
-class CWallet;
 
 /** The maximum allowed size for a serialized block, in bytes (network rule) */
 static const unsigned int MAX_BLOCK_SIZE = 1000000;
@@ -103,11 +97,9 @@ extern int64_t nTransactionFee;
 static const uint64_t nMinDiskSpace = 52428800;
 
 
-class CReserveKey;
 class CCoinsDB;
 class CBlockTreeDB;
 struct CDiskBlockPos;
-class CCoins;
 class CTxUndo;
 class CCoinsView;
 class CCoinsViewCache;
diff --git a/src/walletdb.h b/src/walletdb.h
@@ -20,6 +20,7 @@ class CBlockLocator;
 class CKeyPool;
 class CMasterKey;
 class CScript;
+class CWallet;
 class CWalletTx;
 class uint160;
 class uint256;
