Index: tools/lldb-mi/MIDataTypes.h
===================================================================
--- tools/lldb-mi/MIDataTypes.h
+++ tools/lldb-mi/MIDataTypes.h
@@ -39,15 +39,6 @@
 // Use to avoid "unused parameter" compiler warnings:
 #define MIunused(x) (void) x;
 
-#ifdef _WIN32
-#define MI_NO_INITIALIZE_VTABLE __declspec(novtable)
-#define MI_FORCE_INLINE __forceinline
-#else
-#define MI_NO_INITIALIZE_VTABLE
-#define MI_FORCE_INLINE inline
-// __attribute__( ( always_inline ) )
-#endif // _WIN32
-
 // Portability issues
 #ifdef _WIN64
 typedef unsigned __int64 size_t;
@@ -72,10 +63,3 @@
 // Fundamentals:
 typedef long long MIint64;           // 64bit signed integer.
 typedef unsigned long long MIuint64; // 64bit unsigned integer.
-
-// using namespace std; // Better to put this or std:: at translation units scope.
-
-//--------------------------------------------------------------------------------------
-// Common routines:
-
-//--------------------------------------------------------------------------------------