From bf911b3038fdcf39c4b7e7250fafc4dff9400b84 Mon Sep 17 00:00:00 2001
From: Simon <simon@bitcartel.com>
Date: Mon, 30 Apr 2018 09:24:41 -0700
Subject: [PATCH] Tweaks to d0a1d83 to complete backport of Bitcoin PR #8704

---
 src/rpcblockchain.cpp | 4 ++--
 src/rpcserver.cpp     | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 5599073ae..d8b75f0ce 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -394,12 +394,12 @@ UniValue getblock(const UniValue& params, bool fHelp)
 {
     if (fHelp || params.size() < 1 || params.size() > 2)
         throw runtime_error(
-            "getblock \"hash|height\" ( verbose )\n"
+            "getblock \"hash|height\" ( verbosity )\n"
             "\nIf verbosity is 0, returns a string that is serialized, hex-encoded data for block 'hash'.\n"
             "If verbosity is 1, returns an Object with information about block <hash>.\n"
             "If verbosity is 2, returns an Object with information about block <hash> and information about each transaction. \n"
             "\nArguments:\n"
-            "1. \"blockhash\"          (string, required) The block hash\n"
+            "1. \"hash|height\"          (string, required) The block hash or height\n"
             "2. verbosity              (numeric, optional, default=1) 0 for hex encoded data, 1 for a json object, and 2 for json object with transaction data\n"
             "\nResult (for verbosity = 0):\n"
             "\"data\"             (string) A string that is serialized, hex-encoded data for block 'hash'.\n"
diff --git a/src/rpcserver.cpp b/src/rpcserver.cpp
index ca4cfc9b2..86e27867e 100644
--- a/src/rpcserver.cpp
+++ b/src/rpcserver.cpp
@@ -27,8 +27,6 @@
 #include <boost/signals2/signal.hpp>
 #include <boost/thread.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
-#include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/split.hpp>
 
 using namespace RPCServer;
 using namespace std;