fixed compilation for msvc

mix/AssemblyDebuggerControl.cpp

@@ -17,6 +17,10 @@
  * 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>
@@ -86,7 +90,7 @@ void AssemblyDebuggerControl::keyPressed(int _key)
 	}
 }
 
-void AssemblyDebuggerControl::callContract(TransactionSettings _tr, Address _contract)
+void AssemblyDebuggerControl::callContract(TransactionSettings _tr, dev::Address _contract)
 {
 	CompilerResult compilerRes = m_compilation->compile(m_doc->toPlainText());
 	if (!compilerRes.success)

mix/AssemblyDebuggerControl.h

@@ -19,6 +19,10 @@
 
 #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,6 +17,10 @@
  * 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,6 +19,10 @@
 
 #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/DebuggingStateWrapper.h

@@ -23,6 +23,7 @@
 #pragma once
 
 #include <QStringList>
+#include <QMap>
 #include <libdevcore/Common.h>
 #include <libethereum/State.h>
 #include <libethereum/Executive.h>

mix/KeyEventManager.h

@@ -23,6 +23,7 @@
 #pragma once
 
 #include <QObject>
+#include <QVariant>
 
 class KeyEventManager: public QObject
 {