Merge pull request #226 from jordanlewis/betterheaders

Optimize header dependencies; improve Makefile dependency graph

diff --cc src/db.cpp
Simple merge

diff --cc src/init.cpp
Simple merge

diff --cc src/irc.cpp
Simple merge

diff --cc src/main.cpp
Simple merge

diff --cc src/main.h
index 436ffbe,33c4892..7aa6d41
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -78,7 -84,11 +85,10 @@@ extern int fUseUPnP
  
  
  
+ class CReserveKey;
+ class CTxDB;
+ class CTxIndex;
  
 -
  bool CheckDiskSpace(uint64 nAdditionalBytes=0);
  FILE* OpenBlockFile(unsigned int nFile, unsigned int nBlockPos, const char* pszMode="rb");
  FILE* AppendBlockFile(unsigned int& nFileRet);

diff --cc src/net.cpp
Simple merge

diff --cc src/rpc.cpp
Simple merge

diff --cc src/ui.cpp
Simple merge

diff --cc src/util.cpp
Simple merge

diff --cc src/util.h
Simple merge