another attempt to fix msvc build

mix/AppContext.cpp

@@ -26,7 +26,9 @@
 #include <QMessageBox>
 #include <QQmlComponent>
 #include <QQmlApplicationEngine>
+#include <libwebthree/WebThree.h>
 #include <libdevcrypto/FileSystem.h>
+#include <libsolidity/CompilerStack.h>
 #include "KeyEventManager.h"
 #include "AppContext.h"
 using namespace dev;

mix/AppContext.h

@@ -27,11 +27,19 @@
 
 #pragma once
 
+#include <memory>
 #include <QQmlApplicationEngine>
-#include <libsolidity/CompilerStack.h>
-#include <libwebthree/WebThree.h>
 #include "KeyEventManager.h"
 
+namespace dev
+{
+	class WebThreeDirect;
+	namespace solidity
+	{
+		class CompilerStack;
+	}
+}
+
 namespace dev
 {
 namespace mix
@@ -46,7 +54,6 @@ class AppContext: public QObject
 
 public:
 	AppContext(QQmlApplicationEngine* _engine);
-	~AppContext() {}
 	/// Get the current QQmlApplicationEngine instance.
 	static AppContext* getInstance() { return Instance; }
 	/// Renew QQMLApplicationEngine with a new instance.

mix/AssemblyDebuggerControl.cpp

@@ -17,10 +17,6 @@
  * display opcode debugging.
  */
 
-//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
-//@todo fix this is solidity headers
-#include <libsolidity/Token.h>
-#include <libsolidity/Types.h>
 #include <QtConcurrent/QtConcurrent>
 #include <QDebug>
 #include <QVariableDefinition.h>

mix/AssemblyDebuggerControl.h

@@ -19,10 +19,6 @@
 
 #pragma once
 
-//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
-//@todo fix this is solidity headers
-#include <libsolidity/Token.h>
-#include <libsolidity/Types.h>
 #include <QKeySequence>
 #include <QTextDocument>
 #include "Extension.h"

mix/AssemblyDebuggerModel.cpp

@@ -17,10 +17,6 @@
  * used as a model to debug contract assembly code.
  */
 
-//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
-//@todo fix this is solidity headers
-#include <libsolidity/Token.h>
-#include <libsolidity/Types.h>
 #include <QApplication>
 #include <libdevcore/Common.h>
 #include <libevm/VM.h>

mix/AssemblyDebuggerModel.h

@@ -19,10 +19,6 @@
 
 #pragma once
 
-//These 2 includes should be at the top to avoid conflicts with macros defined in windows.h
-//@todo fix this is solidity headers
-#include <libsolidity/Token.h>
-#include <libsolidity/Types.h>
 #include <QObject>
 #include <QList>
 #include <libdevcore/Common.h>

mix/QContractDefinition.cpp

@@ -20,6 +20,7 @@
  */
 
 #include <QObject>
+#include <libsolidity/CompilerStack.h>
 #include <libsolidity/AST.h>
 #include <libsolidity/Scanner.h>
 #include <libsolidity/Parser.h>

mix/TransactionListView.h

@@ -20,7 +20,6 @@
 #pragma once
 
 #include <QTextDocument>
-#include "TransactionListView.h"
 #include "Extension.h"
 
 namespace dev