small headers ordering cleanup

- keep headers in alphabetical order
- fix Makefile.am (2 files in 1 line - leftover)
- remove some spaces etc.

src/rpcrawtransaction.cpp

@@ -4,13 +4,13 @@
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 #include "base58.h"
-#include "rpcserver.h"
-#include "init.h"
-#include "net.h"
-#include "uint256.h"
 #include "core.h"
-#include "main.h"
+#include "init.h"
 #include "keystore.h"
+#include "main.h"
+#include "net.h"
+#include "rpcserver.h"
+#include "uint256.h"
 #ifdef ENABLE_WALLET
 #include "wallet.h"
 #endif