Move defaults so that cl_miner is not included in MinerAux.h

ethminer/MinerAux.h

@@ -39,7 +39,6 @@
 #include <libdevcore/SHA3.h>
 #include <libethcore/ProofOfWork.h>
 #include <libethcore/EthashAux.h>
-#include <libethash-cl/ethash_cl_miner.h>
 #include <libethcore/Farm.h>
 #if ETH_JSONRPC || !ETH_TRUE
 #include <libweb3jsonrpc/WebThreeStubServer.h>

libethash-cl/ethash_cl_miner.h

@@ -17,13 +17,6 @@
 #include <functional>
 #include <libethash/ethash.h>
 
-/// Default value of the local work size. Also known as workgroup size.
-#define CL_DEFAULT_LOCAL_WORK_SIZE 64
-/// Default value of the global work size as a multiplier of the local work size
-#define CL_DEFAULT_GLOBAL_WORK_SIZE_MULTIPLIER 512 // * CL_DEFAULT_LOCAL_WORK_SIZE
-/// Default value of the milliseconds per global work size (per batch)
-#define CL_DEFAULT_MS_PER_BATCH 100
-
 class ethash_cl_miner
 {
 private:

libethcore/Ethash.h

@@ -31,6 +31,13 @@
 #include "BlockInfo.h"
 #include "Miner.h"
 
+/// Default value of the local work size. Also known as workgroup size.
+#define CL_DEFAULT_LOCAL_WORK_SIZE 64
+/// Default value of the global work size as a multiplier of the local work size
+#define CL_DEFAULT_GLOBAL_WORK_SIZE_MULTIPLIER 512 // * CL_DEFAULT_LOCAL_WORK_SIZE
+/// Default value of the milliseconds per global work size (per batch)
+#define CL_DEFAULT_MS_PER_BATCH 100
+
 class ethash_cl_miner;
 
 namespace dev