diff --git a/CMake/vtkTestTypes.cmake b/CMake/vtkTestTypes.cmake
index 9ef7d36..51485b1 100644
--- a/CMake/vtkTestTypes.cmake
+++ b/CMake/vtkTestTypes.cmake
@@ -118,14 +118,15 @@ ENDIF(VTK_SIZEOF_LONG_LONG)
 
 # Enable the "__int64" type if it is available and unique.  It is not
 # standard.
-SET(VTK_TYPE_USE___INT64)
-IF(VTK_SIZEOF___INT64)
-  IF(NOT VTK_TYPE_SAME_LONG_AND___INT64)
-    IF(NOT VTK_TYPE_SAME_LONG_LONG_AND___INT64)
-      SET(VTK_TYPE_USE___INT64 1)
-    ENDIF(NOT VTK_TYPE_SAME_LONG_LONG_AND___INT64)
-  ENDIF(NOT VTK_TYPE_SAME_LONG_AND___INT64)
-ENDIF(VTK_SIZEOF___INT64)
+SET(VTK_TYPE_USE___INT64 0)
+# IF(VTK_SIZEOF___INT64)
+#   IF(NOT VTK_TYPE_SAME_LONG_AND___INT64)
+#     IF(NOT VTK_TYPE_SAME_LONG_LONG_AND___INT64)
+#       SET(VTK_TYPE_USE___INT64 0)
+#     ENDIF(NOT VTK_TYPE_SAME_LONG_LONG_AND___INT64)
+#   ENDIF(NOT VTK_TYPE_SAME_LONG_AND___INT64)
+# ENDIF(VTK_SIZEOF___INT64)
+# SET(VTK_TYPE_USE___INT64 0)
 
 IF("VTK_COMPILER_HAS_BOOL" MATCHES "^VTK_COMPILER_HAS_BOOL$")
   MESSAGE(STATUS "Checking support for C++ type bool")
diff --git a/Hybrid/vtkVideoSource.cxx b/Hybrid/vtkVideoSource.cxx
index 112c9f6..7fac3b9 100644
--- a/Hybrid/vtkVideoSource.cxx
+++ b/Hybrid/vtkVideoSource.cxx
@@ -432,7 +432,7 @@ void vtkVideoSource::InternalGrab()
   ptr = reinterpret_cast<vtkUnsignedCharArray *>(this->FrameBuffer[index])->GetPointer(0);
 
   // Somebody should check this:
-  lptr = (int *)(((((long)ptr) + 3)/4)*4);
+  lptr = (int *)(((((intptr_t)ptr) + 3)/4)*4);
   i = totalSize/4;
 
   while (--i >= 0)
diff --git a/Rendering/vtkFreeTypeTools.cxx b/Rendering/vtkFreeTypeTools.cxx
index 7443693..681fae6 100644
--- a/Rendering/vtkFreeTypeTools.cxx
+++ b/Rendering/vtkFreeTypeTools.cxx
@@ -222,7 +222,7 @@ vtkFreeTypeToolsFaceRequester(FTC_FaceID face_id,
   // Map the ID to a text property
   vtkSmartPointer<vtkTextProperty> tprop =
       vtkSmartPointer<vtkTextProperty>::New();
-  self->MapIdToTextProperty(reinterpret_cast<unsigned long>(face_id), tprop);
+  self->MapIdToTextProperty(reinterpret_cast<intptr_t>(face_id), tprop);
 
   // Fonts, organized by [Family][Bold][Italic]
   static EmbeddedFontStruct EmbeddedFonts[3][2][2] =
diff --git a/Rendering/vtkFreeTypeUtilities.cxx b/Rendering/vtkFreeTypeUtilities.cxx
index 629e5da..2d140a8 100644
--- a/Rendering/vtkFreeTypeUtilities.cxx
+++ b/Rendering/vtkFreeTypeUtilities.cxx
@@ -337,7 +337,7 @@ vtkFreeTypeUtilitiesFaceRequester(FTC_FaceID face_id,
   // Map the ID to a text property
 
   vtkTextProperty *tprop = vtkTextProperty::New();
-  self->MapIdToTextProperty(reinterpret_cast<unsigned long>(face_id), tprop);
+  self->MapIdToTextProperty(reinterpret_cast<intptr_t>(face_id), tprop);
 
   // Fonts, organized by [Family][Bold][Italic]
 
diff --git a/Rendering/vtkWin32OpenGLRenderWindow.cxx b/Rendering/vtkWin32OpenGLRenderWindow.cxx
index a4485d2..4a3cf11 100644
--- a/Rendering/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/vtkWin32OpenGLRenderWindow.cxx
@@ -31,6 +31,9 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtksys/ios/sstream>
 
 #include "vtkOpenGL.h"
+#ifndef GWL_HINSTANCE
+#	define GWL_HINSTANCE -6
+#endif
 
 vtkStandardNewMacro(vtkWin32OpenGLRenderWindow);
 
@@ -842,7 +845,7 @@ void vtkWin32OpenGLRenderWindow::CreateAWindow()
         }
       //UpdateWindow(this->WindowId);
       this->OwnWindow = 1;
-      vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(vtkLONG)this);
+      vtkSetWindowLong(this->WindowId,sizeof(vtkLONG),(intptr_t)this);
       }
     if (!this->DeviceContext)
       {
diff --git a/Rendering/vtkWin32RenderWindowInteractor.cxx b/Rendering/vtkWin32RenderWindowInteractor.cxx
index a53bbc8..81f0bd6 100644
--- a/Rendering/vtkWin32RenderWindowInteractor.cxx
+++ b/Rendering/vtkWin32RenderWindowInteractor.cxx
@@ -17,7 +17,8 @@
 #include <string.h>
 #include <math.h>
 
-#define _WIN32_WINNT 0x0400  // for trackmouseevent support  requires Win95 with IE 3.0 or greater.
+
+// #define _WIN32_WINNT 0x0400  // for trackmouseevent support  requires Win95 with IE 3.0 or greater.
 
 #include "vtkWin32OpenGLRenderWindow.h"
 
@@ -53,6 +54,10 @@ VTK_RENDERING_EXPORT LRESULT CALLBACK vtkHandleMessage2(HWND,UINT,WPARAM,LPARAM,
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkWin32RenderWindowInteractor);
 #endif
+//
+// #ifndef GWL_WNDPROC
+#	define GWL_WNDPROC -4
+// #endif
 
 void (*vtkWin32RenderWindowInteractor::ClassExitMethod)(void *) = (void (*)(void *))NULL;
 void *vtkWin32RenderWindowInteractor::ClassExitMethodArg = (void *)NULL;
@@ -91,11 +96,11 @@ vtkWin32RenderWindowInteractor::~vtkWin32RenderWindowInteractor()
       // well send a USER message to the other
       // event handler so that it can properly
       // call this event handler if required
-      CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc);
+      CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc);
       }
     else 
       {
-      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc);
+      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc);
       }
     this->Enabled = 0;
     }
@@ -182,11 +187,11 @@ void vtkWin32RenderWindowInteractor::Enable()
       // well send a USER message to the other
       // event handler so that it can properly
       // call this event handler if required
-      CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(LONG)vtkHandleMessage);
+      CallWindowProc(this->OldProc,this->WindowId,WM_USER+12,24,(intptr_t)vtkHandleMessage);
       }
     else 
       {
-      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)vtkHandleMessage);
+      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)vtkHandleMessage);
       }
     
 #ifdef VTK_USE_TDX
@@ -232,11 +237,11 @@ void vtkWin32RenderWindowInteractor::Disable()
       // well send a USER message to the other
       // event handler so that it can properly
       // call this event handler if required
-      CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(LONG)this->OldProc);
+      CallWindowProc(this->OldProc,this->WindowId,WM_USER+14,28,(intptr_t)this->OldProc);
       }
     else 
       {
-      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(vtkLONG)this->OldProc);
+      vtkSetWindowLong(this->WindowId,vtkGWL_WNDPROC,(intptr_t)this->OldProc);
       }
 #ifdef VTK_USE_TDX
     if(this->Device->GetInitialized())
diff --git a/Utilities/vtknetcdf/v2i.c b/Utilities/vtknetcdf/v2i.c
index 74e84dd..27f57e3 100644
--- a/Utilities/vtknetcdf/v2i.c
+++ b/Utilities/vtknetcdf/v2i.c
@@ -73,7 +73,7 @@ nvdims(int ncid, int varid)
 
 #endif
 
-typedef signed char schar;
+// typedef signed char schar;
 
 /*
  * Computes number of record variables in an open netCDF file, and an array of