diff --git a/Charts/Testing/Cxx/TestContext.cxx b/Charts/Testing/Cxx/TestContext.cxx
index 3055a7f3a9fec0b468abb728b39c7e22d0edd230..7f249ae9cd9291fdb5c817deffd003bbd14fcfde 100644
--- a/Charts/Testing/Cxx/TestContext.cxx
+++ b/Charts/Testing/Cxx/TestContext.cxx
@@ -39,7 +39,7 @@ class ContextTest : public vtkContextItem
 {
 public:
   static ContextTest *New();
-  vtkTypeRevisionMacro(ContextTest, vtkContextItem);
+  vtkTypeMacro(ContextTest, vtkContextItem);
   // Paint event for the chart, called whenever the chart needs to be drawn
   virtual bool Paint(vtkContext2D *painter);
 };
@@ -67,7 +67,6 @@ int TestContext( int argc, char * argv [] )
 
 // Make our new derived class to draw a diagram
 vtkStandardNewMacro(ContextTest);
-vtkCxxRevisionMacro(ContextTest, "1.2");
 // This function aims to test the primitives provided by the 2D API.
 bool ContextTest::Paint(vtkContext2D *painter)
 {
diff --git a/Charts/Testing/Cxx/TestDiagram.cxx b/Charts/Testing/Cxx/TestDiagram.cxx
index 3ed3fa29a605c4f658a6f62a30b781c3ae02e30c..07295729cc7e43749ab1698f542a9d8324a96208 100644
--- a/Charts/Testing/Cxx/TestDiagram.cxx
+++ b/Charts/Testing/Cxx/TestDiagram.cxx
@@ -37,7 +37,7 @@ class APIDiagram : public vtkContextItem
 {
 public:
   static APIDiagram *New();
-  vtkTypeRevisionMacro(APIDiagram, vtkContextItem);
+  vtkTypeMacro(APIDiagram, vtkContextItem);
   // Paint event for the chart, called whenever the chart needs to be drawn
   virtual bool Paint(vtkContext2D *painter);
 };
@@ -76,7 +76,6 @@ int TestDiagram( int argc, char * argv [] )
 
 // Make our new derived class to draw a diagram
 vtkStandardNewMacro(APIDiagram);
-vtkCxxRevisionMacro(APIDiagram, "1.5");
 // This function draws our API diagram
 bool APIDiagram::Paint(vtkContext2D *painter)
 {
diff --git a/Charts/Testing/Cxx/TestQtDiagram.cxx b/Charts/Testing/Cxx/TestQtDiagram.cxx
index 37daa86d22c13dbd82a83027d292461f3024824e..ad3153026f1567ea26a70e0e0d9595b51b8b0041 100644
--- a/Charts/Testing/Cxx/TestQtDiagram.cxx
+++ b/Charts/Testing/Cxx/TestQtDiagram.cxx
@@ -39,7 +39,7 @@ class APIDiagram2 : public vtkContextItem
 {
 public:
   static APIDiagram2 *New();
-  vtkTypeRevisionMacro(APIDiagram2, vtkContextItem);
+  vtkTypeMacro(APIDiagram2, vtkContextItem);
   // Paint event for the chart, called whenever the chart needs to be drawn
   virtual bool Paint(vtkContext2D *painter);
 };
@@ -89,7 +89,6 @@ int TestQtDiagram( int argc, char * argv [] )
 
 // Make our new derived class to draw a diagram
 vtkStandardNewMacro(APIDiagram2);
-vtkCxxRevisionMacro(APIDiagram2, "1.5");
 // This function draws our API diagram
 bool APIDiagram2::Paint(vtkContext2D *painter)
 {
diff --git a/Charts/vtkAbstractContextBufferId.cxx b/Charts/vtkAbstractContextBufferId.cxx
index ada5db8511054a418e0103f45e954cc1a73173a5..b9893f583428f802a678a0b26320345e4c17681b 100644
--- a/Charts/vtkAbstractContextBufferId.cxx
+++ b/Charts/vtkAbstractContextBufferId.cxx
@@ -15,7 +15,6 @@
 
 #include "vtkAbstractContextBufferId.h"
 
-vtkCxxRevisionMacro(vtkAbstractContextBufferId, "1.1");
 
 // ----------------------------------------------------------------------------
 vtkAbstractContextBufferId::vtkAbstractContextBufferId()
diff --git a/Charts/vtkAbstractContextBufferId.h b/Charts/vtkAbstractContextBufferId.h
index b1b8927f0b2920da680b0a2a1d6f821fc5521931..b04858e6466b7283e5807568cff4d000faecf82c 100644
--- a/Charts/vtkAbstractContextBufferId.h
+++ b/Charts/vtkAbstractContextBufferId.h
@@ -40,7 +40,7 @@
 class VTK_CHARTS_EXPORT vtkAbstractContextBufferId : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractContextBufferId, vtkObject);
+  vtkTypeMacro(vtkAbstractContextBufferId, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Charts/vtkAxis.cxx b/Charts/vtkAxis.cxx
index 47be58bb554f1efc9c5cac019d2d03131909b968..1d15c427d2575f324236471ab52b3ded1822b6de 100644
--- a/Charts/vtkAxis.cxx
+++ b/Charts/vtkAxis.cxx
@@ -29,7 +29,6 @@
 #include "math.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkAxis, "1.28");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkAxis);
diff --git a/Charts/vtkAxis.h b/Charts/vtkAxis.h
index 1fb19ec45b6ee2bac35c27bc5b712cc48d96c503..09f2f8522573166dbc4be84bdbd81b618baaf65e 100644
--- a/Charts/vtkAxis.h
+++ b/Charts/vtkAxis.h
@@ -36,7 +36,7 @@ class vtkTextProperty;
 class VTK_CHARTS_EXPORT vtkAxis : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkAxis, vtkContextItem);
+  vtkTypeMacro(vtkAxis, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
 //BTX
diff --git a/Charts/vtkBarMark.cxx b/Charts/vtkBarMark.cxx
index 6aad7e8470a348cdac3f513f7ab99aeb7b361d48..269bfb8c0e89100fde126fd9e8ed5d8f894c6ee1 100644
--- a/Charts/vtkBarMark.cxx
+++ b/Charts/vtkBarMark.cxx
@@ -27,7 +27,6 @@
 #include "vtkPanelMark.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBarMark, "1.3");
 vtkStandardNewMacro(vtkBarMark);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkBarMark.h b/Charts/vtkBarMark.h
index e9ab6c16ecdd5c1825ee83565faa2fb0f32cd6a0..df21529fa37617fef67e5217611504d46013b632 100644
--- a/Charts/vtkBarMark.h
+++ b/Charts/vtkBarMark.h
@@ -32,7 +32,7 @@ class vtkAbstractContextBufferId;
 class VTK_CHARTS_EXPORT vtkBarMark : public vtkMark
 {
 public:
-  vtkTypeRevisionMacro(vtkBarMark, vtkMark);
+  vtkTypeMacro(vtkBarMark, vtkMark);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkBarMark* New();
 
diff --git a/Charts/vtkBlockItem.cxx b/Charts/vtkBlockItem.cxx
index c2943bd779f5ea4526ed518805d09141703a1688..84cf15aff7bbf60e81de5773780f17fe1a54d116 100644
--- a/Charts/vtkBlockItem.cxx
+++ b/Charts/vtkBlockItem.cxx
@@ -27,7 +27,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBlockItem, "1.6");
 vtkStandardNewMacro(vtkBlockItem);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkBlockItem.h b/Charts/vtkBlockItem.h
index 9a7c15ed9114373536e9dc3ead9e14755bb3f1ee..5d16296d89885dff7c27f24eaf1d99bb3fa15701 100644
--- a/Charts/vtkBlockItem.h
+++ b/Charts/vtkBlockItem.h
@@ -29,7 +29,7 @@ class vtkContext2D;
 class VTK_CHARTS_EXPORT vtkBlockItem : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkBlockItem, vtkContextItem);
+  vtkTypeMacro(vtkBlockItem, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkBlockItem *New();
diff --git a/Charts/vtkBrush.cxx b/Charts/vtkBrush.cxx
index 57c15a2ac1f7c1a471ab7d28513affe78b692ac4..9a77262d4aeffd387334a1d7c523888305e30764 100644
--- a/Charts/vtkBrush.cxx
+++ b/Charts/vtkBrush.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBrush, "1.3");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkBrush);
diff --git a/Charts/vtkBrush.h b/Charts/vtkBrush.h
index 51d5de163e7cf63ea7f95dac16908e21689757a8..30276a1da64cbb6d545df6b50d4b8221a00d8c5c 100644
--- a/Charts/vtkBrush.h
+++ b/Charts/vtkBrush.h
@@ -31,7 +31,7 @@
 class VTK_CHARTS_EXPORT vtkBrush : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkBrush, vtkObject);
+  vtkTypeMacro(vtkBrush, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkBrush *New();
diff --git a/Charts/vtkChart.cxx b/Charts/vtkChart.cxx
index bfab728c50baa624c282c0a843cec8a22da2b3f8..2a73a02bd0bd4b57ca41397a6cf6c355808f9c20 100644
--- a/Charts/vtkChart.cxx
+++ b/Charts/vtkChart.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkChart, "1.16");
 vtkCxxSetObjectMacro(vtkChart, AnnotationLink, vtkAnnotationLink);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkChart.h b/Charts/vtkChart.h
index 6471d0c4713ca28e117a26ed897215fa7259956d..3b671b3396a14798ccb66996b8b33616129b7f76 100644
--- a/Charts/vtkChart.h
+++ b/Charts/vtkChart.h
@@ -36,7 +36,7 @@ class vtkTable;
 class VTK_CHARTS_EXPORT vtkChart : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkChart, vtkContextItem);
+  vtkTypeMacro(vtkChart, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
 //BTX
diff --git a/Charts/vtkChartLegend.cxx b/Charts/vtkChartLegend.cxx
index c6c5447279c764251628295f9829d2f7a1c0af1c..bd1b375aa01da0ed7b2cb215bdcdca1c566b5aed 100644
--- a/Charts/vtkChartLegend.cxx
+++ b/Charts/vtkChartLegend.cxx
@@ -47,7 +47,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkChartLegend, "1.3");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkChartLegend);
diff --git a/Charts/vtkChartLegend.h b/Charts/vtkChartLegend.h
index 4fb3843df701eca9a16ee8a9b1328244f642fe43..e6dae63c3c00e91dd6cbd1622e0c59ad5f564f06 100644
--- a/Charts/vtkChartLegend.h
+++ b/Charts/vtkChartLegend.h
@@ -31,7 +31,7 @@ class vtkChart;
 class VTK_CHARTS_EXPORT vtkChartLegend : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkChartLegend, vtkContextItem);
+  vtkTypeMacro(vtkChartLegend, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkChartParallelCoordinates.cxx b/Charts/vtkChartParallelCoordinates.cxx
index 78d690d1ebf751e8536d52ae9f9fc4e1a4e601dc..66510ecd689f936afa52cca5f3555aa00ca6a55f 100644
--- a/Charts/vtkChartParallelCoordinates.cxx
+++ b/Charts/vtkChartParallelCoordinates.cxx
@@ -66,7 +66,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkChartParallelCoordinates, "1.14");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkChartParallelCoordinates);
diff --git a/Charts/vtkChartParallelCoordinates.h b/Charts/vtkChartParallelCoordinates.h
index 43afb26132885019ccc38c330f62644d40ceb661..fb9105be372549227801f82a957782b9f0c01bc8 100644
--- a/Charts/vtkChartParallelCoordinates.h
+++ b/Charts/vtkChartParallelCoordinates.h
@@ -29,7 +29,7 @@ class vtkStringArray;
 class VTK_CHARTS_EXPORT vtkChartParallelCoordinates : public vtkChart
 {
 public:
-  vtkTypeRevisionMacro(vtkChartParallelCoordinates, vtkChart);
+  vtkTypeMacro(vtkChartParallelCoordinates, vtkChart);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkChartXY.cxx b/Charts/vtkChartXY.cxx
index cbb0b9b5090cd9ab533336a52566934acebe4e11..2d0bb2e47dfc8991f9233c7919f13efd187e40ad 100644
--- a/Charts/vtkChartXY.cxx
+++ b/Charts/vtkChartXY.cxx
@@ -73,7 +73,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkChartXY, "1.48");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkChartXY);
diff --git a/Charts/vtkChartXY.h b/Charts/vtkChartXY.h
index 1eb454909698bb6c23e4b29be41eb3668bf897ca..773f51c0c683ec5a9157b32ea535961cc9750455 100644
--- a/Charts/vtkChartXY.h
+++ b/Charts/vtkChartXY.h
@@ -35,7 +35,7 @@ class vtkChartXYPrivate; // Private class to keep my STL vector in...
 class VTK_CHARTS_EXPORT vtkChartXY : public vtkChart
 {
 public:
-  vtkTypeRevisionMacro(vtkChartXY, vtkChart);
+  vtkTypeMacro(vtkChartXY, vtkChart);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkColorSeries.cxx b/Charts/vtkColorSeries.cxx
index de670385f0f3a9d80094685d5e283a4e28903801..becec7f7201c81e11ce43a44fa56cde4010ae63b 100644
--- a/Charts/vtkColorSeries.cxx
+++ b/Charts/vtkColorSeries.cxx
@@ -27,7 +27,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkColorSeries, "1.3");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkColorSeries);
diff --git a/Charts/vtkColorSeries.h b/Charts/vtkColorSeries.h
index e6536d419cfb457ef263899643e19334047f513f..aa09d9b501d4e3a760fb5cb13c7b96c08fb3897a 100644
--- a/Charts/vtkColorSeries.h
+++ b/Charts/vtkColorSeries.h
@@ -30,7 +30,7 @@
 class VTK_CHARTS_EXPORT vtkColorSeries : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkColorSeries, vtkObject);
+  vtkTypeMacro(vtkColorSeries, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContext2D.cxx b/Charts/vtkContext2D.cxx
index da578c04a2df72471356a87ae8fa9e522eb7afad..b97f84d4be45c552a7bbf1db865ad06562fa7fb6 100644
--- a/Charts/vtkContext2D.cxx
+++ b/Charts/vtkContext2D.cxx
@@ -29,7 +29,6 @@
 
 #include <cassert>
 
-vtkCxxRevisionMacro(vtkContext2D, "1.25");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkContext2D);
diff --git a/Charts/vtkContext2D.h b/Charts/vtkContext2D.h
index d5ea819253aea85cc6f1d2256b0e092a5a3827c9..b8185206ace636bce9d1fed2ecdb3e84169a5b51 100644
--- a/Charts/vtkContext2D.h
+++ b/Charts/vtkContext2D.h
@@ -42,7 +42,7 @@ class vtkAbstractContextBufferId;
 class VTK_CHARTS_EXPORT vtkContext2D : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkContext2D, vtkObject);
+  vtkTypeMacro(vtkContext2D, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContextActor.cxx b/Charts/vtkContextActor.cxx
index de85e3988485363bd4577d0aa39a0a739e5aecd3..e4b0079a6340e5cd503155c98878f8a4cd497779 100644
--- a/Charts/vtkContextActor.cxx
+++ b/Charts/vtkContextActor.cxx
@@ -24,7 +24,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkContextActor, "1.8");
 vtkStandardNewMacro(vtkContextActor);
 
 vtkCxxSetObjectMacro(vtkContextActor, Context, vtkContext2D);
diff --git a/Charts/vtkContextActor.h b/Charts/vtkContextActor.h
index cf5b301a0d083dce6facca2d935feb337eb14d5a..dfc556dc7de88827807664b600dfab4c6915c7a0 100644
--- a/Charts/vtkContextActor.h
+++ b/Charts/vtkContextActor.h
@@ -30,7 +30,7 @@ class VTK_CHARTS_EXPORT vtkContextActor : public vtkProp
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkContextActor,vtkProp);
+  vtkTypeMacro(vtkContextActor,vtkProp);
 
   static vtkContextActor* New();
 
diff --git a/Charts/vtkContextBufferId.cxx b/Charts/vtkContextBufferId.cxx
index e1b4b37dbe949250dbb1ef8703ee8e504ff45e8d..77199235eff2fc43d989b11d6046558be8f3a90b 100644
--- a/Charts/vtkContextBufferId.cxx
+++ b/Charts/vtkContextBufferId.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkgl.h"
 
-vtkCxxRevisionMacro(vtkContextBufferId, "1.3");
 vtkStandardNewMacro(vtkContextBufferId);
 
 // ----------------------------------------------------------------------------
diff --git a/Charts/vtkContextBufferId.h b/Charts/vtkContextBufferId.h
index d7d1bd204fcb3bc62bfa1c8bd23a355997e1a2de..cc3c36e4249401a4f9c5f89148434d7ce1044bd9 100644
--- a/Charts/vtkContextBufferId.h
+++ b/Charts/vtkContextBufferId.h
@@ -29,7 +29,7 @@ class vtkIntArray;
 class VTK_CHARTS_EXPORT vtkContextBufferId : public vtkAbstractContextBufferId
 {
 public:
-  vtkTypeRevisionMacro(vtkContextBufferId, vtkAbstractContextBufferId);
+  vtkTypeMacro(vtkContextBufferId, vtkAbstractContextBufferId);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContextDevice2D.cxx b/Charts/vtkContextDevice2D.cxx
index 07659016030cb08ec79355b7b7595909cfc3e924..c07ce762bfbcd9d61d9a0fcb7b1d60b0b3d38794 100644
--- a/Charts/vtkContextDevice2D.cxx
+++ b/Charts/vtkContextDevice2D.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkContextDevice2D, "1.3");
 //-----------------------------------------------------------------------------
 //vtkStandardNewMacro(vtkContextDevice2D);
 
diff --git a/Charts/vtkContextDevice2D.h b/Charts/vtkContextDevice2D.h
index 58be33e93bb464d901da1714529abb6aab9558c7..803ea368636a2a9ffb294da23a3c9e70854cabd0 100644
--- a/Charts/vtkContextDevice2D.h
+++ b/Charts/vtkContextDevice2D.h
@@ -37,7 +37,7 @@ class vtkAbstractContextBufferId;
 class VTK_CHARTS_EXPORT vtkContextDevice2D : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkContextDevice2D, vtkObject);
+  vtkTypeMacro(vtkContextDevice2D, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContextItem.cxx b/Charts/vtkContextItem.cxx
index e917c85a09be447210b771049119f333a9048d7e..24b442166e233fd6f07668ea848c3036a7dda099 100644
--- a/Charts/vtkContextItem.cxx
+++ b/Charts/vtkContextItem.cxx
@@ -26,7 +26,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkContextItem, "1.9");
 vtkCxxSetObjectMacro(vtkContextItem, Transform, vtkTransform2D);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkContextItem.h b/Charts/vtkContextItem.h
index 33a6268e5604bd5bc0bf4cd503c70e7918ce7b43..767f020228ccce3cb47cfce2a3320b88da987255 100644
--- a/Charts/vtkContextItem.h
+++ b/Charts/vtkContextItem.h
@@ -33,7 +33,7 @@ class vtkContextMouseEvent;
 class VTK_CHARTS_EXPORT vtkContextItem : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkContextItem, vtkObject);
+  vtkTypeMacro(vtkContextItem, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContextMapper2D.cxx b/Charts/vtkContextMapper2D.cxx
index edb018db6ff73c31e5839283d0797cbaf71a3441..306ddad18a6a05bf2f0b4558dfbfcbcfcd225670 100644
--- a/Charts/vtkContextMapper2D.cxx
+++ b/Charts/vtkContextMapper2D.cxx
@@ -21,7 +21,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkContextMapper2D, "1.1");
 vtkStandardNewMacro(vtkContextMapper2D);
 //-----------------------------------------------------------------------------
 vtkContextMapper2D::vtkContextMapper2D()
diff --git a/Charts/vtkContextMapper2D.h b/Charts/vtkContextMapper2D.h
index b42680b9fb9bed43cb41cc23dcc409e87cba2838..6a32a28d382bedacbf8acab1b37375dc14ce752b 100644
--- a/Charts/vtkContextMapper2D.h
+++ b/Charts/vtkContextMapper2D.h
@@ -33,7 +33,7 @@ class vtkAbstractArray;
 class VTK_CHARTS_EXPORT vtkContextMapper2D : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkContextMapper2D, vtkAlgorithm);
+  vtkTypeMacro(vtkContextMapper2D, vtkAlgorithm);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkContextMapper2D *New();
 
diff --git a/Charts/vtkContextScene.cxx b/Charts/vtkContextScene.cxx
index 6b09448a3d30d9d9b76085b1fbaf9daa2a3bc64f..b041e7dae3b2762294b0666e99e4819433dfa498 100644
--- a/Charts/vtkContextScene.cxx
+++ b/Charts/vtkContextScene.cxx
@@ -146,7 +146,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkContextScene, "1.21");
 vtkStandardNewMacro(vtkContextScene);
 vtkCxxSetObjectMacro(vtkContextScene, AnnotationLink, vtkAnnotationLink);
 
diff --git a/Charts/vtkContextScene.h b/Charts/vtkContextScene.h
index 8fa1926edb19a7c8d7c4dce3d5951425e9c1df72..65676a7439d8afc07898220b136a77b97903e695 100644
--- a/Charts/vtkContextScene.h
+++ b/Charts/vtkContextScene.h
@@ -41,7 +41,7 @@ class vtkAbstractContextBufferId;
 class VTK_CHARTS_EXPORT vtkContextScene : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkContextScene, vtkObject);
+  vtkTypeMacro(vtkContextScene, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkContextView.cxx b/Charts/vtkContextView.cxx
index ca136b0e4aca82595ce560408681632842cbba96..2052981972efe268848058e5aa244e1a08579305 100644
--- a/Charts/vtkContextView.cxx
+++ b/Charts/vtkContextView.cxx
@@ -27,7 +27,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkContextView, "1.4");
 vtkStandardNewMacro(vtkContextView);
 
 vtkCxxSetObjectMacro(vtkContextView, Context, vtkContext2D);
diff --git a/Charts/vtkContextView.h b/Charts/vtkContextView.h
index 26574ed9c25cd050851a14509ce283559d37d594..44cf665628ea3fe92b4934ae6ddb8930aa7550af 100644
--- a/Charts/vtkContextView.h
+++ b/Charts/vtkContextView.h
@@ -31,7 +31,7 @@ class VTK_CHARTS_EXPORT vtkContextView : public vtkRenderView
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkContextView,vtkRenderView);
+  vtkTypeMacro(vtkContextView,vtkRenderView);
 
   static vtkContextView* New();
 
diff --git a/Charts/vtkImageItem.cxx b/Charts/vtkImageItem.cxx
index f17f885ea6168ee1e0c16b74663cc07d3bc4e428..166ec9160e91b4345b1c0c304df584aff210f67b 100644
--- a/Charts/vtkImageItem.cxx
+++ b/Charts/vtkImageItem.cxx
@@ -29,7 +29,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkImageItem, "1.9");
 vtkStandardNewMacro(vtkImageItem);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkImageItem.h b/Charts/vtkImageItem.h
index 143eef916ead9b8a6707855daaca7be12f047b51..6cb1e95f4581324b035a7aa37d6db076221fa783 100644
--- a/Charts/vtkImageItem.h
+++ b/Charts/vtkImageItem.h
@@ -31,7 +31,7 @@ class vtkImageData;
 class VTK_CHARTS_EXPORT vtkImageItem : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkImageItem, vtkContextItem);
+  vtkTypeMacro(vtkImageItem, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkImageItem *New();
diff --git a/Charts/vtkLineMark.cxx b/Charts/vtkLineMark.cxx
index 275a1b1f2b3ae0cf2f9a4ce634aa66968e9f5e02..f5e4e36d8281e64a55046ff073286aecca5ebaef 100644
--- a/Charts/vtkLineMark.cxx
+++ b/Charts/vtkLineMark.cxx
@@ -22,7 +22,6 @@
 #include "vtkPen.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkLineMark, "1.2");
 vtkStandardNewMacro(vtkLineMark);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkLineMark.h b/Charts/vtkLineMark.h
index 0662a8887751c0f2d45494b48a41ea8985616927..8813c55a46cf0b32b7773a3ee9a2ff56eca229bd 100644
--- a/Charts/vtkLineMark.h
+++ b/Charts/vtkLineMark.h
@@ -31,7 +31,7 @@ class vtkPen;
 class VTK_CHARTS_EXPORT vtkLineMark : public vtkMark
 {
 public:
-  vtkTypeRevisionMacro(vtkLineMark, vtkMark);
+  vtkTypeMacro(vtkLineMark, vtkMark);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkLineMark* New();
 
diff --git a/Charts/vtkMark.cxx b/Charts/vtkMark.cxx
index 13a73b8b8217b640b402c1826759b341d4a447a2..68c7762caac9ad546d8baf71c87d09557419296d 100644
--- a/Charts/vtkMark.cxx
+++ b/Charts/vtkMark.cxx
@@ -34,7 +34,6 @@
 #include <cassert>
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMark, "1.5");
 vtkStandardNewMacro(vtkMark);
 
 class vtkMarkPrivateCompareStrings
@@ -53,7 +52,7 @@ typedef vtkstd::map<vtkstd::string,vtkValue<double>,vtkMarkPrivateCompareStrings
 class vtkMarkPrivate : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkMarkPrivate, vtkObject);
+  vtkTypeMacro(vtkMarkPrivate, vtkObject);
   
   static vtkMarkPrivate *New();
   
@@ -62,7 +61,6 @@ public:
   VariablesMap Map;
 };
 
-vtkCxxRevisionMacro(vtkMarkPrivate, "1.5");
 vtkStandardNewMacro(vtkMarkPrivate);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkMark.h b/Charts/vtkMark.h
index 9100623d49c84808a98d09e3095a3dfaba59a301..9e72d79b4d07de522eb646353b5335f375d0dabf 100644
--- a/Charts/vtkMark.h
+++ b/Charts/vtkMark.h
@@ -52,7 +52,7 @@ class vtkMarkPrivate; // PIMPL for vtkstd::map
 class VTK_CHARTS_EXPORT vtkMark : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkMark, vtkContextItem);
+  vtkTypeMacro(vtkMark, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkMark* New();
 
diff --git a/Charts/vtkOpenGLContextBufferId.cxx b/Charts/vtkOpenGLContextBufferId.cxx
index 90ec25b9d989dfc78705215e895b993400e2edf4..f01b2bd094af9b5050c4ced537782cb51d28dfab 100644
--- a/Charts/vtkOpenGLContextBufferId.cxx
+++ b/Charts/vtkOpenGLContextBufferId.cxx
@@ -23,7 +23,6 @@
 #include "vtkgl.h"
 #include "vtkOpenGLRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkOpenGLContextBufferId, "1.7");
 vtkStandardNewMacro(vtkOpenGLContextBufferId);
 
 // ----------------------------------------------------------------------------
diff --git a/Charts/vtkOpenGLContextBufferId.h b/Charts/vtkOpenGLContextBufferId.h
index 4dc0e8d2ec7eed44f8c4770aa977ea955d56549d..d45a61adc9886e5321b64a2194a1c948ed6c9e7c 100644
--- a/Charts/vtkOpenGLContextBufferId.h
+++ b/Charts/vtkOpenGLContextBufferId.h
@@ -30,7 +30,7 @@ class vtkOpenGLRenderWindow;
 class VTK_CHARTS_EXPORT vtkOpenGLContextBufferId : public vtkAbstractContextBufferId
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLContextBufferId, vtkAbstractContextBufferId);
+  vtkTypeMacro(vtkOpenGLContextBufferId, vtkAbstractContextBufferId);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkOpenGLContextDevice2D.cxx b/Charts/vtkOpenGLContextDevice2D.cxx
index 02f46ce82db362f3edc19dc8727c58b14be7c375..264cab677413bf5ca8a9f79884232c1fdab35f5c 100644
--- a/Charts/vtkOpenGLContextDevice2D.cxx
+++ b/Charts/vtkOpenGLContextDevice2D.cxx
@@ -150,7 +150,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkOpenGLContextDevice2D, "1.27");
 vtkStandardNewMacro(vtkOpenGLContextDevice2D);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkOpenGLContextDevice2D.h b/Charts/vtkOpenGLContextDevice2D.h
index dbc0ee750de8d101dfb5b91eca660f39b404a294..c266f8c8bb6104c03f95edb19745456c59256d14 100644
--- a/Charts/vtkOpenGLContextDevice2D.h
+++ b/Charts/vtkOpenGLContextDevice2D.h
@@ -35,7 +35,7 @@ class vtkOpenGLExtensionManager;
 class VTK_CHARTS_EXPORT vtkOpenGLContextDevice2D : public vtkContextDevice2D
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
+  vtkTypeMacro(vtkOpenGLContextDevice2D, vtkContextDevice2D);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPanelMark.cxx b/Charts/vtkPanelMark.cxx
index ea5f19f1c01130aa29c40346f36aab15f76134da..5105f89ba8997c98cc0de9b7cfa0ee05af66e100 100644
--- a/Charts/vtkPanelMark.cxx
+++ b/Charts/vtkPanelMark.cxx
@@ -23,7 +23,6 @@
 #include "vtkContextScene.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPanelMark, "1.10");
 vtkStandardNewMacro(vtkPanelMark);
 
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkPanelMark.h b/Charts/vtkPanelMark.h
index 2b211f48617d5d6c5cc1f7ed743a53c279710f56..95e6c015187975af2aff59f4a4f0c5c254c376da 100644
--- a/Charts/vtkPanelMark.h
+++ b/Charts/vtkPanelMark.h
@@ -34,7 +34,7 @@ class vtkContextBufferId;
 class VTK_CHARTS_EXPORT vtkPanelMark : public vtkMark
 {
 public:
-  vtkTypeRevisionMacro(vtkPanelMark, vtkMark);
+  vtkTypeMacro(vtkPanelMark, vtkMark);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkPanelMark* New();
 
diff --git a/Charts/vtkPen.cxx b/Charts/vtkPen.cxx
index 6f51ef58c86bf44a0d957d074a11871ab066cabd..49cbc3f2b34e6cff27e8bd08ab0eb0e3a2c3a0c2 100644
--- a/Charts/vtkPen.cxx
+++ b/Charts/vtkPen.cxx
@@ -19,7 +19,6 @@
 #include "vtkColor.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPen, "1.7");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkPen);
diff --git a/Charts/vtkPen.h b/Charts/vtkPen.h
index 1070f51a229ebeb7aaec5c7e759127914bd30585..f541d70c4a4d201e06081c8cbe89aa8aa704f879 100644
--- a/Charts/vtkPen.h
+++ b/Charts/vtkPen.h
@@ -32,7 +32,7 @@
 class VTK_CHARTS_EXPORT vtkPen : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkPen, vtkObject);
+  vtkTypeMacro(vtkPen, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkPen *New();
diff --git a/Charts/vtkPlot.cxx b/Charts/vtkPlot.cxx
index 19ccbcda9a4a5b5a4da5103761e680bf507b9d33..48593e3e37f13e1714412607fb76dc75492f148d 100644
--- a/Charts/vtkPlot.cxx
+++ b/Charts/vtkPlot.cxx
@@ -26,7 +26,6 @@
 
 #include "vtkStdString.h"
 
-vtkCxxRevisionMacro(vtkPlot, "1.15");
 vtkCxxSetObjectMacro(vtkPlot, Selection, vtkIdTypeArray);
 vtkCxxSetObjectMacro(vtkPlot, XAxis, vtkAxis);
 vtkCxxSetObjectMacro(vtkPlot, YAxis, vtkAxis);
diff --git a/Charts/vtkPlot.h b/Charts/vtkPlot.h
index 27189f77a12b528393f0b24d1c941bf8a7c47d64..33be06a755c486ef8b0013555acc3b5e67ae84ce 100644
--- a/Charts/vtkPlot.h
+++ b/Charts/vtkPlot.h
@@ -35,7 +35,7 @@ class vtkVector2f;
 class VTK_CHARTS_EXPORT vtkPlot : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkPlot, vtkContextItem);
+  vtkTypeMacro(vtkPlot, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPlotBar.cxx b/Charts/vtkPlotBar.cxx
index a6c8c9d5fb8141af9583f5b241c7bb59da109b46..6be34f08ae633a7c47a8c7f5a8f1540454f63ddf 100644
--- a/Charts/vtkPlotBar.cxx
+++ b/Charts/vtkPlotBar.cxx
@@ -33,7 +33,6 @@
 #include "vtkstd/vector"
 #include "vtkstd/algorithm"
 
-vtkCxxRevisionMacro(vtkPlotBar, "1.7");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkPlotBar);
diff --git a/Charts/vtkPlotBar.h b/Charts/vtkPlotBar.h
index 950553183d4f54ab512883b139b9dd8953b11479..88b289b8521ada82d4249d4205ef39e5dfc60df7 100644
--- a/Charts/vtkPlotBar.h
+++ b/Charts/vtkPlotBar.h
@@ -32,7 +32,7 @@ class vtkStdString;
 class VTK_CHARTS_EXPORT vtkPlotBar : public vtkPlot
 {
 public:
-  vtkTypeRevisionMacro(vtkPlotBar, vtkPlot);
+  vtkTypeMacro(vtkPlotBar, vtkPlot);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPlotGrid.cxx b/Charts/vtkPlotGrid.cxx
index e7812fbd3913e835b04bf891bf0f2561df8b4f34..1d0a0248f8a571ab78f8a115f681e9a21b2db201 100644
--- a/Charts/vtkPlotGrid.cxx
+++ b/Charts/vtkPlotGrid.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPlotGrid, "1.6");
 vtkCxxSetObjectMacro(vtkPlotGrid, XAxis, vtkAxis);
 vtkCxxSetObjectMacro(vtkPlotGrid, YAxis, vtkAxis);
 //-----------------------------------------------------------------------------
diff --git a/Charts/vtkPlotGrid.h b/Charts/vtkPlotGrid.h
index 060b175482be907fec3cd08e192c44610e38ba36..e7c6efbbe78b381ef17944b245d470222fd5c9f8 100644
--- a/Charts/vtkPlotGrid.h
+++ b/Charts/vtkPlotGrid.h
@@ -34,7 +34,7 @@ class vtkAxis;
 class VTK_CHARTS_EXPORT vtkPlotGrid : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkPlotGrid, vtkContextItem);
+  vtkTypeMacro(vtkPlotGrid, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPlotLine.cxx b/Charts/vtkPlotLine.cxx
index f39425aefcf0fede7700c402c2eaf05fbbbaf9df..28ae83a0f3299781b7337b49327cc9d3becd1fb1 100644
--- a/Charts/vtkPlotLine.cxx
+++ b/Charts/vtkPlotLine.cxx
@@ -38,7 +38,6 @@
 #include "vtkstd/vector"
 #include "vtkstd/algorithm"
 
-vtkCxxRevisionMacro(vtkPlotLine, "1.30");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkPlotLine);
diff --git a/Charts/vtkPlotLine.h b/Charts/vtkPlotLine.h
index b3dac3b8148e2e279bd6488adff2436009ae52b6..d18b73d01f91d9a826e5a57c9a8d8f17e2a1e0a0 100644
--- a/Charts/vtkPlotLine.h
+++ b/Charts/vtkPlotLine.h
@@ -33,7 +33,7 @@ class vtkImageData;
 class VTK_CHARTS_EXPORT vtkPlotLine : public vtkPlot
 {
 public:
-  vtkTypeRevisionMacro(vtkPlotLine, vtkPlot);
+  vtkTypeMacro(vtkPlotLine, vtkPlot);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPlotParallelCoordinates.cxx b/Charts/vtkPlotParallelCoordinates.cxx
index 6a9cf8206ea2f8a722a446eaaa91e727b3ca9a12..6f6c969ad7e97b3bde015f10c25b4ba1450d76d9 100644
--- a/Charts/vtkPlotParallelCoordinates.cxx
+++ b/Charts/vtkPlotParallelCoordinates.cxx
@@ -55,7 +55,6 @@ public:
   bool SelectionInitialized;
 };
 
-vtkCxxRevisionMacro(vtkPlotParallelCoordinates, "1.9");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkPlotParallelCoordinates);
diff --git a/Charts/vtkPlotParallelCoordinates.h b/Charts/vtkPlotParallelCoordinates.h
index 8c70a88c7aed43c3acf3d1b1fa1ab0370e2abb4e..cf8f0ea43f5bd07bdfcebb92b61e47406d4443d6 100644
--- a/Charts/vtkPlotParallelCoordinates.h
+++ b/Charts/vtkPlotParallelCoordinates.h
@@ -32,7 +32,7 @@ class vtkStdString;
 class VTK_CHARTS_EXPORT vtkPlotParallelCoordinates : public vtkPlot
 {
 public:
-  vtkTypeRevisionMacro(vtkPlotParallelCoordinates, vtkPlot);
+  vtkTypeMacro(vtkPlotParallelCoordinates, vtkPlot);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkPlotPoints.cxx b/Charts/vtkPlotPoints.cxx
index 8d38259c263fbb27ebf1120902c33c5d77e0f3f0..ead35b47768ae77807e5611b9d3ceee258e753e8 100644
--- a/Charts/vtkPlotPoints.cxx
+++ b/Charts/vtkPlotPoints.cxx
@@ -30,7 +30,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPlotPoints, "1.4");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkPlotPoints);
diff --git a/Charts/vtkPlotPoints.h b/Charts/vtkPlotPoints.h
index a53dfde4cf0d88c3779d8d5cdc82ae5ed469d403..d46924dd1b38687252afbbe876e8b083c496a36c 100644
--- a/Charts/vtkPlotPoints.h
+++ b/Charts/vtkPlotPoints.h
@@ -32,7 +32,7 @@ class vtkStdString;
 class VTK_CHARTS_EXPORT vtkPlotPoints : public vtkPlot
 {
 public:
-  vtkTypeRevisionMacro(vtkPlotPoints, vtkPlot);
+  vtkTypeMacro(vtkPlotPoints, vtkPlot);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkTooltipItem.cxx b/Charts/vtkTooltipItem.cxx
index ed8abc4ef2945e35c49f6b35f20036b833307715..773d5bb9dfdf9eb4ea7b5db3e341b05146dd5bff 100644
--- a/Charts/vtkTooltipItem.cxx
+++ b/Charts/vtkTooltipItem.cxx
@@ -27,7 +27,6 @@
 #include "vtkObjectFactory.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkTooltipItem, "1.1");
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkTooltipItem);
diff --git a/Charts/vtkTooltipItem.h b/Charts/vtkTooltipItem.h
index e3ad122fb320a0b5849d0b3ed19e1b117156188e..3c7cf7d99e9f930866c4fe8377053b06ef060ed1 100644
--- a/Charts/vtkTooltipItem.h
+++ b/Charts/vtkTooltipItem.h
@@ -34,7 +34,7 @@ class vtkTextProperty;
 class VTK_CHARTS_EXPORT vtkTooltipItem : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkTooltipItem, vtkContextItem);
+  vtkTypeMacro(vtkTooltipItem, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Charts/vtkWedgeMark.cxx b/Charts/vtkWedgeMark.cxx
index 395f45bb1b62ebeee1495b269b037b9676ab96f3..44cc390d067300d759e3e5642c92b5f193a6b9b7 100644
--- a/Charts/vtkWedgeMark.cxx
+++ b/Charts/vtkWedgeMark.cxx
@@ -35,7 +35,6 @@ vtkInformationKeyMacro(vtkWedgeMark,INNER_RADIUS,Double);
 vtkInformationKeyMacro(vtkWedgeMark,FILL_STYLE,String);
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkWedgeMark, "1.9");
 vtkStandardNewMacro(vtkWedgeMark);
 
 // ----------------------------------------------------------------------------
diff --git a/Charts/vtkWedgeMark.h b/Charts/vtkWedgeMark.h
index 0eb7c9ae72a6620aad8aa6c94ce19e8b7f051868..2cd7fd300a40ed7db3ec2b6f049a7d9f3bc1e580 100644
--- a/Charts/vtkWedgeMark.h
+++ b/Charts/vtkWedgeMark.h
@@ -47,7 +47,7 @@ class vtkAbstractContextBufferId;
 class VTK_CHARTS_EXPORT vtkWedgeMark : public vtkMark
 {
 public:
-  vtkTypeRevisionMacro(vtkWedgeMark, vtkMark);
+  vtkTypeMacro(vtkWedgeMark, vtkMark);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkWedgeMark* New();
 
diff --git a/Common/Testing/Cxx/ObjectFactory.cxx b/Common/Testing/Cxx/ObjectFactory.cxx
index c0dc35f3769531b41605441e44547d394ac21fc6..8b40a58a1d04a778d12a12327c58e2b99fb294ba 100644
--- a/Common/Testing/Cxx/ObjectFactory.cxx
+++ b/Common/Testing/Cxx/ObjectFactory.cxx
@@ -32,7 +32,7 @@ public:
     {
     }
 
-  vtkTypeRevisionMacro(vtkTestPoints,vtkPoints);
+  vtkTypeMacro(vtkTestPoints,vtkPoints);
   static vtkTestPoints* New() { return new vtkTestPoints; }
   vtkTestPoints() {  }
 private:
@@ -40,7 +40,6 @@ private:
   void operator=(const vtkTestPoints&);
 };
 
-vtkCxxRevisionMacro(vtkTestPoints, "1.24");
 
 class vtkTestPoints2 : public vtkPoints
 {
@@ -50,7 +49,7 @@ public:
     }
 
   // Methods from vtkObject
-  vtkTypeRevisionMacro(vtkTestPoints2,vtkPoints);
+  vtkTypeMacro(vtkTestPoints2,vtkPoints);
   static vtkTestPoints2* New() { return new vtkTestPoints2; }
   vtkTestPoints2() { }
 private:
@@ -58,7 +57,6 @@ private:
   void operator=(const vtkTestPoints2&);
 };
 
-vtkCxxRevisionMacro(vtkTestPoints2, "1.24");
 
 VTK_CREATE_CREATE_FUNCTION(vtkTestPoints);
 VTK_CREATE_CREATE_FUNCTION(vtkTestPoints2);
diff --git a/Common/Testing/HeaderTesting.py b/Common/Testing/HeaderTesting.py
index 34b029eda545b1e2d803e82882d7d4f526b493e9..d1f087e9cbe22a7a9669f41f9e8ca6c7d4422df4 100755
--- a/Common/Testing/HeaderTesting.py
+++ b/Common/Testing/HeaderTesting.py
@@ -234,7 +234,7 @@ class TestVTKFiles:
             rm = regx.match(line)
             if rm:
                 found = 1
-                if rm.group(1) != "Revision":
+                if rm.group(1) == "Revision":
                     oldlines.append(" %4d: %s" % (cc, line))
                 cname = rm.group(2)
                 pname = rm.group(3)
@@ -249,7 +249,7 @@ class TestVTKFiles:
                     rm = regx.match(line)
                     if rm:
                         found = 1
-                        if rm.group(1) != "Revision":
+                        if rm.group(1) == "Revision":
                             oldlines.append(" %4d: %s" % (cc, line))
                         cname = rm.group(2)
                         pname = rm.group(3)
@@ -260,19 +260,19 @@ class TestVTKFiles:
             self.Print( "File: %s has broken type macro(s):" % self.FileName )
             for a in lines:
                 self.Print( a )
-            self.Print( "Should be:\n vtkTypeRevisionMacro(%s, %s)" %
+            self.Print( "Should be:\n vtkTypeMacro(%s, %s)" %
                         (self.ClassName, self.ParentName) )
             self.Error("Broken type macro")
         if len(oldlines) > 0:
-            self.Print( "File: %s has old type macro(s):" % self.FileName )
+            self.Print( "File: %s has legacy type-revision macro(s):" % self.FileName )
             for a in oldlines:
                 self.Print( a )
-                self.Print( "Should be:\n vtkTypeRevisionMacro(%s, %s);" %
+                self.Print( "Should be:\n vtkTypeMacro(%s, %s);" %
                             (self.ClassName, self.ParentName))
-            self.Error("Old style type macro")
+            self.Error("Legacy style type-revision macro")
         if not found:
             self.Print( "File: %s does not have type macro" % self.FileName )
-            self.Print( "Should be:\n vtkTypeRevisionMacro(%s, %s);" %
+            self.Print( "Should be:\n vtkTypeMacro(%s, %s);" %
                             (self.ClassName, self.ParentName))
             self.Error("No type macro")
         pass
diff --git a/Common/vtkAbstractArray.cxx b/Common/vtkAbstractArray.cxx
index 09507e62f16c4330eaaca2fb8f3b4f8e115b735d..cbdde9add8fd5c9820d4522a5129e326804caf59 100644
--- a/Common/vtkAbstractArray.cxx
+++ b/Common/vtkAbstractArray.cxx
@@ -52,7 +52,6 @@ namespace
 class vtkAbstractArray::vtkInternalComponentNames : public vtkInternalComponentNameBase {};
 
 
-vtkCxxRevisionMacro(vtkAbstractArray, "1.19");
 
 //----------------------------------------------------------------------------
 // Construct object with sane defaults.
diff --git a/Common/vtkAbstractArray.h b/Common/vtkAbstractArray.h
index 71cd98822d2c41c1fea4adc1467d2a1305a14cb9..3d8c6d82d2c3174183a9f78a1483683fc92f874c 100644
--- a/Common/vtkAbstractArray.h
+++ b/Common/vtkAbstractArray.h
@@ -53,7 +53,7 @@ class vtkInformation;
 class VTK_COMMON_EXPORT vtkAbstractArray : public vtkObject 
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractArray,vtkObject);
+  vtkTypeMacro(vtkAbstractArray,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkAbstractTransform.cxx b/Common/vtkAbstractTransform.cxx
index 6ab5b576f586e0f55cb8e64c5d045b0b268ed135..37407fcd9a245c93043bc684ca46534da196223f 100644
--- a/Common/vtkAbstractTransform.cxx
+++ b/Common/vtkAbstractTransform.cxx
@@ -22,7 +22,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkAbstractTransform, "1.29");
 
 //----------------------------------------------------------------------------
 vtkAbstractTransform::vtkAbstractTransform()
@@ -366,7 +365,7 @@ void vtkAbstractTransform::UnRegister(vtkObjectBase *o)
 class vtkSimpleTransform : public vtkHomogeneousTransform
 {
 public:
-  vtkTypeRevisionMacro(vtkSimpleTransform,vtkHomogeneousTransform);
+  vtkTypeMacro(vtkSimpleTransform,vtkHomogeneousTransform);
   static vtkSimpleTransform *New() {
 #ifdef VTK_DEBUG_LEAKS
     vtkDebugLeaks::ConstructClass("vtkSimpleTransform");
@@ -380,7 +379,6 @@ protected:
   void operator=(const vtkSimpleTransform&);
 };
 
-vtkCxxRevisionMacro(vtkSimpleTransform, "1.29");
 
 //----------------------------------------------------------------------------
 vtkTransformConcatenation::vtkTransformConcatenation()
diff --git a/Common/vtkAbstractTransform.h b/Common/vtkAbstractTransform.h
index d1a60f1ee0f664f30f03cb539586e93abed0f4a0..18d77c3d6e15a3e3f8599eedfde46fde51a9df1f 100644
--- a/Common/vtkAbstractTransform.h
+++ b/Common/vtkAbstractTransform.h
@@ -48,7 +48,7 @@ class VTK_COMMON_EXPORT vtkAbstractTransform : public vtkObject
 {
 public:
 
-  vtkTypeRevisionMacro(vtkAbstractTransform,vtkObject);
+  vtkTypeMacro(vtkAbstractTransform,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkAmoebaMinimizer.cxx b/Common/vtkAmoebaMinimizer.cxx
index caea27cfb624b486b12c040affd96b99e4951573..f4680c34f65dd921d8da5a9ffff9db2fcccb6bbd 100644
--- a/Common/vtkAmoebaMinimizer.cxx
+++ b/Common/vtkAmoebaMinimizer.cxx
@@ -15,7 +15,6 @@
 #include "vtkAmoebaMinimizer.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkAmoebaMinimizer, "1.7");
 vtkStandardNewMacro(vtkAmoebaMinimizer);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkAmoebaMinimizer.h b/Common/vtkAmoebaMinimizer.h
index 72bc6f41060444e485f95c7a9b347cf467452c2e..66c44b58fd8598430309f0630578812f85634e30 100644
--- a/Common/vtkAmoebaMinimizer.h
+++ b/Common/vtkAmoebaMinimizer.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkAmoebaMinimizer : public vtkObject
 {
 public:
   static vtkAmoebaMinimizer *New();
-  vtkTypeRevisionMacro(vtkAmoebaMinimizer,vtkObject);
+  vtkTypeMacro(vtkAmoebaMinimizer,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkAnimationCue.cxx b/Common/vtkAnimationCue.cxx
index c81fa06fee7f84a5b3fd0f6d5e3cd29cbd41a9cc..3a9d278ec6d182e737e93fe8c06dc5b33532b926 100644
--- a/Common/vtkAnimationCue.cxx
+++ b/Common/vtkAnimationCue.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkAnimationCue, "1.8");
 vtkStandardNewMacro(vtkAnimationCue);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkAnimationCue.h b/Common/vtkAnimationCue.h
index 5dd76fef2dfa839d903148799a91f7f1bf4ffe40..4645067ce1b5dcfd9d16ac92df47785a1bbf5317 100644
--- a/Common/vtkAnimationCue.h
+++ b/Common/vtkAnimationCue.h
@@ -40,7 +40,7 @@
 class VTK_COMMON_EXPORT vtkAnimationCue: public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAnimationCue,vtkObject);
+  vtkTypeMacro(vtkAnimationCue,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkAnimationCue* New();
diff --git a/Common/vtkAnimationScene.cxx b/Common/vtkAnimationScene.cxx
index d05e24c0723734daacec425c927fe99e5e8692a0..7c27b1d4c2f1b55b8d8781934b33ed071c215d45 100644
--- a/Common/vtkAnimationScene.cxx
+++ b/Common/vtkAnimationScene.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkAnimationScene, "1.15");
 vtkStandardNewMacro(vtkAnimationScene);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkAnimationScene.h b/Common/vtkAnimationScene.h
index 08dfa1614a5f321008afc602f9d2ddb4eada7ff5..af5f409e942d1507182d1a6a337653966d4515e7 100644
--- a/Common/vtkAnimationScene.h
+++ b/Common/vtkAnimationScene.h
@@ -37,7 +37,7 @@ class vtkTimerLog;
 class VTK_COMMON_EXPORT vtkAnimationScene: public vtkAnimationCue
 {
 public:
-  vtkTypeRevisionMacro(vtkAnimationScene, vtkAnimationCue);
+  vtkTypeMacro(vtkAnimationScene, vtkAnimationCue);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkAnimationScene* New();
 
diff --git a/Common/vtkArray.cxx b/Common/vtkArray.cxx
index 7b1eca00255bc1930fba879105ef1b19fd9a7818..d901c28d94cc7af76d54bdaa44920d2cc182a1f9 100644
--- a/Common/vtkArray.cxx
+++ b/Common/vtkArray.cxx
@@ -30,7 +30,6 @@
 // Standard functions
 //
 
-vtkCxxRevisionMacro(vtkArray, "1.6");
 
 //----------------------------------------------------------------------------
 
diff --git a/Common/vtkArray.h b/Common/vtkArray.h
index 29d076da452c9350aaff43793173d1d07f54690c..004e9d102a5a3d8615838054ad34cd48c50df47c 100644
--- a/Common/vtkArray.h
+++ b/Common/vtkArray.h
@@ -56,7 +56,7 @@
 class VTK_COMMON_EXPORT vtkArray : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkArray, vtkObject);
+  vtkTypeMacro(vtkArray, vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
 //BTX
diff --git a/Common/vtkArrayCoordinateIterator.cxx b/Common/vtkArrayCoordinateIterator.cxx
index 9782bc0c8fff8de29b2b62a2854d04009a31202b..82ac64434a6c5950c2280cc882ec269a07261887 100644
--- a/Common/vtkArrayCoordinateIterator.cxx
+++ b/Common/vtkArrayCoordinateIterator.cxx
@@ -25,7 +25,6 @@
 
 #include <vtksys/stl/iterator>
 
-vtkCxxRevisionMacro(vtkArrayCoordinateIterator, "1.1");
 vtkStandardNewMacro(vtkArrayCoordinateIterator);
 
 vtkArrayCoordinateIterator::vtkArrayCoordinateIterator() :
diff --git a/Common/vtkArrayIterator.cxx b/Common/vtkArrayIterator.cxx
index 77a380e53902c0b9367aef89a5591ab06c0ee5b3..d36e8b4d984bf567c3e0c6fdc05953159d1e5597 100644
--- a/Common/vtkArrayIterator.cxx
+++ b/Common/vtkArrayIterator.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkArrayIterator, "1.1");
 //-----------------------------------------------------------------------------
 vtkArrayIterator::vtkArrayIterator()
 {
diff --git a/Common/vtkArrayIterator.h b/Common/vtkArrayIterator.h
index e582701d911b0ead6b0a7b0bfaf1a432f62fa3d7..4456fa6bc23456563410a679bb8f5a3472b86bdc 100644
--- a/Common/vtkArrayIterator.h
+++ b/Common/vtkArrayIterator.h
@@ -43,7 +43,7 @@ class vtkAbstractArray;
 class VTK_COMMON_EXPORT vtkArrayIterator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkArrayIterator, vtkObject);
+  vtkTypeMacro(vtkArrayIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkArrayIteratorTemplate.h b/Common/vtkArrayIteratorTemplate.h
index 4c0213d9f928377cb64f9f864ef7e2addbbf2402..c848a6d06303d01ef4152745d90ca50fbc3e0bbb 100644
--- a/Common/vtkArrayIteratorTemplate.h
+++ b/Common/vtkArrayIteratorTemplate.h
@@ -33,8 +33,6 @@ private:
   virtual const char* GetClassNameInternal() const 
     { return "vtkArrayIteratorTemplate"; }
 
-protected:
-  void CollectRevisions(ostream& os);
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Common/vtkArrayIteratorTemplate.txx b/Common/vtkArrayIteratorTemplate.txx
index bc70875ba41c0e159b6d110b5f490231045d3bac..87f0b4ccd20d6b7c102a44c1d023f8d22101baae 100644
--- a/Common/vtkArrayIteratorTemplate.txx
+++ b/Common/vtkArrayIteratorTemplate.txx
@@ -31,9 +31,6 @@ vtkArrayIteratorTemplate<T>* vtkArrayIteratorTemplate<T>::New()
   return new vtkArrayIteratorTemplate<T>;
 }
 
-template <class T>
-vtkCxxRevisionMacro(vtkArrayIteratorTemplate<T>, "1.3");
-
 template <class T>
 vtkCxxSetObjectMacro(vtkArrayIteratorTemplate<T>, Array, vtkAbstractArray);
 //-----------------------------------------------------------------------------
diff --git a/Common/vtkAssemblyNode.cxx b/Common/vtkAssemblyNode.cxx
index 28cb438ee9b3d55b56f078aaa5ef290b901b419b..47fbc4e75249e3e2b99e231beeaeed2605babc25 100644
--- a/Common/vtkAssemblyNode.cxx
+++ b/Common/vtkAssemblyNode.cxx
@@ -17,7 +17,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkAssemblyNode, "1.11");
 vtkStandardNewMacro(vtkAssemblyNode);
 
 vtkAssemblyNode::vtkAssemblyNode()
diff --git a/Common/vtkAssemblyNode.h b/Common/vtkAssemblyNode.h
index 7cc43d21e985daeb089f0fed5335df988734c723..9f787224c0a148b7424f4aa7dbb1d23f61e5b597 100644
--- a/Common/vtkAssemblyNode.h
+++ b/Common/vtkAssemblyNode.h
@@ -54,7 +54,7 @@ public:
   // Create an assembly node.
   static vtkAssemblyNode *New();
 
-  vtkTypeRevisionMacro(vtkAssemblyNode,vtkObject);
+  vtkTypeMacro(vtkAssemblyNode,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkAssemblyPath.cxx b/Common/vtkAssemblyPath.cxx
index 44a7de167760bfd3f233c25a64cbf0b0fde1ff57..fdb529c444e5232f48f155c62733abd702dc21a4 100644
--- a/Common/vtkAssemblyPath.cxx
+++ b/Common/vtkAssemblyPath.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkProp.h"
 
-vtkCxxRevisionMacro(vtkAssemblyPath, "1.9");
 vtkStandardNewMacro(vtkAssemblyPath);
 
 vtkAssemblyPath::vtkAssemblyPath()
diff --git a/Common/vtkAssemblyPath.h b/Common/vtkAssemblyPath.h
index 816655f8e002aa37da09a673e02952591b598116..7829e84b0b8b1a76bf6cb98d986be82850fa8c47 100644
--- a/Common/vtkAssemblyPath.h
+++ b/Common/vtkAssemblyPath.h
@@ -37,7 +37,7 @@ class vtkProp;
 class VTK_COMMON_EXPORT vtkAssemblyPath : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkAssemblyPath,vtkCollection);
+  vtkTypeMacro(vtkAssemblyPath,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkAssemblyPaths.cxx b/Common/vtkAssemblyPaths.cxx
index f781f243ea49d57c340e949a35914b72d6b9b2f8..3a25ee67b64aba70e1e3f4bc89c183088b683573 100644
--- a/Common/vtkAssemblyPaths.cxx
+++ b/Common/vtkAssemblyPaths.cxx
@@ -15,7 +15,6 @@
 #include "vtkAssemblyPaths.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkAssemblyPaths, "1.6");
 vtkStandardNewMacro(vtkAssemblyPaths);
 
 unsigned long vtkAssemblyPaths::GetMTime()
diff --git a/Common/vtkAssemblyPaths.h b/Common/vtkAssemblyPaths.h
index ae003a1006027e106dbfd0d2f4993250ebfcb2fe..16c46da94437a6851b3a86f30154003302e8b762 100644
--- a/Common/vtkAssemblyPaths.h
+++ b/Common/vtkAssemblyPaths.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkAssemblyPaths : public vtkCollection
 {
 public:
   static vtkAssemblyPaths *New();
-  vtkTypeRevisionMacro(vtkAssemblyPaths,vtkCollection);
+  vtkTypeMacro(vtkAssemblyPaths,vtkCollection);
 
   // Description:
   // Add a path to the list.
diff --git a/Common/vtkBitArray.cxx b/Common/vtkBitArray.cxx
index 07f5b4166c7fe0a42b017bc995f22f6416f6f209..21560e3459be81a4b63b81e39a8d4a8ee1bf9b05 100644
--- a/Common/vtkBitArray.cxx
+++ b/Common/vtkBitArray.cxx
@@ -45,7 +45,6 @@ public:
   bool Rebuild;
 };
 
-vtkCxxRevisionMacro(vtkBitArray, "1.66");
 vtkStandardNewMacro(vtkBitArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkBitArray.h b/Common/vtkBitArray.h
index 81b09bc518036fbd9db57523c81e167352e0344d..f48b66c694a58b2ef979757515c2be79cbbc1978 100644
--- a/Common/vtkBitArray.h
+++ b/Common/vtkBitArray.h
@@ -30,7 +30,7 @@ class VTK_COMMON_EXPORT vtkBitArray : public vtkDataArray
 {
 public:
   static vtkBitArray *New();
-  vtkTypeRevisionMacro(vtkBitArray,vtkDataArray);
+  vtkTypeMacro(vtkBitArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkBitArrayIterator.cxx b/Common/vtkBitArrayIterator.cxx
index 81a4b28b5e1b28724c9a7b698d0e39aef052c573..3e54d266de73d5f96b5502d4864e89b798bab67d 100644
--- a/Common/vtkBitArrayIterator.cxx
+++ b/Common/vtkBitArrayIterator.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkBitArrayIterator);
-vtkCxxRevisionMacro(vtkBitArrayIterator, "1.3");
 vtkCxxSetObjectMacro(vtkBitArrayIterator, Array, vtkBitArray);
 //-----------------------------------------------------------------------------
 vtkBitArrayIterator::vtkBitArrayIterator()
diff --git a/Common/vtkBitArrayIterator.h b/Common/vtkBitArrayIterator.h
index 9d10422d8a8996ff8d2d51ecad1ccd572d3df182..2d669dbca7dd3bbc92995020822908530aed9c8f 100644
--- a/Common/vtkBitArrayIterator.h
+++ b/Common/vtkBitArrayIterator.h
@@ -26,7 +26,7 @@ class VTK_COMMON_EXPORT vtkBitArrayIterator : public vtkArrayIterator
 {
 public:
   static vtkBitArrayIterator* New();
-  vtkTypeRevisionMacro(vtkBitArrayIterator, vtkArrayIterator);
+  vtkTypeMacro(vtkBitArrayIterator, vtkArrayIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkBox.cxx b/Common/vtkBox.cxx
index eab343044a0f4b532fd1202a6f21e969287a9ff3..5871fed96dca3b2e672827e8d9e3ecfa8be3d5d5 100644
--- a/Common/vtkBox.cxx
+++ b/Common/vtkBox.cxx
@@ -18,7 +18,6 @@
 #include "vtkBoundingBox.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkBox, "1.10");
 vtkStandardNewMacro(vtkBox);
 
 // Construct the box centered at the origin and each side length 1.0.
diff --git a/Common/vtkBox.h b/Common/vtkBox.h
index 6b4b2ce04fed0ee74e403c67d69d3b2eacaa499b..21c40f76ac584c8f6aa820360db4fba537cb554b 100644
--- a/Common/vtkBox.h
+++ b/Common/vtkBox.h
@@ -34,7 +34,7 @@ class vtkBoundingBox;
 class VTK_COMMON_EXPORT vtkBox : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkBox,vtkImplicitFunction);
+  vtkTypeMacro(vtkBox,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Common/vtkBoxMuellerRandomSequence.cxx b/Common/vtkBoxMuellerRandomSequence.cxx
index 5dbff0f4254872c2d019383a7d72daed51914ce4..bcce64e4f093a977e679151b9460b68c152e4c32 100644
--- a/Common/vtkBoxMuellerRandomSequence.cxx
+++ b/Common/vtkBoxMuellerRandomSequence.cxx
@@ -18,7 +18,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkBoxMuellerRandomSequence, "1.4");
 vtkStandardNewMacro(vtkBoxMuellerRandomSequence);
 
 
diff --git a/Common/vtkBoxMuellerRandomSequence.h b/Common/vtkBoxMuellerRandomSequence.h
index dfa091da8d460e9d37c24394c393902a4ba819c9..e8d90fb4fb769d8b0e6535351912c8ed60c54294 100644
--- a/Common/vtkBoxMuellerRandomSequence.h
+++ b/Common/vtkBoxMuellerRandomSequence.h
@@ -28,7 +28,7 @@
 class VTK_COMMON_EXPORT vtkBoxMuellerRandomSequence: public vtkGaussianRandomSequence
 {
 public:
-  vtkTypeRevisionMacro(vtkBoxMuellerRandomSequence,vtkGaussianRandomSequence);
+  vtkTypeMacro(vtkBoxMuellerRandomSequence,vtkGaussianRandomSequence);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkBoxMuellerRandomSequence* New();
diff --git a/Common/vtkByteSwap.cxx b/Common/vtkByteSwap.cxx
index bfe8b8f5302086a95fa3de651fe8f396f1da580d..7c283d9da8c1056c9872388490e3ea4cf25148dc 100644
--- a/Common/vtkByteSwap.cxx
+++ b/Common/vtkByteSwap.cxx
@@ -16,7 +16,6 @@
 #include <memory.h>
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkByteSwap, "1.57");
 vtkStandardNewMacro(vtkByteSwap);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkByteSwap.h b/Common/vtkByteSwap.h
index 6c350214c05c2f49b3b000837f60417a68e10531..fa86ab8546a96f3beb4e2961c648035b914654cc 100644
--- a/Common/vtkByteSwap.h
+++ b/Common/vtkByteSwap.h
@@ -26,7 +26,7 @@ class VTK_COMMON_EXPORT vtkByteSwap : public vtkObject
 {
 public:
   static vtkByteSwap *New();
-  vtkTypeRevisionMacro(vtkByteSwap,vtkObject);
+  vtkTypeMacro(vtkByteSwap,vtkObject);
 
   //BTX
   // Description:
diff --git a/Common/vtkCharArray.cxx b/Common/vtkCharArray.cxx
index c4ca73c38e5d4eebc39e3a9b52fe7191077af445..07cb20b61ba7e713100052db6cb2058137abc2ba 100644
--- a/Common/vtkCharArray.cxx
+++ b/Common/vtkCharArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(char);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkCharArray, "1.40");
 vtkStandardNewMacro(vtkCharArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkCharArray.h b/Common/vtkCharArray.h
index f9550094a3c53cc637f99a47896e0556023f2cac..4e7d33b76b5c433e07498214277bdb93be90c43e 100644
--- a/Common/vtkCharArray.h
+++ b/Common/vtkCharArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkCharArray : public vtkDataArray
 {
 public:
   static vtkCharArray* New();
-  vtkTypeRevisionMacro(vtkCharArray,vtkDataArray);
+  vtkTypeMacro(vtkCharArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkClientSocket.cxx b/Common/vtkClientSocket.cxx
index e7f35d57897f838cc81ef2cb0ea69db382c8853c..492b19a685470a4d4d8b4fb50a7cdd073635b232 100644
--- a/Common/vtkClientSocket.cxx
+++ b/Common/vtkClientSocket.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkClientSocket);
-vtkCxxRevisionMacro(vtkClientSocket, "1.2");
 //-----------------------------------------------------------------------------
 vtkClientSocket::vtkClientSocket()
 {
diff --git a/Common/vtkClientSocket.h b/Common/vtkClientSocket.h
index 4d7454a382ce45ce1abe1442c0e68023a269395a..5810173b9cef2c6bbfba0ef7e53011c1b0dcf621 100644
--- a/Common/vtkClientSocket.h
+++ b/Common/vtkClientSocket.h
@@ -24,7 +24,7 @@ class VTK_COMMON_EXPORT vtkClientSocket : public vtkSocket
 {
 public:
   static vtkClientSocket* New();
-  vtkTypeRevisionMacro(vtkClientSocket, vtkSocket);
+  vtkTypeMacro(vtkClientSocket, vtkSocket);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkCollection.cxx b/Common/vtkCollection.cxx
index 1415116f43820806a5f8be67734d8b5824ff5c0c..15a52fdb000a450503698691a57be3abefc0f5d4 100644
--- a/Common/vtkCollection.cxx
+++ b/Common/vtkCollection.cxx
@@ -21,7 +21,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCollection, "1.48");
 vtkStandardNewMacro(vtkCollection);
 
 // Construct with empty list.
diff --git a/Common/vtkCollection.h b/Common/vtkCollection.h
index e46704fe8a83f69ff13cb4fe31e36dda5b5a8212..93e2bed9bfb94c7f274935b213f7924a06183928 100644
--- a/Common/vtkCollection.h
+++ b/Common/vtkCollection.h
@@ -46,7 +46,7 @@ class vtkCollectionIterator;
 class VTK_COMMON_EXPORT vtkCollection : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCollection,vtkObject);
+  vtkTypeMacro(vtkCollection,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkCollectionIterator.cxx b/Common/vtkCollectionIterator.cxx
index e1c05d7ce30fbcb2c5eb63bdc919bd05bf033af1..6fbb566a03e939d16595838a68e839d65356f58e 100644
--- a/Common/vtkCollectionIterator.cxx
+++ b/Common/vtkCollectionIterator.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCollection.h"
 
-vtkCxxRevisionMacro(vtkCollectionIterator, "1.5");
 vtkStandardNewMacro(vtkCollectionIterator);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkCollectionIterator.h b/Common/vtkCollectionIterator.h
index 9b4baaf918885a60c93ed64ec6e13c96e61b217c..8eb7d80ebc5c50dc6c0bfcfc0de76dc49b562289 100644
--- a/Common/vtkCollectionIterator.h
+++ b/Common/vtkCollectionIterator.h
@@ -33,7 +33,7 @@ class vtkCollectionElement;
 class VTK_COMMON_EXPORT vtkCollectionIterator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCollectionIterator,vtkObject);
+  vtkTypeMacro(vtkCollectionIterator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkCollectionIterator* New();
   
diff --git a/Common/vtkConditionVariable.cxx b/Common/vtkConditionVariable.cxx
index e071619b83b2e4563fd127b641b6044e1eea3932..8de06c2d0094451fa56191248cf11d73ce1a67c7 100644
--- a/Common/vtkConditionVariable.cxx
+++ b/Common/vtkConditionVariable.cxx
@@ -5,7 +5,6 @@
 #include <errno.h>
 
 vtkStandardNewMacro(vtkConditionVariable);
-vtkCxxRevisionMacro(vtkConditionVariable,"1.17");
 
 #ifndef EPERM
 #  define EPERM 1
diff --git a/Common/vtkConditionVariable.h b/Common/vtkConditionVariable.h
index 69b9c3ee282e8fd4d33bd3750c71ce232297b8b6..9b2f48863a92779b3dd85a926734da1336443e46 100644
--- a/Common/vtkConditionVariable.h
+++ b/Common/vtkConditionVariable.h
@@ -141,7 +141,7 @@ class VTK_COMMON_EXPORT vtkConditionVariable : public vtkObject
 {
 public:
   static vtkConditionVariable* New();
-  vtkTypeRevisionMacro(vtkConditionVariable,vtkObject);
+  vtkTypeMacro(vtkConditionVariable,vtkObject);
   void PrintSelf( ostream& os, vtkIndent indent );
   
   // Description:
diff --git a/Common/vtkContourValues.cxx b/Common/vtkContourValues.cxx
index e6d6aabac0db2e032f306c78fc0ad4061b1a810e..becae103c771fbf4322bb1166c878c534ca9e5c1 100644
--- a/Common/vtkContourValues.cxx
+++ b/Common/vtkContourValues.cxx
@@ -16,7 +16,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkContourValues, "1.22");
 vtkStandardNewMacro(vtkContourValues);
 
 // Construct object with a single contour value at 0.0.
diff --git a/Common/vtkContourValues.h b/Common/vtkContourValues.h
index 20e8a44c5fc17f53557753e70de091c7e212f557..6dc4fc76273795823ddc9d2c475170ff6843ad52 100644
--- a/Common/vtkContourValues.h
+++ b/Common/vtkContourValues.h
@@ -35,7 +35,7 @@ public:
   // Construct object with a single contour value at 0.0.
   static vtkContourValues *New();
 
-  vtkTypeRevisionMacro(vtkContourValues,vtkObject);
+  vtkTypeMacro(vtkContourValues,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkCriticalSection.cxx b/Common/vtkCriticalSection.cxx
index 126d30d8c9146a22be1740f7ea6d7b088bf1f5bb..10e013c53842610bf955b9d83646560c9232726a 100644
--- a/Common/vtkCriticalSection.cxx
+++ b/Common/vtkCriticalSection.cxx
@@ -15,7 +15,6 @@
 #include "vtkCriticalSection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCriticalSection, "1.13");
 vtkStandardNewMacro(vtkCriticalSection);
 
 // New for the SimpleCriticalSection
diff --git a/Common/vtkCriticalSection.h b/Common/vtkCriticalSection.h
index c557fa6bcdcb055833022ca71765c466f5b669af..6b4affc467d40178e92c6cebecc455827e096dc3 100644
--- a/Common/vtkCriticalSection.h
+++ b/Common/vtkCriticalSection.h
@@ -109,7 +109,7 @@ class VTK_COMMON_EXPORT vtkCriticalSection : public vtkObject
 public:
   static vtkCriticalSection *New();
 
-  vtkTypeRevisionMacro(vtkCriticalSection,vtkObject);
+  vtkTypeMacro(vtkCriticalSection,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkCylindricalTransform.cxx b/Common/vtkCylindricalTransform.cxx
index 242d8bc656d80790f7d15884a4bba65e7c9dbf27..a4ece2a0e604a98175884e43ef29eb1595100904 100644
--- a/Common/vtkCylindricalTransform.cxx
+++ b/Common/vtkCylindricalTransform.cxx
@@ -18,7 +18,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkCylindricalTransform, "1.6");
 vtkStandardNewMacro(vtkCylindricalTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkCylindricalTransform.h b/Common/vtkCylindricalTransform.h
index 9fb487c76c5c1f9ad073c4d70517d73eb30827ca..f18ed4f7e632a5f9f14fc228b212876d12281536 100644
--- a/Common/vtkCylindricalTransform.h
+++ b/Common/vtkCylindricalTransform.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkCylindricalTransform : public vtkWarpTransform
 {
 public:
   static vtkCylindricalTransform *New();
-  vtkTypeRevisionMacro(vtkCylindricalTransform,vtkWarpTransform);
+  vtkTypeMacro(vtkCylindricalTransform,vtkWarpTransform);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkDataArray.cxx b/Common/vtkDataArray.cxx
index 365d9ea127c8e5f64cdd166f66fcf007d0579081..2acbc5b56e0dd6643a07564b6dbe3c37055edc3a 100644
--- a/Common/vtkDataArray.cxx
+++ b/Common/vtkDataArray.cxx
@@ -39,7 +39,6 @@ vtkInformationKeyMacro(vtkDataArray, PER_COMPONENT, InformationVector);
 vtkInformationKeyRestrictedMacro(vtkDataArray, COMPONENT_RANGE, DoubleVector, 2);
 vtkInformationKeyRestrictedMacro(vtkDataArray, L2_NORM_RANGE, DoubleVector, 2);
 
-vtkCxxRevisionMacro(vtkDataArray, "1.83");
 
 //----------------------------------------------------------------------------
 // Construct object with default tuple dimension (number of components) of 1.
diff --git a/Common/vtkDataArray.h b/Common/vtkDataArray.h
index e9b6ebe83b35a247cb9dfa6687a6326d749e348f..5f673cac3bb1148aa476908fb862810e170fa7b1 100644
--- a/Common/vtkDataArray.h
+++ b/Common/vtkDataArray.h
@@ -45,7 +45,7 @@ class vtkLookupTable;
 class VTK_COMMON_EXPORT vtkDataArray : public vtkAbstractArray
 {
 public:
-  vtkTypeRevisionMacro(vtkDataArray,vtkAbstractArray);
+  vtkTypeMacro(vtkDataArray,vtkAbstractArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkDataArrayCollection.cxx b/Common/vtkDataArrayCollection.cxx
index 888f3df8fcdecfcaa93dccb8986b50a6cd6366cb..8d29ebd298e4a7763fa09ecfcdf3f4b195d2eeee 100644
--- a/Common/vtkDataArrayCollection.cxx
+++ b/Common/vtkDataArrayCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkDataArrayCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataArrayCollection, "1.2");
 vtkStandardNewMacro(vtkDataArrayCollection);
diff --git a/Common/vtkDataArrayCollection.h b/Common/vtkDataArrayCollection.h
index ab58203016fe5180b942176c12adab7a93d4cc4a..53ed52cd26f3a88ea5375373c66baa44227da058 100644
--- a/Common/vtkDataArrayCollection.h
+++ b/Common/vtkDataArrayCollection.h
@@ -28,7 +28,7 @@ class VTK_COMMON_EXPORT vtkDataArrayCollection : public vtkCollection
 {
 public:
   static vtkDataArrayCollection *New();
-  vtkTypeRevisionMacro(vtkDataArrayCollection,vtkCollection);
+  vtkTypeMacro(vtkDataArrayCollection,vtkCollection);
 
   // Description:
   // Add a dataarray to the list.
diff --git a/Common/vtkDataArrayCollectionIterator.cxx b/Common/vtkDataArrayCollectionIterator.cxx
index 1c68e6fb4931e4bfa6ac2d4bceefcfa7af3ca0fb..f5c4a2764acbcf10c218209d7d2b1303331a5953 100644
--- a/Common/vtkDataArrayCollectionIterator.cxx
+++ b/Common/vtkDataArrayCollectionIterator.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataArray.h"
 #include "vtkDataArrayCollection.h"
 
-vtkCxxRevisionMacro(vtkDataArrayCollectionIterator, "1.3");
 vtkStandardNewMacro(vtkDataArrayCollectionIterator);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkDataArrayCollectionIterator.h b/Common/vtkDataArrayCollectionIterator.h
index 6f6929707f81e3890893c53cc190a00b9664b50f..350b94a338a0e133df83dc3c38148b93f9a28c1a 100644
--- a/Common/vtkDataArrayCollectionIterator.h
+++ b/Common/vtkDataArrayCollectionIterator.h
@@ -29,7 +29,7 @@ class vtkDataArrayCollection;
 class VTK_COMMON_EXPORT vtkDataArrayCollectionIterator : public vtkCollectionIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkDataArrayCollectionIterator,vtkCollectionIterator);
+  vtkTypeMacro(vtkDataArrayCollectionIterator,vtkCollectionIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkDataArrayCollectionIterator* New();  
   
diff --git a/Common/vtkDataArraySelection.cxx b/Common/vtkDataArraySelection.cxx
index 50bab5d114ad52f0a16f0ea9c48b8c60faf5ae4a..6dec9a0d554cff7b008b65b4b9f8f3e9fb37adef 100644
--- a/Common/vtkDataArraySelection.cxx
+++ b/Common/vtkDataArraySelection.cxx
@@ -18,7 +18,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkDataArraySelection, "1.21");
 vtkStandardNewMacro(vtkDataArraySelection);
 
 class vtkDataArraySelectionInternals
diff --git a/Common/vtkDataArraySelection.h b/Common/vtkDataArraySelection.h
index 41f73108bb60355df7a853ff8d7f00adcb3dbb26..3236b34e7a8336ea0f0d086733a6fe0313a2d3e2 100644
--- a/Common/vtkDataArraySelection.h
+++ b/Common/vtkDataArraySelection.h
@@ -30,7 +30,7 @@ class vtkDataArraySelectionInternals;
 class VTK_COMMON_EXPORT vtkDataArraySelection : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkDataArraySelection,vtkObject);
+  vtkTypeMacro(vtkDataArraySelection,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkDataArraySelection* New();
 
diff --git a/Common/vtkDebugLeaks.cxx b/Common/vtkDebugLeaks.cxx
index d06bdbb942e1b745db8bbe1a6f317ee8fc991c6d..23659c62b7c2010db9a7932786b5feda9ccd76c7 100644
--- a/Common/vtkDebugLeaks.cxx
+++ b/Common/vtkDebugLeaks.cxx
@@ -40,7 +40,6 @@ int vtkDebugLeaksIgnoreClassesCheck(const char* s)
   return 0;
 }
 
-vtkCxxRevisionMacro(vtkDebugLeaks, "1.42");
 vtkStandardNewMacro(vtkDebugLeaks);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkDebugLeaks.h b/Common/vtkDebugLeaks.h
index ecf61ec06d4e11196138b9ea4361ac03fc350966..7b99867b90ad0d80c5b0e49dcdaa76f9671a400d 100644
--- a/Common/vtkDebugLeaks.h
+++ b/Common/vtkDebugLeaks.h
@@ -38,7 +38,7 @@ class VTK_COMMON_EXPORT vtkDebugLeaks : public vtkObject
 {
 public: 
   static vtkDebugLeaks *New();
-  vtkTypeRevisionMacro(vtkDebugLeaks,vtkObject);
+  vtkTypeMacro(vtkDebugLeaks,vtkObject);
 
   // Description:
   // Call this when creating a class of a given name.
diff --git a/Common/vtkDirectory.cxx b/Common/vtkDirectory.cxx
index 73676cb46439eea01246070a26c731ffb43e4b08..83af611cdb23bff70f0f4f8879c0bd27bd65f6a7 100644
--- a/Common/vtkDirectory.cxx
+++ b/Common/vtkDirectory.cxx
@@ -20,7 +20,6 @@
 #include <sys/stat.h>
 #include <vtksys/SystemTools.hxx>
 
-vtkCxxRevisionMacro(vtkDirectory, "1.35");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkDirectory.h b/Common/vtkDirectory.h
index e718aeefd5122f99a5e2848ebbc6c7824ceece4f..d671e8c5137874819cc9af50878499743a68ec34 100644
--- a/Common/vtkDirectory.h
+++ b/Common/vtkDirectory.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkDirectory : public vtkObject
 public:
   // Description:
   // Return the class name as a string.
-  vtkTypeRevisionMacro(vtkDirectory,vtkObject);
+  vtkTypeMacro(vtkDirectory,vtkObject);
 
   // Description:
   // Create a new vtkDirectory object.
diff --git a/Common/vtkDoubleArray.cxx b/Common/vtkDoubleArray.cxx
index eb680291df77243d8ea9b66d42392058000c5d7e..533e455ab2f876904088d86b45bff67f6ae7c78b 100644
--- a/Common/vtkDoubleArray.cxx
+++ b/Common/vtkDoubleArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(double);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkDoubleArray, "1.49");
 vtkStandardNewMacro(vtkDoubleArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkDoubleArray.h b/Common/vtkDoubleArray.h
index 66403d8105ff69f3a2681adf9222bcb5e65b5191..e6cc248462a23890d9d88f9eb1e495f97e1e3050 100644
--- a/Common/vtkDoubleArray.h
+++ b/Common/vtkDoubleArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkDoubleArray : public vtkDataArray
 {
 public:
   static vtkDoubleArray* New();
-  vtkTypeRevisionMacro(vtkDoubleArray,vtkDataArray);
+  vtkTypeMacro(vtkDoubleArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkDynamicLoader.cxx b/Common/vtkDynamicLoader.cxx
index 846963a02a4d6b1cdae3b34e32fec472de148cce..af6ca5fab29bfee1b7a7d9c0098895fcd1e302c3 100644
--- a/Common/vtkDynamicLoader.cxx
+++ b/Common/vtkDynamicLoader.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkDebugLeaks.h"
 
-vtkCxxRevisionMacro(vtkDynamicLoader, "1.25");
 
 //-----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkDynamicLoader.h b/Common/vtkDynamicLoader.h
index ffb4919eaf6e4b70d13943da15b90d489d87d139..9dafe84d6c35a26378601422f01e74760720d756 100644
--- a/Common/vtkDynamicLoader.h
+++ b/Common/vtkDynamicLoader.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkDynamicLoader : public vtkObject
 {
 public:
   static vtkDynamicLoader* New();
-  vtkTypeRevisionMacro(vtkDynamicLoader,vtkObject);
+  vtkTypeMacro(vtkDynamicLoader,vtkObject);
 
   //BTX
   // Description:
diff --git a/Common/vtkEdgeTable.cxx b/Common/vtkEdgeTable.cxx
index ec5d796d9c1bd45002c0cd985fe25886f8244ff3..720bb8cc0a0dc5d9d0c7a74d093a6e939b60f7a6 100644
--- a/Common/vtkEdgeTable.cxx
+++ b/Common/vtkEdgeTable.cxx
@@ -18,7 +18,6 @@
 #include "vtkVoidArray.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkEdgeTable, "1.39");
 vtkStandardNewMacro(vtkEdgeTable);
 
 // Instantiate object based on maximum point id.
diff --git a/Common/vtkEdgeTable.h b/Common/vtkEdgeTable.h
index cb3846f7e1d366d33224119be7614a1e52f24732..708c00c0e4cc5dd4c5f5c74ccd77c177457b14bf 100644
--- a/Common/vtkEdgeTable.h
+++ b/Common/vtkEdgeTable.h
@@ -40,7 +40,7 @@ public:
   // Instantiate object assuming that 1000 edges are to be inserted.
   static vtkEdgeTable *New();
 
-  vtkTypeRevisionMacro(vtkEdgeTable,vtkObject);
+  vtkTypeMacro(vtkEdgeTable,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkExtentSplitter.cxx b/Common/vtkExtentSplitter.cxx
index ee22e8c65264965513a0ab46f72f8ee18d354823..756e9e1e2cb7fe2d53c772ea7710fec54d361b23 100644
--- a/Common/vtkExtentSplitter.cxx
+++ b/Common/vtkExtentSplitter.cxx
@@ -20,7 +20,6 @@
 #include <vtkstd/queue>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkExtentSplitter, "1.5");
 vtkStandardNewMacro(vtkExtentSplitter);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkExtentSplitter.h b/Common/vtkExtentSplitter.h
index 111aea90c2ae1fca40b3fce787a395ef74205771..4301dee4df1d3a913c473d1034046bdba9e6fbd8 100644
--- a/Common/vtkExtentSplitter.h
+++ b/Common/vtkExtentSplitter.h
@@ -33,7 +33,7 @@ class vtkExtentSplitterInternals;
 class VTK_COMMON_EXPORT vtkExtentSplitter : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkExtentSplitter,vtkObject);
+  vtkTypeMacro(vtkExtentSplitter,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkExtentSplitter *New();
   
diff --git a/Common/vtkExtentTranslator.cxx b/Common/vtkExtentTranslator.cxx
index be064dc2aac724dd46e4fcb7c5fb057f5216d89d..7cc72e5ce093f5bbb6cc32b2f43bbd7318c0c234 100644
--- a/Common/vtkExtentTranslator.cxx
+++ b/Common/vtkExtentTranslator.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkLargeInteger.h"
 
-vtkCxxRevisionMacro(vtkExtentTranslator, "1.22");
 vtkStandardNewMacro(vtkExtentTranslator);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkExtentTranslator.h b/Common/vtkExtentTranslator.h
index 26c7d31a29eeb96ab24091f1b697f1d4b0bf1374..a90334fc3fc2e5f855a12325d5d10881802f3fec 100644
--- a/Common/vtkExtentTranslator.h
+++ b/Common/vtkExtentTranslator.h
@@ -33,7 +33,7 @@ class VTK_COMMON_EXPORT vtkExtentTranslator : public vtkObject
 public:
   static vtkExtentTranslator *New();
 
-  vtkTypeRevisionMacro(vtkExtentTranslator,vtkObject);
+  vtkTypeMacro(vtkExtentTranslator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkFastNumericConversion.cxx b/Common/vtkFastNumericConversion.cxx
index fc6bfa508c3d9e137e622e3c87005b8ccdd29c46..f7bf8c9c08f9ce2a7cad1004d00ed2ba6cb43925 100644
--- a/Common/vtkFastNumericConversion.cxx
+++ b/Common/vtkFastNumericConversion.cxx
@@ -41,7 +41,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkFastNumericConversion, "1.4");
 vtkStandardNewMacro(vtkFastNumericConversion);
 
 int vtkFastNumericConversion::TestQuickFloor(double val)
diff --git a/Common/vtkFastNumericConversion.h b/Common/vtkFastNumericConversion.h
index 23a04facb14e00e6aefae6a372a3f8a00856f363..0502234ad5f3f6a31f510c89dbe12028da92f987 100644
--- a/Common/vtkFastNumericConversion.h
+++ b/Common/vtkFastNumericConversion.h
@@ -76,7 +76,7 @@ class VTK_COMMON_EXPORT vtkFastNumericConversion : public vtkObject
 {
 public:
   static vtkFastNumericConversion *New();
-  vtkTypeRevisionMacro(vtkFastNumericConversion, vtkObject);
+  vtkTypeMacro(vtkFastNumericConversion, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkFileOutputWindow.cxx b/Common/vtkFileOutputWindow.cxx
index b08a96e917a209141920d5a881b266391730f79c..20bdca72a23f2f76b008accac8be9671c436617f 100644
--- a/Common/vtkFileOutputWindow.cxx
+++ b/Common/vtkFileOutputWindow.cxx
@@ -15,7 +15,6 @@
 #include "vtkFileOutputWindow.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkFileOutputWindow, "1.9");
 vtkStandardNewMacro(vtkFileOutputWindow);
 
 vtkFileOutputWindow::vtkFileOutputWindow()
diff --git a/Common/vtkFileOutputWindow.h b/Common/vtkFileOutputWindow.h
index a47af41a87200767bbe62b52b5baf752fdee26b2..3b9091a86759140ba1e6cb1aa379c0bf8e037e70 100644
--- a/Common/vtkFileOutputWindow.h
+++ b/Common/vtkFileOutputWindow.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkFileOutputWindow : public vtkOutputWindow
 {
 public:
-  vtkTypeRevisionMacro(vtkFileOutputWindow, vtkOutputWindow);
+  vtkTypeMacro(vtkFileOutputWindow, vtkOutputWindow);
 
   static vtkFileOutputWindow* New();
 
diff --git a/Common/vtkFloatArray.cxx b/Common/vtkFloatArray.cxx
index c8dc36eb71d213152d9f17b2455632f384a2ed0d..111292d3f69996270b9e498f33b27bf023ae9648 100644
--- a/Common/vtkFloatArray.cxx
+++ b/Common/vtkFloatArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(float);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkFloatArray, "1.59");
 vtkStandardNewMacro(vtkFloatArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkFloatArray.h b/Common/vtkFloatArray.h
index 0650f38f87f95ab8043410c063c49b98b7317bbf..0d7b55d63fbfee91dda397e219fc0dac0f4fc225 100644
--- a/Common/vtkFloatArray.h
+++ b/Common/vtkFloatArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkFloatArray : public vtkDataArray
 {
 public:
   static vtkFloatArray* New();
-  vtkTypeRevisionMacro(vtkFloatArray,vtkDataArray);
+  vtkTypeMacro(vtkFloatArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkFunctionParser.cxx b/Common/vtkFunctionParser.cxx
index 6d33bf74526151cc24e6cf19f5ca679b576c416c..212d3d0935d486b5b65225fc5615d3fbd5dd9283 100644
--- a/Common/vtkFunctionParser.cxx
+++ b/Common/vtkFunctionParser.cxx
@@ -17,7 +17,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkFunctionParser, "1.46");
 vtkStandardNewMacro(vtkFunctionParser);
 
 static double vtkParserVectorErrorResult[3] = { VTK_PARSER_ERROR_RESULT, 
diff --git a/Common/vtkFunctionParser.h b/Common/vtkFunctionParser.h
index 21b940cc4db7102b2b589d6f0ad83f9aaa5975f5..0c0b8c948d66b42f01292fcff5f5b914df1dc9d1 100644
--- a/Common/vtkFunctionParser.h
+++ b/Common/vtkFunctionParser.h
@@ -116,7 +116,7 @@ class VTK_COMMON_EXPORT vtkFunctionParser : public vtkObject
 {
 public:
   static vtkFunctionParser *New();
-  vtkTypeRevisionMacro(vtkFunctionParser, vtkObject);
+  vtkTypeMacro(vtkFunctionParser, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Decription:
diff --git a/Common/vtkFunctionSet.cxx b/Common/vtkFunctionSet.cxx
index 56e9b5728fd88af813949ce4860f95a5a58c6f5e..eb7665392d2433ea807a776a4c328da5560d2315 100644
--- a/Common/vtkFunctionSet.cxx
+++ b/Common/vtkFunctionSet.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkFunctionSet.h"
 
-vtkCxxRevisionMacro(vtkFunctionSet, "1.5");
 
 vtkFunctionSet::vtkFunctionSet() 
 {
diff --git a/Common/vtkFunctionSet.h b/Common/vtkFunctionSet.h
index 206563504aad8ea62182a341fad30ec9a2657148..276b61a0d201a57439eda0faec39e5a5d8550663 100644
--- a/Common/vtkFunctionSet.h
+++ b/Common/vtkFunctionSet.h
@@ -31,7 +31,7 @@
 class VTK_COMMON_EXPORT vtkFunctionSet : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkFunctionSet,vtkObject);
+  vtkTypeMacro(vtkFunctionSet,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkGarbageCollector.cxx b/Common/vtkGarbageCollector.cxx
index 9b1a9c8eee904bcb355adc5e23c1fc4f37fd0e92..ecd91f29e3f8ecfc64ebd88b3338cb503a6781e5 100644
--- a/Common/vtkGarbageCollector.cxx
+++ b/Common/vtkGarbageCollector.cxx
@@ -36,7 +36,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGarbageCollector, "1.31");
 vtkStandardNewMacro(vtkGarbageCollector);
 
 #if VTK_GARBAGE_COLLECTOR_HASH
diff --git a/Common/vtkGarbageCollector.h b/Common/vtkGarbageCollector.h
index 4197e122cae91e9ad78919217e641b0fffe0788d..592ab7ac9ab29bae1849c4b293fc146163c78373 100644
--- a/Common/vtkGarbageCollector.h
+++ b/Common/vtkGarbageCollector.h
@@ -92,7 +92,7 @@ class vtkObjectBaseToGarbageCollectorFriendship;
 class VTK_COMMON_EXPORT vtkGarbageCollector : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGarbageCollector,vtkObject);
+  vtkTypeMacro(vtkGarbageCollector,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkGarbageCollector* New();
 
diff --git a/Common/vtkGaussianRandomSequence.cxx b/Common/vtkGaussianRandomSequence.cxx
index 7f4f40163d577361814a0ae6c632ea0fbbcf13b4..cda2686421815337e18f78b6840854861f29c7e3 100644
--- a/Common/vtkGaussianRandomSequence.cxx
+++ b/Common/vtkGaussianRandomSequence.cxx
@@ -13,7 +13,6 @@
 =========================================================================*/
 #include "vtkGaussianRandomSequence.h"
 
-vtkCxxRevisionMacro(vtkGaussianRandomSequence, "1.1");
 
 // ----------------------------------------------------------------------------
 vtkGaussianRandomSequence::vtkGaussianRandomSequence()
diff --git a/Common/vtkGaussianRandomSequence.h b/Common/vtkGaussianRandomSequence.h
index 99dc8fe0ec02765505292bd76ff973d3f4ad3140..69be71668f6091f533f14f7da28a18ed0b135c93 100644
--- a/Common/vtkGaussianRandomSequence.h
+++ b/Common/vtkGaussianRandomSequence.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkGaussianRandomSequence : public vtkRandomSequence
 {
 public:
-  vtkTypeRevisionMacro(vtkGaussianRandomSequence,vtkRandomSequence);
+  vtkTypeMacro(vtkGaussianRandomSequence,vtkRandomSequence);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkGeneralTransform.cxx b/Common/vtkGeneralTransform.cxx
index ffd82be5e3d2068cd01ae2a2ea23b98530016c92..85bf4d01e701f2c08443f0b060a957b256bbfd81 100644
--- a/Common/vtkGeneralTransform.cxx
+++ b/Common/vtkGeneralTransform.cxx
@@ -16,7 +16,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkGeneralTransform, "1.40");
 vtkStandardNewMacro(vtkGeneralTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkGeneralTransform.h b/Common/vtkGeneralTransform.h
index 8943faa564f06146e31978d6d68ca3526318d4e3..b701db9f6d495e6f8cdfa67e3dcb6536f62d73fb 100644
--- a/Common/vtkGeneralTransform.h
+++ b/Common/vtkGeneralTransform.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkGeneralTransform : public vtkAbstractTransform
 public:
   static vtkGeneralTransform *New();
 
-  vtkTypeRevisionMacro(vtkGeneralTransform,vtkAbstractTransform);
+  vtkTypeMacro(vtkGeneralTransform,vtkAbstractTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkHeap.cxx b/Common/vtkHeap.cxx
index b7f3716c7ad5c20417aca5a0092eb7c35db14400..4487926365d8fc92603a5c0cc871d3175c0cfba9 100644
--- a/Common/vtkHeap.cxx
+++ b/Common/vtkHeap.cxx
@@ -15,7 +15,6 @@
 #include "vtkHeap.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkHeap, "1.16");
 vtkStandardNewMacro(vtkHeap);
 
 struct vtkTestAlignLong
diff --git a/Common/vtkHeap.h b/Common/vtkHeap.h
index 5d444eb271767d249792d7b1840bafddb80eca92..83836c7df2fc4ce5c81ca66d178528861fa36bb6 100644
--- a/Common/vtkHeap.h
+++ b/Common/vtkHeap.h
@@ -50,7 +50,7 @@ class VTK_COMMON_EXPORT vtkHeap : public vtkObject
 {
 public:
   static vtkHeap *New();
-  vtkTypeRevisionMacro(vtkHeap,vtkObject);
+  vtkTypeMacro(vtkHeap,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkHomogeneousTransform.cxx b/Common/vtkHomogeneousTransform.cxx
index 8bccd94fd01445005a920ae58733743baa7e1c73..7f1b06719c12b55c252b53c32afe8231f566492f 100644
--- a/Common/vtkHomogeneousTransform.cxx
+++ b/Common/vtkHomogeneousTransform.cxx
@@ -18,7 +18,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkHomogeneousTransform, "1.12");
 
 //----------------------------------------------------------------------------
 vtkHomogeneousTransform::vtkHomogeneousTransform()
diff --git a/Common/vtkHomogeneousTransform.h b/Common/vtkHomogeneousTransform.h
index 95c1e92d94fbfca455a2b05b7a92499f9041a2af..5c8c6a35aa346a0d85483e46d632203264c22f76 100644
--- a/Common/vtkHomogeneousTransform.h
+++ b/Common/vtkHomogeneousTransform.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkHomogeneousTransform : public vtkAbstractTransform
 {
 public:
 
-  vtkTypeRevisionMacro(vtkHomogeneousTransform,vtkAbstractTransform);
+  vtkTypeMacro(vtkHomogeneousTransform,vtkAbstractTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkIdList.cxx b/Common/vtkIdList.cxx
index 4f7b3c8cf8abed84d95fb263144eba942f2abe5d..b99d60601d8cee9c15d6f3e3a0c52e2f9693d839 100644
--- a/Common/vtkIdList.cxx
+++ b/Common/vtkIdList.cxx
@@ -15,7 +15,6 @@
 #include "vtkIdList.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkIdList, "1.45");
 vtkStandardNewMacro(vtkIdList);
 
 vtkIdList::vtkIdList()
diff --git a/Common/vtkIdList.h b/Common/vtkIdList.h
index 3f6ecb9e16a5d78407c6bb55b7c5502fa3b9586e..32b472e8e57ae1d7dd1f87e66fafb9ce07f117ed 100644
--- a/Common/vtkIdList.h
+++ b/Common/vtkIdList.h
@@ -30,7 +30,7 @@ public:
 
   void Initialize();
   int Allocate(const vtkIdType sz, const int strategy=0);
-  vtkTypeRevisionMacro(vtkIdList,vtkObject);
+  vtkTypeMacro(vtkIdList,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkIdListCollection.cxx b/Common/vtkIdListCollection.cxx
index 9af51defb9e8a69f20421f94b932d058968265cd..ec7f9086b2e0fad00d3c8a1ac016085a13437a8d 100644
--- a/Common/vtkIdListCollection.cxx
+++ b/Common/vtkIdListCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkIdListCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkIdListCollection, "1.2");
 vtkStandardNewMacro(vtkIdListCollection);
diff --git a/Common/vtkIdListCollection.h b/Common/vtkIdListCollection.h
index 1c1e77b0282edaf41f441a74dba9be067d7f8c14..2c1d4e5ad2f6f22fe9bd2d7163bcd58113eb0cde 100644
--- a/Common/vtkIdListCollection.h
+++ b/Common/vtkIdListCollection.h
@@ -28,7 +28,7 @@ class VTK_COMMON_EXPORT vtkIdListCollection : public vtkCollection
 {
 public:
   static vtkIdListCollection *New();
-  vtkTypeRevisionMacro(vtkIdListCollection,vtkCollection);
+  vtkTypeMacro(vtkIdListCollection,vtkCollection);
 
   // Description:
   // Add a dataset to the list.
diff --git a/Common/vtkIdTypeArray.cxx b/Common/vtkIdTypeArray.cxx
index 72d7294bbdd9c67e38216090c114edce2a3dbe4a..ce9cba6287dfb3835f048a80fd1052efd044a203 100644
--- a/Common/vtkIdTypeArray.cxx
+++ b/Common/vtkIdTypeArray.cxx
@@ -27,7 +27,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkIdTypeArray, "1.13");
 vtkStandardNewMacro(vtkIdTypeArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkIdTypeArray.h b/Common/vtkIdTypeArray.h
index def25eb2483d024884878d878fb1c2ed1e0aa452..c1cd019e3f3c4c530fafd9ddc3d3c657362d9ec3 100644
--- a/Common/vtkIdTypeArray.h
+++ b/Common/vtkIdTypeArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkIdTypeArray : public vtkDataArray
 {
 public:
   static vtkIdTypeArray* New();
-  vtkTypeRevisionMacro(vtkIdTypeArray,vtkDataArray);
+  vtkTypeMacro(vtkIdTypeArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkIdentityTransform.cxx b/Common/vtkIdentityTransform.cxx
index 01d087015eed2302ceed6b1d2af292df72937906..70a1f8c2f164a1497e6747e86004d65c88a75fc2 100644
--- a/Common/vtkIdentityTransform.cxx
+++ b/Common/vtkIdentityTransform.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkIdentityTransform, "1.19");
 vtkStandardNewMacro(vtkIdentityTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkIdentityTransform.h b/Common/vtkIdentityTransform.h
index 3978daf99516f0e85d2e50bd51c76e407d737df1..12d962ca5f41500e12ada2171f9bb14eb4aedaee 100644
--- a/Common/vtkIdentityTransform.h
+++ b/Common/vtkIdentityTransform.h
@@ -31,7 +31,7 @@ class VTK_COMMON_EXPORT vtkIdentityTransform : public vtkLinearTransform
 public:
   static vtkIdentityTransform *New();
 
-  vtkTypeRevisionMacro(vtkIdentityTransform,vtkLinearTransform);
+  vtkTypeMacro(vtkIdentityTransform,vtkLinearTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkImplicitFunction.cxx b/Common/vtkImplicitFunction.cxx
index 95648c6a48662555af1e038b8f9c86a2872b5556..8b8ac631ddf8cda2f1b3f2d1eabf4551438f9b9a 100644
--- a/Common/vtkImplicitFunction.cxx
+++ b/Common/vtkImplicitFunction.cxx
@@ -18,7 +18,6 @@
 #include "vtkAbstractTransform.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkImplicitFunction, "1.38");
 vtkCxxSetObjectMacro(vtkImplicitFunction,Transform,vtkAbstractTransform);
 
 vtkImplicitFunction::vtkImplicitFunction()
diff --git a/Common/vtkImplicitFunction.h b/Common/vtkImplicitFunction.h
index 692769f71f6ecb9239f9f0ef5a061dde6b588ba8..f97c660082e9ba455ce6be7b75f5d0007f8bbc32 100644
--- a/Common/vtkImplicitFunction.h
+++ b/Common/vtkImplicitFunction.h
@@ -54,7 +54,7 @@ class vtkAbstractTransform;
 class VTK_COMMON_EXPORT vtkImplicitFunction : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitFunction,vtkObject);
+  vtkTypeMacro(vtkImplicitFunction,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkImplicitFunctionCollection.cxx b/Common/vtkImplicitFunctionCollection.cxx
index f7334c4c7f6c652383c8a0ee5ebfb6c91da666d4..c8ed486f23950c2a541f4958a71c42818472aa3d 100644
--- a/Common/vtkImplicitFunctionCollection.cxx
+++ b/Common/vtkImplicitFunctionCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkImplicitFunctionCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImplicitFunctionCollection, "1.7");
 vtkStandardNewMacro(vtkImplicitFunctionCollection);
diff --git a/Common/vtkImplicitFunctionCollection.h b/Common/vtkImplicitFunctionCollection.h
index 01f4d4df814a65abef164e6fbcf69b1d00b1f1c2..04240c20fa709675f25f8f7c356ea5e4ba2f0203 100644
--- a/Common/vtkImplicitFunctionCollection.h
+++ b/Common/vtkImplicitFunctionCollection.h
@@ -29,7 +29,7 @@
 class VTK_COMMON_EXPORT vtkImplicitFunctionCollection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitFunctionCollection,vtkCollection);
+  vtkTypeMacro(vtkImplicitFunctionCollection,vtkCollection);
   static vtkImplicitFunctionCollection *New();
 
   // Description:
diff --git a/Common/vtkInformation.cxx b/Common/vtkInformation.cxx
index 4934865f8e9c0a21fee45cc4577424ca73537981..a5103b9f3aca4d169cfd36aafc5a95039f247030 100644
--- a/Common/vtkInformation.cxx
+++ b/Common/vtkInformation.cxx
@@ -41,7 +41,6 @@
 
 #include "vtkInformationInternals.h"
 
-vtkCxxRevisionMacro(vtkInformation, "1.33");
 vtkStandardNewMacro(vtkInformation);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkInformation.h b/Common/vtkInformation.h
index f738e237b49c8cb978df21bb5862cb029bf03e82..702dbf82e4fdeb260ed0fc326100e1216fffe226 100644
--- a/Common/vtkInformation.h
+++ b/Common/vtkInformation.h
@@ -64,7 +64,7 @@ class vtkInformation : public vtkObject
 {
 public:
   VTK_COMMON_EXPORT static vtkInformation *New();
-  vtkExportedTypeRevisionMacro(vtkInformation,vtkObject,VTK_COMMON_EXPORT);
+  vtkTypeMacro(vtkInformation,vtkObject);
   VTK_COMMON_EXPORT void PrintSelf(ostream& os, vtkIndent indent);
   VTK_COMMON_EXPORT void PrintKeys(ostream& os, vtkIndent indent);
 
diff --git a/Common/vtkInformationDataObjectKey.cxx b/Common/vtkInformationDataObjectKey.cxx
index 3e4d744ce1757d5b835f994f422fc5d996bebd97..ff88b719d8f45447660ec72eae888cf688119f18 100644
--- a/Common/vtkInformationDataObjectKey.cxx
+++ b/Common/vtkInformationDataObjectKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkDataObject.h"
 
-vtkCxxRevisionMacro(vtkInformationDataObjectKey, "1.7");
 
 //----------------------------------------------------------------------------
 vtkInformationDataObjectKey::vtkInformationDataObjectKey(const char* name, const char* location):
diff --git a/Common/vtkInformationDataObjectKey.h b/Common/vtkInformationDataObjectKey.h
index aa3ef30769e8e78eb4e207b0c05b98e446de2750..5fa84cb26504ec118d9208d0f20933b7b3f88ebc 100644
--- a/Common/vtkInformationDataObjectKey.h
+++ b/Common/vtkInformationDataObjectKey.h
@@ -29,7 +29,7 @@ class vtkDataObject;
 class VTK_COMMON_EXPORT vtkInformationDataObjectKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationDataObjectKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationDataObjectKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationDataObjectKey(const char* name, const char* location);
diff --git a/Common/vtkInformationDoubleKey.cxx b/Common/vtkInformationDoubleKey.cxx
index 71ea98e88bd15f1e53f89e54defaf0f006ddc1c2..86e4146a50e94d93e226fd7283b7975b5b21e2cd 100644
--- a/Common/vtkInformationDoubleKey.cxx
+++ b/Common/vtkInformationDoubleKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationDoubleKey, "1.4");
 
 //----------------------------------------------------------------------------
 vtkInformationDoubleKey::vtkInformationDoubleKey(const char* name, const char* location):
diff --git a/Common/vtkInformationDoubleKey.h b/Common/vtkInformationDoubleKey.h
index 06012cbb87e6a7251a725f1503c6e031a2f46ca8..256702619e5e2b55b12c0f707f6999165c4ff7a4 100644
--- a/Common/vtkInformationDoubleKey.h
+++ b/Common/vtkInformationDoubleKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationDoubleKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationDoubleKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationDoubleKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationDoubleKey(const char* name, const char* location);
diff --git a/Common/vtkInformationDoubleVectorKey.cxx b/Common/vtkInformationDoubleVectorKey.cxx
index 937b136feb400a1a6e4065f254b88bc7e4f5ec01..858fe9d3fb2597c01b8938d6555900ad661ec262 100644
--- a/Common/vtkInformationDoubleVectorKey.cxx
+++ b/Common/vtkInformationDoubleVectorKey.cxx
@@ -18,7 +18,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkInformationDoubleVectorKey, "1.2");
 
 //----------------------------------------------------------------------------
 vtkInformationDoubleVectorKey
diff --git a/Common/vtkInformationDoubleVectorKey.h b/Common/vtkInformationDoubleVectorKey.h
index b29819ad2f00273f1f55e447ca95b53258106a31..1926ccdb16be2cd4d17dd67e36a1b6621c21321b 100644
--- a/Common/vtkInformationDoubleVectorKey.h
+++ b/Common/vtkInformationDoubleVectorKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationDoubleVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationDoubleVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationDoubleVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationDoubleVectorKey(const char* name, const char* location,
diff --git a/Common/vtkInformationIdTypeKey.cxx b/Common/vtkInformationIdTypeKey.cxx
index 6641fdb0fdb288306cb3acce790b91c3043e7cf4..af940ba4138a2b9b16e4b7367cb5b9f91db1a6e9 100644
--- a/Common/vtkInformationIdTypeKey.cxx
+++ b/Common/vtkInformationIdTypeKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationIdTypeKey, "1.4");
 
 //----------------------------------------------------------------------------
 vtkInformationIdTypeKey::vtkInformationIdTypeKey(const char* name, const char* location):
diff --git a/Common/vtkInformationIdTypeKey.h b/Common/vtkInformationIdTypeKey.h
index c893059854c970f89070275569b2f54198fe37e1..a4ceeb79a16047f7b096f30808764112c2571374 100644
--- a/Common/vtkInformationIdTypeKey.h
+++ b/Common/vtkInformationIdTypeKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationIdTypeKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationIdTypeKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationIdTypeKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationIdTypeKey(const char* name, const char* location);
diff --git a/Common/vtkInformationInformationKey.cxx b/Common/vtkInformationInformationKey.cxx
index 2166865a12dc0288d15497e3257c7d265fe0ce9a..1746f4c458484962bef39527aa3c1dde2c7e7530 100644
--- a/Common/vtkInformationInformationKey.cxx
+++ b/Common/vtkInformationInformationKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationInformationKey, "1.7");
 
 //----------------------------------------------------------------------------
 vtkInformationInformationKey::vtkInformationInformationKey(const char* name, const char* location):
diff --git a/Common/vtkInformationInformationKey.h b/Common/vtkInformationInformationKey.h
index 0df33101de911c1b754325fd07631f07600b5ab4..421c60e0ce5c3e6e4cfc916210f08167572e502a 100644
--- a/Common/vtkInformationInformationKey.h
+++ b/Common/vtkInformationInformationKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationInformationKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationInformationKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationInformationKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationInformationKey(const char* name, const char* location);
diff --git a/Common/vtkInformationInformationVectorKey.cxx b/Common/vtkInformationInformationVectorKey.cxx
index 2bcd8f5535b0c7b5f3345629fe2d42ae2d8c6c13..b05fc8e35ab887212ca710e7b5069e20d7bb8314 100644
--- a/Common/vtkInformationInformationVectorKey.cxx
+++ b/Common/vtkInformationInformationVectorKey.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformationVector.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationInformationVectorKey, "1.7");
 
 //----------------------------------------------------------------------------
 vtkInformationInformationVectorKey::vtkInformationInformationVectorKey(const char* name, const char* location):
diff --git a/Common/vtkInformationInformationVectorKey.h b/Common/vtkInformationInformationVectorKey.h
index 1fbbeea14e28fbc1aff1cf6164c38c88eeb3d5d5..0b97d71d6bdb576d668c2905e4aa9d70ca98aa6f 100644
--- a/Common/vtkInformationInformationVectorKey.h
+++ b/Common/vtkInformationInformationVectorKey.h
@@ -29,7 +29,7 @@ class vtkInformationVector;
 class VTK_COMMON_EXPORT vtkInformationInformationVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationInformationVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationInformationVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationInformationVectorKey(const char* name, const char* location);
diff --git a/Common/vtkInformationIntegerKey.cxx b/Common/vtkInformationIntegerKey.cxx
index ab9aefcf824855b17c4e60cbaf54e920b71e058e..149579466cd88bd67db5cd09acbc79ef3f555f9d 100644
--- a/Common/vtkInformationIntegerKey.cxx
+++ b/Common/vtkInformationIntegerKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationIntegerKey, "1.9");
 
 //----------------------------------------------------------------------------
 vtkInformationIntegerKey::vtkInformationIntegerKey(const char* name, const char* location):
diff --git a/Common/vtkInformationIntegerKey.h b/Common/vtkInformationIntegerKey.h
index 2127b1a230415979b97ca5416fef2ed332111617..0483724176533b2570750692f51074b7a104cc3a 100644
--- a/Common/vtkInformationIntegerKey.h
+++ b/Common/vtkInformationIntegerKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationIntegerKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationIntegerKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationIntegerKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationIntegerKey(const char* name, const char* location);
diff --git a/Common/vtkInformationIntegerPointerKey.cxx b/Common/vtkInformationIntegerPointerKey.cxx
index 72118cec348e97edc75d612791d2560ae3f04cc6..410414239c9ceac07a8e03d4a82f512db7e77a1d 100644
--- a/Common/vtkInformationIntegerPointerKey.cxx
+++ b/Common/vtkInformationIntegerPointerKey.cxx
@@ -19,7 +19,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkInformationIntegerPointerKey, "1.2");
 
 //----------------------------------------------------------------------------
 vtkInformationIntegerPointerKey
diff --git a/Common/vtkInformationIntegerPointerKey.h b/Common/vtkInformationIntegerPointerKey.h
index bcab3c2a4692761a2e349f89bf9ac7ea60a94a27..e6cc5f61ef7e3a834891aed5c5cde6a0f0985b71 100644
--- a/Common/vtkInformationIntegerPointerKey.h
+++ b/Common/vtkInformationIntegerPointerKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationIntegerPointerKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationIntegerPointerKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationIntegerPointerKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationIntegerPointerKey(const char* name, const char* location,
diff --git a/Common/vtkInformationIntegerVectorKey.cxx b/Common/vtkInformationIntegerVectorKey.cxx
index 7726ba44d6d9f533b4e0c1659b05ce7df646bdf9..b5ca0891393f90b6c6661b7f8d6e797315136916 100644
--- a/Common/vtkInformationIntegerVectorKey.cxx
+++ b/Common/vtkInformationIntegerVectorKey.cxx
@@ -19,7 +19,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkInformationIntegerVectorKey, "1.9");
 
 //----------------------------------------------------------------------------
 vtkInformationIntegerVectorKey
diff --git a/Common/vtkInformationIntegerVectorKey.h b/Common/vtkInformationIntegerVectorKey.h
index 3cfededf28bd8429ab903ce66c47541edb35e103..2d300d25bec6dcb2ed7ffefa542cac9739579a8a 100644
--- a/Common/vtkInformationIntegerVectorKey.h
+++ b/Common/vtkInformationIntegerVectorKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationIntegerVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationIntegerVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationIntegerVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationIntegerVectorKey(const char* name, const char* location,
diff --git a/Common/vtkInformationIterator.cxx b/Common/vtkInformationIterator.cxx
index 39a01b6c51f7969e52931f498167f287eb6faff8..6812e94ca5864059300769317ba7ab3c6c7c75d3 100644
--- a/Common/vtkInformationIterator.cxx
+++ b/Common/vtkInformationIterator.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformationKey.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkInformationIterator, "1.3");
 vtkStandardNewMacro(vtkInformationIterator);
 
 vtkCxxSetObjectMacro(vtkInformationIterator, Information, vtkInformation);
diff --git a/Common/vtkInformationIterator.h b/Common/vtkInformationIterator.h
index ac505df5c44c8df6297a0e81f5aabfe34616fd14..3883f4026fe091a6a90b20427d2423b2d71eae83 100644
--- a/Common/vtkInformationIterator.h
+++ b/Common/vtkInformationIterator.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkInformationIterator : public vtkObject
 {
 public:
   static vtkInformationIterator *New();
-  vtkTypeRevisionMacro(vtkInformationIterator,vtkObject);
+  vtkTypeMacro(vtkInformationIterator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkInformationKey.cxx b/Common/vtkInformationKey.cxx
index 66298e2b035fecfc6e5ee956c90c3935f4ed69a1..6009f5f0ed89516a36c207853774f82c83fdfd56 100644
--- a/Common/vtkInformationKey.cxx
+++ b/Common/vtkInformationKey.cxx
@@ -17,7 +17,6 @@
 #include "vtkDebugLeaks.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationKey, "1.6");
 
 class vtkInformationKeyToInformationFriendship
 {
diff --git a/Common/vtkInformationKey.h b/Common/vtkInformationKey.h
index 1401bc5391f0ff53600674ff575f7a14225a088a..b2f2434491d62e4e2a96e3ddeb43e7c7a549bd09 100644
--- a/Common/vtkInformationKey.h
+++ b/Common/vtkInformationKey.h
@@ -27,14 +27,14 @@
 #define __vtkInformationKey_h
 
 #include "vtkObjectBase.h"
-#include "vtkObject.h" // Need vtkTypeRevisionMacro
+#include "vtkObject.h" // Need vtkTypeMacro
 
 class vtkInformation;
 
 class VTK_COMMON_EXPORT vtkInformationKey : public vtkObjectBase
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationKey,vtkObjectBase);
+  vtkTypeMacro(vtkInformationKey,vtkObjectBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkInformationKeyVectorKey.cxx b/Common/vtkInformationKeyVectorKey.cxx
index 316ac75edd33def8aaa3bf0222c15a828597f513..d2b9058735d4789d8333ec8a79a4dda60ca7f679 100644
--- a/Common/vtkInformationKeyVectorKey.cxx
+++ b/Common/vtkInformationKeyVectorKey.cxx
@@ -18,7 +18,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/algorithm> // find()
 
-vtkCxxRevisionMacro(vtkInformationKeyVectorKey, "1.9");
 
 //----------------------------------------------------------------------------
 vtkInformationKeyVectorKey::vtkInformationKeyVectorKey(const char* name, const char* location):
diff --git a/Common/vtkInformationKeyVectorKey.h b/Common/vtkInformationKeyVectorKey.h
index a1c4a0fe3ab5dd228c96d91a91549bd51d9b4785..123a162a3f8c82e71738869d88948b2bec76b70d 100644
--- a/Common/vtkInformationKeyVectorKey.h
+++ b/Common/vtkInformationKeyVectorKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationKeyVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationKeyVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationKeyVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationKeyVectorKey(const char* name, const char* location);
diff --git a/Common/vtkInformationObjectBaseKey.cxx b/Common/vtkInformationObjectBaseKey.cxx
index efcdfbd2256ae669c6af4023fb1f7b3d9acfb4ff..61f150cf2a3e13fad446852990f83badf0d969a2 100644
--- a/Common/vtkInformationObjectBaseKey.cxx
+++ b/Common/vtkInformationObjectBaseKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h" // For vtkErrorWithObjectMacro
 
-vtkCxxRevisionMacro(vtkInformationObjectBaseKey, "1.2");
 
 //----------------------------------------------------------------------------
 vtkInformationObjectBaseKey
diff --git a/Common/vtkInformationObjectBaseKey.h b/Common/vtkInformationObjectBaseKey.h
index 625dc9a209343f154fcaba0593d4498c93250429..03a73fe034caeabb72bba0cfac294ee37322ea07 100644
--- a/Common/vtkInformationObjectBaseKey.h
+++ b/Common/vtkInformationObjectBaseKey.h
@@ -29,7 +29,7 @@ class vtkObjectBase;
 class VTK_COMMON_EXPORT vtkInformationObjectBaseKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationObjectBaseKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationObjectBaseKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationObjectBaseKey(const char* name, const char* location,
diff --git a/Common/vtkInformationObjectBaseVectorKey.cxx b/Common/vtkInformationObjectBaseVectorKey.cxx
index f8272ccecd79472aad64c1824cf38435b2d3ccb7..b52d9140ea98d13070f5771d5276c806e427eff3 100644
--- a/Common/vtkInformationObjectBaseVectorKey.cxx
+++ b/Common/vtkInformationObjectBaseVectorKey.cxx
@@ -33,7 +33,6 @@ private:
 
 
 //============================================================================
-vtkCxxRevisionMacro(vtkInformationObjectBaseVectorKey, "1.4");
 
 //----------------------------------------------------------------------------
 vtkInformationObjectBaseVectorKey::vtkInformationObjectBaseVectorKey(
diff --git a/Common/vtkInformationObjectBaseVectorKey.h b/Common/vtkInformationObjectBaseVectorKey.h
index dc1182c5c4d044be52023734d9c82e64b35cbfcd..14209b290310e20ee3a15e63f4846a2fa2e9ed5f 100644
--- a/Common/vtkInformationObjectBaseVectorKey.h
+++ b/Common/vtkInformationObjectBaseVectorKey.h
@@ -30,7 +30,7 @@ class vtkInformationObjectBaseVectorValue;
 class VTK_COMMON_EXPORT vtkInformationObjectBaseVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationObjectBaseVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationObjectBaseVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
   // Description:
   // The name of the static instance and the class in which
diff --git a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx b/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx
index 0adca1cdc57c02aefb5c344e03899f5199800f94..8228ff5d18cb1d1a17980122ec67b7f23be29d2d 100644
--- a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx
+++ b/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.cxx
@@ -42,7 +42,6 @@ private:
 };
 
 //============================================================================
-vtkCxxRevisionMacro(vtkInformationQuadratureSchemeDefinitionVectorKey, "1.5");
 
 //----------------------------------------------------------------------------
 vtkInformationQuadratureSchemeDefinitionVectorKey::vtkInformationQuadratureSchemeDefinitionVectorKey(
diff --git a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h b/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h
index 2ac77b37fe08c6c33ac891ebdd16d1257a6eaebf..888c697c3eb0e38ba7c8c03e894020379bfa47a2 100644
--- a/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h
+++ b/Common/vtkInformationQuadratureSchemeDefinitionVectorKey.h
@@ -32,7 +32,7 @@ class vtkQuadratureSchemeDefinition;
 class VTK_COMMON_EXPORT vtkInformationQuadratureSchemeDefinitionVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationQuadratureSchemeDefinitionVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationQuadratureSchemeDefinitionVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
   // Description:
   // The name of the static instance and the class in which
diff --git a/Common/vtkInformationRequestKey.cxx b/Common/vtkInformationRequestKey.cxx
index 669cf2aa7a3a38c122c8393e3badd056889d3a71..3dff619c134b5dbcc033ef46a2a440fd3bbfd31b 100644
--- a/Common/vtkInformationRequestKey.cxx
+++ b/Common/vtkInformationRequestKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationRequestKey, "1.2");
 
 //----------------------------------------------------------------------------
 vtkInformationRequestKey::vtkInformationRequestKey(const char* name, const char* location):
diff --git a/Common/vtkInformationRequestKey.h b/Common/vtkInformationRequestKey.h
index f97c55fd59d6554fef54e169f886ba7e9d036781..3b08e5dee23803f6ad4ddcdbb30cf10661cc7cef 100644
--- a/Common/vtkInformationRequestKey.h
+++ b/Common/vtkInformationRequestKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationRequestKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationRequestKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationRequestKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationRequestKey(const char* name, const char* location);
diff --git a/Common/vtkInformationStringKey.cxx b/Common/vtkInformationStringKey.cxx
index 6a32009c896590c59f0a5aeca41c59ae3d5448e4..25239c0e44aa3dc9d89080a21877478ac2c79ee9 100644
--- a/Common/vtkInformationStringKey.cxx
+++ b/Common/vtkInformationStringKey.cxx
@@ -18,7 +18,6 @@
 
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkInformationStringKey, "1.9");
 
 //----------------------------------------------------------------------------
 vtkInformationStringKey::vtkInformationStringKey(const char* name, const char* location):
diff --git a/Common/vtkInformationStringKey.h b/Common/vtkInformationStringKey.h
index 0d79dbfaa1163ffe7507181873b83697e1700f62..8b69c6d4102e6fd786358459ed7e3c2acfde5435 100644
--- a/Common/vtkInformationStringKey.h
+++ b/Common/vtkInformationStringKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationStringKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationStringKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationStringKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationStringKey(const char* name, const char* location);
diff --git a/Common/vtkInformationStringVectorKey.cxx b/Common/vtkInformationStringVectorKey.cxx
index b1beb3bfaab6ab73be6306ab1cf6c156c6da3819..c1e16098cb661891066b5baad168b4773b5b79b5 100644
--- a/Common/vtkInformationStringVectorKey.cxx
+++ b/Common/vtkInformationStringVectorKey.cxx
@@ -20,7 +20,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkInformationStringVectorKey, "1.4");
 
 //----------------------------------------------------------------------------
 vtkInformationStringVectorKey
diff --git a/Common/vtkInformationStringVectorKey.h b/Common/vtkInformationStringVectorKey.h
index 65ddd0524524243ea8855209dd0adcc70fa84646..95f992950667cda58dac60180972739cc88bfb60 100644
--- a/Common/vtkInformationStringVectorKey.h
+++ b/Common/vtkInformationStringVectorKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationStringVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationStringVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationStringVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationStringVectorKey(const char* name, const char* location,
diff --git a/Common/vtkInformationUnsignedLongKey.cxx b/Common/vtkInformationUnsignedLongKey.cxx
index 871f91745be7a6e3bc25706506bf1eac38b21578..e062309eb0fcdd4643007b3d1f2da3b31989c3ba 100644
--- a/Common/vtkInformationUnsignedLongKey.cxx
+++ b/Common/vtkInformationUnsignedLongKey.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkInformationUnsignedLongKey, "1.4");
 
 //----------------------------------------------------------------------------
 vtkInformationUnsignedLongKey::vtkInformationUnsignedLongKey(const char* name, const char* location):
diff --git a/Common/vtkInformationUnsignedLongKey.h b/Common/vtkInformationUnsignedLongKey.h
index acbccf96c24573a2d1e171b7f5ce7648668cd402..a762dfc285f949d75b2462ac8cdf8183829acd68 100644
--- a/Common/vtkInformationUnsignedLongKey.h
+++ b/Common/vtkInformationUnsignedLongKey.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkInformationUnsignedLongKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationUnsignedLongKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationUnsignedLongKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationUnsignedLongKey(const char* name, const char* location);
diff --git a/Common/vtkInformationVector.cxx b/Common/vtkInformationVector.cxx
index a9444c014323d3e7d497e5d5c6db11bebb747671..8583cc2ec8819a69bb6cd3a525ca8ba0775e91b1 100644
--- a/Common/vtkInformationVector.cxx
+++ b/Common/vtkInformationVector.cxx
@@ -20,7 +20,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkInformationVector, "1.3");
 vtkStandardNewMacro(vtkInformationVector);
 
 class vtkInformationVectorInternals
diff --git a/Common/vtkInformationVector.h b/Common/vtkInformationVector.h
index 29ca34a1984ab447a7b47fafb44d9a4c9550e119..33736f91218cf4d9f8bec5f7f1e2f6db5eff6090 100644
--- a/Common/vtkInformationVector.h
+++ b/Common/vtkInformationVector.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkInformationVector : public vtkObject
 {
 public:
   static vtkInformationVector *New();
-  vtkTypeRevisionMacro(vtkInformationVector,vtkObject);
+  vtkTypeMacro(vtkInformationVector,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkInitialValueProblemSolver.cxx b/Common/vtkInitialValueProblemSolver.cxx
index dcd7d585869bd9c100b48ac0998ecce8f31cb684..a936bc8a23ba1c40ee566b071b3b0f9d74c53c75 100644
--- a/Common/vtkInitialValueProblemSolver.cxx
+++ b/Common/vtkInitialValueProblemSolver.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkFunctionSet.h"
 
-vtkCxxRevisionMacro(vtkInitialValueProblemSolver, "1.11");
 
 vtkInitialValueProblemSolver::vtkInitialValueProblemSolver() 
 {
diff --git a/Common/vtkInitialValueProblemSolver.h b/Common/vtkInitialValueProblemSolver.h
index ad7552df269712b81bc0334dacb3cad090f8cbb0..a1af4a3494b74f3a4beaf1f38a932f7fd948428a 100644
--- a/Common/vtkInitialValueProblemSolver.h
+++ b/Common/vtkInitialValueProblemSolver.h
@@ -36,7 +36,7 @@ class vtkFunctionSet;
 class VTK_COMMON_EXPORT vtkInitialValueProblemSolver : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkInitialValueProblemSolver,vtkObject);
+  vtkTypeMacro(vtkInitialValueProblemSolver,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkInstantiator.cxx b/Common/vtkInstantiator.cxx
index e0b9db50d7e861869879d8a1ada8ee5450f21049..9ef419c5570ee98307708e666b1fd5854357d987 100644
--- a/Common/vtkInstantiator.cxx
+++ b/Common/vtkInstantiator.cxx
@@ -15,7 +15,6 @@
 #include "vtkInstantiator.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkInstantiator, "1.6");
 vtkStandardNewMacro(vtkInstantiator);
 
 // Node in hash table.
diff --git a/Common/vtkInstantiator.h b/Common/vtkInstantiator.h
index a2e43e83243855c966ce70f5047c3933f9209577..24b9b6024cdd71b94b2b8f976a86bae822014b1a 100644
--- a/Common/vtkInstantiator.h
+++ b/Common/vtkInstantiator.h
@@ -66,7 +66,7 @@ class VTK_COMMON_EXPORT vtkInstantiator : public vtkObject
 {
 public:
   static vtkInstantiator* New();
-  vtkTypeRevisionMacro(vtkInstantiator,vtkObject);
+  vtkTypeMacro(vtkInstantiator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkIntArray.cxx b/Common/vtkIntArray.cxx
index 89b03473976c02c6b2bee9867ae4452d5ae8d367..d3b369b4f32dd860545ee181b1a66d3a814d8f0a 100644
--- a/Common/vtkIntArray.cxx
+++ b/Common/vtkIntArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(int);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkIntArray, "1.68");
 vtkStandardNewMacro(vtkIntArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkIntArray.h b/Common/vtkIntArray.h
index 151f946cbacd69d51f393e9c9d4a4d402a432b59..2f535843767239e5bc14bb99c8eeda16d8b3e601 100644
--- a/Common/vtkIntArray.h
+++ b/Common/vtkIntArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkIntArray : public vtkDataArray
 {
 public:
   static vtkIntArray* New();
-  vtkTypeRevisionMacro(vtkIntArray,vtkDataArray);
+  vtkTypeMacro(vtkIntArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkLinearTransform.cxx b/Common/vtkLinearTransform.cxx
index e2c507a0a307e00e067a4250052a943d4f147334..322a3fabdbeb0edd7e272cd2c9014832ef672102 100644
--- a/Common/vtkLinearTransform.cxx
+++ b/Common/vtkLinearTransform.cxx
@@ -19,7 +19,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkLinearTransform, "1.35");
 
 //------------------------------------------------------------------------
 void vtkLinearTransform::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Common/vtkLinearTransform.h b/Common/vtkLinearTransform.h
index 5dfb9c57c3c240717aa9aae568b25ddb76957288..49a44b284459e220cc192ee0926412ed3a1697a8 100644
--- a/Common/vtkLinearTransform.h
+++ b/Common/vtkLinearTransform.h
@@ -29,7 +29,7 @@ class VTK_COMMON_EXPORT vtkLinearTransform : public vtkHomogeneousTransform
 {
 public:
 
-  vtkTypeRevisionMacro(vtkLinearTransform,vtkHomogeneousTransform);
+  vtkTypeMacro(vtkLinearTransform,vtkHomogeneousTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkLogLookupTable.cxx b/Common/vtkLogLookupTable.cxx
index cc92773807439167c9e29d130ff50065155c36b1..1899d2acf665e23cd45a5c34bf3a9c0ec3f60890 100644
--- a/Common/vtkLogLookupTable.cxx
+++ b/Common/vtkLogLookupTable.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkLogLookupTable, "1.30");
 vtkStandardNewMacro(vtkLogLookupTable);
 
 // Construct with (minimum,maximum) range 1 to 10 (based on 
diff --git a/Common/vtkLogLookupTable.h b/Common/vtkLogLookupTable.h
index f370c23375aa73105fa9157c6f8ca38dee323575..760c5233b67da157b1d01e9b4946af6a0a2c7e15 100644
--- a/Common/vtkLogLookupTable.h
+++ b/Common/vtkLogLookupTable.h
@@ -30,7 +30,7 @@ class VTK_COMMON_EXPORT vtkLogLookupTable : public vtkLookupTable
 public:
   static vtkLogLookupTable *New();
 
-  vtkTypeRevisionMacro(vtkLogLookupTable,vtkLookupTable);
+  vtkTypeMacro(vtkLogLookupTable,vtkLookupTable);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Common/vtkLongArray.cxx b/Common/vtkLongArray.cxx
index f928825b9a73d7ba50e5d52e17649404cd786fa1..8bae731b7b6503787d406ef2a8146eea7bae0ad6 100644
--- a/Common/vtkLongArray.cxx
+++ b/Common/vtkLongArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(long);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkLongArray, "1.37");
 vtkStandardNewMacro(vtkLongArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkLongArray.h b/Common/vtkLongArray.h
index dad4d046e26098e50374f169d83a49149dff3f7a..720d9ac6db8829dd75b25870aecefa356f089de6 100644
--- a/Common/vtkLongArray.h
+++ b/Common/vtkLongArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkLongArray : public vtkDataArray
 {
 public:
   static vtkLongArray* New();
-  vtkTypeRevisionMacro(vtkLongArray,vtkDataArray);
+  vtkTypeMacro(vtkLongArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkLongLongArray.cxx b/Common/vtkLongLongArray.cxx
index 5a1124575925a4a7b0a0d44231c5acef27325611..c3f0074a78dcee48fdc3fde863c52f6025787613 100644
--- a/Common/vtkLongLongArray.cxx
+++ b/Common/vtkLongLongArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(long long);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkLongLongArray, "1.2");
 vtkStandardNewMacro(vtkLongLongArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkLongLongArray.h b/Common/vtkLongLongArray.h
index ec6d7290b25c5324073ac32ee84d9be170c23d7c..0d85ee880a1d68e25e6b9263a34b262b5a6d0368 100644
--- a/Common/vtkLongLongArray.h
+++ b/Common/vtkLongLongArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkLongLongArray : public vtkDataArray
 {
 public:
   static vtkLongLongArray* New();
-  vtkTypeRevisionMacro(vtkLongLongArray,vtkDataArray);
+  vtkTypeMacro(vtkLongLongArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkLookupTable.cxx b/Common/vtkLookupTable.cxx
index 86dc44bedd5588570fa50a0d9eefac4caac110f1..a01d57821048bf1810451dcd0c12ed84c3f0510b 100644
--- a/Common/vtkLookupTable.cxx
+++ b/Common/vtkLookupTable.cxx
@@ -18,7 +18,6 @@
 #include "vtkMath.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkLookupTable, "1.110");
 vtkStandardNewMacro(vtkLookupTable);
 
 // Construct with range=(0,1); and hsv ranges set up for rainbow color table 
diff --git a/Common/vtkLookupTable.h b/Common/vtkLookupTable.h
index 3c1ec412171eeff331a806ab25609e7601c6efa0..40c6bfb8d8a1260fac43527c72ed79c7400b22cc 100644
--- a/Common/vtkLookupTable.h
+++ b/Common/vtkLookupTable.h
@@ -47,7 +47,7 @@ public:
   // (from red to blue).
   static vtkLookupTable *New();
   
-  vtkTypeRevisionMacro(vtkLookupTable,vtkScalarsToColors);
+  vtkTypeMacro(vtkLookupTable,vtkScalarsToColors);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkLookupTableWithEnabling.cxx b/Common/vtkLookupTableWithEnabling.cxx
index 8ddafb245fe00d02c403c3d83ac5f0b9f31ea56c..363f49772708cde43d2332edb025a3cb43f81bab 100644
--- a/Common/vtkLookupTableWithEnabling.cxx
+++ b/Common/vtkLookupTableWithEnabling.cxx
@@ -19,7 +19,6 @@
 #include "vtkVariant.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkLookupTableWithEnabling, "1.3");
 vtkStandardNewMacro(vtkLookupTableWithEnabling);
 
 vtkCxxSetObjectMacro(vtkLookupTableWithEnabling,EnabledArray,vtkDataArray);
diff --git a/Common/vtkLookupTableWithEnabling.h b/Common/vtkLookupTableWithEnabling.h
index 3a408125a09fcec84cec9f20c9bfd5911be798c8..f4c80051e34feb6fec8e0b09d32aca72d856ce48 100644
--- a/Common/vtkLookupTableWithEnabling.h
+++ b/Common/vtkLookupTableWithEnabling.h
@@ -39,7 +39,7 @@ class VTK_COMMON_EXPORT vtkLookupTableWithEnabling : public vtkLookupTable
 public:
   static vtkLookupTableWithEnabling *New();
   
-  vtkTypeRevisionMacro(vtkLookupTableWithEnabling,vtkLookupTable);
+  vtkTypeMacro(vtkLookupTableWithEnabling,vtkLookupTable);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkMath.cxx b/Common/vtkMath.cxx
index 421cb81a67f5089e4112c30c5fec1d4f7a911859..d96a5a0dadab7016ce242e6b91b745ff14c903e2 100644
--- a/Common/vtkMath.cxx
+++ b/Common/vtkMath.cxx
@@ -32,7 +32,6 @@
 #include "vtkBoxMuellerRandomSequence.h"
 #include "vtkMinimalStandardRandomSequence.h"
 
-vtkCxxRevisionMacro(vtkMath, "1.153");
 vtkStandardNewMacro(vtkMath);
 
 vtkMathInternal::vtkMathInternal()
diff --git a/Common/vtkMath.h b/Common/vtkMath.h
index 5f16956a7aa7e926e24ecaea508424e296f2e616..d74e7e1bf629ee667330fdf8820afe4499c78397 100644
--- a/Common/vtkMath.h
+++ b/Common/vtkMath.h
@@ -56,7 +56,7 @@ class VTK_COMMON_EXPORT vtkMath : public vtkObject
 {
 public:
   static vtkMath *New();
-  vtkTypeRevisionMacro(vtkMath,vtkObject);
+  vtkTypeMacro(vtkMath,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkMatrix3x3.cxx b/Common/vtkMatrix3x3.cxx
index bea103829dc7f0d3f04318b17d09e6547903552e..1a8cfdeac72d0da324a54a817866caeea3dd231f 100644
--- a/Common/vtkMatrix3x3.cxx
+++ b/Common/vtkMatrix3x3.cxx
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkMatrix3x3, "1.3");
 vtkStandardNewMacro(vtkMatrix3x3);
 
 // Useful for viewing a double[9] as a double[3][3]
diff --git a/Common/vtkMatrix3x3.h b/Common/vtkMatrix3x3.h
index 615959d631605207248c442b7676fde363ac241a..1223e0f7d96d57732becbd13d806a7110248599f 100644
--- a/Common/vtkMatrix3x3.h
+++ b/Common/vtkMatrix3x3.h
@@ -42,7 +42,7 @@ public:
   // Construct a 3x3 identity matrix.
   static vtkMatrix3x3 *New();
 
-  vtkTypeRevisionMacro(vtkMatrix3x3,vtkObject);
+  vtkTypeMacro(vtkMatrix3x3,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkMatrix4x4.cxx b/Common/vtkMatrix4x4.cxx
index e0afe0fb91e91a4e51a1ab2b6fb5b3cd074de403..7749517dacb57336b071fe8483e441b226c6fb57 100644
--- a/Common/vtkMatrix4x4.cxx
+++ b/Common/vtkMatrix4x4.cxx
@@ -19,7 +19,6 @@
 #include <stdlib.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkMatrix4x4, "1.64");
 vtkStandardNewMacro(vtkMatrix4x4);
 
 // Useful for viewing a double[16] as a double[4][4]
diff --git a/Common/vtkMatrix4x4.h b/Common/vtkMatrix4x4.h
index 6bde397f59ec7a597f61e69b257734d45eb4e78a..f41897709c0f4066ba2f7e41ec621d11e92bc937 100644
--- a/Common/vtkMatrix4x4.h
+++ b/Common/vtkMatrix4x4.h
@@ -44,7 +44,7 @@ public:
   // Construct a 4x4 identity matrix.
   static vtkMatrix4x4 *New();
 
-  vtkTypeRevisionMacro(vtkMatrix4x4,vtkObject);
+  vtkTypeMacro(vtkMatrix4x4,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkMatrixToHomogeneousTransform.cxx b/Common/vtkMatrixToHomogeneousTransform.cxx
index 0af9f268eac3dcab4d3964a957125e091b8c23ef..d26b0d8f0d122e1b160a822ee1374afa19c21dcb 100644
--- a/Common/vtkMatrixToHomogeneousTransform.cxx
+++ b/Common/vtkMatrixToHomogeneousTransform.cxx
@@ -17,7 +17,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkMatrixToHomogeneousTransform, "1.11");
 vtkStandardNewMacro(vtkMatrixToHomogeneousTransform);
 vtkCxxSetObjectMacro(vtkMatrixToHomogeneousTransform,Input,vtkMatrix4x4);
 
diff --git a/Common/vtkMatrixToHomogeneousTransform.h b/Common/vtkMatrixToHomogeneousTransform.h
index 0ba02d07e86e2bbe45648ad910e63cb8fd94cad3..976b1a8b6ac455efc7483ebd870f34700982f3d8 100644
--- a/Common/vtkMatrixToHomogeneousTransform.h
+++ b/Common/vtkMatrixToHomogeneousTransform.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkMatrixToHomogeneousTransform : public vtkHomogeneousT
 {
  public:
   static vtkMatrixToHomogeneousTransform *New();
-  vtkTypeRevisionMacro(vtkMatrixToHomogeneousTransform,vtkHomogeneousTransform);
+  vtkTypeMacro(vtkMatrixToHomogeneousTransform,vtkHomogeneousTransform);
   void PrintSelf (ostream& os, vtkIndent indent);
 
   // Set the input matrix.  Any modifications to the matrix will be
diff --git a/Common/vtkMatrixToLinearTransform.cxx b/Common/vtkMatrixToLinearTransform.cxx
index c49c203cb62a805e833a0ae885fc6fcd3db1354f..4c02d980ba2fccf76ad4fc03b40e0bf0eba58542 100644
--- a/Common/vtkMatrixToLinearTransform.cxx
+++ b/Common/vtkMatrixToLinearTransform.cxx
@@ -17,7 +17,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkMatrixToLinearTransform, "1.16");
 vtkStandardNewMacro(vtkMatrixToLinearTransform);
 vtkCxxSetObjectMacro(vtkMatrixToLinearTransform,Input,vtkMatrix4x4);
 
diff --git a/Common/vtkMatrixToLinearTransform.h b/Common/vtkMatrixToLinearTransform.h
index 67f59730e84c2b66552ceb4872faeae1a162058d..1b7749487dde86b8a9363e4c98744e3943cae62d 100644
--- a/Common/vtkMatrixToLinearTransform.h
+++ b/Common/vtkMatrixToLinearTransform.h
@@ -34,7 +34,7 @@ class VTK_COMMON_EXPORT vtkMatrixToLinearTransform : public vtkLinearTransform
 {
  public:
   static vtkMatrixToLinearTransform *New();
-  vtkTypeRevisionMacro(vtkMatrixToLinearTransform,vtkLinearTransform);
+  vtkTypeMacro(vtkMatrixToLinearTransform,vtkLinearTransform);
   void PrintSelf (ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkMinimalStandardRandomSequence.cxx b/Common/vtkMinimalStandardRandomSequence.cxx
index 7553fd8f212843626f58f2811eed561a7a9212c6..8140aed7b9541fef122d18d45f5698201201e780 100644
--- a/Common/vtkMinimalStandardRandomSequence.cxx
+++ b/Common/vtkMinimalStandardRandomSequence.cxx
@@ -16,7 +16,6 @@
 #include <cassert>
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkMinimalStandardRandomSequence, "1.3");
 vtkStandardNewMacro(vtkMinimalStandardRandomSequence);
 
 const int VTK_K_A=16807;
diff --git a/Common/vtkMinimalStandardRandomSequence.h b/Common/vtkMinimalStandardRandomSequence.h
index c4caa96a3fe2b65d8873fc0a2b926069f545cc58..32de7cf4d81119b471d6605bba40e2fb16e6339e 100644
--- a/Common/vtkMinimalStandardRandomSequence.h
+++ b/Common/vtkMinimalStandardRandomSequence.h
@@ -38,7 +38,7 @@ class VTK_COMMON_EXPORT vtkMinimalStandardRandomSequence
   : public vtkRandomSequence
 {
 public:
-  vtkTypeRevisionMacro(vtkMinimalStandardRandomSequence,vtkRandomSequence);
+  vtkTypeMacro(vtkMinimalStandardRandomSequence,vtkRandomSequence);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkMinimalStandardRandomSequence* New();
diff --git a/Common/vtkMultiThreader.cxx b/Common/vtkMultiThreader.cxx
index 0113d1eaaa60c8f18ab931b96e9422bb1a68677b..dbd42c7058be8f0618d489f8dc1701a415a164f3 100644
--- a/Common/vtkMultiThreader.cxx
+++ b/Common/vtkMultiThreader.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkWindows.h"
 
-vtkCxxRevisionMacro(vtkMultiThreader, "1.53");
 vtkStandardNewMacro(vtkMultiThreader);
 
 // These are the includes necessary for multithreaded rendering on an SGI
diff --git a/Common/vtkMultiThreader.h b/Common/vtkMultiThreader.h
index 542ec36feea265725e56ed52fc54e6a7ccb3c03a..1aafd8d7a5dd0711de3e3f653151e0c1ac43e688 100644
--- a/Common/vtkMultiThreader.h
+++ b/Common/vtkMultiThreader.h
@@ -89,7 +89,7 @@ class VTK_COMMON_EXPORT vtkMultiThreader : public vtkObject
 public:
   static vtkMultiThreader *New();
 
-  vtkTypeRevisionMacro(vtkMultiThreader,vtkObject);
+  vtkTypeMacro(vtkMultiThreader,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkMutexLock.cxx b/Common/vtkMutexLock.cxx
index 320b76f033d8335797e88d52b0522db26791f86f..6aede4fe3a16b6e7266a47e394daa4d3b7b95ea4 100644
--- a/Common/vtkMutexLock.cxx
+++ b/Common/vtkMutexLock.cxx
@@ -19,7 +19,6 @@
 # include "vtkWindows.h"
 #endif
 
-vtkCxxRevisionMacro(vtkMutexLock, "1.23");
 vtkStandardNewMacro(vtkMutexLock);
 
 // New for the SimpleMutex
diff --git a/Common/vtkMutexLock.h b/Common/vtkMutexLock.h
index 9b373ad8dceb40478a23a4a450fddc87c0515826..63ff966a5b90f3cd729038611a0bf61232dd8f54 100644
--- a/Common/vtkMutexLock.h
+++ b/Common/vtkMutexLock.h
@@ -80,7 +80,7 @@ class VTK_COMMON_EXPORT vtkMutexLock : public vtkObject
 public:
   static vtkMutexLock *New();
 
-  vtkTypeRevisionMacro(vtkMutexLock,vtkObject);
+  vtkTypeMacro(vtkMutexLock,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkObject.cxx b/Common/vtkObject.cxx
index acebed0bdeda30aa89e799bf6e21ad103939943c..34cc1815c7176cbc6c45a5fbc4722d7a3224386a 100644
--- a/Common/vtkObject.cxx
+++ b/Common/vtkObject.cxx
@@ -21,7 +21,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkObject, "1.102");
 
 // Initialize static member that controls warning display
 static int vtkObjectGlobalWarningDisplay = 1;
diff --git a/Common/vtkObject.h b/Common/vtkObject.h
index 7f6335de65d09b6cc32475b3a8336f921e071131..3e15587567797d7ccab9bd92faf12a8bffd8c89d 100644
--- a/Common/vtkObject.h
+++ b/Common/vtkObject.h
@@ -48,7 +48,7 @@ class vtkCommand;
 class VTK_COMMON_EXPORT vtkObject : public vtkObjectBase
 {
 public:
-  vtkTypeRevisionMacro(vtkObject,vtkObjectBase);
+  vtkTypeMacro(vtkObject,vtkObjectBase);
 
   // Description:
   // Create an object with Debug turned off, modified time initialized 
diff --git a/Common/vtkObjectBase.h b/Common/vtkObjectBase.h
index 511955b3190c04cfa1862919245e3f0aad79a50a..db8d7824fab2c97dcc231b027760a96fc80ad574 100644
--- a/Common/vtkObjectBase.h
+++ b/Common/vtkObjectBase.h
@@ -59,7 +59,7 @@ public:
 
   // Description:
   // Return the class name as a string. This method is defined
-  // in all subclasses of vtkObjectBase with the vtkTypeRevisionMacro found
+  // in all subclasses of vtkObjectBase with the vtkTypeMacro found
   // in vtkSetGet.h.
   const char* GetClassName() const;
 
@@ -76,13 +76,13 @@ public:
   // Description:
   // Return 1 if this class type is the same type of (or a subclass of)
   // the named class. Returns 0 otherwise. This method works in
-  // combination with vtkTypeRevisionMacro found in vtkSetGet.h.
+  // combination with vtkTypeMacro found in vtkSetGet.h.
   static int IsTypeOf(const char *name);
 
   // Description:
   // Return 1 if this class is the same type of (or a subclass of)
   // the named class. Returns 0 otherwise. This method works in
-  // combination with vtkTypeRevisionMacro found in vtkSetGet.h.
+  // combination with vtkTypeMacro found in vtkSetGet.h.
   virtual int IsA(const char *name);
 
   // Description:
diff --git a/Common/vtkObjectFactory.cxx b/Common/vtkObjectFactory.cxx
index 2cd3d71a6b79f1c0152bb542fc1acb8974c91933..c6a6d3a45d9d435fcba018f7d3b00e7954ac84dd 100644
--- a/Common/vtkObjectFactory.cxx
+++ b/Common/vtkObjectFactory.cxx
@@ -25,7 +25,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkObjectFactory, "1.49");
 
 vtkObjectFactoryCollection* vtkObjectFactory::RegisteredFactories = 0;
 
diff --git a/Common/vtkObjectFactory.h b/Common/vtkObjectFactory.h
index 5f0704ff93d653882fd253b42ba7467115e71ceb..376797bdc62f9429b3fcfc717ee23ee9c063877f 100644
--- a/Common/vtkObjectFactory.h
+++ b/Common/vtkObjectFactory.h
@@ -110,7 +110,7 @@ public:
   // Instance methods to be used on individual instances of vtkObjectFactory
   
   // Methods from vtkObject
-  vtkTypeRevisionMacro(vtkObjectFactory,vtkObject);
+  vtkTypeMacro(vtkObjectFactory,vtkObject);
   // Description:
   // Print ObjectFactory to stream.
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Common/vtkObjectFactoryCollection.cxx b/Common/vtkObjectFactoryCollection.cxx
index 686115b672701dfa466caf6f99afedd03ffed8e9..21ecfa2432b4d8b2fc3c94ad131cc0df5c1eb83a 100644
--- a/Common/vtkObjectFactoryCollection.cxx
+++ b/Common/vtkObjectFactoryCollection.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkDebugLeaks.h"
 
-vtkCxxRevisionMacro(vtkObjectFactoryCollection, "1.5");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkObjectFactoryCollection.h b/Common/vtkObjectFactoryCollection.h
index b69ae159dfe85b2426fda68e63564dee21f3def0..b507ae8bb85a9f2b8b583b52998e8e14563655d7 100644
--- a/Common/vtkObjectFactoryCollection.h
+++ b/Common/vtkObjectFactoryCollection.h
@@ -30,7 +30,7 @@
 class VTK_COMMON_EXPORT vtkObjectFactoryCollection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkObjectFactoryCollection,vtkCollection);
+  vtkTypeMacro(vtkObjectFactoryCollection,vtkCollection);
   static vtkObjectFactoryCollection *New();
 
   // Description:
diff --git a/Common/vtkOnePieceExtentTranslator.cxx b/Common/vtkOnePieceExtentTranslator.cxx
index adcbdbfb18a456baa29bfb111b234710787a1f6b..822002eb8d0bf1e9217d18af4b1eb079f86c1dc6 100644
--- a/Common/vtkOnePieceExtentTranslator.cxx
+++ b/Common/vtkOnePieceExtentTranslator.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkOnePieceExtentTranslator);
-vtkCxxRevisionMacro(vtkOnePieceExtentTranslator, "1.1");
 //-----------------------------------------------------------------------------
 vtkOnePieceExtentTranslator::vtkOnePieceExtentTranslator()
 {
diff --git a/Common/vtkOnePieceExtentTranslator.h b/Common/vtkOnePieceExtentTranslator.h
index f2edb723d54f82567af7149cfb82dcda05696ab3..7d0b41eddd5001959e897fc46f7b58dfba3f7b1c 100644
--- a/Common/vtkOnePieceExtentTranslator.h
+++ b/Common/vtkOnePieceExtentTranslator.h
@@ -24,7 +24,7 @@ class VTK_COMMON_EXPORT vtkOnePieceExtentTranslator : public vtkExtentTranslator
 {
 public:
   static vtkOnePieceExtentTranslator* New();
-  vtkTypeRevisionMacro(vtkOnePieceExtentTranslator, vtkExtentTranslator);
+  vtkTypeMacro(vtkOnePieceExtentTranslator, vtkExtentTranslator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Common/vtkOutputWindow.cxx b/Common/vtkOutputWindow.cxx
index b39d4e7637b7ffbb7c2f22085a289f9fb5cf6908..7db98e685972263e67eb49741a9a3ebd2e5b67ef 100644
--- a/Common/vtkOutputWindow.cxx
+++ b/Common/vtkOutputWindow.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkDebugLeaks.h"
 
-vtkCxxRevisionMacro(vtkOutputWindow, "1.40");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkOutputWindow.h b/Common/vtkOutputWindow.h
index 2df297e82a3d2c909e18d5a000d82fa356847081..01d8e79e069fd96783effed4f9ea3151f377aaac 100644
--- a/Common/vtkOutputWindow.h
+++ b/Common/vtkOutputWindow.h
@@ -37,7 +37,7 @@ class VTK_COMMON_EXPORT vtkOutputWindow : public vtkObject
 {
 public:
 // Methods from vtkObject
-  vtkTypeRevisionMacro(vtkOutputWindow,vtkObject);
+  vtkTypeMacro(vtkOutputWindow,vtkObject);
   // Description:
   // Print ObjectFactor to stream.
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Common/vtkOverrideInformation.cxx b/Common/vtkOverrideInformation.cxx
index 56c4813447c8d86290b8100ecfd952c244a80fc2..89d389d4a2e16c17e67474077723514c6518bdda 100644
--- a/Common/vtkOverrideInformation.cxx
+++ b/Common/vtkOverrideInformation.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkOverrideInformation, "1.9");
 vtkStandardNewMacro(vtkOverrideInformation);
 vtkCxxSetObjectMacro(vtkOverrideInformation,ObjectFactory,vtkObjectFactory);
 
diff --git a/Common/vtkOverrideInformation.h b/Common/vtkOverrideInformation.h
index 75e0e2038fa9726d6c0bb84cf77c01bebc28a8b9..b25231c2c61d5e2c6dd9ba2e27f5e9a541888e44 100644
--- a/Common/vtkOverrideInformation.h
+++ b/Common/vtkOverrideInformation.h
@@ -29,7 +29,7 @@ class VTK_COMMON_EXPORT vtkOverrideInformation : public vtkObject
 {
 public: 
   static vtkOverrideInformation* New();
-  vtkTypeRevisionMacro(vtkOverrideInformation,vtkObject);
+  vtkTypeMacro(vtkOverrideInformation,vtkObject);
   // Description:
   // Print ObjectFactor to stream.
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Common/vtkOverrideInformationCollection.cxx b/Common/vtkOverrideInformationCollection.cxx
index b8ac11742f2703c044ecb9ddf5b58c2afd2fde3e..d905954f2e6cdad328cd9926ebe146e890f5e914 100644
--- a/Common/vtkOverrideInformationCollection.cxx
+++ b/Common/vtkOverrideInformationCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkOverrideInformationCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkOverrideInformationCollection, "1.4");
 vtkStandardNewMacro(vtkOverrideInformationCollection);
diff --git a/Common/vtkOverrideInformationCollection.h b/Common/vtkOverrideInformationCollection.h
index 184329e7a9ff38e4cf16c6890c65d1664be6aaab..e13a20a958af57892b1c9ec874909403d86287c4 100644
--- a/Common/vtkOverrideInformationCollection.h
+++ b/Common/vtkOverrideInformationCollection.h
@@ -29,7 +29,7 @@
 class VTK_COMMON_EXPORT vtkOverrideInformationCollection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkOverrideInformationCollection,vtkCollection);
+  vtkTypeMacro(vtkOverrideInformationCollection,vtkCollection);
   static vtkOverrideInformationCollection *New();
 
   // Description:
diff --git a/Common/vtkParametricBoy.cxx b/Common/vtkParametricBoy.cxx
index 556064f205fd39e791357f31203556e15e288d89..f81a99dc71927c7f5aac3f677d1b626d4b4e2c0f 100644
--- a/Common/vtkParametricBoy.cxx
+++ b/Common/vtkParametricBoy.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricBoy, "1.2");
 vtkStandardNewMacro(vtkParametricBoy);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricBoy.h b/Common/vtkParametricBoy.h
index c06b9bb280f428aa016cf2389198f5f53e503de1..b05ce3ee4501944115f4988ed5b0a8fae5ca3ebe 100644
--- a/Common/vtkParametricBoy.h
+++ b/Common/vtkParametricBoy.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkParametricBoy : public vtkParametricFunction
 {
 public:
 
-  vtkTypeRevisionMacro(vtkParametricBoy,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricBoy,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricConicSpiral.cxx b/Common/vtkParametricConicSpiral.cxx
index e25a51a6031ed55d2b372280bf0c2bafc49c9e5b..e7d4663d770e7c6f5a2a113ef83cee155fbd4c07 100644
--- a/Common/vtkParametricConicSpiral.cxx
+++ b/Common/vtkParametricConicSpiral.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricConicSpiral, "1.3");
 vtkStandardNewMacro(vtkParametricConicSpiral);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricConicSpiral.h b/Common/vtkParametricConicSpiral.h
index a89b869696ce1e9a57b5f169275c4cb43c9472b7..c01cb21ea471c7d29f0ba35ecabb327037c43356 100644
--- a/Common/vtkParametricConicSpiral.h
+++ b/Common/vtkParametricConicSpiral.h
@@ -33,7 +33,7 @@
 class VTK_COMMON_EXPORT vtkParametricConicSpiral : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricConicSpiral,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricConicSpiral,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricCrossCap.cxx b/Common/vtkParametricCrossCap.cxx
index 32b033c5126d6ed24d9c376cb0b8673187637aa2..ee5553351bffaaeebba05c61be122870fefb7973 100644
--- a/Common/vtkParametricCrossCap.cxx
+++ b/Common/vtkParametricCrossCap.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricCrossCap, "1.2");
 vtkStandardNewMacro(vtkParametricCrossCap);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricCrossCap.h b/Common/vtkParametricCrossCap.h
index 3cffb9a7fb003a0b3098d2a7848eb3ec01bed478..749e9d066dfbc3533269785cc7052b3678516ee3 100644
--- a/Common/vtkParametricCrossCap.h
+++ b/Common/vtkParametricCrossCap.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkParametricCrossCap : public vtkParametricFunction
 {
 public:
 
-  vtkTypeRevisionMacro(vtkParametricCrossCap,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricCrossCap,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricDini.cxx b/Common/vtkParametricDini.cxx
index 398e5da21e049900d2e428f1405c73e982f67338..816a70792705b879358816f05338e9763707d8a9 100644
--- a/Common/vtkParametricDini.cxx
+++ b/Common/vtkParametricDini.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricDini, "1.2");
 vtkStandardNewMacro(vtkParametricDini);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricDini.h b/Common/vtkParametricDini.h
index 06a6ad51ab08a9e527fe979ddd292154199ccdcf..2bffa784da88f4710eef6f85dd3cae31c075f043 100644
--- a/Common/vtkParametricDini.h
+++ b/Common/vtkParametricDini.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkParametricDini : public vtkParametricFunction
 {
 public:
 
-  vtkTypeRevisionMacro(vtkParametricDini,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricDini,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricEllipsoid.cxx b/Common/vtkParametricEllipsoid.cxx
index c28c3ded85d640cd12c7e8b51412632d4fd19ce9..b2e2d6764fadf82cf23b79b07b20e2e87132874e 100644
--- a/Common/vtkParametricEllipsoid.cxx
+++ b/Common/vtkParametricEllipsoid.cxx
@@ -17,7 +17,6 @@
 #include "vtkMath.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkParametricEllipsoid, "1.2");
 vtkStandardNewMacro(vtkParametricEllipsoid);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricEllipsoid.h b/Common/vtkParametricEllipsoid.h
index 5727ef5706a5ff6347ed81fb023e2aa6946999e8..f2c219b845c1543e818a873c89a0a77f04ce4ebd 100644
--- a/Common/vtkParametricEllipsoid.h
+++ b/Common/vtkParametricEllipsoid.h
@@ -37,7 +37,7 @@
 class VTK_COMMON_EXPORT vtkParametricEllipsoid : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricEllipsoid,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricEllipsoid,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricEnneper.cxx b/Common/vtkParametricEnneper.cxx
index de0554da980e9c5223f455a3d4d593d12a14b57b..6014b088fe86a969f82417126e1f16ba2ceff84e 100644
--- a/Common/vtkParametricEnneper.cxx
+++ b/Common/vtkParametricEnneper.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricEnneper, "1.2");
 vtkStandardNewMacro(vtkParametricEnneper);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricEnneper.h b/Common/vtkParametricEnneper.h
index 9e7c262d854b4ec460baec0bd77cfbd77378cd20..0f09906711f1442b00eaf600299fd36e84aa5684 100644
--- a/Common/vtkParametricEnneper.h
+++ b/Common/vtkParametricEnneper.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkParametricEnneper : public vtkParametricFunction
 {
 public:
 
-  vtkTypeRevisionMacro(vtkParametricEnneper,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricEnneper,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricFigure8Klein.cxx b/Common/vtkParametricFigure8Klein.cxx
index b80099d2a39c2beb9793fe2bfa159930617d2195..44a05ab8cf7113911d6a0a6fe55ee3299e9c143f 100644
--- a/Common/vtkParametricFigure8Klein.cxx
+++ b/Common/vtkParametricFigure8Klein.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricFigure8Klein, "1.3");
 vtkStandardNewMacro(vtkParametricFigure8Klein);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricFigure8Klein.h b/Common/vtkParametricFigure8Klein.h
index bf3af86344528e35599fa5a59188e845aac20224..bfd92893b2f222d3127819f95063c08d1dacc4cd 100644
--- a/Common/vtkParametricFigure8Klein.h
+++ b/Common/vtkParametricFigure8Klein.h
@@ -41,7 +41,7 @@
 class VTK_COMMON_EXPORT vtkParametricFigure8Klein : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricFigure8Klein,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricFigure8Klein,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricFunction.cxx b/Common/vtkParametricFunction.cxx
index 6d49d5aab752e68f280982dc0bf713277a56a3eb..924d7643c90fa3141fb57fc7142376983d3aeb50 100644
--- a/Common/vtkParametricFunction.cxx
+++ b/Common/vtkParametricFunction.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkParametricFunction.h"
 
-vtkCxxRevisionMacro(vtkParametricFunction, "1.2");
 
 //----------------------------------------------------------------------------
 vtkParametricFunction::vtkParametricFunction() :
diff --git a/Common/vtkParametricFunction.h b/Common/vtkParametricFunction.h
index a827d6246286ee90097a86e76ed805b646f0ccb2..f8c40ebeb750f3b523be92534452fa681542ee93 100644
--- a/Common/vtkParametricFunction.h
+++ b/Common/vtkParametricFunction.h
@@ -55,7 +55,7 @@
 class VTK_COMMON_EXPORT vtkParametricFunction : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricFunction, vtkObject);
+  vtkTypeMacro(vtkParametricFunction, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Common/vtkParametricKlein.cxx b/Common/vtkParametricKlein.cxx
index 36476b5ab19391de6f471e5ce700caca96565c1a..de5b486fa4aea4e3725a00431a2618163ffa3600 100644
--- a/Common/vtkParametricKlein.cxx
+++ b/Common/vtkParametricKlein.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricKlein, "1.3");
 vtkStandardNewMacro(vtkParametricKlein);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricKlein.h b/Common/vtkParametricKlein.h
index 7b3dc3d9b5d1a437cd663e98ecb5b7e9d9b9a3f4..3cfdf949e41d9de5588b473308828ebf39ce4d14 100644
--- a/Common/vtkParametricKlein.h
+++ b/Common/vtkParametricKlein.h
@@ -41,7 +41,7 @@
 class VTK_COMMON_EXPORT vtkParametricKlein : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricKlein,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricKlein,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricMobius.cxx b/Common/vtkParametricMobius.cxx
index 192117aa596360000b9a7a5d4d4ec75ec4d1c494..26252064dd9c2d95086913c63b2c380a7c17f294 100644
--- a/Common/vtkParametricMobius.cxx
+++ b/Common/vtkParametricMobius.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricMobius, "1.3");
 vtkStandardNewMacro(vtkParametricMobius);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricMobius.h b/Common/vtkParametricMobius.h
index 5268b660ce2dcd5709303755294926a157baf498..3a8bd4843bc423425c45f1fb6b74f54400b27f4c 100644
--- a/Common/vtkParametricMobius.h
+++ b/Common/vtkParametricMobius.h
@@ -32,7 +32,7 @@
 class VTK_COMMON_EXPORT vtkParametricMobius : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricMobius,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricMobius,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricRandomHills.cxx b/Common/vtkParametricRandomHills.cxx
index 3e02cee8137fbe5268a5b565e1d1530a88e68889..3618edf555e000b8d55e50ce534c64eed8f7bd88 100644
--- a/Common/vtkParametricRandomHills.cxx
+++ b/Common/vtkParametricRandomHills.cxx
@@ -19,7 +19,6 @@
 
 #include <time.h>
 
-vtkCxxRevisionMacro(vtkParametricRandomHills, "1.8");
 vtkStandardNewMacro(vtkParametricRandomHills);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricRandomHills.h b/Common/vtkParametricRandomHills.h
index 1ee282f857c0400938190afe622ce162fa23b798..9f1020d1f41845cf7968f5f2ae355a2396eb7a85 100644
--- a/Common/vtkParametricRandomHills.h
+++ b/Common/vtkParametricRandomHills.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkParametricRandomHills : public vtkParametricFunction
 {
 
 public:
-  vtkTypeRevisionMacro(vtkParametricRandomHills,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricRandomHills,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Common/vtkParametricRoman.cxx b/Common/vtkParametricRoman.cxx
index 20ebc2cd2920705741ef29057f8f639a11d16237..1a0e23887de002e4653678b9b8a042591de91865 100644
--- a/Common/vtkParametricRoman.cxx
+++ b/Common/vtkParametricRoman.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricRoman, "1.2");
 vtkStandardNewMacro(vtkParametricRoman);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricRoman.h b/Common/vtkParametricRoman.h
index a5251b79e89111c242cadf45dadf27a054dc1cb9..b4fbd6c186a5db6c5af1a7f67fb7c455f60ccfa6 100644
--- a/Common/vtkParametricRoman.h
+++ b/Common/vtkParametricRoman.h
@@ -33,7 +33,7 @@ class VTK_COMMON_EXPORT vtkParametricRoman : public vtkParametricFunction
 {
 
 public:
-  vtkTypeRevisionMacro(vtkParametricRoman,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricRoman,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Common/vtkParametricSuperEllipsoid.cxx b/Common/vtkParametricSuperEllipsoid.cxx
index a99229d1a0aca5f1fb5a03ef94353ea88d027a28..1da7bf776f2b4e4c86bbc5fe9c95c43aff16424a 100644
--- a/Common/vtkParametricSuperEllipsoid.cxx
+++ b/Common/vtkParametricSuperEllipsoid.cxx
@@ -17,7 +17,6 @@
 #include "vtkMath.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkParametricSuperEllipsoid, "1.5");
 vtkStandardNewMacro(vtkParametricSuperEllipsoid);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricSuperEllipsoid.h b/Common/vtkParametricSuperEllipsoid.h
index 6ceeb1e53bcf865a262aa671fc66efb52b5924bd..886055d69f516e7867f4377e5d499db553fc3cd7 100644
--- a/Common/vtkParametricSuperEllipsoid.h
+++ b/Common/vtkParametricSuperEllipsoid.h
@@ -41,7 +41,7 @@
 class VTK_COMMON_EXPORT vtkParametricSuperEllipsoid : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricSuperEllipsoid,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricSuperEllipsoid,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricSuperToroid.cxx b/Common/vtkParametricSuperToroid.cxx
index c1f3b2533f7d61a113a1c3f9b876ed6e35b10275..a186d0651588a243ef464ab782916e7585e9e03e 100644
--- a/Common/vtkParametricSuperToroid.cxx
+++ b/Common/vtkParametricSuperToroid.cxx
@@ -17,7 +17,6 @@
 #include "vtkMath.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkParametricSuperToroid, "1.3");
 vtkStandardNewMacro(vtkParametricSuperToroid);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricSuperToroid.h b/Common/vtkParametricSuperToroid.h
index 6ee48ee15238d8be4202816d3857c6e9b6810b62..9ca44b79470482ed2320aebe7d36091e82b78b85 100644
--- a/Common/vtkParametricSuperToroid.h
+++ b/Common/vtkParametricSuperToroid.h
@@ -45,7 +45,7 @@
 class VTK_COMMON_EXPORT vtkParametricSuperToroid : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricSuperToroid,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricSuperToroid,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkParametricTorus.cxx b/Common/vtkParametricTorus.cxx
index db3eac804818ab924fa8e43d95b60640836eac60..8e3c1f8de458977722e3128b894f0cb1c5358a00 100644
--- a/Common/vtkParametricTorus.cxx
+++ b/Common/vtkParametricTorus.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricTorus, "1.3");
 vtkStandardNewMacro(vtkParametricTorus);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkParametricTorus.h b/Common/vtkParametricTorus.h
index 9c5ecdcf710fac067da7d733770ef4537f60cf85..22ab5ae7531787145e2e729c44e76a11191088a1 100644
--- a/Common/vtkParametricTorus.h
+++ b/Common/vtkParametricTorus.h
@@ -33,7 +33,7 @@ class VTK_COMMON_EXPORT vtkParametricTorus : public vtkParametricFunction
 {
 
 public:
-  vtkTypeRevisionMacro(vtkParametricTorus,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricTorus,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkPerspectiveTransform.cxx b/Common/vtkPerspectiveTransform.cxx
index bc59d69dfb90360db6f87c225e87ba6a4bc41181..9f3e724286ee2d0b0addc27e6a73f9c190ea5c05 100644
--- a/Common/vtkPerspectiveTransform.cxx
+++ b/Common/vtkPerspectiveTransform.cxx
@@ -18,7 +18,6 @@
 
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkPerspectiveTransform, "1.33");
 vtkStandardNewMacro(vtkPerspectiveTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkPerspectiveTransform.h b/Common/vtkPerspectiveTransform.h
index d3b2c1361152167744c4a553f77b5fb21665cc99..765587a9df0a77f8deae690f24077883bf1e6a56 100644
--- a/Common/vtkPerspectiveTransform.h
+++ b/Common/vtkPerspectiveTransform.h
@@ -50,7 +50,7 @@ class VTK_COMMON_EXPORT vtkPerspectiveTransform : public vtkHomogeneousTransform
 {
  public:
   static vtkPerspectiveTransform *New();
-  vtkTypeRevisionMacro(vtkPerspectiveTransform,vtkHomogeneousTransform);
+  vtkTypeMacro(vtkPerspectiveTransform,vtkHomogeneousTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkPlane.cxx b/Common/vtkPlane.cxx
index 5213b68c7e56d67a6b52c3d759737c1371d62ae6..4eb3a80b07f3c2e3c0d5570375678d0437ecf61b 100644
--- a/Common/vtkPlane.cxx
+++ b/Common/vtkPlane.cxx
@@ -16,7 +16,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPlane, "1.47");
 vtkStandardNewMacro(vtkPlane);
 
 // Construct plane passing through origin and normal to z-axis.
diff --git a/Common/vtkPlane.h b/Common/vtkPlane.h
index d0967921e59f607f6c79a05aaec38e9064e43581..237bf103aab36e87d29af3df0135523279ed5ffb 100644
--- a/Common/vtkPlane.h
+++ b/Common/vtkPlane.h
@@ -31,7 +31,7 @@ public:
   // Construct plane passing through origin and normal to z-axis.
   static vtkPlane *New();
 
-  vtkTypeRevisionMacro(vtkPlane,vtkImplicitFunction);
+  vtkTypeMacro(vtkPlane,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Common/vtkPlaneCollection.cxx b/Common/vtkPlaneCollection.cxx
index c1d43a81aedaaa49bf85ca1a00a5680304bc3376..e0c631ca0dc386255841babb84e34489ece05f1e 100644
--- a/Common/vtkPlaneCollection.cxx
+++ b/Common/vtkPlaneCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkPlaneCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPlaneCollection, "1.8");
 vtkStandardNewMacro(vtkPlaneCollection);
 
 vtkPlane *vtkPlaneCollection::GetNextPlane(
diff --git a/Common/vtkPlaneCollection.h b/Common/vtkPlaneCollection.h
index 7c7342d47960f011fc26e5bd9a6bd631f31056d7..1a4baaa382d0e673dedc402ba9dc85cdc569d125 100644
--- a/Common/vtkPlaneCollection.h
+++ b/Common/vtkPlaneCollection.h
@@ -29,7 +29,7 @@
 class VTK_COMMON_EXPORT vtkPlaneCollection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkPlaneCollection,vtkCollection);
+  vtkTypeMacro(vtkPlaneCollection,vtkCollection);
   static vtkPlaneCollection *New();
 
   // Description:
diff --git a/Common/vtkPlanes.cxx b/Common/vtkPlanes.cxx
index 1cfd006ef930b068094f16571f31cc57fec8d808..f8d207f39b4fed9bfd7e261885712cace513aeaa 100644
--- a/Common/vtkPlanes.cxx
+++ b/Common/vtkPlanes.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkPlanes, "1.14");
 vtkStandardNewMacro(vtkPlanes);
 vtkCxxSetObjectMacro(vtkPlanes,Points,vtkPoints);
 
diff --git a/Common/vtkPlanes.h b/Common/vtkPlanes.h
index 4b13a16c96fc181ce0200d242a618136cb3bd4a3..180d8963c9b7e050d1ca5f83347f846042513f76 100644
--- a/Common/vtkPlanes.h
+++ b/Common/vtkPlanes.h
@@ -45,7 +45,7 @@ class VTK_COMMON_EXPORT vtkPlanes : public vtkImplicitFunction
 {
 public:
   static vtkPlanes *New();
-  vtkTypeRevisionMacro(vtkPlanes,vtkImplicitFunction);
+  vtkTypeMacro(vtkPlanes,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Common/vtkPoints.cxx b/Common/vtkPoints.cxx
index d2f878af2e32ca14b9f3c7c1f36c4c9c1dbba0c3..be234fe2b8da4cf5430ea81d3eb383610f931d2d 100644
--- a/Common/vtkPoints.cxx
+++ b/Common/vtkPoints.cxx
@@ -29,7 +29,6 @@
 #include "vtkUnsignedLongArray.h"
 #include "vtkUnsignedShortArray.h"
 
-vtkCxxRevisionMacro(vtkPoints, "1.56");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkPoints.h b/Common/vtkPoints.h
index f7c190484d87b609169dee7cb8e44cfb1d1576b7..664b4802996da327c7a06247dafcb102bf1bcee0 100644
--- a/Common/vtkPoints.h
+++ b/Common/vtkPoints.h
@@ -35,7 +35,7 @@ public:
 //ETX
   static vtkPoints *New();
 
-  vtkTypeRevisionMacro(vtkPoints,vtkObject);
+  vtkTypeMacro(vtkPoints,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkPoints2D.cxx b/Common/vtkPoints2D.cxx
index de4346c2f0a0f14c1b404e31b93497d8dad7e3ac..b89f417ae87148759ddcd1411e88e5d983de00f5 100644
--- a/Common/vtkPoints2D.cxx
+++ b/Common/vtkPoints2D.cxx
@@ -29,7 +29,6 @@
 #include "vtkUnsignedLongArray.h"
 #include "vtkUnsignedShortArray.h"
 
-vtkCxxRevisionMacro(vtkPoints2D, "1.1");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Common/vtkPoints2D.h b/Common/vtkPoints2D.h
index 7d3ec0bde2dd12325b4e5bec5aea8c8a79ca5ebb..1b6bd58c3c52ae2d7d885bc9df3a75c9ce6de782 100644
--- a/Common/vtkPoints2D.h
+++ b/Common/vtkPoints2D.h
@@ -34,7 +34,7 @@ public:
 //ETX
   static vtkPoints2D *New();
 
-  vtkTypeRevisionMacro(vtkPoints2D, vtkObject);
+  vtkTypeMacro(vtkPoints2D, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkPolynomialSolversUnivariate.cxx b/Common/vtkPolynomialSolversUnivariate.cxx
index 215c66a1e688e30f41c292784928dfb415fd9363..aa058d538afe16017920bd587c7035582bb8c10a 100644
--- a/Common/vtkPolynomialSolversUnivariate.cxx
+++ b/Common/vtkPolynomialSolversUnivariate.cxx
@@ -41,7 +41,6 @@
 
 #define VTK_SIGN(x)              (( (x) < 0 )?( -1 ):( 1 ))
 
-vtkCxxRevisionMacro(vtkPolynomialSolversUnivariate, "1.15");
 vtkStandardNewMacro(vtkPolynomialSolversUnivariate);
 
 static const double sqrt3 = sqrt( static_cast<double>( 3. ) );
diff --git a/Common/vtkPolynomialSolversUnivariate.h b/Common/vtkPolynomialSolversUnivariate.h
index 1150aabb93a5c8b07b76c998f6e8249128508333..1ec190234de021480eec029651245cd0608f48bf 100644
--- a/Common/vtkPolynomialSolversUnivariate.h
+++ b/Common/vtkPolynomialSolversUnivariate.h
@@ -52,7 +52,7 @@ class VTK_COMMON_EXPORT vtkPolynomialSolversUnivariate : public vtkObject
 {
 public:
   static vtkPolynomialSolversUnivariate *New();
-  vtkTypeRevisionMacro(vtkPolynomialSolversUnivariate,vtkObject);
+  vtkTypeMacro(vtkPolynomialSolversUnivariate,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static ostream& PrintPolynomial( ostream& os, double* P, int degP );
 
diff --git a/Common/vtkPriorityQueue.cxx b/Common/vtkPriorityQueue.cxx
index 3e8fff6762c1875948ed0befa2979cce86df3da0..335ae272bf3eb26b41b1c93e2f17b911047f0b36 100644
--- a/Common/vtkPriorityQueue.cxx
+++ b/Common/vtkPriorityQueue.cxx
@@ -15,7 +15,6 @@
 #include "vtkPriorityQueue.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPriorityQueue, "1.33");
 vtkStandardNewMacro(vtkPriorityQueue);
 
 // Instantiate priority queue with default size and extension size of 1000.
diff --git a/Common/vtkPriorityQueue.h b/Common/vtkPriorityQueue.h
index ad77442b896df116a5b46f17314f7744bfca5475..503d7beb1a79e9ad07222e14a17bba666252a268 100644
--- a/Common/vtkPriorityQueue.h
+++ b/Common/vtkPriorityQueue.h
@@ -55,7 +55,7 @@ public:
   // Instantiate priority queue with default size and extension size of 1000.
   static vtkPriorityQueue *New();
 
-  vtkTypeRevisionMacro(vtkPriorityQueue,vtkObject);
+  vtkTypeMacro(vtkPriorityQueue,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkProcessStatistics.cxx b/Common/vtkProcessStatistics.cxx
index e63719339a6846ff64269eac3e1f76a736dc614c..2b4230030c0f01ab92fec9e23452ba47fda87561 100644
--- a/Common/vtkProcessStatistics.cxx
+++ b/Common/vtkProcessStatistics.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkProcessStatistics.h"
 
-vtkCxxRevisionMacro(vtkProcessStatistics, "1.13");
 
 #ifndef _WIN32
 #include <sys/procfs.h>
diff --git a/Common/vtkProcessStatistics.h b/Common/vtkProcessStatistics.h
index 623bc0199a4d4bbdff51a998071f2b3ac01be59a..7cbfc66555a9e83be233b713fb7cf4e4537486d0 100644
--- a/Common/vtkProcessStatistics.h
+++ b/Common/vtkProcessStatistics.h
@@ -27,7 +27,7 @@ public:
   // Construct the ProcessStatistics with eight points.
   static vtkProcessStatistics *New();
 
-  vtkTypeRevisionMacro(vtkProcessStatistics,vtkObject);
+  vtkTypeMacro(vtkProcessStatistics,vtkObject);
 
   int    GetProcessSizeInBytes();
   double GetProcessCPUTimeInMilliseconds();
diff --git a/Common/vtkProp.cxx b/Common/vtkProp.cxx
index b89d42f4dcdd51d1333eceb297f079bc6a018edf..4b68c0e9fb8df33cdbac9d697986d16c7c8a56b1 100644
--- a/Common/vtkProp.cxx
+++ b/Common/vtkProp.cxx
@@ -21,7 +21,6 @@
 #include "vtkInformationKey.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkProp, "1.29");
 vtkCxxSetObjectMacro(vtkProp,PropertyKeys,vtkInformation);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkProp.h b/Common/vtkProp.h
index 9a680b47d9c102357ace953d6ae430280a2f1dc1..648fdfb772d0742495bd3321f48f58d3b3eec12d 100644
--- a/Common/vtkProp.h
+++ b/Common/vtkProp.h
@@ -38,7 +38,7 @@ class vtkInformation;
 class VTK_COMMON_EXPORT vtkProp : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkProp,vtkObject);
+  vtkTypeMacro(vtkProp,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description: 
diff --git a/Common/vtkPropCollection.cxx b/Common/vtkPropCollection.cxx
index 3503470c46909e7ea95bfca17a2f9b2654fcb275..0b407c86b0a0d79ac1232d0beaa6281c0c407be0 100644
--- a/Common/vtkPropCollection.cxx
+++ b/Common/vtkPropCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkPropCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPropCollection, "1.11");
 vtkStandardNewMacro(vtkPropCollection);
 
 int vtkPropCollection::GetNumberOfPaths()
diff --git a/Common/vtkPropCollection.h b/Common/vtkPropCollection.h
index 997f63ff39959b89aec759a325816354fe3a3452..cccd7eac96441d6474946247edc7e33b8f70e6ad 100644
--- a/Common/vtkPropCollection.h
+++ b/Common/vtkPropCollection.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkPropCollection : public vtkCollection
 {
  public:
   static vtkPropCollection *New();
-  vtkTypeRevisionMacro(vtkPropCollection,vtkCollection);
+  vtkTypeMacro(vtkPropCollection,vtkCollection);
 
   // Description:
   // Add an Prop to the list.
diff --git a/Common/vtkProperty2D.cxx b/Common/vtkProperty2D.cxx
index c01785931fc7ffe6a3b6071442bb30b2851e9387..8bda0a452fea9a56a20b724bf975644c998d0816 100644
--- a/Common/vtkProperty2D.cxx
+++ b/Common/vtkProperty2D.cxx
@@ -15,7 +15,6 @@
 #include "vtkProperty2D.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkProperty2D, "1.21");
 vtkStandardNewMacro(vtkProperty2D);
 
 // Creates a vtkProperty2D with the following default values:
diff --git a/Common/vtkProperty2D.h b/Common/vtkProperty2D.h
index dad0bfab4b80ed9df1c0e5050b59f78799e38fc5..966c2ab95c97c2d2b0e02c077870b064f93c9a46 100644
--- a/Common/vtkProperty2D.h
+++ b/Common/vtkProperty2D.h
@@ -33,7 +33,7 @@ class vtkViewport;
 class VTK_COMMON_EXPORT vtkProperty2D : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkProperty2D,vtkObject);
+  vtkTypeMacro(vtkProperty2D,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkQuadratureSchemeDefinition.cxx b/Common/vtkQuadratureSchemeDefinition.cxx
index e9fef5ca70c2c4ca89e4584fead56a3487430a51..914486e00835b4aff2ea9d541873b9b920069900 100644
--- a/Common/vtkQuadratureSchemeDefinition.cxx
+++ b/Common/vtkQuadratureSchemeDefinition.cxx
@@ -27,7 +27,6 @@ using vtksys_ios::istringstream;
 using vtkstd::string;
 
 vtkStandardNewMacro(vtkQuadratureSchemeDefinition);
-vtkCxxRevisionMacro(vtkQuadratureSchemeDefinition, "1.7");
 
 //-----------------------------------------------------------------------------
 vtkInformationKeyMacro(
diff --git a/Common/vtkQuadratureSchemeDefinition.h b/Common/vtkQuadratureSchemeDefinition.h
index 0d1989b8aa16b9ff0c7eb5f507cf7837cb933df3..5b5ae0ecf3e4d85d77290121f6aae3f5a90e4427 100644
--- a/Common/vtkQuadratureSchemeDefinition.h
+++ b/Common/vtkQuadratureSchemeDefinition.h
@@ -43,7 +43,7 @@ class VTK_COMMON_EXPORT vtkQuadratureSchemeDefinition : public vtkObject
 {
 public:
   // vtk stuff
-  vtkTypeRevisionMacro(vtkQuadratureSchemeDefinition,vtkObject);
+  vtkTypeMacro(vtkQuadratureSchemeDefinition,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkInformationQuadratureSchemeDefinitionVectorKey* DICTIONARY();
   static vtkInformationStringKey* QUADRATURE_OFFSET_ARRAY_NAME();
diff --git a/Common/vtkQuadric.cxx b/Common/vtkQuadric.cxx
index 697145f79006089844ac2cfe2864c7715d3d4535..f550aafaa4ebbc438d5dc5b37e45c5c377071f89 100644
--- a/Common/vtkQuadric.cxx
+++ b/Common/vtkQuadric.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkQuadric, "1.6");
 vtkStandardNewMacro(vtkQuadric);
 
 // Construct quadric with all coefficients = 1.
diff --git a/Common/vtkQuadric.h b/Common/vtkQuadric.h
index 395d0e97aea4525aa0275b704b04dbf6d8035669..9bb568d31c03f16b60e33326994d008a1b84bcfb 100644
--- a/Common/vtkQuadric.h
+++ b/Common/vtkQuadric.h
@@ -26,7 +26,7 @@
 class VTK_COMMON_EXPORT vtkQuadric : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkQuadric,vtkImplicitFunction);
+  vtkTypeMacro(vtkQuadric,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Common/vtkRandomSequence.cxx b/Common/vtkRandomSequence.cxx
index 3b8b2bc2c2435745087bf683c46666b97914887c..49fb19d8aa0f78a7b8bc81ae25ee534daafea8c5 100644
--- a/Common/vtkRandomSequence.cxx
+++ b/Common/vtkRandomSequence.cxx
@@ -15,7 +15,6 @@
 
 #include <cassert>
 
-vtkCxxRevisionMacro(vtkRandomSequence, "1.2");
 
 // ----------------------------------------------------------------------------
 vtkRandomSequence::vtkRandomSequence()
diff --git a/Common/vtkRandomSequence.h b/Common/vtkRandomSequence.h
index b266f01e98c279def27ffdec588f1ed7d2f71eb2..fae287dfc3974dc2e4bb344c739da673cb3cbcc3 100644
--- a/Common/vtkRandomSequence.h
+++ b/Common/vtkRandomSequence.h
@@ -33,7 +33,7 @@
 class VTK_COMMON_EXPORT vtkRandomSequence : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkRandomSequence,vtkObject);
+  vtkTypeMacro(vtkRandomSequence,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkReferenceCount.cxx b/Common/vtkReferenceCount.cxx
index a663c08b175de1a903161672dae146dc2c7c6292..fdd55a5d8992833364001984d547f621c4fee216 100644
--- a/Common/vtkReferenceCount.cxx
+++ b/Common/vtkReferenceCount.cxx
@@ -15,7 +15,6 @@
 #include "vtkReferenceCount.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkReferenceCount, "1.16");
 vtkStandardNewMacro(vtkReferenceCount);
 
 vtkReferenceCount::vtkReferenceCount() 
diff --git a/Common/vtkReferenceCount.h b/Common/vtkReferenceCount.h
index 29c222b784e154444e946e18686c7d305e48963a..b130cadb6fe7cbc10ae0aeab9b5c918be8f6674d 100644
--- a/Common/vtkReferenceCount.h
+++ b/Common/vtkReferenceCount.h
@@ -28,7 +28,7 @@ class VTK_COMMON_EXPORT vtkReferenceCount : public vtkObject
 public:
   static vtkReferenceCount *New();
 
-  vtkTypeRevisionMacro(vtkReferenceCount,vtkObject);
+  vtkTypeMacro(vtkReferenceCount,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:  
diff --git a/Common/vtkRungeKutta2.cxx b/Common/vtkRungeKutta2.cxx
index 3ae3810d750836c7fe4cb9fb3c299d7e830c05ff..975f7c7cd79bb2a922e5a99bbb95c1d3fa56215f 100644
--- a/Common/vtkRungeKutta2.cxx
+++ b/Common/vtkRungeKutta2.cxx
@@ -17,7 +17,6 @@
 #include "vtkFunctionSet.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkRungeKutta2, "1.14");
 vtkStandardNewMacro(vtkRungeKutta2);
 
 vtkRungeKutta2::vtkRungeKutta2() 
diff --git a/Common/vtkRungeKutta2.h b/Common/vtkRungeKutta2.h
index bdba1ae288c9d13f38e6b89a9d7817887eb15ad3..9ed9364b134443c664d6c67036b4ce0f8df2674e 100644
--- a/Common/vtkRungeKutta2.h
+++ b/Common/vtkRungeKutta2.h
@@ -31,7 +31,7 @@
 class VTK_COMMON_EXPORT vtkRungeKutta2 : public vtkInitialValueProblemSolver
 {
 public:
-  vtkTypeRevisionMacro(vtkRungeKutta2,vtkInitialValueProblemSolver);
+  vtkTypeMacro(vtkRungeKutta2,vtkInitialValueProblemSolver);
 
   // Description:
   // Construct a vtkRungeKutta2 with no initial FunctionSet.
diff --git a/Common/vtkRungeKutta4.cxx b/Common/vtkRungeKutta4.cxx
index 5f9a27af4fc97c753410b134586582921bc7c504..103b9711f5c52ecfc7f58b10a77a825f66150fa0 100644
--- a/Common/vtkRungeKutta4.cxx
+++ b/Common/vtkRungeKutta4.cxx
@@ -17,7 +17,6 @@
 #include "vtkFunctionSet.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkRungeKutta4, "1.13");
 vtkStandardNewMacro(vtkRungeKutta4);
 
 vtkRungeKutta4::vtkRungeKutta4() 
diff --git a/Common/vtkRungeKutta4.h b/Common/vtkRungeKutta4.h
index 284e58ede5e8194189e56eb0bcbbe85b6f01a425..0f712f751e72824c5bf2f3915ec17f4e9db9f81b 100644
--- a/Common/vtkRungeKutta4.h
+++ b/Common/vtkRungeKutta4.h
@@ -31,7 +31,7 @@
 class VTK_COMMON_EXPORT vtkRungeKutta4 : public vtkInitialValueProblemSolver
 {
 public:
-  vtkTypeRevisionMacro(vtkRungeKutta4,vtkInitialValueProblemSolver);
+  vtkTypeMacro(vtkRungeKutta4,vtkInitialValueProblemSolver);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkRungeKutta45.cxx b/Common/vtkRungeKutta45.cxx
index 4a4163735033a7ec6537978fd0c6fd4ca8b20877..4093fde69f54d66a3f6a83e40983210f7c2301b4 100644
--- a/Common/vtkRungeKutta45.cxx
+++ b/Common/vtkRungeKutta45.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkFunctionSet.h"
 
-vtkCxxRevisionMacro(vtkRungeKutta45, "1.14");
 vtkStandardNewMacro(vtkRungeKutta45);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkRungeKutta45.h b/Common/vtkRungeKutta45.h
index 60e3c744d3f3e137777e95c8db1fe8232fcd015a..55cfc07334049f3a77fc272672b166a69333ed60 100644
--- a/Common/vtkRungeKutta45.h
+++ b/Common/vtkRungeKutta45.h
@@ -37,7 +37,7 @@
 class VTK_COMMON_EXPORT vtkRungeKutta45 : public vtkInitialValueProblemSolver
 {
 public:
-  vtkTypeRevisionMacro(vtkRungeKutta45,vtkInitialValueProblemSolver);
+  vtkTypeMacro(vtkRungeKutta45,vtkInitialValueProblemSolver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkScalarsToColors.cxx b/Common/vtkScalarsToColors.cxx
index 3fa950792d997a4051cdda8e10ff38de630a3e9b..26671925f48063a9778d6d5614a1f691a5297027 100644
--- a/Common/vtkScalarsToColors.cxx
+++ b/Common/vtkScalarsToColors.cxx
@@ -18,7 +18,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkScalarsToColors, "1.27");
 
 //----------------------------------------------------------------------------
 vtkScalarsToColors::vtkScalarsToColors()
diff --git a/Common/vtkScalarsToColors.h b/Common/vtkScalarsToColors.h
index e15d89fbe4c046f51332991912b08b853370bea7..6b5f0ecdadf0d7438702c2e436897be0c298cc9d 100644
--- a/Common/vtkScalarsToColors.h
+++ b/Common/vtkScalarsToColors.h
@@ -37,7 +37,7 @@ class vtkUnsignedCharArray;
 class VTK_COMMON_EXPORT vtkScalarsToColors : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkScalarsToColors,vtkObject);
+  vtkTypeMacro(vtkScalarsToColors,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Common/vtkServerSocket.cxx b/Common/vtkServerSocket.cxx
index 2b99b81c7fbc6e7e561892f0bc207be24115d482..1a4f7a0c760aa1f78d7f7c768af70303b56882c7 100644
--- a/Common/vtkServerSocket.cxx
+++ b/Common/vtkServerSocket.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkServerSocket);
-vtkCxxRevisionMacro(vtkServerSocket, "1.2");
 //-----------------------------------------------------------------------------
 vtkServerSocket::vtkServerSocket()
 {
diff --git a/Common/vtkServerSocket.h b/Common/vtkServerSocket.h
index 1f9ec3bf90de0ed02a7422407ef98985d25bbf62..0ed34c5fdc7d579cc2eac7e1f499f0b6a584d9a7 100644
--- a/Common/vtkServerSocket.h
+++ b/Common/vtkServerSocket.h
@@ -26,7 +26,7 @@ class VTK_COMMON_EXPORT vtkServerSocket : public vtkSocket
 {
 public:
   static vtkServerSocket* New();
-  vtkTypeRevisionMacro(vtkServerSocket, vtkSocket);
+  vtkTypeMacro(vtkServerSocket, vtkSocket);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkShortArray.cxx b/Common/vtkShortArray.cxx
index e47d36266d86efa22b2424212412bcf343390630..acb5caaa13593db19510e91d6c38b01684c42b1f 100644
--- a/Common/vtkShortArray.cxx
+++ b/Common/vtkShortArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(short);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkShortArray, "1.55");
 vtkStandardNewMacro(vtkShortArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkShortArray.h b/Common/vtkShortArray.h
index 8dd518a24f286e5a48228fc272d81d0f4291e963..9b094c99ff10d289b0b577b26c427a45ab20e6c0 100644
--- a/Common/vtkShortArray.h
+++ b/Common/vtkShortArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkShortArray : public vtkDataArray
 {
 public:
   static vtkShortArray* New();
-  vtkTypeRevisionMacro(vtkShortArray,vtkDataArray);
+  vtkTypeMacro(vtkShortArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkSignedCharArray.cxx b/Common/vtkSignedCharArray.cxx
index 0bcd91266895cc4e83028d1c8e17e83abfba8158..6c4da6e6a061b4a11e1f9eaad97a7737fc118666 100644
--- a/Common/vtkSignedCharArray.cxx
+++ b/Common/vtkSignedCharArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(signed char);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkSignedCharArray, "1.2");
 vtkStandardNewMacro(vtkSignedCharArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkSignedCharArray.h b/Common/vtkSignedCharArray.h
index 7a26a7abd2130cd77ee0b3b0f854d69a2f9aa634..bbb63118e5bb40bdb550b397653fa4a458e7991d 100644
--- a/Common/vtkSignedCharArray.h
+++ b/Common/vtkSignedCharArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkSignedCharArray : public vtkDataArray
 {
 public:
   static vtkSignedCharArray* New();
-  vtkTypeRevisionMacro(vtkSignedCharArray,vtkDataArray);
+  vtkTypeMacro(vtkSignedCharArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkSocket.cxx b/Common/vtkSocket.cxx
index bb7db34669a5fe0bb8cc0e8f59db0f3c0f76c1ff..7363d21bcdfb7f8f8ead426049edd8294871e582 100644
--- a/Common/vtkSocket.cxx
+++ b/Common/vtkSocket.cxx
@@ -52,7 +52,6 @@
 # pragma warn -8012 /* signed/unsigned comparison */
 #endif
 
-vtkCxxRevisionMacro(vtkSocket, "1.3");
 //-----------------------------------------------------------------------------
 vtkSocket::vtkSocket()
 {
diff --git a/Common/vtkSocket.h b/Common/vtkSocket.h
index 111b188d80038cb3232749c2fd8af0290abf8785..f843d704c777baf6c9c9e84caee02b86263af110 100644
--- a/Common/vtkSocket.h
+++ b/Common/vtkSocket.h
@@ -26,7 +26,7 @@ class vtkSocketCollection;
 class VTK_COMMON_EXPORT vtkSocket : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSocket, vtkObject);
+  vtkTypeMacro(vtkSocket, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // ----- Status API ----
diff --git a/Common/vtkSocketCollection.cxx b/Common/vtkSocketCollection.cxx
index a1000c8e7265a513c29da5aa1e3ee5e7a038ef9e..9bafaf4e1f4c7df8c13e11862bb7c64cf5dd71d7 100644
--- a/Common/vtkSocketCollection.cxx
+++ b/Common/vtkSocketCollection.cxx
@@ -19,7 +19,6 @@
 #include "vtkSocket.h"
 
 vtkStandardNewMacro(vtkSocketCollection);
-vtkCxxRevisionMacro(vtkSocketCollection, "1.1");
 //-----------------------------------------------------------------------------
 vtkSocketCollection::vtkSocketCollection()
 {
diff --git a/Common/vtkSocketCollection.h b/Common/vtkSocketCollection.h
index 24b6e2b04cb64ce6c7b7784be708a286a878e439..b90b00f63bfd86a1f5f0708fe7b37fab01db0b80 100644
--- a/Common/vtkSocketCollection.h
+++ b/Common/vtkSocketCollection.h
@@ -28,7 +28,7 @@ class VTK_COMMON_EXPORT vtkSocketCollection : public vtkCollection
 {
 public:
   static vtkSocketCollection* New();
-  vtkTypeRevisionMacro(vtkSocketCollection, vtkCollection);
+  vtkTypeMacro(vtkSocketCollection, vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Add Socket to the collection.
diff --git a/Common/vtkSortDataArray.cxx b/Common/vtkSortDataArray.cxx
index 4ba4bf5275a3efcddf270b320cccde0c6f110fe1..c0b924ec39c3ac761212e6bb4fffc0fd28d8af54 100644
--- a/Common/vtkSortDataArray.cxx
+++ b/Common/vtkSortDataArray.cxx
@@ -38,7 +38,6 @@
 // -------------------------------------------------------------------------
 
 vtkStandardNewMacro(vtkSortDataArray);
-vtkCxxRevisionMacro(vtkSortDataArray,"1.3");
 
 vtkSortDataArray::vtkSortDataArray()
 {
diff --git a/Common/vtkSortDataArray.h b/Common/vtkSortDataArray.h
index 18e6bc24357b288831b020f91088c1eaa486e89e..b4bb2e0bd776a3b86ecff9f4145e7e34fa2c2e4d 100644
--- a/Common/vtkSortDataArray.h
+++ b/Common/vtkSortDataArray.h
@@ -35,7 +35,7 @@ class vtkAbstractArray;
 class VTK_COMMON_EXPORT vtkSortDataArray : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSortDataArray, vtkObject);
+  vtkTypeMacro(vtkSortDataArray, vtkObject);
   static vtkSortDataArray *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Common/vtkSphericalTransform.cxx b/Common/vtkSphericalTransform.cxx
index 90a0174abbf17c399f6d2dbe7a69f5e19bbc6cb9..6ea8b3a7c0511deece1911d32d569c5a84f2a617 100644
--- a/Common/vtkSphericalTransform.cxx
+++ b/Common/vtkSphericalTransform.cxx
@@ -18,7 +18,6 @@
 #include <math.h>
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkSphericalTransform, "1.6");
 vtkStandardNewMacro(vtkSphericalTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkSphericalTransform.h b/Common/vtkSphericalTransform.h
index 5bef926b60ecd98770b886dadfc82047fc20bc5a..fb13ccce907dac21004d20fdb1e3904456a3bebb 100644
--- a/Common/vtkSphericalTransform.h
+++ b/Common/vtkSphericalTransform.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkSphericalTransform : public vtkWarpTransform
 {
 public:
   static vtkSphericalTransform *New();
-  vtkTypeRevisionMacro(vtkSphericalTransform,vtkWarpTransform);
+  vtkTypeMacro(vtkSphericalTransform,vtkWarpTransform);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkStringArray.cxx b/Common/vtkStringArray.cxx
index 3019ccdd7681db073708f0f6c0418fc66a5292f7..1541b6d0b44ffbfb5a91e0b03bb09fc5d8ddff89 100644
--- a/Common/vtkStringArray.cxx
+++ b/Common/vtkStringArray.cxx
@@ -73,7 +73,6 @@ public:
   bool Rebuild;
 };
 
-vtkCxxRevisionMacro(vtkStringArray, "1.18");
 vtkStandardNewMacro(vtkStringArray);
 
 //-----------------------------------------------------------------------------
diff --git a/Common/vtkStringArray.h b/Common/vtkStringArray.h
index d4c610ea2b3926ffc26b6312f533850d14ee61aa..417d05b73f59b22724aca74c0fa4c0e5a4a93742 100644
--- a/Common/vtkStringArray.h
+++ b/Common/vtkStringArray.h
@@ -50,7 +50,7 @@ class VTK_COMMON_EXPORT vtkStringArray : public vtkAbstractArray
 {
 public:
   static vtkStringArray* New();
-  vtkTypeRevisionMacro(vtkStringArray,vtkAbstractArray);
+  vtkTypeMacro(vtkStringArray,vtkAbstractArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //
diff --git a/Common/vtkStructuredData.cxx b/Common/vtkStructuredData.cxx
index eb4913bf98e6cf4495dae0ca895d1489c7001d24..5c90615f67ad874d5e0a91737a302e43689e0d6b 100644
--- a/Common/vtkStructuredData.cxx
+++ b/Common/vtkStructuredData.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkStructuredData, "1.65");
 
 // Return the topological dimension of the data (e.g., 0, 1, 2, or 3D).
 int vtkStructuredData::GetDataDimension(int dataDescription)
diff --git a/Common/vtkStructuredData.h b/Common/vtkStructuredData.h
index 58bef81a4a1c20393c8045e5cc5aa709a7ab8246..b0e586f8378c9ec59d7868adb48bd728ba939a4e 100644
--- a/Common/vtkStructuredData.h
+++ b/Common/vtkStructuredData.h
@@ -42,7 +42,7 @@ class vtkIdList;
 class VTK_COMMON_EXPORT vtkStructuredData : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredData,vtkObject);
+  vtkTypeMacro(vtkStructuredData,vtkObject);
 
   // Description:
   // Specify the dimensions of a regular, rectangular dataset. The input is
diff --git a/Common/vtkStructuredVisibilityConstraint.cxx b/Common/vtkStructuredVisibilityConstraint.cxx
index 8ef4e4bf0cc7a94cd90169630dc240b9434d05c3..f5d87556c4fc368db2d14f80772b652deb8b5283 100644
--- a/Common/vtkStructuredVisibilityConstraint.cxx
+++ b/Common/vtkStructuredVisibilityConstraint.cxx
@@ -17,8 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkStructuredVisibilityConstraint,
-                    "1.6");
 vtkStandardNewMacro(vtkStructuredVisibilityConstraint);
 
 vtkCxxSetObjectMacro(vtkStructuredVisibilityConstraint,
diff --git a/Common/vtkStructuredVisibilityConstraint.h b/Common/vtkStructuredVisibilityConstraint.h
index ab9f7f5704e8cd9f5410471ed45f3328a9d11c13..35370b17c55010736fbd03e0599a728b7ce69ceb 100644
--- a/Common/vtkStructuredVisibilityConstraint.h
+++ b/Common/vtkStructuredVisibilityConstraint.h
@@ -35,7 +35,7 @@ class VTK_COMMON_EXPORT vtkStructuredVisibilityConstraint : public vtkObject
 public:
   static vtkStructuredVisibilityConstraint *New();
 
-  vtkTypeRevisionMacro(vtkStructuredVisibilityConstraint,vtkObject);
+  vtkTypeMacro(vtkStructuredVisibilityConstraint,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTableExtentTranslator.cxx b/Common/vtkTableExtentTranslator.cxx
index 8f66fb587b2cc03acca0b4d3ef18970564e53f43..05072f8bf4be4745f9f9729d0e8fb9068ac1d921 100644
--- a/Common/vtkTableExtentTranslator.cxx
+++ b/Common/vtkTableExtentTranslator.cxx
@@ -15,7 +15,6 @@
 #include "vtkTableExtentTranslator.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTableExtentTranslator, "1.10");
 vtkStandardNewMacro(vtkTableExtentTranslator);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkTableExtentTranslator.h b/Common/vtkTableExtentTranslator.h
index b11d0fb673c0b52df1fd821c2d46c28adb7698a5..d9c209a94036ca45f0797254a31769bd254e6b0d 100644
--- a/Common/vtkTableExtentTranslator.h
+++ b/Common/vtkTableExtentTranslator.h
@@ -28,7 +28,7 @@
 class VTK_COMMON_EXPORT vtkTableExtentTranslator : public vtkExtentTranslator
 {
 public:
-  vtkTypeRevisionMacro(vtkTableExtentTranslator,vtkExtentTranslator);
+  vtkTypeMacro(vtkTableExtentTranslator,vtkExtentTranslator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   static vtkTableExtentTranslator* New();
diff --git a/Common/vtkTensor.cxx b/Common/vtkTensor.cxx
index 654e1fd98ad49b15f0bf98217e24d43d54324cfd..270fc7a7f59b02d315fd8b7ee494917182c97158 100644
--- a/Common/vtkTensor.cxx
+++ b/Common/vtkTensor.cxx
@@ -15,7 +15,6 @@
 #include "vtkTensor.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTensor, "1.15");
 vtkStandardNewMacro(vtkTensor);
 
 // Construct tensor initially pointing to internal storage.
diff --git a/Common/vtkTensor.h b/Common/vtkTensor.h
index 864a3094554048e1c1b3efbad05e068c9623d540..f3710fb624879912002b07e45b277d6eaa9f071c 100644
--- a/Common/vtkTensor.h
+++ b/Common/vtkTensor.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkTensor : public vtkObject
 {
 public:
   static vtkTensor *New();
-  vtkTypeRevisionMacro(vtkTensor,vtkObject);
+  vtkTypeMacro(vtkTensor,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkThreadMessager.cxx b/Common/vtkThreadMessager.cxx
index c9a9a5b5f569abf33b196e5ac0383167d00da0d8..19456b6225b5d745039cb5d514bd9e95e9a18f30 100644
--- a/Common/vtkThreadMessager.cxx
+++ b/Common/vtkThreadMessager.cxx
@@ -20,7 +20,6 @@
 # include "vtkWindows.h"
 #endif
 
-vtkCxxRevisionMacro(vtkThreadMessager, "1.4");
 vtkStandardNewMacro(vtkThreadMessager);
 
 vtkThreadMessager::vtkThreadMessager()
diff --git a/Common/vtkThreadMessager.h b/Common/vtkThreadMessager.h
index badd32f81a921f56935225aacd7b42345a2430be..b28177532a6a9dc77e23fefd67336f7b13bd5572 100644
--- a/Common/vtkThreadMessager.h
+++ b/Common/vtkThreadMessager.h
@@ -31,7 +31,7 @@ class VTK_COMMON_EXPORT vtkThreadMessager : public vtkObject
 public:
   static vtkThreadMessager *New();
 
-  vtkTypeRevisionMacro(vtkThreadMessager,vtkObject);
+  vtkTypeMacro(vtkThreadMessager,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTimePointUtility.cxx b/Common/vtkTimePointUtility.cxx
index 24565271a8ea6fc532062cc3519e69a680037838..acd4d2a1d19a7337110a33864b1686e734181c48 100644
--- a/Common/vtkTimePointUtility.cxx
+++ b/Common/vtkTimePointUtility.cxx
@@ -43,7 +43,6 @@ const int vtkTimePointUtility::MINUTES_PER_HOUR   =       60;
 const int vtkTimePointUtility::MINUTES_PER_DAY    =     1440;
 const int vtkTimePointUtility::HOURS_PER_DAY      =       24;
 
-vtkCxxRevisionMacro(vtkTimePointUtility, "1.3");
 vtkStandardNewMacro(vtkTimePointUtility);
 
 void vtkTimePointUtility::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Common/vtkTimePointUtility.h b/Common/vtkTimePointUtility.h
index 0caa426eff1b832619f7c6a80117945f7fe13890..92d1873af946f4b17ba56c37ce746a5bb0eff58b 100644
--- a/Common/vtkTimePointUtility.h
+++ b/Common/vtkTimePointUtility.h
@@ -31,7 +31,7 @@ class VTK_COMMON_EXPORT vtkTimePointUtility : public vtkObject
 {
 public:
   static vtkTimePointUtility *New();
-  vtkTypeRevisionMacro(vtkTimePointUtility,vtkObject);
+  vtkTypeMacro(vtkTimePointUtility,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTimerLog.cxx b/Common/vtkTimerLog.cxx
index 3840c02336916817bf1789782144462d85e9932b..9e86eb9c6a2499d0abb5854f9f7c1ee89b4c61f0 100644
--- a/Common/vtkTimerLog.cxx
+++ b/Common/vtkTimerLog.cxx
@@ -38,7 +38,6 @@
 #endif
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTimerLog, "1.45");
 vtkStandardNewMacro(vtkTimerLog);
 
 // Create a singleton to cleanup the table.  No other singletons
diff --git a/Common/vtkTimerLog.h b/Common/vtkTimerLog.h
index bba5fff343436dc8867c57bc60c4f9be64b6a479..0b929db726852a09fb0221cfdbc65dc2836bed85 100644
--- a/Common/vtkTimerLog.h
+++ b/Common/vtkTimerLog.h
@@ -76,7 +76,7 @@ class VTK_COMMON_EXPORT vtkTimerLog : public vtkObject
 public:
   static vtkTimerLog *New();
 
-  vtkTypeRevisionMacro(vtkTimerLog,vtkObject);
+  vtkTypeMacro(vtkTimerLog,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTransform.cxx b/Common/vtkTransform.cxx
index b7adcf22c5e1d2d1f9f3840d9ad7855dabc0e310..ba85dd04853606f0d636f78f2273b844de10ca9c 100644
--- a/Common/vtkTransform.cxx
+++ b/Common/vtkTransform.cxx
@@ -18,7 +18,6 @@
 
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkTransform, "1.111");
 vtkStandardNewMacro(vtkTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkTransform.h b/Common/vtkTransform.h
index 8b364de3db0a0a8bf22e256eb3f322b9caa2ca43..067b0cfe1db61942cb198a42038e505f9c643081 100644
--- a/Common/vtkTransform.h
+++ b/Common/vtkTransform.h
@@ -51,7 +51,7 @@ class VTK_COMMON_EXPORT vtkTransform : public vtkLinearTransform
 {
  public:
   static vtkTransform *New();
-  vtkTypeRevisionMacro(vtkTransform,vtkLinearTransform);
+  vtkTypeMacro(vtkTransform,vtkLinearTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTransform2D.cxx b/Common/vtkTransform2D.cxx
index 03cf1b86809af22b465f7545c20538b1c90436bd..51e8afa4a18f8cfd7bcc75ae26c13e458d89fdc8 100644
--- a/Common/vtkTransform2D.cxx
+++ b/Common/vtkTransform2D.cxx
@@ -19,7 +19,6 @@
 
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkTransform2D, "1.4");
 vtkStandardNewMacro(vtkTransform2D);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkTransform2D.h b/Common/vtkTransform2D.h
index 9e64e1f157ae12bd5549a3e1978b47d13acb1d4e..4ab5e6d93258fbc58860b415045416e5883e6c17 100644
--- a/Common/vtkTransform2D.h
+++ b/Common/vtkTransform2D.h
@@ -38,7 +38,7 @@ class VTK_COMMON_EXPORT vtkTransform2D : public vtkObject
 {
  public:
   static vtkTransform2D *New();
-  vtkTypeRevisionMacro(vtkTransform2D,vtkObject);
+  vtkTypeMacro(vtkTransform2D,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkTransformCollection.cxx b/Common/vtkTransformCollection.cxx
index fd1df4eb580bfe42439457e5613ed5ba59b69821..b4d9916e94c5448520a586d7dde57104503bee35 100644
--- a/Common/vtkTransformCollection.cxx
+++ b/Common/vtkTransformCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkTransformCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTransformCollection, "1.7");
 vtkStandardNewMacro(vtkTransformCollection);
diff --git a/Common/vtkTransformCollection.h b/Common/vtkTransformCollection.h
index 2548e5fe3000df7f95d1d7e9c08044d4d61d8c6f..5cf9613f41316ebeed0278b85dffca47aa3a2668 100644
--- a/Common/vtkTransformCollection.h
+++ b/Common/vtkTransformCollection.h
@@ -31,7 +31,7 @@
 class VTK_COMMON_EXPORT vtkTransformCollection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkTransformCollection,vtkCollection);
+  vtkTypeMacro(vtkTransformCollection,vtkCollection);
   static vtkTransformCollection *New();
 
   // Description:
diff --git a/Common/vtkTypeTemplate.h b/Common/vtkTypeTemplate.h
index b43c9065fd7a7cb4a016893f020b4268e284eef5..ee2fa14a05681423d0068ea1428dd08ddf4f0d4f 100644
--- a/Common/vtkTypeTemplate.h
+++ b/Common/vtkTypeTemplate.h
@@ -19,7 +19,7 @@
 
 =========================================================================*/
 
-// .NAME vtkTypeTemplate - Provides the equivalent of vtkTypeRevisionMacro
+// .NAME vtkTypeTemplate - Provides the equivalent of vtkTypeMacro
 // for use with template classes
 //
 // .SECTION Thanks
diff --git a/Common/vtkTypedArray.cxx.in b/Common/vtkTypedArray.cxx.in
index b25c8870c1845fc200b986d5d46b13551a787114..1aa97183565b0a751746e613132cecbb54c7bbb7 100644
--- a/Common/vtkTypedArray.cxx.in
+++ b/Common/vtkTypedArray.cxx.in
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkType@VTK_TYPE_NAME@Array, "1.1");
 vtkStandardNewMacro(vtkType@VTK_TYPE_NAME@Array);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkTypedArray.h.in b/Common/vtkTypedArray.h.in
index 61efdb5f407a728a9f7ab57d4fe39023da274070..83a8bd7c1d2ce8be9bbc260d198c6f1a99bbba74 100644
--- a/Common/vtkTypedArray.h.in
+++ b/Common/vtkTypedArray.h.in
@@ -27,7 +27,7 @@ class VTK_COMMON_EXPORT vtkType@VTK_TYPE_NAME@Array : public vtk@VTK_TYPE_NATIVE
 {
 public:
   static vtkType@VTK_TYPE_NAME@Array* New();
-  vtkTypeRevisionMacro(vtkType@VTK_TYPE_NAME@Array,vtk@VTK_TYPE_NATIVE@Array);
+  vtkTypeMacro(vtkType@VTK_TYPE_NAME@Array,vtk@VTK_TYPE_NATIVE@Array);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Common/vtkUnicodeStringArray.cxx b/Common/vtkUnicodeStringArray.cxx
index 7c7ef32595454869910a9c61ee2484b53c3081ce..195355fdc2a214d299ef1bb5ec35f511538a1d5e 100644
--- a/Common/vtkUnicodeStringArray.cxx
+++ b/Common/vtkUnicodeStringArray.cxx
@@ -28,7 +28,6 @@ public:
   StorageT Storage;
 };
 
-vtkCxxRevisionMacro(vtkUnicodeStringArray, "1.12");
 vtkStandardNewMacro(vtkUnicodeStringArray);
 
 vtkUnicodeStringArray::vtkUnicodeStringArray(vtkIdType)
diff --git a/Common/vtkUnicodeStringArray.h b/Common/vtkUnicodeStringArray.h
index fb7d2e0bf4217d2e17c2d71a58de74cf1e3e3c3c..9893137c404e76c549ae327655a7430508be0c80 100644
--- a/Common/vtkUnicodeStringArray.h
+++ b/Common/vtkUnicodeStringArray.h
@@ -37,7 +37,7 @@ class VTK_COMMON_EXPORT vtkUnicodeStringArray :
 {
 public:
   static vtkUnicodeStringArray* New();
-  vtkTypeRevisionMacro(vtkUnicodeStringArray,vtkAbstractArray);
+  vtkTypeMacro(vtkUnicodeStringArray,vtkAbstractArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual int Allocate(vtkIdType sz, vtkIdType ext=1000);
diff --git a/Common/vtkUnsignedCharArray.cxx b/Common/vtkUnsignedCharArray.cxx
index b3b115e7806c5f0437c0585fa2bd6b3ef33be2f4..0469ac315142a3ef8a37c95cf47d6cd9b26bd45e 100644
--- a/Common/vtkUnsignedCharArray.cxx
+++ b/Common/vtkUnsignedCharArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned char);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsignedCharArray, "1.60");
 vtkStandardNewMacro(vtkUnsignedCharArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsignedCharArray.h b/Common/vtkUnsignedCharArray.h
index ab340e3f791245294ff79c38c2da3e3d398612da..fb5efea3601b13d76d1b4aefb6f12bafaf6d1fab 100644
--- a/Common/vtkUnsignedCharArray.h
+++ b/Common/vtkUnsignedCharArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsignedCharArray : public vtkDataArray
 {
 public:
   static vtkUnsignedCharArray* New();
-  vtkTypeRevisionMacro(vtkUnsignedCharArray,vtkDataArray);
+  vtkTypeMacro(vtkUnsignedCharArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkUnsignedIntArray.cxx b/Common/vtkUnsignedIntArray.cxx
index 9dfadd7cd66defbd8da134d963df2aa58c49f0b8..43a8cc5e8c848461abeeaeab22fa4b09fe58efde 100644
--- a/Common/vtkUnsignedIntArray.cxx
+++ b/Common/vtkUnsignedIntArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned int);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsignedIntArray, "1.36");
 vtkStandardNewMacro(vtkUnsignedIntArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsignedIntArray.h b/Common/vtkUnsignedIntArray.h
index 4f258ab3c8f72169b3a8fb569e1845d476c309b5..7c42a6cc6870c2fc81f93b483cd985150df6e502 100644
--- a/Common/vtkUnsignedIntArray.h
+++ b/Common/vtkUnsignedIntArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsignedIntArray : public vtkDataArray
 {
 public:
   static vtkUnsignedIntArray* New();
-  vtkTypeRevisionMacro(vtkUnsignedIntArray,vtkDataArray);
+  vtkTypeMacro(vtkUnsignedIntArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkUnsignedLongArray.cxx b/Common/vtkUnsignedLongArray.cxx
index 0baf7ff19a649d8847b6ce9dfdde9d9cdcaeea4d..e38ee189e164cc4181d4dd04973f031c33a0805f 100644
--- a/Common/vtkUnsignedLongArray.cxx
+++ b/Common/vtkUnsignedLongArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned long);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsignedLongArray, "1.36");
 vtkStandardNewMacro(vtkUnsignedLongArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsignedLongArray.h b/Common/vtkUnsignedLongArray.h
index 641f0b355567d711b4e608d8f84b87dc5d819059..6d636c98bcdb37321ea427e6f14e6d5ce317d071 100644
--- a/Common/vtkUnsignedLongArray.h
+++ b/Common/vtkUnsignedLongArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsignedLongArray : public vtkDataArray
 {
 public:
   static vtkUnsignedLongArray* New();
-  vtkTypeRevisionMacro(vtkUnsignedLongArray,vtkDataArray);
+  vtkTypeMacro(vtkUnsignedLongArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkUnsignedLongLongArray.cxx b/Common/vtkUnsignedLongLongArray.cxx
index a12b3eb0de82f7f59bb2876b3e25ca64790ce2af..5d98a047ecf30046acd162b3c2022e0f46d8b876 100644
--- a/Common/vtkUnsignedLongLongArray.cxx
+++ b/Common/vtkUnsignedLongLongArray.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned long long);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsignedLongLongArray, "1.2");
 vtkStandardNewMacro(vtkUnsignedLongLongArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsignedLongLongArray.h b/Common/vtkUnsignedLongLongArray.h
index a4522bf86799ff88e9a00cbb1ec9b86af3653df4..912a23cf00c3e70900e990951670fd98ef9c0911 100644
--- a/Common/vtkUnsignedLongLongArray.h
+++ b/Common/vtkUnsignedLongLongArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsignedLongLongArray : public vtkDataArray
 {
 public:
   static vtkUnsignedLongLongArray* New();
-  vtkTypeRevisionMacro(vtkUnsignedLongLongArray,vtkDataArray);
+  vtkTypeMacro(vtkUnsignedLongLongArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkUnsignedShortArray.cxx b/Common/vtkUnsignedShortArray.cxx
index 6249150fa07dbe76d21c57fcfff1071e25c500ac..02e783c95c329e936f494ee6d94259e766ee53f0 100644
--- a/Common/vtkUnsignedShortArray.cxx
+++ b/Common/vtkUnsignedShortArray.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned short);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsignedShortArray, "1.39");
 vtkStandardNewMacro(vtkUnsignedShortArray);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsignedShortArray.h b/Common/vtkUnsignedShortArray.h
index df0d1c169a0c05bec3768c2f4ea1600ac8fa7616..42c99b21b6963c6499f297aeee8198fbbd4125f0 100644
--- a/Common/vtkUnsignedShortArray.h
+++ b/Common/vtkUnsignedShortArray.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsignedShortArray : public vtkDataArray
 {
 public:
   static vtkUnsignedShortArray* New();
-  vtkTypeRevisionMacro(vtkUnsignedShortArray,vtkDataArray);
+  vtkTypeMacro(vtkUnsignedShortArray,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkUnsigned__Int64Array.cxx b/Common/vtkUnsigned__Int64Array.cxx
index 0667f3356254ce0862b4b515563d0ec391d09f62..6bc4c4fd891861963c9514904af24b81df221c47 100644
--- a/Common/vtkUnsigned__Int64Array.cxx
+++ b/Common/vtkUnsigned__Int64Array.cxx
@@ -24,7 +24,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(unsigned __int64);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUnsigned__Int64Array, "1.2");
 vtkStandardNewMacro(vtkUnsigned__Int64Array);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkUnsigned__Int64Array.h b/Common/vtkUnsigned__Int64Array.h
index 0777d07d40bc64b40eb8eb9af9eaf55a552ab7bc..f6c853a71b64b425273ee2af64fc6d495bf227f0 100644
--- a/Common/vtkUnsigned__Int64Array.h
+++ b/Common/vtkUnsigned__Int64Array.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtkUnsigned__Int64Array : public vtkDataArray
 {
 public:
   static vtkUnsigned__Int64Array* New();
-  vtkTypeRevisionMacro(vtkUnsigned__Int64Array,vtkDataArray);
+  vtkTypeMacro(vtkUnsigned__Int64Array,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkVariantArray.cxx b/Common/vtkVariantArray.cxx
index 9cee5e1a0964cd597c7d5c335351b9cae336c569..d2831994010f99b28081c0806cc1f85817c99ac3 100644
--- a/Common/vtkVariantArray.cxx
+++ b/Common/vtkVariantArray.cxx
@@ -76,7 +76,6 @@ public:
 // Standard functions
 //
 
-vtkCxxRevisionMacro(vtkVariantArray, "1.17");
 vtkStandardNewMacro(vtkVariantArray);
 //----------------------------------------------------------------------------
 void vtkVariantArray::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Common/vtkVariantArray.h b/Common/vtkVariantArray.h
index 50ccaccda8990e347e8d35551e2b8c934b792cf6..bddfe32733ad94f60c61ba2c4c463b89e618288a 100644
--- a/Common/vtkVariantArray.h
+++ b/Common/vtkVariantArray.h
@@ -48,7 +48,7 @@ class VTK_COMMON_EXPORT vtkVariantArray : public vtkAbstractArray
 
 public:
   static vtkVariantArray* New();
-  vtkTypeRevisionMacro(vtkVariantArray,vtkAbstractArray);
+  vtkTypeMacro(vtkVariantArray,vtkAbstractArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // 
diff --git a/Common/vtkVersion.cxx b/Common/vtkVersion.cxx
index 9f9e3922d8b07097895087964412c5b83850a114..a612f5bd565e2f9bac82da10ba64b216e98b1986 100644
--- a/Common/vtkVersion.cxx
+++ b/Common/vtkVersion.cxx
@@ -15,5 +15,4 @@
 #include "vtkVersion.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkVersion, "1.7");
 vtkStandardNewMacro(vtkVersion);
diff --git a/Common/vtkVersion.h b/Common/vtkVersion.h
index 01d15ce37375c2dfbd423aa3b89cc9bbb1629292..6983660939366868143a02999ba39f818ef3e77e 100644
--- a/Common/vtkVersion.h
+++ b/Common/vtkVersion.h
@@ -40,7 +40,7 @@ class VTK_COMMON_EXPORT vtkVersion : public vtkObject
 {
 public:
   static vtkVersion *New();
-  vtkTypeRevisionMacro(vtkVersion,vtkObject);
+  vtkTypeMacro(vtkVersion,vtkObject);
 
   // Description: 
   // Return the version of vtk this object is a part of.
diff --git a/Common/vtkVoidArray.cxx b/Common/vtkVoidArray.cxx
index c27a778b2b978c01550931673a1af2ac18df4eb4..04956ebb70e692257bd061951cd0c69452966223 100644
--- a/Common/vtkVoidArray.cxx
+++ b/Common/vtkVoidArray.cxx
@@ -15,7 +15,6 @@
 #include "vtkVoidArray.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkVoidArray, "1.44");
 vtkStandardNewMacro(vtkVoidArray);
 
 typedef void *voidPtr;
diff --git a/Common/vtkVoidArray.h b/Common/vtkVoidArray.h
index 56cbe8c8ca0002314d2b26cd9cd3706b00673bae..50411661e3a2234664ad355ceb9654ed75c7510f 100644
--- a/Common/vtkVoidArray.h
+++ b/Common/vtkVoidArray.h
@@ -30,7 +30,7 @@ public:
   // Initialize with empty array.
   static vtkVoidArray *New();
 
-  vtkTypeRevisionMacro(vtkVoidArray,vtkObject);
+  vtkTypeMacro(vtkVoidArray,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkWarpTransform.cxx b/Common/vtkWarpTransform.cxx
index c7b2a911e165dee821da9882e107477a57edcad4..e6b18ec3cd3201c8b655204e38c8412ab0740724 100644
--- a/Common/vtkWarpTransform.cxx
+++ b/Common/vtkWarpTransform.cxx
@@ -15,7 +15,6 @@
 #include "vtkWarpTransform.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkWarpTransform, "1.11");
 
 //----------------------------------------------------------------------------
 void vtkWarpTransform::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Common/vtkWarpTransform.h b/Common/vtkWarpTransform.h
index d3cec5936b62f50aa8dc50e9711fa6fc4c8dcaf8..855fc2078e366921d80b7c2954639f738e3037e0 100644
--- a/Common/vtkWarpTransform.h
+++ b/Common/vtkWarpTransform.h
@@ -29,7 +29,7 @@ class VTK_COMMON_EXPORT vtkWarpTransform : public vtkAbstractTransform
 {
 public:
 
-  vtkTypeRevisionMacro(vtkWarpTransform,vtkAbstractTransform);
+  vtkTypeMacro(vtkWarpTransform,vtkAbstractTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkWin32OutputWindow.cxx b/Common/vtkWin32OutputWindow.cxx
index 9683c205e0239b922033d84e4cd8ded54937ee87..5e5fb7f956ea4af4ce32d3e5aad25a58cde7ca30 100644
--- a/Common/vtkWin32OutputWindow.cxx
+++ b/Common/vtkWin32OutputWindow.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkWindows.h"
 
-vtkCxxRevisionMacro(vtkWin32OutputWindow, "1.25");
 vtkStandardNewMacro(vtkWin32OutputWindow);
 
 HWND vtkWin32OutputWindowOutputWindow = 0;
diff --git a/Common/vtkWin32OutputWindow.h b/Common/vtkWin32OutputWindow.h
index 47ef97a0ca4fb75718134e32f0489655f811ae0b..a06ed1146dde8c69377b291c70693c9d59a93c33 100644
--- a/Common/vtkWin32OutputWindow.h
+++ b/Common/vtkWin32OutputWindow.h
@@ -32,7 +32,7 @@ class VTK_COMMON_EXPORT vtkWin32OutputWindow : public vtkOutputWindow
 {
 public:
 // Methods from vtkObject
-  vtkTypeRevisionMacro(vtkWin32OutputWindow,vtkOutputWindow);
+  vtkTypeMacro(vtkWin32OutputWindow,vtkOutputWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkWin32ProcessOutputWindow.cxx b/Common/vtkWin32ProcessOutputWindow.cxx
index 376614fab0d851eb8ccaf63c6f74a7a76805b4a2..d316d533fd3fd57da739a3db17b5b4874250de34 100644
--- a/Common/vtkWin32ProcessOutputWindow.cxx
+++ b/Common/vtkWin32ProcessOutputWindow.cxx
@@ -26,7 +26,6 @@
 # define _MAX_PATH 4096
 #endif
 
-vtkCxxRevisionMacro(vtkWin32ProcessOutputWindow, "1.7");
 vtkStandardNewMacro(vtkWin32ProcessOutputWindow);
 
 extern "C" int vtkEncodedArrayWin32OutputWindowProcessWrite(const char* fname);
diff --git a/Common/vtkWin32ProcessOutputWindow.h b/Common/vtkWin32ProcessOutputWindow.h
index bb73ca605495462bec48837f5805cc38f52f276e..bf40315f7572bab8f90472245eaaabeb41efa447 100644
--- a/Common/vtkWin32ProcessOutputWindow.h
+++ b/Common/vtkWin32ProcessOutputWindow.h
@@ -27,7 +27,7 @@
 class VTK_COMMON_EXPORT vtkWin32ProcessOutputWindow : public vtkOutputWindow
 {
 public:
-  vtkTypeRevisionMacro(vtkWin32ProcessOutputWindow,vtkOutputWindow);
+  vtkTypeMacro(vtkWin32ProcessOutputWindow,vtkOutputWindow);
   static vtkWin32ProcessOutputWindow* New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Common/vtkWindow.cxx b/Common/vtkWindow.cxx
index 68490695bdd5bb84d033abc38114d3d167f4fb04..3b5485826cdd733fa2710ca778c3d0dff05911f1 100644
--- a/Common/vtkWindow.cxx
+++ b/Common/vtkWindow.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkToolkits.h"
 
-vtkCxxRevisionMacro(vtkWindow, "1.30");
 
 //-----------------------------------------------------------------------------
 // Construct an instance of  vtkRenderWindow with its screen size 
diff --git a/Common/vtkWindow.h b/Common/vtkWindow.h
index e12e80dbfcee8d6c88838b93f4efbe54c5ab91f2..1074954bc980a8a6c8c3c52fdea2e2745e57210b 100644
--- a/Common/vtkWindow.h
+++ b/Common/vtkWindow.h
@@ -30,7 +30,7 @@ class vtkUnsignedCharArray;
 class VTK_COMMON_EXPORT vtkWindow : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkWindow,vtkObject);
+  vtkTypeMacro(vtkWindow,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkWindowLevelLookupTable.cxx b/Common/vtkWindowLevelLookupTable.cxx
index b8855f8e5358ae93e5a61d4f4a1b3f4b26f6808a..aa378911c4a3fbbdaeffc552505fb630fc76a0f9 100644
--- a/Common/vtkWindowLevelLookupTable.cxx
+++ b/Common/vtkWindowLevelLookupTable.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkWindowLevelLookupTable, "1.26");
 vtkStandardNewMacro(vtkWindowLevelLookupTable);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkWindowLevelLookupTable.h b/Common/vtkWindowLevelLookupTable.h
index 4bfad110eac9acdb4a9d323ddc4c3391a24d87ee..49095e1718b5b5b048b0f4f4e81c0801d2efb31f 100644
--- a/Common/vtkWindowLevelLookupTable.h
+++ b/Common/vtkWindowLevelLookupTable.h
@@ -39,7 +39,7 @@ class VTK_COMMON_EXPORT vtkWindowLevelLookupTable : public vtkLookupTable
 {
 public:
   static vtkWindowLevelLookupTable *New();
-  vtkTypeRevisionMacro(vtkWindowLevelLookupTable,vtkLookupTable);
+  vtkTypeMacro(vtkWindowLevelLookupTable,vtkLookupTable);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Common/vtkXMLDataElement.cxx b/Common/vtkXMLDataElement.cxx
index aa695fa9efef7c38c4bcab93412a8ae028ab96d1..87c09d5884d958b8c52a1b89192100c68f2c841d 100644
--- a/Common/vtkXMLDataElement.cxx
+++ b/Common/vtkXMLDataElement.cxx
@@ -26,7 +26,6 @@ using vtksys_ios::istringstream;
 using vtkstd::string;
 #include <locale> // C++ locale
 
-vtkCxxRevisionMacro(vtkXMLDataElement, "1.5");
 vtkStandardNewMacro(vtkXMLDataElement);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtkXMLDataElement.h b/Common/vtkXMLDataElement.h
index 4ce7d7918bdaa247b2550e7865e198b71453df67..e47f7db039bdb593ed31cc1b561598101a785f6d 100644
--- a/Common/vtkXMLDataElement.h
+++ b/Common/vtkXMLDataElement.h
@@ -32,7 +32,7 @@ class vtkXMLDataParser;
 class VTK_COMMON_EXPORT vtkXMLDataElement : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLDataElement,vtkObject);
+  vtkTypeMacro(vtkXMLDataElement,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLDataElement* New();
 
diff --git a/Common/vtkXMLFileOutputWindow.cxx b/Common/vtkXMLFileOutputWindow.cxx
index 11bbccda4764b41ecb187d890dc329b6c9c31f22..5ecf300582c29d5e9665aed844e7189f8043e467 100644
--- a/Common/vtkXMLFileOutputWindow.cxx
+++ b/Common/vtkXMLFileOutputWindow.cxx
@@ -15,7 +15,6 @@
 #include "vtkXMLFileOutputWindow.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkXMLFileOutputWindow, "1.8");
 vtkStandardNewMacro(vtkXMLFileOutputWindow);
 
 void vtkXMLFileOutputWindow::Initialize() 
diff --git a/Common/vtkXMLFileOutputWindow.h b/Common/vtkXMLFileOutputWindow.h
index bbb899ece9b2968f897b65da7e47bbc75b44ab59..367a79fb2050b81a6f1ad87fecf58f4b64facf51 100644
--- a/Common/vtkXMLFileOutputWindow.h
+++ b/Common/vtkXMLFileOutputWindow.h
@@ -41,7 +41,7 @@
 class VTK_COMMON_EXPORT vtkXMLFileOutputWindow : public vtkFileOutputWindow
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLFileOutputWindow, vtkFileOutputWindow);
+  vtkTypeMacro(vtkXMLFileOutputWindow, vtkFileOutputWindow);
 
   static vtkXMLFileOutputWindow* New();
 
diff --git a/Common/vtk__Int64Array.cxx b/Common/vtk__Int64Array.cxx
index 4ef9512b4dafcce5afcf5a41df2f706b8f685806..898472dd879f517331b8322af2690c25eabfeed0 100644
--- a/Common/vtk__Int64Array.cxx
+++ b/Common/vtk__Int64Array.cxx
@@ -25,7 +25,6 @@ VTK_ARRAY_ITERATOR_TEMPLATE_INSTANTIATE(__int64);
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtk__Int64Array, "1.2");
 vtkStandardNewMacro(vtk__Int64Array);
 
 //----------------------------------------------------------------------------
diff --git a/Common/vtk__Int64Array.h b/Common/vtk__Int64Array.h
index 799ed18fe9646a6e80513e0a25c595430f33b7f4..c8f3d6362597982d7cb5116181994951702039ac 100644
--- a/Common/vtk__Int64Array.h
+++ b/Common/vtk__Int64Array.h
@@ -36,7 +36,7 @@ class VTK_COMMON_EXPORT vtk__Int64Array : public vtkDataArray
 {
 public:
   static vtk__Int64Array* New();
-  vtkTypeRevisionMacro(vtk__Int64Array,vtkDataArray);
+  vtkTypeMacro(vtk__Int64Array,vtkDataArray);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Examples/Build/vtkLocal/vtkLocalExample.cxx b/Examples/Build/vtkLocal/vtkLocalExample.cxx
index 7c0363910f8632477e89ba80eb9519cb76295583..49dd2cfd50ae389347dce0da4471b65719e65855 100644
--- a/Examples/Build/vtkLocal/vtkLocalExample.cxx
+++ b/Examples/Build/vtkLocal/vtkLocalExample.cxx
@@ -6,7 +6,6 @@ wishing to create their own VTK classes locally.
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkLocalExample, "1.2");
 vtkStandardNewMacro(vtkLocalExample);
 
 //----------------------------------------------------------------------------
diff --git a/Examples/Build/vtkLocal/vtkLocalExample.h b/Examples/Build/vtkLocal/vtkLocalExample.h
index 73e8fe8a2077a90b23769da7490dfee08ed9f014..5f2ebf8ce5fd026ca1f6f3edcbde0252cc0afff7 100644
--- a/Examples/Build/vtkLocal/vtkLocalExample.h
+++ b/Examples/Build/vtkLocal/vtkLocalExample.h
@@ -17,7 +17,7 @@ class VTK_vtkLocal_EXPORT vtkLocalExample : public vtkObject
 {
 public:
   static vtkLocalExample* New();
-  vtkTypeRevisionMacro(vtkLocalExample, vtkObject);
+  vtkTypeMacro(vtkLocalExample, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Examples/Build/vtkMy/Common/vtkBar.cxx b/Examples/Build/vtkMy/Common/vtkBar.cxx
index 8eea1af485faeb1a364bde21d1ddfa83b87b9c72..daa6d63948570c51b070ded2cb3b20ac0693352c 100644
--- a/Examples/Build/vtkMy/Common/vtkBar.cxx
+++ b/Examples/Build/vtkMy/Common/vtkBar.cxx
@@ -17,5 +17,4 @@
 
 //----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkBar, "1.4");
 vtkStandardNewMacro(vtkBar);
diff --git a/Examples/Build/vtkMy/Common/vtkBar.h b/Examples/Build/vtkMy/Common/vtkBar.h
index 4f89e8d36b6f0d00de35d3c001e8acdd1d10fabc..4c2d30bffbef0eaea07b8e899a104973508cb580 100644
--- a/Examples/Build/vtkMy/Common/vtkBar.h
+++ b/Examples/Build/vtkMy/Common/vtkBar.h
@@ -26,7 +26,7 @@ class VTK_MY_COMMON_EXPORT vtkBar : public vtkObject
 {
 public:
   static vtkBar *New();
-  vtkTypeRevisionMacro(vtkBar,vtkObject);
+  vtkTypeMacro(vtkBar,vtkObject);
 
 protected:
   vtkBar() {};
diff --git a/Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx b/Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx
index 3ba03c2af12899c3b4273041e9aae5db29fe540c..a9389476c0ea2c4c917fafb57f91c91c749e4cdf 100644
--- a/Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx
+++ b/Examples/Build/vtkMy/Imaging/vtkImageFoo.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkImageFoo, "1.11");
 vtkStandardNewMacro(vtkImageFoo);
 
 //----------------------------------------------------------------------------
diff --git a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
index f4f08c5c6c9dc07a603980c307fc84e1dca3f1be..ec0ea0ccb9bf9259be6f9856affbce082b8720b2 100644
--- a/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
+++ b/Examples/Build/vtkMy/Imaging/vtkImageFoo.h
@@ -28,7 +28,7 @@ class VTK_MY_IMAGING_EXPORT vtkImageFoo : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageFoo *New();
-  vtkTypeRevisionMacro(vtkImageFoo,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageFoo,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Examples/Build/vtkMy/Unsorted/vtkBar2.cxx b/Examples/Build/vtkMy/Unsorted/vtkBar2.cxx
index ad9026e9a9981fe8fc8dd118b6673eebb2b8b62a..f3091e6a2bd808a6440fbcc7ef16e9bbe1c0580f 100644
--- a/Examples/Build/vtkMy/Unsorted/vtkBar2.cxx
+++ b/Examples/Build/vtkMy/Unsorted/vtkBar2.cxx
@@ -17,5 +17,4 @@
 
 //----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkBar2, "1.4");
 vtkStandardNewMacro(vtkBar2);
diff --git a/Examples/Build/vtkMy/Unsorted/vtkBar2.h b/Examples/Build/vtkMy/Unsorted/vtkBar2.h
index 35787208db5595907ff6e13da4c3f43d16906ca6..bbd386a57b970c1a1314c982b860a84ec08bd4f3 100644
--- a/Examples/Build/vtkMy/Unsorted/vtkBar2.h
+++ b/Examples/Build/vtkMy/Unsorted/vtkBar2.h
@@ -26,7 +26,7 @@ class VTK_MY_UNSORTED_EXPORT vtkBar2 : public vtkObject
 {
 public:
   static vtkBar2 *New();
-  vtkTypeRevisionMacro(vtkBar2,vtkObject);
+  vtkTypeMacro(vtkBar2,vtkObject);
 
 protected:
   vtkBar2() {};
diff --git a/Examples/Charts/Cxx/GraphItem.cxx b/Examples/Charts/Cxx/GraphItem.cxx
index ba33cb96ccf9d6762bae8336458a51beca20e30b..c9ff2b1aeeba3399bd98345f744845d8f4bd472a 100644
--- a/Examples/Charts/Cxx/GraphItem.cxx
+++ b/Examples/Charts/Cxx/GraphItem.cxx
@@ -33,7 +33,7 @@ class GraphAnimate : public vtkCommand
 {
 public:
   static GraphAnimate *New() { return new GraphAnimate(); }
-  vtkTypeRevisionMacro(GraphAnimate, vtkCommand);
+  vtkTypeMacro(GraphAnimate, vtkCommand);
   virtual void Execute(vtkObject *, unsigned long, void *)
     {
     this->GraphItem->UpdatePositions();
@@ -43,7 +43,6 @@ public:
   vtkGraphItem* GraphItem;
   vtkContextView* View;
 };
-vtkCxxRevisionMacro(GraphAnimate, "1.2");
 
 //----------------------------------------------------------------------------
 int main(int, char *[])
diff --git a/Examples/Charts/Cxx/vtkGraphItem.cxx b/Examples/Charts/Cxx/vtkGraphItem.cxx
index 5aaf906a506c0917375c2c05d29d4b9ce7906ada..de2d9e1a5e0e61edfde6debfdc189c6445e70ef6 100644
--- a/Examples/Charts/Cxx/vtkGraphItem.cxx
+++ b/Examples/Charts/Cxx/vtkGraphItem.cxx
@@ -36,7 +36,6 @@
 
 //-----------------------------------------------------------------------------
 vtkCxxSetObjectMacro(vtkGraphItem, Graph, vtkGraph);
-vtkCxxRevisionMacro(vtkGraphItem, "1.2");
 vtkStandardNewMacro(vtkGraphItem);
 
 class vtkGraphItem::Implementation
diff --git a/Examples/Charts/Cxx/vtkGraphItem.h b/Examples/Charts/Cxx/vtkGraphItem.h
index b55ca088925e80e298585cbe3b958a297f6974e8..848567270efcd5d221a37842c5c188354da966d5 100644
--- a/Examples/Charts/Cxx/vtkGraphItem.h
+++ b/Examples/Charts/Cxx/vtkGraphItem.h
@@ -30,7 +30,7 @@ class vtkGraph;
 class vtkGraphItem : public vtkContextItem
 {
 public:
-  vtkTypeRevisionMacro(vtkGraphItem, vtkContextItem);
+  vtkTypeMacro(vtkGraphItem, vtkContextItem);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkGraphItem *New();
diff --git a/Filtering/vtkAbstractCellLocator.cxx b/Filtering/vtkAbstractCellLocator.cxx
index b778196943a3558137caa71d2294f95066a92266..8d0711e215553de9659a68c05429800dbea9d9f6 100644
--- a/Filtering/vtkAbstractCellLocator.cxx
+++ b/Filtering/vtkAbstractCellLocator.cxx
@@ -23,7 +23,6 @@
 #include "vtkDataSet.h"
 #include "vtkMath.h"
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkAbstractCellLocator, "1.9");
 //----------------------------------------------------------------------------
 vtkAbstractCellLocator::vtkAbstractCellLocator()
 {
diff --git a/Filtering/vtkAbstractCellLocator.h b/Filtering/vtkAbstractCellLocator.h
index 23ed12fd3ff39831fde7acff2d47aeff7fd6664a..20a65f5a078e614b73173b24673f65b1e3981675 100644
--- a/Filtering/vtkAbstractCellLocator.h
+++ b/Filtering/vtkAbstractCellLocator.h
@@ -46,7 +46,7 @@ class vtkPoints;
 class VTK_FILTERING_EXPORT vtkAbstractCellLocator : public vtkLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractCellLocator,vtkLocator);
+  vtkTypeMacro(vtkAbstractCellLocator,vtkLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkAbstractInterpolatedVelocityField.cxx b/Filtering/vtkAbstractInterpolatedVelocityField.cxx
index adaa4c5f34a0fb4b262a821a0c46e13a3fc31021..b789bf11ce5b1fadd70d13fd86506db187516145 100644
--- a/Filtering/vtkAbstractInterpolatedVelocityField.cxx
+++ b/Filtering/vtkAbstractInterpolatedVelocityField.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro( vtkAbstractInterpolatedVelocityField, "1.6" );
 
 //----------------------------------------------------------------------------
 const double vtkAbstractInterpolatedVelocityField::TOLERANCE_SCALE = 1.0E-8;
diff --git a/Filtering/vtkAbstractInterpolatedVelocityField.h b/Filtering/vtkAbstractInterpolatedVelocityField.h
index 31bd92ca3b485085be3eb287022ac84476d8c298..ecaadc24b36bef270ce898d76411ceed81640037 100644
--- a/Filtering/vtkAbstractInterpolatedVelocityField.h
+++ b/Filtering/vtkAbstractInterpolatedVelocityField.h
@@ -80,7 +80,7 @@ class vtkAbstractInterpolatedVelocityFieldDataSetsType;
 class VTK_FILTERING_EXPORT vtkAbstractInterpolatedVelocityField : public vtkFunctionSet
 {
 public:
-  vtkTypeRevisionMacro( vtkAbstractInterpolatedVelocityField, vtkFunctionSet );
+  vtkTypeMacro( vtkAbstractInterpolatedVelocityField, vtkFunctionSet );
   void PrintSelf( ostream & os, vtkIndent indent );
   
   // Description:
diff --git a/Filtering/vtkAbstractMapper.cxx b/Filtering/vtkAbstractMapper.cxx
index 272218f4e4e14faa474b040534031d6c785f685a..91d4c58d900a8ae1e3e337f1a611039dc07bed03 100644
--- a/Filtering/vtkAbstractMapper.cxx
+++ b/Filtering/vtkAbstractMapper.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkAbstractMapper, "1.6");
 
 vtkCxxSetObjectMacro(vtkAbstractMapper,ClippingPlanes,vtkPlaneCollection);
 
diff --git a/Filtering/vtkAbstractMapper.h b/Filtering/vtkAbstractMapper.h
index d1fe0fc19d5e775ce4eadd7651d7d3f9b05aaa04..70997598efb597bf581c683d2e859f7572054d83 100644
--- a/Filtering/vtkAbstractMapper.h
+++ b/Filtering/vtkAbstractMapper.h
@@ -48,7 +48,7 @@ class vtkWindow;
 class VTK_FILTERING_EXPORT vtkAbstractMapper : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractMapper,vtkAlgorithm);
+  vtkTypeMacro(vtkAbstractMapper,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkAbstractPointLocator.cxx b/Filtering/vtkAbstractPointLocator.cxx
index 093c2095012580d0d02fab22212db1a307532390..95f4b139734bd47b48083dd7cd9f70ec6f790fe2 100644
--- a/Filtering/vtkAbstractPointLocator.cxx
+++ b/Filtering/vtkAbstractPointLocator.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataSet.h"
 #include "vtkIdList.h"
 
-vtkCxxRevisionMacro(vtkAbstractPointLocator, "1.1");
 
 vtkAbstractPointLocator::vtkAbstractPointLocator()
 {
diff --git a/Filtering/vtkAbstractPointLocator.h b/Filtering/vtkAbstractPointLocator.h
index d95a20a2797c094cfdde355cbc2323db57b72b26..05ce69d159053e9095b7800ff327bedfab4524e4 100644
--- a/Filtering/vtkAbstractPointLocator.h
+++ b/Filtering/vtkAbstractPointLocator.h
@@ -31,7 +31,7 @@ class vtkIdList;
 class VTK_FILTERING_EXPORT vtkAbstractPointLocator : public vtkLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractPointLocator,vtkLocator);
+  vtkTypeMacro(vtkAbstractPointLocator,vtkLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkActor2D.cxx b/Filtering/vtkActor2D.cxx
index c9469a7a653108205ca55d3e2f60fee39dd24cd2..1f16646251a163ff3e3e2e0880d567a0d83fd309 100644
--- a/Filtering/vtkActor2D.cxx
+++ b/Filtering/vtkActor2D.cxx
@@ -19,7 +19,6 @@
 #include "vtkPropCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkActor2D, "1.8");
 vtkStandardNewMacro(vtkActor2D);
 
 vtkCxxSetObjectMacro(vtkActor2D,Property, vtkProperty2D);
diff --git a/Filtering/vtkActor2D.h b/Filtering/vtkActor2D.h
index a2b752d4e6355a58d2dd49f5fcbbe64c6738137e..ca22886fc87475a3f2503fa33688ab68f7505d11 100644
--- a/Filtering/vtkActor2D.h
+++ b/Filtering/vtkActor2D.h
@@ -36,7 +36,7 @@ class VTK_FILTERING_EXPORT vtkActor2D : public vtkProp
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkActor2D,vtkProp);
+  vtkTypeMacro(vtkActor2D,vtkProp);
 
   // Description:
   // Creates an actor2D with the following defaults: 
diff --git a/Filtering/vtkActor2DCollection.cxx b/Filtering/vtkActor2DCollection.cxx
index 1467e73b0739daf6b738a7541d8db2f5734b1e28..af4e984c81e68981f2be5a721574b345d3563403 100644
--- a/Filtering/vtkActor2DCollection.cxx
+++ b/Filtering/vtkActor2DCollection.cxx
@@ -16,7 +16,6 @@
 #include "vtkActor2DCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkActor2DCollection, "1.2");
 vtkStandardNewMacro(vtkActor2DCollection);
 
 // protected function to delete an element. Internal use only.
diff --git a/Filtering/vtkActor2DCollection.h b/Filtering/vtkActor2DCollection.h
index 7d5eb9b3853fdee4bbe423033b3ca1c4f357064d..577ca5a297214f38978d2933e005b04eaf98c197 100644
--- a/Filtering/vtkActor2DCollection.h
+++ b/Filtering/vtkActor2DCollection.h
@@ -39,7 +39,7 @@ class VTK_FILTERING_EXPORT vtkActor2DCollection : public vtkPropCollection
   // objects from the collection.
   static vtkActor2DCollection *New();
 
-  vtkTypeRevisionMacro(vtkActor2DCollection,vtkPropCollection);
+  vtkTypeMacro(vtkActor2DCollection,vtkPropCollection);
 
   // Description:
   // Sorts the vtkActor2DCollection by layer number.  Smaller layer
diff --git a/Filtering/vtkAdjacentVertexIterator.cxx b/Filtering/vtkAdjacentVertexIterator.cxx
index 3fc8477b83f2f801188cd53d28f27748d01737b3..9e40d1bff11d431ca363a1d20280cba2d846b471 100644
--- a/Filtering/vtkAdjacentVertexIterator.cxx
+++ b/Filtering/vtkAdjacentVertexIterator.cxx
@@ -24,7 +24,6 @@
 #include "vtkGraph.h"
 
 vtkCxxSetObjectMacro(vtkAdjacentVertexIterator, Graph, vtkGraph);
-vtkCxxRevisionMacro(vtkAdjacentVertexIterator, "1.2");
 vtkStandardNewMacro(vtkAdjacentVertexIterator);
 //----------------------------------------------------------------------------
 vtkAdjacentVertexIterator::vtkAdjacentVertexIterator()
diff --git a/Filtering/vtkAdjacentVertexIterator.h b/Filtering/vtkAdjacentVertexIterator.h
index 018d486d3f1d2fb1f6fe50184966073f0704e797..459632921d90246b4ba9af7a849d1dfbd1e07ad1 100644
--- a/Filtering/vtkAdjacentVertexIterator.h
+++ b/Filtering/vtkAdjacentVertexIterator.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkAdjacentVertexIterator : public vtkObject
 {
 public:
   static vtkAdjacentVertexIterator *New();
-  vtkTypeRevisionMacro(vtkAdjacentVertexIterator, vtkObject);
+  vtkTypeMacro(vtkAdjacentVertexIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkAlgorithm.cxx b/Filtering/vtkAlgorithm.cxx
index a688c52e86dc4a849fee92752428daadcfce8d7d..f6593bc40f3db0cb1e552eb00ad87094feb7358f 100644
--- a/Filtering/vtkAlgorithm.cxx
+++ b/Filtering/vtkAlgorithm.cxx
@@ -41,7 +41,6 @@
 #include <vtkstd/set>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkAlgorithm, "1.48");
 vtkStandardNewMacro(vtkAlgorithm);
 
 vtkCxxSetObjectMacro(vtkAlgorithm,Information,vtkInformation);
diff --git a/Filtering/vtkAlgorithm.h b/Filtering/vtkAlgorithm.h
index 66b9cf92bdeb2728c6579d7c631f3b694ca263b9..1ffbdf93ed187230bcdd120609b1c7c03f858c0d 100644
--- a/Filtering/vtkAlgorithm.h
+++ b/Filtering/vtkAlgorithm.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkAlgorithm : public vtkObject
 {
 public:
   static vtkAlgorithm *New();
-  vtkTypeRevisionMacro(vtkAlgorithm,vtkObject);
+  vtkTypeMacro(vtkAlgorithm,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkAlgorithmOutput.cxx b/Filtering/vtkAlgorithmOutput.cxx
index 684b4652b6ec1c6c2d832caffcddafc5530ee62a..f6e5633424c1d53a90fcdc5d0c72bccc90831f51 100644
--- a/Filtering/vtkAlgorithmOutput.cxx
+++ b/Filtering/vtkAlgorithmOutput.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkAlgorithmOutput, "1.1");
 vtkStandardNewMacro(vtkAlgorithmOutput);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkAlgorithmOutput.h b/Filtering/vtkAlgorithmOutput.h
index c8ff7f29b5a1f3f745e9cfbcfa3eddbf525268a6..8e47df28963530483cfc4ca8f1df8dfecb2d1a59 100644
--- a/Filtering/vtkAlgorithmOutput.h
+++ b/Filtering/vtkAlgorithmOutput.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkAlgorithmOutput : public vtkObject
 {
 public:
   static vtkAlgorithmOutput *New();
-  vtkTypeRevisionMacro(vtkAlgorithmOutput,vtkObject);
+  vtkTypeMacro(vtkAlgorithmOutput,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void SetIndex(int index);
diff --git a/Filtering/vtkAnnotation.cxx b/Filtering/vtkAnnotation.cxx
index 194bd5f2fad8f38b15060e69b3b138b3dd1aaf5c..ba684395c14d73c437be325bcaef5777c234e698 100644
--- a/Filtering/vtkAnnotation.cxx
+++ b/Filtering/vtkAnnotation.cxx
@@ -31,7 +31,6 @@
 #include "vtkSelection.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkAnnotation, "1.8");
 vtkStandardNewMacro(vtkAnnotation);
 
 vtkCxxSetObjectMacro(vtkAnnotation, Selection, vtkSelection);
diff --git a/Filtering/vtkAnnotation.h b/Filtering/vtkAnnotation.h
index 9fcc309b4ca1778b3e3e71e50e8f8462822d4375..f575d8d5291a0cad81f29962d27f41d196727792 100644
--- a/Filtering/vtkAnnotation.h
+++ b/Filtering/vtkAnnotation.h
@@ -44,7 +44,7 @@ class vtkSelection;
 class VTK_FILTERING_EXPORT vtkAnnotation : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAnnotation, vtkDataObject);
+  vtkTypeMacro(vtkAnnotation, vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkAnnotation* New();
 
diff --git a/Filtering/vtkAnnotationLayers.cxx b/Filtering/vtkAnnotationLayers.cxx
index 461f4ff8f914b77a177842a65cef58fa042f202a..a17fd3adbedf58bac9baa63b40aab6d2b50eeeba 100644
--- a/Filtering/vtkAnnotationLayers.cxx
+++ b/Filtering/vtkAnnotationLayers.cxx
@@ -41,7 +41,6 @@
    affect other headers.  */
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkAnnotationLayers, "1.12");
 vtkStandardNewMacro(vtkAnnotationLayers);
 vtkCxxSetObjectMacro(vtkAnnotationLayers, CurrentAnnotation, vtkAnnotation);
 
diff --git a/Filtering/vtkAnnotationLayers.h b/Filtering/vtkAnnotationLayers.h
index 7bcf902042117be23dcee4ddb3684340c4ceabd3..1b97e50cb291f745c4395da8efb750414642e298 100644
--- a/Filtering/vtkAnnotationLayers.h
+++ b/Filtering/vtkAnnotationLayers.h
@@ -38,7 +38,7 @@ class vtkSelection;
 class VTK_FILTERING_EXPORT vtkAnnotationLayers : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAnnotationLayers, vtkDataObject);
+  vtkTypeMacro(vtkAnnotationLayers, vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkAnnotationLayers* New();
 
diff --git a/Filtering/vtkAnnotationLayersAlgorithm.cxx b/Filtering/vtkAnnotationLayersAlgorithm.cxx
index dcea8c71adb4dae6649b0c30af86721625620a81..2c3fb70d5a5b6f7a974362d3475829abcc584d54 100644
--- a/Filtering/vtkAnnotationLayersAlgorithm.cxx
+++ b/Filtering/vtkAnnotationLayersAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkAnnotationLayersAlgorithm, "1.2");
 vtkStandardNewMacro(vtkAnnotationLayersAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkAnnotationLayersAlgorithm.h b/Filtering/vtkAnnotationLayersAlgorithm.h
index c41214ca4757e2adb20cd9055cbd50ad8e609dc9..42ef9e1710b3b4730150c444106b039dc58228f8 100644
--- a/Filtering/vtkAnnotationLayersAlgorithm.h
+++ b/Filtering/vtkAnnotationLayersAlgorithm.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkAnnotationLayersAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkAnnotationLayersAlgorithm *New();
-  vtkTypeRevisionMacro(vtkAnnotationLayersAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkAnnotationLayersAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkArrayData.cxx b/Filtering/vtkArrayData.cxx
index f98dd0ece61bfaba0ae42b246944052a79f52732..57784767d5d3c412c54b06520de7fa32819e25c8 100644
--- a/Filtering/vtkArrayData.cxx
+++ b/Filtering/vtkArrayData.cxx
@@ -32,7 +32,6 @@
 // Standard functions
 //
 
-vtkCxxRevisionMacro(vtkArrayData, "1.13");
 vtkStandardNewMacro(vtkArrayData);
 
 class vtkArrayData::implementation
diff --git a/Filtering/vtkArrayData.h b/Filtering/vtkArrayData.h
index fb60235988199616a5e133a5c69469ac3397cfc9..59d9ca6508c446c816462b3c0506a221c0c59f30 100644
--- a/Filtering/vtkArrayData.h
+++ b/Filtering/vtkArrayData.h
@@ -46,7 +46,7 @@ class VTK_FILTERING_EXPORT vtkArrayData : public vtkDataObject
 {
 public:
   static vtkArrayData* New();
-  vtkTypeRevisionMacro(vtkArrayData, vtkDataObject);
+  vtkTypeMacro(vtkArrayData, vtkDataObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkArrayData* GetData(vtkInformation* info);
diff --git a/Filtering/vtkArrayDataAlgorithm.cxx b/Filtering/vtkArrayDataAlgorithm.cxx
index 950bd78ac3cce11afa707fe0cbbe235e6d765edf..cafa92794c97e3287750943cdca20892fd7a9075 100644
--- a/Filtering/vtkArrayDataAlgorithm.cxx
+++ b/Filtering/vtkArrayDataAlgorithm.cxx
@@ -28,7 +28,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkArrayDataAlgorithm, "1.1");
 vtkStandardNewMacro(vtkArrayDataAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkArrayDataAlgorithm.h b/Filtering/vtkArrayDataAlgorithm.h
index 43d88730064f717becaa262ccf6319f98eb76e8c..201d6bd652f09bc98c5ad0d32c0dbe67b0f79da3 100644
--- a/Filtering/vtkArrayDataAlgorithm.h
+++ b/Filtering/vtkArrayDataAlgorithm.h
@@ -54,7 +54,7 @@ class VTK_FILTERING_EXPORT vtkArrayDataAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkArrayDataAlgorithm *New();
-  vtkTypeRevisionMacro(vtkArrayDataAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkArrayDataAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkAttributesErrorMetric.cxx b/Filtering/vtkAttributesErrorMetric.cxx
index 901ed9e2edfd3ff4c3548c7d77aa1d060335c3aa..64b60dc9d51901bc8c3cc5249486dc309ca9031c 100644
--- a/Filtering/vtkAttributesErrorMetric.cxx
+++ b/Filtering/vtkAttributesErrorMetric.cxx
@@ -21,7 +21,6 @@
 #include "vtkGenericDataSet.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkAttributesErrorMetric,"1.9");
 vtkStandardNewMacro(vtkAttributesErrorMetric);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkAttributesErrorMetric.h b/Filtering/vtkAttributesErrorMetric.h
index 85733db3de7992c52779c5a1ee89c1ef4a10be74..4e640787a2dfd9a150ed5fa8c8b846027772efc7 100644
--- a/Filtering/vtkAttributesErrorMetric.h
+++ b/Filtering/vtkAttributesErrorMetric.h
@@ -40,7 +40,7 @@ public:
   
   // Description:
   // Standard VTK type and error macros.
-  vtkTypeRevisionMacro(vtkAttributesErrorMetric,vtkGenericSubdivisionErrorMetric);
+  vtkTypeMacro(vtkAttributesErrorMetric,vtkGenericSubdivisionErrorMetric);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkBSPCuts.cxx b/Filtering/vtkBSPCuts.cxx
index da85621b2fe877f6fc4b72d91417eb1a59ff61b1..4a38f2515c813233adc1829fdf17b36eb3c0a24a 100644
--- a/Filtering/vtkBSPCuts.cxx
+++ b/Filtering/vtkBSPCuts.cxx
@@ -27,7 +27,6 @@
 #pragma warning ( disable : 4100 )
 #endif
 
-vtkCxxRevisionMacro(vtkBSPCuts, "1.1");
 vtkStandardNewMacro(vtkBSPCuts);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkBSPCuts.h b/Filtering/vtkBSPCuts.h
index 46026e373f782092833d0a42b2b1b3272c8815d4..e20d83e55cb8c71a2f98e54081f22e3684415212 100644
--- a/Filtering/vtkBSPCuts.h
+++ b/Filtering/vtkBSPCuts.h
@@ -40,7 +40,7 @@ class vtkKdNode;
 class VTK_FILTERING_EXPORT vtkBSPCuts : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkBSPCuts, vtkObject);
+  vtkTypeMacro(vtkBSPCuts, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkBSPCuts *New();
diff --git a/Filtering/vtkBSPIntersections.cxx b/Filtering/vtkBSPIntersections.cxx
index 65af99cc53f7ff95b0b7124bd9099010089df7ad..3e837e354b21453f8a026b5df4aeddf1d37e19f1 100644
--- a/Filtering/vtkBSPIntersections.cxx
+++ b/Filtering/vtkBSPIntersections.cxx
@@ -28,7 +28,6 @@
 
 #include <vtkstd/set>
 
-vtkCxxRevisionMacro(vtkBSPIntersections, "1.2");
 
 vtkStandardNewMacro(vtkBSPIntersections);
 
diff --git a/Filtering/vtkBSPIntersections.h b/Filtering/vtkBSPIntersections.h
index 603d165e32d923553397ec2aee3e741747b9770c..8a863184a7a85b361fb1e3a4d2fcf274c17e552e 100644
--- a/Filtering/vtkBSPIntersections.h
+++ b/Filtering/vtkBSPIntersections.h
@@ -41,7 +41,7 @@ class vtkBSPCuts;
 class VTK_FILTERING_EXPORT vtkBSPIntersections : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkBSPIntersections, vtkObject);
+  vtkTypeMacro(vtkBSPIntersections, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkBSPIntersections *New();
diff --git a/Filtering/vtkBiQuadraticQuad.cxx b/Filtering/vtkBiQuadraticQuad.cxx
index b0f70196479b0f347716ea2291d795eb71963e15..e9e8fd059e5052ded1deff8565f1b3890dfc2652 100644
--- a/Filtering/vtkBiQuadraticQuad.cxx
+++ b/Filtering/vtkBiQuadraticQuad.cxx
@@ -26,7 +26,6 @@
 #include "vtkQuadraticEdge.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkBiQuadraticQuad, "1.10");
 vtkStandardNewMacro(vtkBiQuadraticQuad);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkBiQuadraticQuad.h b/Filtering/vtkBiQuadraticQuad.h
index 115a014aeed8e8dd1a120f729d34b02fe13d2662..9004b3a76df4e09ca425a6e4536f8c02b74f5551 100644
--- a/Filtering/vtkBiQuadraticQuad.h
+++ b/Filtering/vtkBiQuadraticQuad.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkBiQuadraticQuad : public vtkNonLinearCell
 {
 public:
   static vtkBiQuadraticQuad *New ();
-  vtkTypeRevisionMacro (vtkBiQuadraticQuad, vtkNonLinearCell);
+  vtkTypeMacro(vtkBiQuadraticQuad,vtkNonLinearCell);
   void PrintSelf (ostream & os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkBiQuadraticQuadraticHexahedron.cxx b/Filtering/vtkBiQuadraticQuadraticHexahedron.cxx
index ca89370aaa95daced57fc6db5cb9918e5713ff94..24eb10287575337b68ff95c255404e6621f958db 100644
--- a/Filtering/vtkBiQuadraticQuadraticHexahedron.cxx
+++ b/Filtering/vtkBiQuadraticQuadraticHexahedron.cxx
@@ -30,7 +30,6 @@
 #include "vtkPoints.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkBiQuadraticQuadraticHexahedron, "1.13");
 vtkStandardNewMacro(vtkBiQuadraticQuadraticHexahedron);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkBiQuadraticQuadraticHexahedron.h b/Filtering/vtkBiQuadraticQuadraticHexahedron.h
index cc459193a4fd986590105e22e12c93cf7be50555..f948b1021abd71c8b3cd429259c3c24610241de0 100644
--- a/Filtering/vtkBiQuadraticQuadraticHexahedron.h
+++ b/Filtering/vtkBiQuadraticQuadraticHexahedron.h
@@ -78,7 +78,7 @@ class VTK_FILTERING_EXPORT vtkBiQuadraticQuadraticHexahedron : public vtkNonLine
 {
 public:
   static vtkBiQuadraticQuadraticHexahedron *New();
-  vtkTypeRevisionMacro(vtkBiQuadraticQuadraticHexahedron,vtkNonLinearCell);
+  vtkTypeMacro(vtkBiQuadraticQuadraticHexahedron,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkBiQuadraticQuadraticWedge.cxx b/Filtering/vtkBiQuadraticQuadraticWedge.cxx
index 7bc8beb38285dc6164f000928057bfa244380b2e..f1d4da145e057626d842bfa96f186b0d12abbc2e 100644
--- a/Filtering/vtkBiQuadraticQuadraticWedge.cxx
+++ b/Filtering/vtkBiQuadraticQuadraticWedge.cxx
@@ -29,7 +29,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro (vtkBiQuadraticQuadraticWedge, "1.12");
 vtkStandardNewMacro (vtkBiQuadraticQuadraticWedge);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkBiQuadraticQuadraticWedge.h b/Filtering/vtkBiQuadraticQuadraticWedge.h
index bb3bc4cfe63aa4dad8b54e999e5843bc42fea999..5d5318cae0a2bb65cf3c71a88a3d6a28404f1d20 100644
--- a/Filtering/vtkBiQuadraticQuadraticWedge.h
+++ b/Filtering/vtkBiQuadraticQuadraticWedge.h
@@ -51,7 +51,7 @@ class VTK_FILTERING_EXPORT vtkBiQuadraticQuadraticWedge : public vtkNonLinearCel
 {
 public:
   static vtkBiQuadraticQuadraticWedge *New ();
-  vtkTypeRevisionMacro (vtkBiQuadraticQuadraticWedge, vtkNonLinearCell);
+  vtkTypeMacro(vtkBiQuadraticQuadraticWedge,vtkNonLinearCell);
   void PrintSelf (ostream & os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkBiQuadraticTriangle.cxx b/Filtering/vtkBiQuadraticTriangle.cxx
index 9cacbcd276c155564451a57f5f4c070ac22ba74a..bbaae6b324a975931d4f5218c72ec0d094be308a 100644
--- a/Filtering/vtkBiQuadraticTriangle.cxx
+++ b/Filtering/vtkBiQuadraticTriangle.cxx
@@ -22,7 +22,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkBiQuadraticTriangle, "1.2");
 vtkStandardNewMacro(vtkBiQuadraticTriangle);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkBiQuadraticTriangle.h b/Filtering/vtkBiQuadraticTriangle.h
index e058b931669136011b62ca5321a3d6d31501fdd2..7cbf583e1bfb232b86228572a9f56ee49e6e7c0e 100644
--- a/Filtering/vtkBiQuadraticTriangle.h
+++ b/Filtering/vtkBiQuadraticTriangle.h
@@ -45,7 +45,7 @@ class VTK_FILTERING_EXPORT vtkBiQuadraticTriangle : public vtkNonLinearCell
 {
 public:
   static vtkBiQuadraticTriangle *New();
-  vtkTypeRevisionMacro(vtkBiQuadraticTriangle,vtkNonLinearCell);
+  vtkTypeMacro(vtkBiQuadraticTriangle,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx b/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx
index 4a5fe805dd34581d7d9925053f517114d1ed482f..70fb22b46eb56b300344b1c3b253f30affd4ff17 100644
--- a/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx
+++ b/Filtering/vtkCachedStreamingDemandDrivenPipeline.cxx
@@ -25,7 +25,6 @@
 #include "vtkInformationVector.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkCachedStreamingDemandDrivenPipeline, "1.6");
 vtkStandardNewMacro(vtkCachedStreamingDemandDrivenPipeline);
 
 
diff --git a/Filtering/vtkCachedStreamingDemandDrivenPipeline.h b/Filtering/vtkCachedStreamingDemandDrivenPipeline.h
index 993d62392c37d8bcb08d8fe6224df6a0e450ea31..06058bb0913b21624bc4e8ee9241828cca4b4938 100644
--- a/Filtering/vtkCachedStreamingDemandDrivenPipeline.h
+++ b/Filtering/vtkCachedStreamingDemandDrivenPipeline.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkCachedStreamingDemandDrivenPipeline :
 {
 public:
   static vtkCachedStreamingDemandDrivenPipeline* New();
-  vtkTypeRevisionMacro(vtkCachedStreamingDemandDrivenPipeline,
+  vtkTypeMacro(vtkCachedStreamingDemandDrivenPipeline,
                        vtkStreamingDemandDrivenPipeline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Filtering/vtkCardinalSpline.cxx b/Filtering/vtkCardinalSpline.cxx
index 7ee4cc42a4c470a60a4a5dabfc44f7ce6af0e500..6f4f5f520a8009dc79ab25f0537161b65d7baf36 100644
--- a/Filtering/vtkCardinalSpline.cxx
+++ b/Filtering/vtkCardinalSpline.cxx
@@ -18,7 +18,6 @@
 #include "vtkPiecewiseFunction.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkCardinalSpline, "1.31");
 vtkStandardNewMacro(vtkCardinalSpline);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkCardinalSpline.h b/Filtering/vtkCardinalSpline.h
index 2cb600167d2e562d3e6714676b41b3e34bbfd960..c3c2e8031f987a8530c587614afb231bc62e5264 100644
--- a/Filtering/vtkCardinalSpline.h
+++ b/Filtering/vtkCardinalSpline.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkCardinalSpline : public vtkSpline
 public:
   static vtkCardinalSpline *New();
 
-  vtkTypeRevisionMacro(vtkCardinalSpline,vtkSpline);
+  vtkTypeMacro(vtkCardinalSpline,vtkSpline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkCastToConcrete.cxx b/Filtering/vtkCastToConcrete.cxx
index 9b5f33ca921b0fd522f0c7f19361503093f0e136..6e31494cac2db25dfa7dc65189db2f19f15d687c 100644
--- a/Filtering/vtkCastToConcrete.cxx
+++ b/Filtering/vtkCastToConcrete.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkCastToConcrete, "1.31");
 vtkStandardNewMacro(vtkCastToConcrete);
 
 int vtkCastToConcrete::RequestData(
diff --git a/Filtering/vtkCastToConcrete.h b/Filtering/vtkCastToConcrete.h
index 9774f3f783efa7dbb394be3704634e480dff9194..150f226dedb686cef0b67052646e3a343214687d 100644
--- a/Filtering/vtkCastToConcrete.h
+++ b/Filtering/vtkCastToConcrete.h
@@ -45,7 +45,7 @@ class VTK_FILTERING_EXPORT vtkCastToConcrete : public vtkDataSetAlgorithm
 
 public:
   static vtkCastToConcrete *New();
-  vtkTypeRevisionMacro(vtkCastToConcrete,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkCastToConcrete,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Filtering/vtkCell.cxx b/Filtering/vtkCell.cxx
index 398b5663bc1fd2f28bd86b99cdc0b4efb1e9ebd2..6ca9df13a50cb1c18845f0ef8fe5205842b89349 100644
--- a/Filtering/vtkCell.cxx
+++ b/Filtering/vtkCell.cxx
@@ -18,7 +18,6 @@
 #include "vtkMarchingSquaresCases.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkCell, "1.2");
 
 // Construct cell.
 vtkCell::vtkCell()
diff --git a/Filtering/vtkCell.h b/Filtering/vtkCell.h
index 073ce2d4df84a5d987026d586a33cae3160940d3..c808bd444147e10b5066cb47a90ea8568fc315ac 100644
--- a/Filtering/vtkCell.h
+++ b/Filtering/vtkCell.h
@@ -52,7 +52,7 @@ class vtkPoints;
 class VTK_FILTERING_EXPORT vtkCell : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCell,vtkObject);
+  vtkTypeMacro(vtkCell,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCell3D.cxx b/Filtering/vtkCell3D.cxx
index b3b6546a36518ae245c6af4be0baf66371975bb2..8eafe8858642199df9681a4a2ee91d3ade34db70 100644
--- a/Filtering/vtkCell3D.cxx
+++ b/Filtering/vtkCell3D.cxx
@@ -24,7 +24,6 @@
 #include "vtkCellArray.h"
 #include "vtkDoubleArray.h"
 
-vtkCxxRevisionMacro(vtkCell3D, "1.3");
 
 vtkCell3D::vtkCell3D()
 {
diff --git a/Filtering/vtkCell3D.h b/Filtering/vtkCell3D.h
index 701e2fbbfe4892d966b85b276a3a0d99ce951c3c..c98d159f861686aa6dfc67bcfb618c7873412588 100644
--- a/Filtering/vtkCell3D.h
+++ b/Filtering/vtkCell3D.h
@@ -34,7 +34,7 @@ class vtkDoubleArray;
 class VTK_FILTERING_EXPORT vtkCell3D : public vtkCell
 {
 public:
-  vtkTypeRevisionMacro(vtkCell3D,vtkCell);
+  vtkTypeMacro(vtkCell3D,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCellArray.cxx b/Filtering/vtkCellArray.cxx
index d4f33fbfb5ce9854356c619daad383a0375a4be6..c4b4e0f69bcc0deb01e5d2ebe5120be2af66957a 100644
--- a/Filtering/vtkCellArray.cxx
+++ b/Filtering/vtkCellArray.cxx
@@ -15,7 +15,6 @@
 #include "vtkCellArray.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCellArray, "1.3");
 vtkStandardNewMacro(vtkCellArray);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkCellArray.h b/Filtering/vtkCellArray.h
index 9319710ae81d47b104e03b8b7453f0bca3b00699..c3dc92f1b715f957b9bc7564817b41e59aa2b795 100644
--- a/Filtering/vtkCellArray.h
+++ b/Filtering/vtkCellArray.h
@@ -40,7 +40,7 @@
 class VTK_FILTERING_EXPORT vtkCellArray : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCellArray,vtkObject);
+  vtkTypeMacro(vtkCellArray,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCellData.cxx b/Filtering/vtkCellData.cxx
index 91550264bbca0695827321dcc1c41bac4143bf0d..9192875e456abf5b24c4c43f6d1d1c823a212def 100644
--- a/Filtering/vtkCellData.cxx
+++ b/Filtering/vtkCellData.cxx
@@ -15,7 +15,6 @@
 #include "vtkCellData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCellData, "1.1");
 vtkStandardNewMacro(vtkCellData);
 
 void vtkCellData::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Filtering/vtkCellData.h b/Filtering/vtkCellData.h
index 704532091d7cdd2784127e5c6e910675ce4da179..83a6ffa2d99db3bb0bc4f294a7e4d01ef90f60db 100644
--- a/Filtering/vtkCellData.h
+++ b/Filtering/vtkCellData.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkCellData : public vtkDataSetAttributes
 public:
   static vtkCellData *New();
 
-  vtkTypeRevisionMacro(vtkCellData,vtkDataSetAttributes);
+  vtkTypeMacro(vtkCellData,vtkDataSetAttributes);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Filtering/vtkCellLinks.cxx b/Filtering/vtkCellLinks.cxx
index 7459ef5152d805b1b03badf6f5e13d35efdbadb9..46448edbe8012ba2be08906d5edc74f35ad6bf75 100644
--- a/Filtering/vtkCellLinks.cxx
+++ b/Filtering/vtkCellLinks.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkCellLinks, "1.4");
 vtkStandardNewMacro(vtkCellLinks);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkCellLinks.h b/Filtering/vtkCellLinks.h
index 480d1f4729077db3472963c92160fd317047cdbd..af44c6230a5ed38441caa78cbef431dcdf4aebcb 100644
--- a/Filtering/vtkCellLinks.h
+++ b/Filtering/vtkCellLinks.h
@@ -42,7 +42,7 @@ public:
   //ETX
 
   static vtkCellLinks *New();
-  vtkTypeRevisionMacro(vtkCellLinks,vtkObject);
+  vtkTypeMacro(vtkCellLinks,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCellLocator.cxx b/Filtering/vtkCellLocator.cxx
index 1b8dbe7f796963b32d4a8a8b5c421988c3a1dd30..8b16e95f3f9ddf7ba5fd67a58679cf4f2dc56671 100644
--- a/Filtering/vtkCellLocator.cxx
+++ b/Filtering/vtkCellLocator.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCellLocator, "1.90");
 vtkStandardNewMacro(vtkCellLocator);
 
 #define VTK_CELL_OUTSIDE 0
diff --git a/Filtering/vtkCellLocator.h b/Filtering/vtkCellLocator.h
index 212ff6c1deb48d08fe48ecdf2ec2968d5c05e11b..15266169061cd21b3a38dd9972690344607b905f 100644
--- a/Filtering/vtkCellLocator.h
+++ b/Filtering/vtkCellLocator.h
@@ -42,7 +42,7 @@ class vtkNeighborCells;
 class VTK_FILTERING_EXPORT vtkCellLocator : public vtkAbstractCellLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkCellLocator,vtkAbstractCellLocator);
+  vtkTypeMacro(vtkCellLocator,vtkAbstractCellLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCellLocatorInterpolatedVelocityField.cxx b/Filtering/vtkCellLocatorInterpolatedVelocityField.cxx
index ed9ea16642c5afb541b037a11c3e17854e2f35ed..255388cc89a13b31f973d34ea1006623e79b1327 100644
--- a/Filtering/vtkCellLocatorInterpolatedVelocityField.cxx
+++ b/Filtering/vtkCellLocatorInterpolatedVelocityField.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkModifiedBSPTree.h"
 
-vtkCxxRevisionMacro ( vtkCellLocatorInterpolatedVelocityField, "1.7" );
 vtkStandardNewMacro ( vtkCellLocatorInterpolatedVelocityField ); 
 vtkCxxSetObjectMacro( vtkCellLocatorInterpolatedVelocityField, CellLocatorPrototype, vtkAbstractCellLocator );
 
diff --git a/Filtering/vtkCellLocatorInterpolatedVelocityField.h b/Filtering/vtkCellLocatorInterpolatedVelocityField.h
index d170bd4a8014dc41d3e8c74e7259f7a5e51867bf..beb21526b9a6e7d837c39060994f61735dc89372 100644
--- a/Filtering/vtkCellLocatorInterpolatedVelocityField.h
+++ b/Filtering/vtkCellLocatorInterpolatedVelocityField.h
@@ -54,7 +54,7 @@ class vtkCellLocatorInterpolatedVelocityFieldCellLocatorsType;
 class VTK_FILTERING_EXPORT vtkCellLocatorInterpolatedVelocityField : public vtkAbstractInterpolatedVelocityField
 {
 public:
-  vtkTypeRevisionMacro( vtkCellLocatorInterpolatedVelocityField, 
+  vtkTypeMacro( vtkCellLocatorInterpolatedVelocityField,
                         vtkAbstractInterpolatedVelocityField );
   void PrintSelf( ostream & os, vtkIndent indent );
 
diff --git a/Filtering/vtkCellTypes.cxx b/Filtering/vtkCellTypes.cxx
index 918db865b6cd7d585676dbac548c9f24a553c228..9b39d78ebe0bc330f92859cf9ca932b58d6dc7f2 100644
--- a/Filtering/vtkCellTypes.cxx
+++ b/Filtering/vtkCellTypes.cxx
@@ -15,7 +15,6 @@
 #include "vtkCellTypes.h"
 #include "vtkObjectFactory.h"  
 
-vtkCxxRevisionMacro(vtkCellTypes, "1.5");
 vtkStandardNewMacro(vtkCellTypes);
 
 // This list should contain the cell class names in
diff --git a/Filtering/vtkCellTypes.h b/Filtering/vtkCellTypes.h
index 08015d2c0a2e892fcde89c7b1097d8435a50906a..5f483f9d35b526b0d651a27d485596c5e1bfed21 100644
--- a/Filtering/vtkCellTypes.h
+++ b/Filtering/vtkCellTypes.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkCellTypes : public vtkObject
 {
 public:
   static vtkCellTypes *New();
-  vtkTypeRevisionMacro(vtkCellTypes,vtkObject);
+  vtkTypeMacro(vtkCellTypes,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkColorTransferFunction.cxx b/Filtering/vtkColorTransferFunction.cxx
index dea4ad3c2fba1873ef72edd9cfb22aa60fbb0647..64f236f2f67adf8d275ce3dc91f21d0c56fe7a58 100644
--- a/Filtering/vtkColorTransferFunction.cxx
+++ b/Filtering/vtkColorTransferFunction.cxx
@@ -22,7 +22,6 @@
 #include <vtkstd/iterator>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkColorTransferFunction, "1.81");
 vtkStandardNewMacro(vtkColorTransferFunction);
 
 #define MY_MAX(x, y) ((x) > (y) ? (x) : (y))
diff --git a/Filtering/vtkColorTransferFunction.h b/Filtering/vtkColorTransferFunction.h
index 98cfdc1954ed8e5ffb9a73cf53acbef5c5107824..3da678366a80f0cc2cec6315bb80220c82fd376e 100644
--- a/Filtering/vtkColorTransferFunction.h
+++ b/Filtering/vtkColorTransferFunction.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkColorTransferFunction : public vtkScalarsToColors
 {
 public:
   static vtkColorTransferFunction *New();
-  vtkTypeRevisionMacro(vtkColorTransferFunction,vtkScalarsToColors);
+  vtkTypeMacro(vtkColorTransferFunction,vtkScalarsToColors);
   void DeepCopy( vtkColorTransferFunction *f );
   void ShallowCopy( vtkColorTransferFunction *f );
 
diff --git a/Filtering/vtkCompositeDataIterator.cxx b/Filtering/vtkCompositeDataIterator.cxx
index ce7e5bcf0c0f6cee6e155a09c0a3d8bd5b3675d5..365ba41764747208e3f6a5348b63309e0cc8573f 100644
--- a/Filtering/vtkCompositeDataIterator.cxx
+++ b/Filtering/vtkCompositeDataIterator.cxx
@@ -273,7 +273,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkCompositeDataIterator);
-vtkCxxRevisionMacro(vtkCompositeDataIterator, "1.9");
 //----------------------------------------------------------------------------
 vtkCompositeDataIterator::vtkCompositeDataIterator()
 {
diff --git a/Filtering/vtkCompositeDataIterator.h b/Filtering/vtkCompositeDataIterator.h
index 7ae9775819a4776d86c49bb1a98d54bd6b451f16..8ad86f4108c9a99b57007ad4befa5ba490b41007 100644
--- a/Filtering/vtkCompositeDataIterator.h
+++ b/Filtering/vtkCompositeDataIterator.h
@@ -31,7 +31,7 @@ class VTK_FILTERING_EXPORT vtkCompositeDataIterator : public vtkObject
 {
 public:
   static vtkCompositeDataIterator* New();
-  vtkTypeRevisionMacro(vtkCompositeDataIterator, vtkObject);
+  vtkTypeMacro(vtkCompositeDataIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCompositeDataPipeline.cxx b/Filtering/vtkCompositeDataPipeline.cxx
index 22907821144e9e99542b375a16cfd4f24177361f..31f23b3dd6e69c57cb7948c5b1cee9a0065db95a 100644
--- a/Filtering/vtkCompositeDataPipeline.cxx
+++ b/Filtering/vtkCompositeDataPipeline.cxx
@@ -81,7 +81,6 @@ PURPOSE.  See the above copyright notice for more information.
         !strcmp(name, "vtkTemporalStreamTracer")) \
       { \
 */
-vtkCxxRevisionMacro(vtkCompositeDataPipeline, "1.76");
 vtkStandardNewMacro(vtkCompositeDataPipeline);
 
 vtkInformationKeyMacro(vtkCompositeDataPipeline,REQUIRES_TIME_DOWNSTREAM, Integer);
diff --git a/Filtering/vtkCompositeDataPipeline.h b/Filtering/vtkCompositeDataPipeline.h
index 290ae215d3d5ab0114da14d72b67d6665545cf4a..8ca7775a61b7f9ff366c82ff76fc66521bb3811d 100644
--- a/Filtering/vtkCompositeDataPipeline.h
+++ b/Filtering/vtkCompositeDataPipeline.h
@@ -55,7 +55,7 @@ class VTK_FILTERING_EXPORT vtkCompositeDataPipeline : public vtkStreamingDemandD
 {
 public:
   static vtkCompositeDataPipeline* New();
-  vtkTypeRevisionMacro(vtkCompositeDataPipeline,vtkStreamingDemandDrivenPipeline);
+  vtkTypeMacro(vtkCompositeDataPipeline,vtkStreamingDemandDrivenPipeline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCompositeDataSet.cxx b/Filtering/vtkCompositeDataSet.cxx
index acfecd39bd98d0f12749785c05318a348e00f1cd..088b62167c36f6bcc3808eba0c68235a4f48059e 100644
--- a/Filtering/vtkCompositeDataSet.cxx
+++ b/Filtering/vtkCompositeDataSet.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkCompositeDataSet, "1.17");
 vtkInformationKeyMacro(vtkCompositeDataSet, NAME, String);
 //----------------------------------------------------------------------------
 vtkCompositeDataSet::vtkCompositeDataSet()
diff --git a/Filtering/vtkCompositeDataSet.h b/Filtering/vtkCompositeDataSet.h
index 9480342be69dc0e05f36603b6ff0380c11f6dd9b..74e0a6dd8078c86ab155a829c1c784fdf4dbd1d2 100644
--- a/Filtering/vtkCompositeDataSet.h
+++ b/Filtering/vtkCompositeDataSet.h
@@ -40,7 +40,7 @@ class vtkInformationStringKey;
 class VTK_FILTERING_EXPORT vtkCompositeDataSet : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCompositeDataSet, vtkDataObject);
+  vtkTypeMacro(vtkCompositeDataSet, vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCompositeDataSetAlgorithm.cxx b/Filtering/vtkCompositeDataSetAlgorithm.cxx
index 294c55e4bd578f1ad75cd6ca832b9dd50bbac101..d3b2073ca1849827dbccadef8cfb28c9470f1d28 100644
--- a/Filtering/vtkCompositeDataSetAlgorithm.cxx
+++ b/Filtering/vtkCompositeDataSetAlgorithm.cxx
@@ -23,7 +23,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkCompositeDataSetAlgorithm, "1.1");
 vtkStandardNewMacro(vtkCompositeDataSetAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkCompositeDataSetAlgorithm.h b/Filtering/vtkCompositeDataSetAlgorithm.h
index 2f098dfd93430482b5c3adc5c84999bacd5cea25..9a82fd649b78b443014246562b586a84ad8c7108 100644
--- a/Filtering/vtkCompositeDataSetAlgorithm.h
+++ b/Filtering/vtkCompositeDataSetAlgorithm.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkCompositeDataSetAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkCompositeDataSetAlgorithm *New();
-  vtkTypeRevisionMacro(vtkCompositeDataSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkCompositeDataSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkComputingResources.cxx b/Filtering/vtkComputingResources.cxx
index ad504bb3301709ce27a54005965ec8e6c2959fad..d697de430f681de79a12909acae7546d89fe7562 100644
--- a/Filtering/vtkComputingResources.cxx
+++ b/Filtering/vtkComputingResources.cxx
@@ -37,7 +37,6 @@
 #include <vtksys/hash_map.hxx>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkComputingResources, "1.6");
 vtkStandardNewMacro(vtkComputingResources);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkComputingResources.h b/Filtering/vtkComputingResources.h
index a5e1bb28fbdee6ceabc6f60d7437a0240e494ef0..4cca670634c2c526d7b0bf72e895518962178d31 100644
--- a/Filtering/vtkComputingResources.h
+++ b/Filtering/vtkComputingResources.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkComputingResources : public vtkObject
 {
 public:
   static vtkComputingResources* New();
-  vtkTypeRevisionMacro(vtkComputingResources,vtkObject);
+  vtkTypeMacro(vtkComputingResources,vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCone.cxx b/Filtering/vtkCone.cxx
index 4d7ab82fc8cb357a98403604abecbd7d92b4d295..e985595e9436bebfccc5e9b6f9ba0ede056587b7 100644
--- a/Filtering/vtkCone.cxx
+++ b/Filtering/vtkCone.cxx
@@ -16,7 +16,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCone, "1.28");
 vtkStandardNewMacro(vtkCone);
 
 // Construct cone with angle of 45 degrees.
diff --git a/Filtering/vtkCone.h b/Filtering/vtkCone.h
index e0d462044691869174a041861bb3f472f8d52565..cbd85b94f90cb7792737be0a0ee39bac94e9dd89 100644
--- a/Filtering/vtkCone.h
+++ b/Filtering/vtkCone.h
@@ -37,7 +37,7 @@ public:
   // Construct cone with angle of 45 degrees.
   static vtkCone *New();
 
-  vtkTypeRevisionMacro(vtkCone,vtkImplicitFunction);
+  vtkTypeMacro(vtkCone,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Filtering/vtkConvexPointSet.cxx b/Filtering/vtkConvexPointSet.cxx
index 1ca9591d138d7a3d97c5cb771d5c1e472c5ae7b0..722c5053ed550a4aaec4bf5a613d212dd386b20c 100644
--- a/Filtering/vtkConvexPointSet.cxx
+++ b/Filtering/vtkConvexPointSet.cxx
@@ -24,7 +24,6 @@
 #include "vtkTetra.h"
 #include "vtkTriangle.h"
 
-vtkCxxRevisionMacro(vtkConvexPointSet, "1.7");
 vtkStandardNewMacro(vtkConvexPointSet);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkConvexPointSet.h b/Filtering/vtkConvexPointSet.h
index d97e50c02cdde1d28d6e105f2560a4d69804882b..653dfed095060cd135e3233e265efc195655e124 100644
--- a/Filtering/vtkConvexPointSet.h
+++ b/Filtering/vtkConvexPointSet.h
@@ -39,7 +39,7 @@ class VTK_FILTERING_EXPORT vtkConvexPointSet : public vtkCell3D
 {
 public:
   static vtkConvexPointSet *New();
-  vtkTypeRevisionMacro(vtkConvexPointSet,vtkCell3D);
+  vtkTypeMacro(vtkConvexPointSet,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCoordinate.cxx b/Filtering/vtkCoordinate.cxx
index cf550847a4c50bc869d1b94b1fdf69805af0d84d..f56536ef0e6373738d8aa49a8ea42ef4d31b0020 100644
--- a/Filtering/vtkCoordinate.cxx
+++ b/Filtering/vtkCoordinate.cxx
@@ -16,7 +16,6 @@
 #include "vtkViewport.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCoordinate, "1.4");
 vtkStandardNewMacro(vtkCoordinate);
 
 vtkCxxSetObjectMacro(vtkCoordinate,ReferenceCoordinate,vtkCoordinate);
diff --git a/Filtering/vtkCoordinate.h b/Filtering/vtkCoordinate.h
index 724256cfd8aa73ce296307a8c2b1746c8ad38683..3be1e149a7f48a5f1147b8f8561b6f2ecfd144a7 100644
--- a/Filtering/vtkCoordinate.h
+++ b/Filtering/vtkCoordinate.h
@@ -60,7 +60,7 @@ class vtkViewport;
 class VTK_FILTERING_EXPORT vtkCoordinate : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCoordinate,vtkObject);
+  vtkTypeMacro(vtkCoordinate,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCubicLine.cxx b/Filtering/vtkCubicLine.cxx
index 64791e5ef8f5c74aedc5ed09482482dd413700a5..4a455dcfeed03e924e757a4c2e537acf358f63ab 100644
--- a/Filtering/vtkCubicLine.cxx
+++ b/Filtering/vtkCubicLine.cxx
@@ -26,7 +26,6 @@
 #include "vtkPoints.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkCubicLine, "1.2");
 vtkStandardNewMacro(vtkCubicLine);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkCubicLine.h b/Filtering/vtkCubicLine.h
index a440136a82a89431e5eba6d3a37247d47f2bad67..57d0648691e345a90f88bfc9b4512cadf43a12a9 100644
--- a/Filtering/vtkCubicLine.h
+++ b/Filtering/vtkCubicLine.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkCubicLine : public vtkNonLinearCell
 {
 public:
   static vtkCubicLine *New();
-  vtkTypeRevisionMacro(vtkCubicLine,vtkNonLinearCell);
+  vtkTypeMacro(vtkCubicLine,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkCylinder.cxx b/Filtering/vtkCylinder.cxx
index c73fa27be2decc67136ed07e6432fe08c08ab08d..a9c8287561fd9a7b331f3d0b14b5d9288fad3a61 100644
--- a/Filtering/vtkCylinder.cxx
+++ b/Filtering/vtkCylinder.cxx
@@ -15,7 +15,6 @@
 #include "vtkCylinder.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCylinder, "1.27");
 vtkStandardNewMacro(vtkCylinder);
 
 // Construct cylinder radius of 0.5.
diff --git a/Filtering/vtkCylinder.h b/Filtering/vtkCylinder.h
index 40500e61ad0403aab35b43a9ee9d542f1c334d36..4bece5dbf8e1c6f6ad914b6fad9b18883146d3da 100644
--- a/Filtering/vtkCylinder.h
+++ b/Filtering/vtkCylinder.h
@@ -33,7 +33,7 @@
 class VTK_FILTERING_EXPORT vtkCylinder : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkCylinder,vtkImplicitFunction);
+  vtkTypeMacro(vtkCylinder,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkDataObject.cxx b/Filtering/vtkDataObject.cxx
index b641238c27578def164640263ffed47428d91aef..114be395fe69853f3370b241844a596ec9dbb16e 100644
--- a/Filtering/vtkDataObject.cxx
+++ b/Filtering/vtkDataObject.cxx
@@ -37,7 +37,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkInformationVector.h"
 #include "vtkDataSetAttributes.h"
 
-vtkCxxRevisionMacro(vtkDataObject, "1.47");
 vtkStandardNewMacro(vtkDataObject);
 
 vtkCxxSetObjectMacro(vtkDataObject,Information,vtkInformation);
diff --git a/Filtering/vtkDataObject.h b/Filtering/vtkDataObject.h
index bd4f4c6b7612cb281003eed6021a33eee78f3eb1..e921ce127eea60eea0a82da2a50c65b5e752bff3 100644
--- a/Filtering/vtkDataObject.h
+++ b/Filtering/vtkDataObject.h
@@ -64,7 +64,7 @@ class VTK_FILTERING_EXPORT vtkDataObject : public vtkObject
 public:
   static vtkDataObject *New();
 
-  vtkTypeRevisionMacro(vtkDataObject,vtkObject);
+  vtkTypeMacro(vtkDataObject,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataObjectAlgorithm.cxx b/Filtering/vtkDataObjectAlgorithm.cxx
index 38a3707a8dc4a8608e3b35acf4f150fa2fd03370..995ed977830c8f3fc834cee99d781a813ec029f4 100644
--- a/Filtering/vtkDataObjectAlgorithm.cxx
+++ b/Filtering/vtkDataObjectAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkDataObjectAlgorithm, "1.2");
 vtkStandardNewMacro(vtkDataObjectAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkDataObjectAlgorithm.h b/Filtering/vtkDataObjectAlgorithm.h
index 83ba84845013d44580d4132d8e2507b3353ddaf9..966bd9591a1f9bae6f0355339aa3000a3bf0ea99 100644
--- a/Filtering/vtkDataObjectAlgorithm.h
+++ b/Filtering/vtkDataObjectAlgorithm.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkDataObjectAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkDataObjectAlgorithm *New();
-  vtkTypeRevisionMacro(vtkDataObjectAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkDataObjectAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataObjectCollection.cxx b/Filtering/vtkDataObjectCollection.cxx
index 9f33acc1a9eaaac6314ba44cfaf8d8edc94f3bd4..e91e2030548501f9cf46c6423dc627eb245e23eb 100644
--- a/Filtering/vtkDataObjectCollection.cxx
+++ b/Filtering/vtkDataObjectCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkDataObjectCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataObjectCollection, "1.1");
 vtkStandardNewMacro(vtkDataObjectCollection);
diff --git a/Filtering/vtkDataObjectCollection.h b/Filtering/vtkDataObjectCollection.h
index 69552f411296b0d3c2250a4ffa81cbdc71656bb6..9c56e6b117fedb46e05fab278a539b97d6cb381f 100644
--- a/Filtering/vtkDataObjectCollection.h
+++ b/Filtering/vtkDataObjectCollection.h
@@ -28,7 +28,7 @@ class VTK_FILTERING_EXPORT vtkDataObjectCollection : public vtkCollection
 {
 public:
   static vtkDataObjectCollection *New();
-  vtkTypeRevisionMacro(vtkDataObjectCollection,vtkCollection);
+  vtkTypeMacro(vtkDataObjectCollection,vtkCollection);
 
   // Description:
   // Add a data object to the list.
diff --git a/Filtering/vtkDataObjectSource.cxx b/Filtering/vtkDataObjectSource.cxx
index 05714990bef788a00c5381c04e730e51d3da328c..62c554267ea1173275dcda2d2c47339abc73bb9f 100644
--- a/Filtering/vtkDataObjectSource.cxx
+++ b/Filtering/vtkDataObjectSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkInformation.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataObjectSource, "1.18");
 
 vtkDataObjectSource::vtkDataObjectSource()
 {
diff --git a/Filtering/vtkDataObjectSource.h b/Filtering/vtkDataObjectSource.h
index 17c46a84dd00ad76ded78e77c16ae87f4562c570..dbf07ac96d94ac3a57174ce78f1f44fda2884837 100644
--- a/Filtering/vtkDataObjectSource.h
+++ b/Filtering/vtkDataObjectSource.h
@@ -59,7 +59,7 @@ class vtkDataObject;
 class VTK_FILTERING_EXPORT vtkDataObjectSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataObjectSource,vtkSource);
+  vtkTypeMacro(vtkDataObjectSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataObjectTypes.cxx b/Filtering/vtkDataObjectTypes.cxx
index 384a03ee62dbff653d96c91cabca085e4185c8d5..e122a557d1ad5ed63457ff80fcc40ad8986cb50c 100644
--- a/Filtering/vtkDataObjectTypes.cxx
+++ b/Filtering/vtkDataObjectTypes.cxx
@@ -49,7 +49,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include  "vtkArrayData.h"
 #endif
 
-vtkCxxRevisionMacro(vtkDataObjectTypes, "1.8");
 vtkStandardNewMacro(vtkDataObjectTypes);
 
 // This list should contain the data object class names in
diff --git a/Filtering/vtkDataObjectTypes.h b/Filtering/vtkDataObjectTypes.h
index 7945b37dce532bd4ad077f800a783865f5038c46..feea7ed95e6c6470ae46f24ad0412a4080cf0347 100644
--- a/Filtering/vtkDataObjectTypes.h
+++ b/Filtering/vtkDataObjectTypes.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkDataObjectTypes : public vtkObject
 public:
   static vtkDataObjectTypes *New();
 
-  vtkTypeRevisionMacro(vtkDataObjectTypes,vtkObject);
+  vtkTypeMacro(vtkDataObjectTypes,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSet.cxx b/Filtering/vtkDataSet.cxx
index b65b42b0be07eccf8fa1b681788fdea2ceef3a47..859fda0704c32dd89e2a0eff5f0b6c37ad3c0884 100644
--- a/Filtering/vtkDataSet.cxx
+++ b/Filtering/vtkDataSet.cxx
@@ -28,7 +28,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkDataSet, "1.15");
 
 //----------------------------------------------------------------------------
 // Constructor with default bounds (0,1, 0,1, 0,1).
diff --git a/Filtering/vtkDataSet.h b/Filtering/vtkDataSet.h
index 55e04301210fa2e2490077ff127064dc8761a24f..aa34eea86eca99376782d5d2d363f13c4c106397 100644
--- a/Filtering/vtkDataSet.h
+++ b/Filtering/vtkDataSet.h
@@ -50,7 +50,7 @@ class vtkSourceToDataSetFriendship;
 class VTK_FILTERING_EXPORT vtkDataSet : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSet,vtkDataObject);
+  vtkTypeMacro(vtkDataSet,vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetAlgorithm.cxx b/Filtering/vtkDataSetAlgorithm.cxx
index 33497c712bed22e50c58a73c7880e20c44f03b13..5175c4e36f5ab8be04ca8ce686d8229b4e1f973d 100644
--- a/Filtering/vtkDataSetAlgorithm.cxx
+++ b/Filtering/vtkDataSetAlgorithm.cxx
@@ -27,7 +27,6 @@
 #include "vtkStructuredPoints.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkDataSetAlgorithm, "1.16");
 vtkStandardNewMacro(vtkDataSetAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkDataSetAlgorithm.h b/Filtering/vtkDataSetAlgorithm.h
index 5a0673b0bc8b382f1fc05bd5ec876006abdda3aa..846c36572f6b2bc1f53fb2f0b4eed0e83467a2c8 100644
--- a/Filtering/vtkDataSetAlgorithm.h
+++ b/Filtering/vtkDataSetAlgorithm.h
@@ -46,7 +46,7 @@ class VTK_FILTERING_EXPORT vtkDataSetAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkDataSetAlgorithm *New();
-  vtkTypeRevisionMacro(vtkDataSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkDataSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetAttributes.cxx b/Filtering/vtkDataSetAttributes.cxx
index d5739b0dfefd3a68e823b588c6f6c1cffcf7adbb..bca259b6b60fb59c97d6ec28f010fe2f6b68a121 100644
--- a/Filtering/vtkDataSetAttributes.cxx
+++ b/Filtering/vtkDataSetAttributes.cxx
@@ -39,7 +39,6 @@ namespace
 }
 class vtkDataSetAttributes::vtkInternalComponentNames : public vtkInternalComponentNameBase {};
 
-vtkCxxRevisionMacro(vtkDataSetAttributes, "1.39");
 vtkStandardNewMacro(vtkDataSetAttributes);
 
 //--------------------------------------------------------------------------
diff --git a/Filtering/vtkDataSetAttributes.h b/Filtering/vtkDataSetAttributes.h
index 33051cc70fc08756bce5d3c4b3fc65376c2d6dc2..21544c136cb02d59fa3c355991bf304601b7ed93 100644
--- a/Filtering/vtkDataSetAttributes.h
+++ b/Filtering/vtkDataSetAttributes.h
@@ -52,7 +52,7 @@ public:
   // Construct object with copying turned on for all data.
   static vtkDataSetAttributes *New();
   
-  vtkTypeRevisionMacro(vtkDataSetAttributes,vtkFieldData);
+  vtkTypeMacro(vtkDataSetAttributes,vtkFieldData);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetCollection.cxx b/Filtering/vtkDataSetCollection.cxx
index 151409d288f2315e8eb4109d1ab225a58a52dca0..cbdd331d5fc3174f0b254d08ced4357f83b5b2f3 100644
--- a/Filtering/vtkDataSetCollection.cxx
+++ b/Filtering/vtkDataSetCollection.cxx
@@ -15,5 +15,4 @@
 #include "vtkDataSetCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataSetCollection, "1.1");
 vtkStandardNewMacro(vtkDataSetCollection);
diff --git a/Filtering/vtkDataSetCollection.h b/Filtering/vtkDataSetCollection.h
index 21c32ed6cf9ac47744f50f60d8abb7f5bfaeacd9..26948200dae0912af0e29490a0c56fd4d52de680 100644
--- a/Filtering/vtkDataSetCollection.h
+++ b/Filtering/vtkDataSetCollection.h
@@ -28,7 +28,7 @@ class VTK_FILTERING_EXPORT vtkDataSetCollection : public vtkCollection
 {
 public:
   static vtkDataSetCollection *New();
-  vtkTypeRevisionMacro(vtkDataSetCollection,vtkCollection);
+  vtkTypeMacro(vtkDataSetCollection,vtkCollection);
 
   // Description:
   // Add a dataset to the list.
diff --git a/Filtering/vtkDataSetSource.cxx b/Filtering/vtkDataSetSource.cxx
index 72df36e9282b8229eb91ada272c416f0fa80abba..70bd88c043a3a4dc8d352e257895fda573c93662 100644
--- a/Filtering/vtkDataSetSource.cxx
+++ b/Filtering/vtkDataSetSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkDataSet.h"
 
-vtkCxxRevisionMacro(vtkDataSetSource, "1.18");
 
 vtkDataSetSource::vtkDataSetSource()
 {
diff --git a/Filtering/vtkDataSetSource.h b/Filtering/vtkDataSetSource.h
index 19b88d16f25e4434e29b4d34dcdbde21d815b6fe..5460480d8f4ff1a761bfcc69edd6c233743549d4 100644
--- a/Filtering/vtkDataSetSource.h
+++ b/Filtering/vtkDataSetSource.h
@@ -26,7 +26,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetSource,vtkSource);
+  vtkTypeMacro(vtkDataSetSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToDataSetFilter.cxx b/Filtering/vtkDataSetToDataSetFilter.cxx
index a8b9e89d419c346d4c38fb521beff0d24aed4e9e..bd57855f6baa09072a3a87a5689c482b45d38672 100644
--- a/Filtering/vtkDataSetToDataSetFilter.cxx
+++ b/Filtering/vtkDataSetToDataSetFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkRectilinearGrid.h"
 
-vtkCxxRevisionMacro(vtkDataSetToDataSetFilter, "1.71");
 
 // Construct object.
 vtkDataSetToDataSetFilter::vtkDataSetToDataSetFilter()
diff --git a/Filtering/vtkDataSetToDataSetFilter.h b/Filtering/vtkDataSetToDataSetFilter.h
index b0d7fffa559b9b91aa20875334c7b3b2024e8fb9..936ed61cf83223ceee34a07cfb11254f119c0a02 100644
--- a/Filtering/vtkDataSetToDataSetFilter.h
+++ b/Filtering/vtkDataSetToDataSetFilter.h
@@ -51,7 +51,7 @@ class VTK_FILTERING_EXPORT vtkDataSetToDataSetFilter : public vtkDataSetSource
 {
 
 public:
-  vtkTypeRevisionMacro(vtkDataSetToDataSetFilter,vtkDataSetSource);
+  vtkTypeMacro(vtkDataSetToDataSetFilter,vtkDataSetSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToImageFilter.cxx b/Filtering/vtkDataSetToImageFilter.cxx
index bd3a3443952b3e96d0d67c1dbfd944c1fbbad538..32bdf00cd708294c515ddd490538678133d32833 100644
--- a/Filtering/vtkDataSetToImageFilter.cxx
+++ b/Filtering/vtkDataSetToImageFilter.cxx
@@ -18,7 +18,6 @@
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkDataSetToImageFilter, "1.7");
 
 //----------------------------------------------------------------------------
 vtkDataSetToImageFilter::vtkDataSetToImageFilter()
diff --git a/Filtering/vtkDataSetToImageFilter.h b/Filtering/vtkDataSetToImageFilter.h
index f9c80fa31db1f655aafb0c21e31a5c4a2df4e2ba..5364d2cec8a8d485208413b18e8baf6c812ef2aa 100644
--- a/Filtering/vtkDataSetToImageFilter.h
+++ b/Filtering/vtkDataSetToImageFilter.h
@@ -30,7 +30,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetToImageFilter : public vtkImageSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToImageFilter,vtkImageSource);
+  vtkTypeMacro(vtkDataSetToImageFilter,vtkImageSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToPolyDataFilter.cxx b/Filtering/vtkDataSetToPolyDataFilter.cxx
index a4f5c13d54ef359130e1f790de8b927d06ba9260..45faf392c52aa4b6e6dce62be730df9fcf90a021 100644
--- a/Filtering/vtkDataSetToPolyDataFilter.cxx
+++ b/Filtering/vtkDataSetToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataSet.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkDataSetToPolyDataFilter, "1.19");
 
 //----------------------------------------------------------------------------
 vtkDataSetToPolyDataFilter::vtkDataSetToPolyDataFilter()
diff --git a/Filtering/vtkDataSetToPolyDataFilter.h b/Filtering/vtkDataSetToPolyDataFilter.h
index 48b3e6299f68cea810d8f3ef372f73c3fb1d3be3..468d0b4dd51ba2e9736a4a0e052a498dfdcdd942 100644
--- a/Filtering/vtkDataSetToPolyDataFilter.h
+++ b/Filtering/vtkDataSetToPolyDataFilter.h
@@ -33,7 +33,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkDataSetToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToStructuredGridFilter.cxx b/Filtering/vtkDataSetToStructuredGridFilter.cxx
index 23c578b51972b4c5b098a60152be21efb687ee84..7d44d2edc44c6e6a7972e92b266077b937fb81c5 100644
--- a/Filtering/vtkDataSetToStructuredGridFilter.cxx
+++ b/Filtering/vtkDataSetToStructuredGridFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkDataSetToStructuredGridFilter, "1.22");
 
 //----------------------------------------------------------------------------
 vtkDataSetToStructuredGridFilter::vtkDataSetToStructuredGridFilter()
diff --git a/Filtering/vtkDataSetToStructuredGridFilter.h b/Filtering/vtkDataSetToStructuredGridFilter.h
index 228d315b3db2e29e64b1ac89393b90acd005906b..16fd67c4eb48568070a5dffe50cfa022029ebe61 100644
--- a/Filtering/vtkDataSetToStructuredGridFilter.h
+++ b/Filtering/vtkDataSetToStructuredGridFilter.h
@@ -28,7 +28,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetToStructuredGridFilter : public vtkStructuredGridSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToStructuredGridFilter,vtkStructuredGridSource);
+  vtkTypeMacro(vtkDataSetToStructuredGridFilter,vtkStructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToStructuredPointsFilter.cxx b/Filtering/vtkDataSetToStructuredPointsFilter.cxx
index ce9ab6d686199e79ab7f68b06547fa471c565752..e9d961d1585f141c7529c1110dea5079a613c222 100644
--- a/Filtering/vtkDataSetToStructuredPointsFilter.cxx
+++ b/Filtering/vtkDataSetToStructuredPointsFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkDataSetToStructuredPointsFilter, "1.33");
 
 //----------------------------------------------------------------------------
 vtkDataSetToStructuredPointsFilter::vtkDataSetToStructuredPointsFilter()
diff --git a/Filtering/vtkDataSetToStructuredPointsFilter.h b/Filtering/vtkDataSetToStructuredPointsFilter.h
index 7f86f1b1744e13284732ed48daee48a155ea1894..7aad0dc651509ad31c887a9f1e382c86842ad895 100644
--- a/Filtering/vtkDataSetToStructuredPointsFilter.h
+++ b/Filtering/vtkDataSetToStructuredPointsFilter.h
@@ -31,7 +31,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetToStructuredPointsFilter : public vtkStructuredPointsSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToStructuredPointsFilter,vtkStructuredPointsSource);
+  vtkTypeMacro(vtkDataSetToStructuredPointsFilter,vtkStructuredPointsSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDataSetToUnstructuredGridFilter.cxx b/Filtering/vtkDataSetToUnstructuredGridFilter.cxx
index 3a137e272f2bf685b359ede104365f7d53f5a790..7f04dc9ed285da2408e0d263d555550806c319fc 100644
--- a/Filtering/vtkDataSetToUnstructuredGridFilter.cxx
+++ b/Filtering/vtkDataSetToUnstructuredGridFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkDataSetToUnstructuredGridFilter, "1.29");
 
 //----------------------------------------------------------------------------
 vtkDataSetToUnstructuredGridFilter::vtkDataSetToUnstructuredGridFilter()
diff --git a/Filtering/vtkDataSetToUnstructuredGridFilter.h b/Filtering/vtkDataSetToUnstructuredGridFilter.h
index a2a2aefc9e37531bb6b8901aeb7dd1eba2535d7c..9c3254dbacf3e02cd57aa74b89ecbf1c4df0be51 100644
--- a/Filtering/vtkDataSetToUnstructuredGridFilter.h
+++ b/Filtering/vtkDataSetToUnstructuredGridFilter.h
@@ -32,7 +32,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkDataSetToUnstructuredGridFilter : public vtkUnstructuredGridSource
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToUnstructuredGridFilter,vtkUnstructuredGridSource);
+  vtkTypeMacro(vtkDataSetToUnstructuredGridFilter,vtkUnstructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDemandDrivenPipeline.cxx b/Filtering/vtkDemandDrivenPipeline.cxx
index 323400e400ac0bc67ba5557ef36c4dec0e07ba79..bd3f44008389a558f077e91be50c053121636474 100644
--- a/Filtering/vtkDemandDrivenPipeline.cxx
+++ b/Filtering/vtkDemandDrivenPipeline.cxx
@@ -37,7 +37,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkDemandDrivenPipeline, "1.61");
 vtkStandardNewMacro(vtkDemandDrivenPipeline);
 
 vtkInformationKeyMacro(vtkDemandDrivenPipeline, DATA_NOT_GENERATED, Integer);
diff --git a/Filtering/vtkDemandDrivenPipeline.h b/Filtering/vtkDemandDrivenPipeline.h
index b02eb95124c0876d848e101dc2a51df7c07b21b0..87d5190bf5061a56bcd63efd03f2cf853c04bac5 100644
--- a/Filtering/vtkDemandDrivenPipeline.h
+++ b/Filtering/vtkDemandDrivenPipeline.h
@@ -38,7 +38,7 @@ class VTK_FILTERING_EXPORT vtkDemandDrivenPipeline : public vtkExecutive
 {
 public:
   static vtkDemandDrivenPipeline* New();
-  vtkTypeRevisionMacro(vtkDemandDrivenPipeline,vtkExecutive);
+  vtkTypeMacro(vtkDemandDrivenPipeline,vtkExecutive);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDirectedAcyclicGraph.cxx b/Filtering/vtkDirectedAcyclicGraph.cxx
index eb65b6e86bceab6285350a8a62d55d86c7f6d860..b98077677dc103c2dba4c08f75aae5ed6dcb431d 100644
--- a/Filtering/vtkDirectedAcyclicGraph.cxx
+++ b/Filtering/vtkDirectedAcyclicGraph.cxx
@@ -30,7 +30,6 @@
 
 using vtksys_stl::vector;
 
-vtkCxxRevisionMacro(vtkDirectedAcyclicGraph, "1.5");
 vtkStandardNewMacro(vtkDirectedAcyclicGraph);
 //----------------------------------------------------------------------------
 vtkDirectedAcyclicGraph::vtkDirectedAcyclicGraph()
diff --git a/Filtering/vtkDirectedAcyclicGraph.h b/Filtering/vtkDirectedAcyclicGraph.h
index a78bb6abd07caffbaefce4ad64de6b3408c23ef9..9c0c4a41dd24faf5cac9e8fc3e2b469bb9429a51 100644
--- a/Filtering/vtkDirectedAcyclicGraph.h
+++ b/Filtering/vtkDirectedAcyclicGraph.h
@@ -51,7 +51,7 @@ class VTK_FILTERING_EXPORT vtkDirectedAcyclicGraph : public vtkDirectedGraph
 {
 public:
   static vtkDirectedAcyclicGraph *New();
-  vtkTypeRevisionMacro(vtkDirectedAcyclicGraph, vtkDirectedGraph);
+  vtkTypeMacro(vtkDirectedAcyclicGraph, vtkDirectedGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDirectedGraph.cxx b/Filtering/vtkDirectedGraph.cxx
index c269a647c0f814ada90af28602f17c451578339a..bff6aecde92be2b1e552da0487722ca5d4ce5096 100644
--- a/Filtering/vtkDirectedGraph.cxx
+++ b/Filtering/vtkDirectedGraph.cxx
@@ -32,7 +32,6 @@
 //----------------------------------------------------------------------------
 // class vtkDirectedGraph
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkDirectedGraph, "1.2");
 vtkStandardNewMacro(vtkDirectedGraph);
 //----------------------------------------------------------------------------
 vtkDirectedGraph::vtkDirectedGraph()
diff --git a/Filtering/vtkDirectedGraph.h b/Filtering/vtkDirectedGraph.h
index 05b5a955c1fafe885d950411a8feca92a045b34b..e6b21e1fe28713fa8e69809848d08471cb2b5509 100644
--- a/Filtering/vtkDirectedGraph.h
+++ b/Filtering/vtkDirectedGraph.h
@@ -41,7 +41,7 @@ class VTK_FILTERING_EXPORT vtkDirectedGraph : public vtkGraph
 {
 public:
   static vtkDirectedGraph *New();
-  vtkTypeRevisionMacro(vtkDirectedGraph, vtkGraph);
+  vtkTypeMacro(vtkDirectedGraph, vtkGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDirectedGraphAlgorithm.cxx b/Filtering/vtkDirectedGraphAlgorithm.cxx
index e5d276906a8c12601f99360f00c973bc0bd89b33..8b2c51ff386ad3024620b58ef5dca69df27244fc 100644
--- a/Filtering/vtkDirectedGraphAlgorithm.cxx
+++ b/Filtering/vtkDirectedGraphAlgorithm.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkDirectedGraphAlgorithm, "1.2");
 vtkStandardNewMacro(vtkDirectedGraphAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkDirectedGraphAlgorithm.h b/Filtering/vtkDirectedGraphAlgorithm.h
index 48032a01117b63936338140d3e4c629e00e5607e..491f28fdd7e7290e12c879f110a56941fcb4ebdd 100644
--- a/Filtering/vtkDirectedGraphAlgorithm.h
+++ b/Filtering/vtkDirectedGraphAlgorithm.h
@@ -52,7 +52,7 @@ class VTK_FILTERING_EXPORT vtkDirectedGraphAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkDirectedGraphAlgorithm *New();
-  vtkTypeRevisionMacro(vtkDirectedGraphAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkDirectedGraphAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkDiscretizableColorTransferFunction.cxx b/Filtering/vtkDiscretizableColorTransferFunction.cxx
index 92b050fbaeefdd1d78691b0dbe2a58296239165d..222e1daac4e3ab4f9abfd11538fc37ce969a3d1f 100644
--- a/Filtering/vtkDiscretizableColorTransferFunction.cxx
+++ b/Filtering/vtkDiscretizableColorTransferFunction.cxx
@@ -20,7 +20,6 @@
 #include <vtkstd/vector>
 
 vtkStandardNewMacro(vtkDiscretizableColorTransferFunction);
-vtkCxxRevisionMacro(vtkDiscretizableColorTransferFunction, "1.2");
 //-----------------------------------------------------------------------------
 vtkDiscretizableColorTransferFunction::vtkDiscretizableColorTransferFunction()
 {
diff --git a/Filtering/vtkDiscretizableColorTransferFunction.h b/Filtering/vtkDiscretizableColorTransferFunction.h
index 07444b26bd65030d9113cc2bbac179db54754b4f..11e4745aca20ec4db05ca6f644202b7be751cb24 100644
--- a/Filtering/vtkDiscretizableColorTransferFunction.h
+++ b/Filtering/vtkDiscretizableColorTransferFunction.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkDiscretizableColorTransferFunction : public vtkCol
 {
 public:
   static vtkDiscretizableColorTransferFunction* New();
-  vtkTypeRevisionMacro(vtkDiscretizableColorTransferFunction, vtkColorTransferFunction);
+  vtkTypeMacro(vtkDiscretizableColorTransferFunction, vtkColorTransferFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkDistributedGraphHelper.cxx b/Filtering/vtkDistributedGraphHelper.cxx
index 10d6ecf166c38eeb8cf4c8f06f1adf46d4a0b7e5..73506cc0584efe3610a8dca39f563c3e40824426 100644
--- a/Filtering/vtkDistributedGraphHelper.cxx
+++ b/Filtering/vtkDistributedGraphHelper.cxx
@@ -39,7 +39,6 @@ vtkInformationKeyMacro(vtkDistributedGraphHelper, DISTRIBUTEDEDGEIDS, Integer);
 //----------------------------------------------------------------------------
 // class vtkDistributedGraphHelper
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkDistributedGraphHelper, "1.7");
 
 //----------------------------------------------------------------------------
 void vtkDistributedGraphHelper::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Filtering/vtkDistributedGraphHelper.h b/Filtering/vtkDistributedGraphHelper.h
index 26b0f7012f3a63e0897c371ab6fb8d54fa2f4075..a14bce29e3948fa94aa8f2d80cf8ac5cca215b15 100644
--- a/Filtering/vtkDistributedGraphHelper.h
+++ b/Filtering/vtkDistributedGraphHelper.h
@@ -72,7 +72,7 @@ typedef vtkIdType (*vtkVertexPedigreeIdDistribution)
 class VTK_FILTERING_EXPORT vtkDistributedGraphHelper : public vtkObject
 {
  public:
-  vtkTypeRevisionMacro (vtkDistributedGraphHelper, vtkObject);
+  vtkTypeMacro(vtkDistributedGraphHelper,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkEdgeListIterator.cxx b/Filtering/vtkEdgeListIterator.cxx
index 30fb2170463c89f74b3f6a3922fd383f8d6d5cee..d189f4e239fb978a1301c9f8357d8912e1fa3f8b 100644
--- a/Filtering/vtkEdgeListIterator.cxx
+++ b/Filtering/vtkEdgeListIterator.cxx
@@ -27,7 +27,6 @@
 #include "vtkGraph.h"
 #include "vtkGraphEdge.h"
 
-vtkCxxRevisionMacro(vtkEdgeListIterator, "1.4");
 vtkStandardNewMacro(vtkEdgeListIterator);
 //----------------------------------------------------------------------------
 vtkEdgeListIterator::vtkEdgeListIterator()
diff --git a/Filtering/vtkEdgeListIterator.h b/Filtering/vtkEdgeListIterator.h
index cd99ed20798b42f51fd035974feccfc7a59250c9..0c0fe2817028a134750ea686ed9f6d87498429e1 100644
--- a/Filtering/vtkEdgeListIterator.h
+++ b/Filtering/vtkEdgeListIterator.h
@@ -47,7 +47,7 @@ class VTK_FILTERING_EXPORT vtkEdgeListIterator : public vtkObject
 {
 public:
   static vtkEdgeListIterator *New();
-  vtkTypeRevisionMacro(vtkEdgeListIterator, vtkObject);
+  vtkTypeMacro(vtkEdgeListIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGetObjectMacro(Graph, vtkGraph);
diff --git a/Filtering/vtkEmptyCell.cxx b/Filtering/vtkEmptyCell.cxx
index ab5cc3a7d3996449ba39db7b008c4a49f5abbd3c..1a378dcd8a856d909873987cb83448bcebcad03d 100644
--- a/Filtering/vtkEmptyCell.cxx
+++ b/Filtering/vtkEmptyCell.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkEmptyCell, "1.4");
 vtkStandardNewMacro(vtkEmptyCell);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkEmptyCell.h b/Filtering/vtkEmptyCell.h
index 91dced6b7caaa698569818182525fe6a9d8c1a71..dd496ad704cdf7b39107ba0706578eb69e9ae58c 100644
--- a/Filtering/vtkEmptyCell.h
+++ b/Filtering/vtkEmptyCell.h
@@ -26,7 +26,7 @@ class VTK_FILTERING_EXPORT vtkEmptyCell : public vtkCell
 {
 public:
   static vtkEmptyCell *New();
-  vtkTypeRevisionMacro(vtkEmptyCell,vtkCell);
+  vtkTypeMacro(vtkEmptyCell,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkExecutionScheduler.cxx b/Filtering/vtkExecutionScheduler.cxx
index 7df90d8d22e8db2e119b109179f4e4236209df6b..dee90cc4c9b7aeaeba31aae0155f26767165c5c4 100644
--- a/Filtering/vtkExecutionScheduler.cxx
+++ b/Filtering/vtkExecutionScheduler.cxx
@@ -50,7 +50,6 @@
 #include <vtksys/hash_set.hxx>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkExecutionScheduler, "1.19");
 vtkStandardNewMacro(vtkExecutionScheduler);
 
 vtkInformationKeyMacro(vtkExecutionScheduler, TASK_PRIORITY, Integer);
diff --git a/Filtering/vtkExecutionScheduler.h b/Filtering/vtkExecutionScheduler.h
index 2b11276cda871ecc8246203e56335e9e2c91d325..060f196f1103426eb6f2ee60bbb5cb7e7294c9d7 100644
--- a/Filtering/vtkExecutionScheduler.h
+++ b/Filtering/vtkExecutionScheduler.h
@@ -54,7 +54,7 @@ class VTK_FILTERING_EXPORT vtkExecutionScheduler : public vtkObject
 {
 public:
   static vtkExecutionScheduler* New();
-  vtkTypeRevisionMacro(vtkExecutionScheduler,vtkObject);
+  vtkTypeMacro(vtkExecutionScheduler,vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkExecutive.cxx b/Filtering/vtkExecutive.cxx
index 422711242495004e4fb6efd02858c8bc8e886133..ca5a10f8930226b168599dc69da0702c4337d2c0 100644
--- a/Filtering/vtkExecutive.cxx
+++ b/Filtering/vtkExecutive.cxx
@@ -33,7 +33,6 @@
 
 #include "vtkCompositeDataPipeline.h"
 
-vtkCxxRevisionMacro(vtkExecutive, "1.33");
 vtkInformationKeyMacro(vtkExecutive, ALGORITHM_AFTER_FORWARD, Integer);
 vtkInformationKeyMacro(vtkExecutive, ALGORITHM_BEFORE_FORWARD, Integer);
 vtkInformationKeyMacro(vtkExecutive, ALGORITHM_DIRECTION, Integer);
diff --git a/Filtering/vtkExecutive.h b/Filtering/vtkExecutive.h
index c121aa8df29704b24eaa0b50f79ebc1b7f52ce84..9ab7cfa76d1589bde7916dbb6838c4fab18707f9 100644
--- a/Filtering/vtkExecutive.h
+++ b/Filtering/vtkExecutive.h
@@ -42,7 +42,7 @@ class vtkInformationVector;
 class VTK_FILTERING_EXPORT vtkExecutive : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkExecutive,vtkObject);
+  vtkTypeMacro(vtkExecutive,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkExecutiveCollection.cxx b/Filtering/vtkExecutiveCollection.cxx
index ad4e3b7742871f775b5906da45e4b22f07a8f661..15cf0d2b6a4e6d503b7c2e2f61d6538fcfa54784 100644
--- a/Filtering/vtkExecutiveCollection.cxx
+++ b/Filtering/vtkExecutiveCollection.cxx
@@ -31,7 +31,6 @@
 #include "vtkExecutiveCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkExecutiveCollection, "1.1");
 vtkStandardNewMacro(vtkExecutiveCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkExecutiveCollection.h b/Filtering/vtkExecutiveCollection.h
index 76e57587d8e736b60a88874d4df6fc4a04c21426..16d814b8b327dfb4bfd8d922b32e385c34bc5e91 100644
--- a/Filtering/vtkExecutiveCollection.h
+++ b/Filtering/vtkExecutiveCollection.h
@@ -46,7 +46,7 @@ class VTK_FILTERING_EXPORT vtkExecutiveCollection : public vtkCollection
 {
 public:
   static vtkExecutiveCollection *New();
-  vtkTypeRevisionMacro(vtkExecutiveCollection,vtkCollection);
+  vtkTypeMacro(vtkExecutiveCollection,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkExplicitCell.cxx b/Filtering/vtkExplicitCell.cxx
index db455df373bd3256a3bc49b9974061d66cd24a0b..5b73b48d4f0ef17e682d83d36330712c62519fbf 100644
--- a/Filtering/vtkExplicitCell.cxx
+++ b/Filtering/vtkExplicitCell.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkDataSet.h"
 
-vtkCxxRevisionMacro(vtkExplicitCell, "1.2");
 vtkCxxSetObjectMacro(vtkExplicitCell,DataSet,vtkDataSet);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkExplicitCell.h b/Filtering/vtkExplicitCell.h
index 9a6bc790b9d01ebe68d35d4ca32787ac73670a5f..f0907c2f8ac2d0c4467e2856532801d210ee770f 100644
--- a/Filtering/vtkExplicitCell.h
+++ b/Filtering/vtkExplicitCell.h
@@ -31,7 +31,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkExplicitCell : public vtkNonLinearCell
 {
 public:
-  vtkTypeRevisionMacro(vtkExplicitCell,vtkNonLinearCell);
+  vtkTypeMacro(vtkExplicitCell,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkFieldData.cxx b/Filtering/vtkFieldData.cxx
index 2bf2909aef792dd387333bdbe2e5153886727e7b..8c714e1083feb1cdeef31defecab1c5e2c5a9bd3 100644
--- a/Filtering/vtkFieldData.cxx
+++ b/Filtering/vtkFieldData.cxx
@@ -19,7 +19,6 @@
 #include "vtkIdList.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkFieldData, "1.9");
 vtkStandardNewMacro(vtkFieldData);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkFieldData.h b/Filtering/vtkFieldData.h
index 7ff86741cc108730355d34a53ac4c0815bf9abe5..6064f1634d1cbbedd20eefbc15a2e2c1fc870f52 100644
--- a/Filtering/vtkFieldData.h
+++ b/Filtering/vtkFieldData.h
@@ -55,7 +55,7 @@ class VTK_FILTERING_EXPORT vtkFieldData : public vtkObject
 public:
   static vtkFieldData *New();
 
-  vtkTypeRevisionMacro(vtkFieldData,vtkObject);
+  vtkTypeMacro(vtkFieldData,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericAdaptorCell.cxx b/Filtering/vtkGenericAdaptorCell.cxx
index 4c904c014e0b105a92ae300822dca75108b377c9..77311ba82821fb8a5514cbf5bc62c67319cc1c6c 100644
--- a/Filtering/vtkGenericAdaptorCell.cxx
+++ b/Filtering/vtkGenericAdaptorCell.cxx
@@ -37,7 +37,6 @@
 #include "vtkWedge.h"
 #include "vtkPyramid.h"
 
-vtkCxxRevisionMacro(vtkGenericAdaptorCell, "1.26");
 
 vtkGenericAdaptorCell::vtkGenericAdaptorCell()
 {
diff --git a/Filtering/vtkGenericAdaptorCell.h b/Filtering/vtkGenericAdaptorCell.h
index 3e41e05071fc48c940ef110d84ca2aa1fabf6e7e..7cc8a72d5fbd756d9060baa62cfdcabcf47f561e 100644
--- a/Filtering/vtkGenericAdaptorCell.h
+++ b/Filtering/vtkGenericAdaptorCell.h
@@ -88,7 +88,7 @@ class vtkPyramid;
 class VTK_FILTERING_EXPORT vtkGenericAdaptorCell : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericAdaptorCell,vtkObject);
+  vtkTypeMacro(vtkGenericAdaptorCell,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericAttribute.cxx b/Filtering/vtkGenericAttribute.cxx
index 4ef4b2e9386922364879c24103c3afecab1e467b..3b0320d231807eb76d101adff5a99efe94539bff 100644
--- a/Filtering/vtkGenericAttribute.cxx
+++ b/Filtering/vtkGenericAttribute.cxx
@@ -18,7 +18,6 @@
 #include "vtkGenericAttribute.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGenericAttribute, "1.1");
 
 //---------------------------------------------------------------------------
 vtkGenericAttribute::vtkGenericAttribute()
diff --git a/Filtering/vtkGenericAttribute.h b/Filtering/vtkGenericAttribute.h
index c9ab8365141c3a7e3e5636b39599f8b5987b6b5b..e0d21f987a1b8358d942209c8ffc91a323dd326a 100644
--- a/Filtering/vtkGenericAttribute.h
+++ b/Filtering/vtkGenericAttribute.h
@@ -43,7 +43,7 @@ enum
 class VTK_FILTERING_EXPORT vtkGenericAttribute : public vtkObject
 {
  public:
-  vtkTypeRevisionMacro(vtkGenericAttribute,vtkObject);
+  vtkTypeMacro(vtkGenericAttribute,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericAttributeCollection.cxx b/Filtering/vtkGenericAttributeCollection.cxx
index f36b1203751acede6217cacbe99e7b6749961bee..ce7b352591c77d415c8ef46f8230712f20f3b848 100644
--- a/Filtering/vtkGenericAttributeCollection.cxx
+++ b/Filtering/vtkGenericAttributeCollection.cxx
@@ -22,7 +22,6 @@
 #include <vtkstd/vector>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGenericAttributeCollection,"1.10");
 vtkStandardNewMacro(vtkGenericAttributeCollection);
 
 class vtkGenericAttributeInternalVector
diff --git a/Filtering/vtkGenericAttributeCollection.h b/Filtering/vtkGenericAttributeCollection.h
index 66495f0b7a542d1b0cd8563d0057ffd7af9324e9..a04d96e18ac7a2c281d73e78f04fb578a7604656 100644
--- a/Filtering/vtkGenericAttributeCollection.h
+++ b/Filtering/vtkGenericAttributeCollection.h
@@ -35,7 +35,7 @@ public:
   
   // Description:
   // Standard type definition and print methods for a VTK class.
-  vtkTypeRevisionMacro(vtkGenericAttributeCollection,vtkObject);
+  vtkTypeMacro(vtkGenericAttributeCollection,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkGenericCell.cxx b/Filtering/vtkGenericCell.cxx
index e42d498e4a553108c18b7f538ca8c16c74d67be0..dd29b7cd3a34aa28678cb0b014521740e9b2ff1f 100644
--- a/Filtering/vtkGenericCell.cxx
+++ b/Filtering/vtkGenericCell.cxx
@@ -51,7 +51,6 @@
 #include "vtkBiQuadraticQuadraticHexahedron.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkGenericCell, "1.8");
 vtkStandardNewMacro(vtkGenericCell);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkGenericCell.h b/Filtering/vtkGenericCell.h
index 50686ec0c7a43c15feb19e272d9610b1946f8b39..c798406abeae8f67a49389d89c60558573eb7667 100644
--- a/Filtering/vtkGenericCell.h
+++ b/Filtering/vtkGenericCell.h
@@ -36,7 +36,7 @@ public:
   // Create handle to any type of cell; by default a vtkEmptyCell.
   static vtkGenericCell *New();
 
-  vtkTypeRevisionMacro(vtkGenericCell,vtkCell);
+  vtkTypeMacro(vtkGenericCell,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericCellIterator.cxx b/Filtering/vtkGenericCellIterator.cxx
index 9c17104da903320c8863afdbe59a789caaf241f1..049889686ac3465682b32d3dcc9e8f03dcf874ed 100644
--- a/Filtering/vtkGenericCellIterator.cxx
+++ b/Filtering/vtkGenericCellIterator.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkGenericCellIterator.h"
 
-vtkCxxRevisionMacro(vtkGenericCellIterator, "1.1");
 
 //----------------------------------------------------------------------------
 vtkGenericCellIterator::vtkGenericCellIterator()
diff --git a/Filtering/vtkGenericCellIterator.h b/Filtering/vtkGenericCellIterator.h
index 90f297b29b25386c4bfaa13e9faf47076e463319..44e76e1c251577e0e283c7ba2326123d00a277b7 100644
--- a/Filtering/vtkGenericCellIterator.h
+++ b/Filtering/vtkGenericCellIterator.h
@@ -39,7 +39,7 @@ class VTK_FILTERING_EXPORT vtkGenericCellIterator : public vtkObject
 public:
   // Description:
   // Standard VTK construction and type macros.
-  vtkTypeRevisionMacro(vtkGenericCellIterator,vtkObject);
+  vtkTypeMacro(vtkGenericCellIterator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericCellTessellator.cxx b/Filtering/vtkGenericCellTessellator.cxx
index 9cbca8e2abda5b0e649da4924696babbd106e071..ab84ed4ed527b328e213ae7fb7c42322c32b1ab7 100644
--- a/Filtering/vtkGenericCellTessellator.cxx
+++ b/Filtering/vtkGenericCellTessellator.cxx
@@ -33,7 +33,6 @@
 
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkGenericCellTessellator, "1.15");
 vtkCxxSetObjectMacro(vtkGenericCellTessellator, ErrorMetrics, vtkCollection);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkGenericCellTessellator.h b/Filtering/vtkGenericCellTessellator.h
index b78d9dec91843781e83a6db0c6a8355d8fa76c6e..ba316c690d887bb846e1903e7c4c3f1b559e7ac0 100644
--- a/Filtering/vtkGenericCellTessellator.h
+++ b/Filtering/vtkGenericCellTessellator.h
@@ -55,7 +55,7 @@ class vtkGenericDataSet;
 class VTK_FILTERING_EXPORT vtkGenericCellTessellator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericCellTessellator,vtkObject);
+  vtkTypeMacro(vtkGenericCellTessellator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkGenericDataSet.cxx b/Filtering/vtkGenericDataSet.cxx
index 22d2de36cdccf2353be5dfc56e0dfbc263728704..c46c7974dc021e54856de88bf75080a271c66d5f 100644
--- a/Filtering/vtkGenericDataSet.cxx
+++ b/Filtering/vtkGenericDataSet.cxx
@@ -25,7 +25,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGenericDataSet, "1.8");
 vtkCxxSetObjectMacro(vtkGenericDataSet,Tessellator,vtkGenericCellTessellator);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkGenericDataSet.h b/Filtering/vtkGenericDataSet.h
index 487a8d8a7d0e60a7a2e6cdccc68737bbbf44dd22..dcf61883fe7ce190fb6e922883989eaf6129c35f 100644
--- a/Filtering/vtkGenericDataSet.h
+++ b/Filtering/vtkGenericDataSet.h
@@ -67,7 +67,7 @@ class VTK_FILTERING_EXPORT vtkGenericDataSet : public vtkDataObject
 public:
   // Description:
   // Standard VTK type and print macros.
-  vtkTypeRevisionMacro(vtkGenericDataSet,vtkDataObject);
+  vtkTypeMacro(vtkGenericDataSet,vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericDataSetAlgorithm.cxx b/Filtering/vtkGenericDataSetAlgorithm.cxx
index 1161a7720f2dfa9d0786889a3659f3e5924cb063..86967dc8a13c8ce9ec07e60ccd7abf14d0e66650 100644
--- a/Filtering/vtkGenericDataSetAlgorithm.cxx
+++ b/Filtering/vtkGenericDataSetAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkGenericDataSetAlgorithm, "1.2");
 
 //----------------------------------------------------------------------------
 vtkGenericDataSetAlgorithm::vtkGenericDataSetAlgorithm()
diff --git a/Filtering/vtkGenericDataSetAlgorithm.h b/Filtering/vtkGenericDataSetAlgorithm.h
index ff9a6dff4eb54870b9aca7a20dd26688cf412394..4761f9064c06ba20cbb79c2053403f7b0f663334 100644
--- a/Filtering/vtkGenericDataSetAlgorithm.h
+++ b/Filtering/vtkGenericDataSetAlgorithm.h
@@ -43,7 +43,7 @@ class vtkGenericDataSet;
 class VTK_FILTERING_EXPORT vtkGenericDataSetAlgorithm : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericDataSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkGenericDataSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericEdgeTable.cxx b/Filtering/vtkGenericEdgeTable.cxx
index 124b27f391ae56ae3543dd4957d7d293b9e49a02..d13e2cf120a01b542f78c050bab6e31719601a12 100644
--- a/Filtering/vtkGenericEdgeTable.cxx
+++ b/Filtering/vtkGenericEdgeTable.cxx
@@ -18,7 +18,6 @@
 #include <vtkstd/vector>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGenericEdgeTable, "1.13");
 vtkStandardNewMacro(vtkGenericEdgeTable);
 
 static int PRIME_NUMBERS[] = {1, 3, 7, 13, 31, 61, 127,  251,  509,  1021,
diff --git a/Filtering/vtkGenericEdgeTable.h b/Filtering/vtkGenericEdgeTable.h
index f1970d1317b1adc48d8d5e34c9bfb62f8944540a..f83d14516d253a377c67130dab6acbdd4b274957 100644
--- a/Filtering/vtkGenericEdgeTable.h
+++ b/Filtering/vtkGenericEdgeTable.h
@@ -41,7 +41,7 @@ public:
   
   // Description:
   // Standard VTK type and print macros.
-  vtkTypeRevisionMacro(vtkGenericEdgeTable,vtkObject);
+  vtkTypeMacro(vtkGenericEdgeTable,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericInterpolatedVelocityField.cxx b/Filtering/vtkGenericInterpolatedVelocityField.cxx
index 04614216485dec47da902a5156744823b38b1686..ffd9673ef553675c37f2229ab241bb5134eb2a58 100644
--- a/Filtering/vtkGenericInterpolatedVelocityField.cxx
+++ b/Filtering/vtkGenericInterpolatedVelocityField.cxx
@@ -24,7 +24,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkGenericInterpolatedVelocityField, "1.2");
 vtkStandardNewMacro(vtkGenericInterpolatedVelocityField);
 
 typedef vtkstd::vector< vtkGenericDataSet* > DataSetsTypeBase;
diff --git a/Filtering/vtkGenericInterpolatedVelocityField.h b/Filtering/vtkGenericInterpolatedVelocityField.h
index 481933f1bcbbdcf7a4391f42afcee6f79ea957eb..44db221e12eaa277fd718b2ab054d16aaa05a25e 100644
--- a/Filtering/vtkGenericInterpolatedVelocityField.h
+++ b/Filtering/vtkGenericInterpolatedVelocityField.h
@@ -50,7 +50,7 @@ class vtkGenericInterpolatedVelocityFieldDataSetsType;
 class VTK_FILTERING_EXPORT vtkGenericInterpolatedVelocityField : public vtkFunctionSet
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericInterpolatedVelocityField,vtkFunctionSet);
+  vtkTypeMacro(vtkGenericInterpolatedVelocityField,vtkFunctionSet);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericPointIterator.cxx b/Filtering/vtkGenericPointIterator.cxx
index 5d429ca9d87a617d560f2451a5e751c55b7a7e16..72752ebebb890c19d733c24fdbce22beffdfeec7 100644
--- a/Filtering/vtkGenericPointIterator.cxx
+++ b/Filtering/vtkGenericPointIterator.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkGenericPointIterator.h"
 
-vtkCxxRevisionMacro(vtkGenericPointIterator, "1.1");
 
 //----------------------------------------------------------------------------
 vtkGenericPointIterator::vtkGenericPointIterator()
diff --git a/Filtering/vtkGenericPointIterator.h b/Filtering/vtkGenericPointIterator.h
index e62e7f6f90fd0217a550e5ef7cc18b8e693e4baf..33b82b704609ab2bbd106b88c4ce8baa7c37e21d 100644
--- a/Filtering/vtkGenericPointIterator.h
+++ b/Filtering/vtkGenericPointIterator.h
@@ -38,7 +38,7 @@ class VTK_FILTERING_EXPORT vtkGenericPointIterator : public vtkObject
 public:
   // Description:
   // Standard VTK construction and type macros.
-  vtkTypeRevisionMacro(vtkGenericPointIterator,vtkObject);
+  vtkTypeMacro(vtkGenericPointIterator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGenericSubdivisionErrorMetric.cxx b/Filtering/vtkGenericSubdivisionErrorMetric.cxx
index 07f50971d9e78a5c06612bee1bf962a6beeb4ee0..87194f0305a83f05f70d8cd8c0be851631566122 100644
--- a/Filtering/vtkGenericSubdivisionErrorMetric.cxx
+++ b/Filtering/vtkGenericSubdivisionErrorMetric.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGenericSubdivisionErrorMetric,"1.5");
 
 //-----------------------------------------------------------------------------
 vtkGenericSubdivisionErrorMetric::vtkGenericSubdivisionErrorMetric()
diff --git a/Filtering/vtkGenericSubdivisionErrorMetric.h b/Filtering/vtkGenericSubdivisionErrorMetric.h
index fd82ffdbc746caa1f22fe420bd451071cb4c28f2..7446f06fedd61f9da0a8bd24df8f80bf2578ccc5 100644
--- a/Filtering/vtkGenericSubdivisionErrorMetric.h
+++ b/Filtering/vtkGenericSubdivisionErrorMetric.h
@@ -46,7 +46,7 @@ class VTK_FILTERING_EXPORT vtkGenericSubdivisionErrorMetric : public vtkObject
 public:  
   // Description:
   // Standard VTK type and error macros.
-  vtkTypeRevisionMacro(vtkGenericSubdivisionErrorMetric,vtkObject);
+  vtkTypeMacro(vtkGenericSubdivisionErrorMetric,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
  
   // Description:
diff --git a/Filtering/vtkGeometricErrorMetric.cxx b/Filtering/vtkGeometricErrorMetric.cxx
index ffee717255a597e2b7eeba11f3bde5517884fe60..e8e5f5d56686011d69c152baa44f4bb8b7166a23 100644
--- a/Filtering/vtkGeometricErrorMetric.cxx
+++ b/Filtering/vtkGeometricErrorMetric.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGeometricErrorMetric,"1.7");
 vtkStandardNewMacro(vtkGeometricErrorMetric);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkGeometricErrorMetric.h b/Filtering/vtkGeometricErrorMetric.h
index 3a2a2e47917189a6b92646e1f0fc47808321bd2b..e53924aec30ce028fbf7bcdec38350efd7390530 100644
--- a/Filtering/vtkGeometricErrorMetric.h
+++ b/Filtering/vtkGeometricErrorMetric.h
@@ -39,7 +39,7 @@ public:
   
   // Description:
   // Standard VTK type and error macros.
-  vtkTypeRevisionMacro(vtkGeometricErrorMetric,vtkGenericSubdivisionErrorMetric);
+  vtkTypeMacro(vtkGeometricErrorMetric,vtkGenericSubdivisionErrorMetric);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkGraph.cxx b/Filtering/vtkGraph.cxx
index d3c04dd8d0c562046c8e72ce5951c33ad43c7ac9..cda39ba934864747fedbbad34f7a8fbdb39b0f43 100644
--- a/Filtering/vtkGraph.cxx
+++ b/Filtering/vtkGraph.cxx
@@ -54,7 +54,7 @@ class vtkGraphEdgePoints : public vtkObject
 {
 public:
   static vtkGraphEdgePoints *New();
-  vtkTypeRevisionMacro(vtkGraphEdgePoints, vtkObject);
+  vtkTypeMacro(vtkGraphEdgePoints, vtkObject);
   vtksys_stl::vector< vtksys_stl::vector<double> > Storage;
 
 protected:
@@ -66,7 +66,6 @@ private:
   void operator=(const vtkGraphEdgePoints&);  // Not implemented.
 };
 vtkStandardNewMacro(vtkGraphEdgePoints);
-vtkCxxRevisionMacro(vtkGraphEdgePoints, "1.40");
 
 //----------------------------------------------------------------------------
 // class vtkGraph
@@ -75,7 +74,6 @@ vtkCxxSetObjectMacro(vtkGraph, Points, vtkPoints);
 vtkCxxSetObjectMacro(vtkGraph, Internals, vtkGraphInternals);
 vtkCxxSetObjectMacro(vtkGraph, EdgePoints, vtkGraphEdgePoints);
 vtkCxxSetObjectMacro(vtkGraph, EdgeList, vtkIdTypeArray);
-vtkCxxRevisionMacro(vtkGraph, "1.40");
 //----------------------------------------------------------------------------
 vtkGraph::vtkGraph()
 {
diff --git a/Filtering/vtkGraph.h b/Filtering/vtkGraph.h
index 3874090a76147547e0df7e526f06deffaea16480..58311aa56f6c212cf960db82d12b6c3b49bbea5c 100644
--- a/Filtering/vtkGraph.h
+++ b/Filtering/vtkGraph.h
@@ -272,7 +272,7 @@ struct vtkEdgeType : vtkEdgeBase
 class VTK_FILTERING_EXPORT vtkGraph : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGraph, vtkDataObject);
+  vtkTypeMacro(vtkGraph, vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGraphAlgorithm.cxx b/Filtering/vtkGraphAlgorithm.cxx
index 5f09dbefb8cfd002f3bee7df42e71375128ec33d..88ce1af00578a5235ac3a92396e5cb4f7b545aaf 100644
--- a/Filtering/vtkGraphAlgorithm.cxx
+++ b/Filtering/vtkGraphAlgorithm.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkGraphAlgorithm, "1.5");
 vtkStandardNewMacro(vtkGraphAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkGraphAlgorithm.h b/Filtering/vtkGraphAlgorithm.h
index 28c732642f3ed63897efc493db0aec28548358e0..65cc38826a1cebc367c5294170be567da704e571 100644
--- a/Filtering/vtkGraphAlgorithm.h
+++ b/Filtering/vtkGraphAlgorithm.h
@@ -52,7 +52,7 @@ class VTK_FILTERING_EXPORT vtkGraphAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkGraphAlgorithm *New();
-  vtkTypeRevisionMacro(vtkGraphAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkGraphAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGraphEdge.cxx b/Filtering/vtkGraphEdge.cxx
index 7ff73e864892bf2460eec7cafab3232a2fabcd70..e33dc27094603654e4694400ca7bbfafddd2eeda 100644
--- a/Filtering/vtkGraphEdge.cxx
+++ b/Filtering/vtkGraphEdge.cxx
@@ -22,7 +22,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkGraphEdge, "1.2");
 vtkStandardNewMacro(vtkGraphEdge);
 //----------------------------------------------------------------------------
 vtkGraphEdge::vtkGraphEdge()
diff --git a/Filtering/vtkGraphEdge.h b/Filtering/vtkGraphEdge.h
index da170064a35d663c4d29d4a4885902da25a6e781..fad61632747321545975317c3ac604c39b8a1602 100644
--- a/Filtering/vtkGraphEdge.h
+++ b/Filtering/vtkGraphEdge.h
@@ -36,7 +36,7 @@ class VTK_FILTERING_EXPORT vtkGraphEdge : public vtkObject
 {
 public:
   static vtkGraphEdge *New();
-  vtkTypeRevisionMacro(vtkGraphEdge, vtkObject);
+  vtkTypeMacro(vtkGraphEdge, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkGraphInternals.cxx b/Filtering/vtkGraphInternals.cxx
index 5765001f75e17a2b602de2f6da8813f1940a62c6..f9977ce09e0b16d031d73301c95959781e5c3816 100644
--- a/Filtering/vtkGraphInternals.cxx
+++ b/Filtering/vtkGraphInternals.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkGraphInternals);
-vtkCxxRevisionMacro(vtkGraphInternals, "1.6");
 
 //----------------------------------------------------------------------------
 vtkGraphInternals::vtkGraphInternals()
diff --git a/Filtering/vtkGraphInternals.h b/Filtering/vtkGraphInternals.h
index 52d782fbcda793396da715f96f63a05f7513341e..20278a00cc6b6dcc77d6976a1a222618d9ded854 100644
--- a/Filtering/vtkGraphInternals.h
+++ b/Filtering/vtkGraphInternals.h
@@ -50,7 +50,7 @@ class VTK_FILTERING_EXPORT vtkGraphInternals : public vtkObject
 public:
   static vtkGraphInternals *New();
   //BTX
-  vtkTypeRevisionMacro(vtkGraphInternals, vtkObject);
+  vtkTypeMacro(vtkGraphInternals, vtkObject);
   vtksys_stl::vector<vtkVertexAdjacencyList> Adjacency;
   //ETX
   vtkIdType NumberOfEdges;
diff --git a/Filtering/vtkHexagonalPrism.cxx b/Filtering/vtkHexagonalPrism.cxx
index 7604a1cfbd6a3bda6030c39250a3bc0c7af9c487..455ba9b9e6dbf1900f58b98d929bc33c59d1eea7 100644
--- a/Filtering/vtkHexagonalPrism.cxx
+++ b/Filtering/vtkHexagonalPrism.cxx
@@ -29,7 +29,6 @@
 #include "vtkMath.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkHexagonalPrism, "1.7");
 vtkStandardNewMacro(vtkHexagonalPrism);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkHexagonalPrism.h b/Filtering/vtkHexagonalPrism.h
index f7d10fd30e9ad64031b09ee6419bbdc206ed3d22..524f6ef69077efa7ffb74dee7d27626fbbf94a42 100644
--- a/Filtering/vtkHexagonalPrism.h
+++ b/Filtering/vtkHexagonalPrism.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkHexagonalPrism : public vtkCell3D
 {
 public:
   static vtkHexagonalPrism *New();
-  vtkTypeRevisionMacro(vtkHexagonalPrism,vtkCell3D);
+  vtkTypeMacro(vtkHexagonalPrism,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHexahedron.cxx b/Filtering/vtkHexahedron.cxx
index 348adcd84eb2baacb0b00a64c1576c5ec12d8862..b1ff1448e8249a988e5380bd39e58469a0af4a7f 100644
--- a/Filtering/vtkHexahedron.cxx
+++ b/Filtering/vtkHexahedron.cxx
@@ -24,7 +24,6 @@
 #include "vtkPoints.h"
 #include "vtkQuad.h"
 
-vtkCxxRevisionMacro(vtkHexahedron, "1.6");
 vtkStandardNewMacro(vtkHexahedron);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkHexahedron.h b/Filtering/vtkHexahedron.h
index 197c9e1cfcf0fb6db29a60835c0465bb74f75337..c20f7315e4e01afd834775b67a70dae989e9a6d9 100644
--- a/Filtering/vtkHexahedron.h
+++ b/Filtering/vtkHexahedron.h
@@ -38,7 +38,7 @@ class VTK_FILTERING_EXPORT vtkHexahedron : public vtkCell3D
 {
 public:
   static vtkHexahedron *New();
-  vtkTypeRevisionMacro(vtkHexahedron,vtkCell3D);
+  vtkTypeMacro(vtkHexahedron,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHierarchicalBoxDataIterator.cxx b/Filtering/vtkHierarchicalBoxDataIterator.cxx
index 37d85e6050d702335e9107861924ff7cf3210f5f..0c912c8cd899f884b33f46a8145e8966893bb204 100644
--- a/Filtering/vtkHierarchicalBoxDataIterator.cxx
+++ b/Filtering/vtkHierarchicalBoxDataIterator.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkHierarchicalBoxDataIterator);
-vtkCxxRevisionMacro(vtkHierarchicalBoxDataIterator, "1.1");
 //----------------------------------------------------------------------------
 vtkHierarchicalBoxDataIterator::vtkHierarchicalBoxDataIterator()
 {
diff --git a/Filtering/vtkHierarchicalBoxDataIterator.h b/Filtering/vtkHierarchicalBoxDataIterator.h
index 1c7c3fe99c39bdb7c3e8377a1a53e3d3d26ac7f0..cae4d2b71e6b051cbc1c32f93a336e6a062fcd4e 100644
--- a/Filtering/vtkHierarchicalBoxDataIterator.h
+++ b/Filtering/vtkHierarchicalBoxDataIterator.h
@@ -25,7 +25,7 @@ class VTK_FILTERING_EXPORT vtkHierarchicalBoxDataIterator : public vtkCompositeD
 {
 public:
   static vtkHierarchicalBoxDataIterator* New();
-  vtkTypeRevisionMacro(vtkHierarchicalBoxDataIterator, vtkCompositeDataIterator);
+  vtkTypeMacro(vtkHierarchicalBoxDataIterator, vtkCompositeDataIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHierarchicalBoxDataSet.cxx b/Filtering/vtkHierarchicalBoxDataSet.cxx
index c278b6f926ddd331e49d27fec2d78ba2bc142f26..e245f4adc9f145a03606641cd1eeb221483ee35e 100644
--- a/Filtering/vtkHierarchicalBoxDataSet.cxx
+++ b/Filtering/vtkHierarchicalBoxDataSet.cxx
@@ -30,7 +30,6 @@
 #include <vtkstd/vector>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkHierarchicalBoxDataSet, "1.27");
 vtkStandardNewMacro(vtkHierarchicalBoxDataSet);
 
 vtkInformationKeyMacro(vtkHierarchicalBoxDataSet,BOX,IntegerVector);
diff --git a/Filtering/vtkHierarchicalBoxDataSet.h b/Filtering/vtkHierarchicalBoxDataSet.h
index be398849071d4ffa1c8a4013585df2baa7d6a639..f8ed7bf078ec8e3a2f5baf17a25f40b0f9734c31 100644
--- a/Filtering/vtkHierarchicalBoxDataSet.h
+++ b/Filtering/vtkHierarchicalBoxDataSet.h
@@ -52,7 +52,7 @@ class VTK_FILTERING_EXPORT vtkHierarchicalBoxDataSet : public vtkCompositeDataSe
 {
 public:
   static vtkHierarchicalBoxDataSet *New();
-  vtkTypeRevisionMacro(vtkHierarchicalBoxDataSet,vtkCompositeDataSet);
+  vtkTypeMacro(vtkHierarchicalBoxDataSet,vtkCompositeDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx b/Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx
index d44ff128dc042b056781462bff3e81668c814e90..e1f039c194eb02cc405f3d86690a4c223e52720e 100644
--- a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx
+++ b/Filtering/vtkHierarchicalBoxDataSetAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkHierarchicalBoxDataSetAlgorithm);
-vtkCxxRevisionMacro(vtkHierarchicalBoxDataSetAlgorithm, "1.1");
 //----------------------------------------------------------------------------
 vtkHierarchicalBoxDataSetAlgorithm::vtkHierarchicalBoxDataSetAlgorithm()
 {
diff --git a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.h b/Filtering/vtkHierarchicalBoxDataSetAlgorithm.h
index ae20f7da5b5fd71aa4cc036232bd3952ed44ebf3..846c1567597794859d0b4fa560b4822809363fa0 100644
--- a/Filtering/vtkHierarchicalBoxDataSetAlgorithm.h
+++ b/Filtering/vtkHierarchicalBoxDataSetAlgorithm.h
@@ -29,7 +29,7 @@ class VTK_FILTERING_EXPORT vtkHierarchicalBoxDataSetAlgorithm : public vtkAlgori
 {
 public:
   static vtkHierarchicalBoxDataSetAlgorithm* New();
-  vtkTypeRevisionMacro(vtkHierarchicalBoxDataSetAlgorithm, vtkAlgorithm);
+  vtkTypeMacro(vtkHierarchicalBoxDataSetAlgorithm, vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHyperOctree.cxx b/Filtering/vtkHyperOctree.cxx
index 721de72e3e798dade31b684f066d037b018120c6..f23f705908a7c215bd9a2888e47b79749b414895 100644
--- a/Filtering/vtkHyperOctree.cxx
+++ b/Filtering/vtkHyperOctree.cxx
@@ -50,7 +50,7 @@ class vtkHyperOctreeInternal
   : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeInternal,vtkObject);
+  vtkTypeMacro(vtkHyperOctreeInternal,vtkObject);
   virtual void Initialize()=0;
   virtual vtkHyperOctreeCursor *NewCursor()=0;
   virtual vtkIdType GetNumberOfLeaves()=0;
@@ -114,7 +114,6 @@ void vtkHyperOctree::PrintSelf(ostream& os, vtkIndent indent)
 }
 
 
-vtkCxxRevisionMacro(vtkHyperOctreeInternal, "1.23");
 
 template<unsigned int D> class vtkCompactHyperOctree;
 template<unsigned int D> class vtkCompactHyperOctreeNode;
@@ -139,7 +138,7 @@ public:
         }
     }
   
-  vtkTypeRevisionMacro(vtkCompactHyperOctreeCursor<D>,vtkHyperOctreeCursor);
+  vtkTypeMacro(vtkCompactHyperOctreeCursor<D>,vtkHyperOctreeCursor);
   
   //---------------------------------------------------------------------------
   // Initialization
@@ -517,16 +516,6 @@ private:
   void operator=(const vtkCompactHyperOctreeCursor<D> &);    // Not implemented.
 };
 
-// vtkCxxRevisionMacro(vtkCompactHyperOctreeCursor, "1.23");
-template<unsigned int D>
-void vtkCompactHyperOctreeCursor<D>::CollectRevisions(ostream& sos)
-{
-  vtkOStreamWrapper os(sos);
-  this->Superclass::CollectRevisions(os);
-  os << "vtkCompactHyperOctreeCursor<" << D <<"> " << "1.23" << '\n';
-}
-  
-
 // D is the dimension of the space
 // D>=1 && D<=3
 // So its not really a generi class because the template argument
@@ -655,8 +644,6 @@ protected:
   int Children[1<<D]; // indices
 };
 
-//vtkCxxRevisionMacro(vtkCompactHyperOctree, "1.23");
-
 template<unsigned int D> class vtkCompactHyperOctree
   : public vtkHyperOctreeInternal
 {
@@ -677,7 +664,7 @@ public:
         }
     }
   
-  vtkTypeRevisionMacro(vtkCompactHyperOctree<D>,vtkHyperOctreeInternal);
+  vtkTypeMacro(vtkCompactHyperOctree<D>,vtkHyperOctreeInternal);
   
   //---------------------------------------------------------------------------
   // Description:
@@ -960,21 +947,10 @@ private:
   void operator=(const vtkCompactHyperOctree<D> &);    // Not implemented.
 };
 
-// vtkCxxRevisionMacro(vtkCompactHyperOctree, "1.23");
-template<unsigned int D>
-void vtkCompactHyperOctree<D>::CollectRevisions(ostream& sos)
-{
-  vtkOStreamWrapper os(sos);
-  this->Superclass::CollectRevisions(os);
-  os << "vtkCompactHyperOctree<" << D <<"> " << "1.23" << '\n';
-}
-  
-
 // octree: vtkHyperOctreeInternal<3>
 // quadtree: vtkHyperOctreeInternal<2>
 // bittree: vtkHyperOctreeInternal<1>
 
-vtkCxxRevisionMacro(vtkHyperOctree, "1.23");
 vtkStandardNewMacro(vtkHyperOctree);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkHyperOctree.h b/Filtering/vtkHyperOctree.h
index 6fdf8612f0c42496a07ee860c76ca1b453505cdb..a1cd938790be8d3daca5d8fa5536dd558dd6b5e2 100644
--- a/Filtering/vtkHyperOctree.h
+++ b/Filtering/vtkHyperOctree.h
@@ -144,7 +144,7 @@ public:
   static vtkInformationDoubleVectorKey* SIZES();
   static vtkHyperOctree *New();
   
-  vtkTypeRevisionMacro(vtkHyperOctree,vtkDataSet);
+  vtkTypeMacro(vtkHyperOctree,vtkDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkHyperOctreeAlgorithm.cxx b/Filtering/vtkHyperOctreeAlgorithm.cxx
index 01a766d6a9c4ea074517894bb21904cff9add65f..410a09448cc27924f3924079578ad23b6ae6eaf7 100644
--- a/Filtering/vtkHyperOctreeAlgorithm.cxx
+++ b/Filtering/vtkHyperOctreeAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeAlgorithm, "1.1");
 
 //----------------------------------------------------------------------------
 vtkHyperOctreeAlgorithm::vtkHyperOctreeAlgorithm()
diff --git a/Filtering/vtkHyperOctreeAlgorithm.h b/Filtering/vtkHyperOctreeAlgorithm.h
index 7181ff0d1f30174b60a7ec5a7334fb6c73e9da7f..3df12d05cac30a865af5171af0cbe66955b1be47 100644
--- a/Filtering/vtkHyperOctreeAlgorithm.h
+++ b/Filtering/vtkHyperOctreeAlgorithm.h
@@ -43,7 +43,7 @@ class vtkHyperOctree;
 class VTK_FILTERING_EXPORT vtkHyperOctreeAlgorithm : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkHyperOctreeCursor.cxx b/Filtering/vtkHyperOctreeCursor.cxx
index 699e6ea1b7fcd14bd170f5147353b485652eb5e5..e3de8706645380b6bfecd3eb42a6df51ab5b401a 100644
--- a/Filtering/vtkHyperOctreeCursor.cxx
+++ b/Filtering/vtkHyperOctreeCursor.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkHyperOctreeCursor.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeCursor, "1.1");
 
 //-----------------------------------------------------------------------------
 // Constructor.
diff --git a/Filtering/vtkHyperOctreeCursor.h b/Filtering/vtkHyperOctreeCursor.h
index 6cfad5c0033688759ff1a81cb24857c1713c3fe4..4be427b1a0dfae73c3eb449b4ff952e2ba684051 100644
--- a/Filtering/vtkHyperOctreeCursor.h
+++ b/Filtering/vtkHyperOctreeCursor.h
@@ -47,7 +47,7 @@ const int VTK_BINARY_TREE_CHILD_RIGHT=VTK_QUADTREE_CHILD_SE;
 class VTK_FILTERING_EXPORT vtkHyperOctreeCursor : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeCursor,vtkObject);
+  vtkTypeMacro(vtkHyperOctreeCursor,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkHyperOctreePointsGrabber.cxx b/Filtering/vtkHyperOctreePointsGrabber.cxx
index 50e70d8e976206319150c41dce01bb8c20c4691c..f5ca29728e15cafe3cf61086373d927468f72dfb 100644
--- a/Filtering/vtkHyperOctreePointsGrabber.cxx
+++ b/Filtering/vtkHyperOctreePointsGrabber.cxx
@@ -16,7 +16,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkHyperOctreePointsGrabber, "1.1");
 
 //-----------------------------------------------------------------------------
 // Default constructor.
diff --git a/Filtering/vtkHyperOctreePointsGrabber.h b/Filtering/vtkHyperOctreePointsGrabber.h
index 210a0aad1e5a53923437c4e4c8950af312f493a2..6ac9dfc5b07b63f4dc9119921fd58f4ae7cb6596 100644
--- a/Filtering/vtkHyperOctreePointsGrabber.h
+++ b/Filtering/vtkHyperOctreePointsGrabber.h
@@ -31,7 +31,7 @@
 class VTK_FILTERING_EXPORT vtkHyperOctreePointsGrabber : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreePointsGrabber,vtkObject);
+  vtkTypeMacro(vtkHyperOctreePointsGrabber,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkImageAlgorithm.cxx b/Filtering/vtkImageAlgorithm.cxx
index 74802b164fec0392a26333720d9094d56876aa24..8fcf9556993f40d581292a0147cdece121f6abd5 100644
--- a/Filtering/vtkImageAlgorithm.cxx
+++ b/Filtering/vtkImageAlgorithm.cxx
@@ -23,7 +23,6 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageAlgorithm, "1.33");
 
 //----------------------------------------------------------------------------
 vtkImageAlgorithm::vtkImageAlgorithm()
diff --git a/Filtering/vtkImageAlgorithm.h b/Filtering/vtkImageAlgorithm.h
index 625a45dbb53c7c0fd471fccd6a34f84b9b5c3a11..e94e3e08d4d98b46c9a870dff72f8492bdc6a41f 100644
--- a/Filtering/vtkImageAlgorithm.h
+++ b/Filtering/vtkImageAlgorithm.h
@@ -33,7 +33,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkImageAlgorithm : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkImageAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageData.cxx b/Filtering/vtkImageData.cxx
index de23b3a0d0faaca21a0b427958101cac9f512361..6190f3d162ccdce47c2cafd6a2e1958eab9678e5 100644
--- a/Filtering/vtkImageData.cxx
+++ b/Filtering/vtkImageData.cxx
@@ -31,7 +31,6 @@
 #include "vtkVertex.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkImageData, "1.42");
 vtkStandardNewMacro(vtkImageData);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkImageData.h b/Filtering/vtkImageData.h
index d4ebf660fdb17298e2b9c1617d9bb89204b6f52e..3f21d2cd9ba643035781c7c0569ef43b1ae6c850 100644
--- a/Filtering/vtkImageData.h
+++ b/Filtering/vtkImageData.h
@@ -37,7 +37,7 @@ class VTK_FILTERING_EXPORT vtkImageData : public vtkDataSet
 public:
   static vtkImageData *New();
 
-  vtkTypeRevisionMacro(vtkImageData,vtkDataSet);
+  vtkTypeMacro(vtkImageData,vtkDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageInPlaceFilter.cxx b/Filtering/vtkImageInPlaceFilter.cxx
index 33cc4f49577c1cec932e4dd941bbf06c0028ef06..790cbb8ce38278749ff01300212c50d5dd6bdbdc 100644
--- a/Filtering/vtkImageInPlaceFilter.cxx
+++ b/Filtering/vtkImageInPlaceFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageInPlaceFilter, "1.46");
 
 //----------------------------------------------------------------------------
 vtkImageInPlaceFilter::vtkImageInPlaceFilter()
diff --git a/Filtering/vtkImageInPlaceFilter.h b/Filtering/vtkImageInPlaceFilter.h
index 4d3649ecf2b3ea463459859912498129d8dd0ca6..4f1e2ae0e59c521f8dafc4158f545dbf2173eac8 100644
--- a/Filtering/vtkImageInPlaceFilter.h
+++ b/Filtering/vtkImageInPlaceFilter.h
@@ -31,7 +31,7 @@
 class VTK_FILTERING_EXPORT vtkImageInPlaceFilter : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageInPlaceFilter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageInPlaceFilter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Filtering/vtkImageMultipleInputFilter.cxx b/Filtering/vtkImageMultipleInputFilter.cxx
index 0ed4c8d15b2c2e213f360f0b20603eb0253037fa..90c79b80872223ba25cd0e7a223e6775b1ba6c0a 100644
--- a/Filtering/vtkImageMultipleInputFilter.cxx
+++ b/Filtering/vtkImageMultipleInputFilter.cxx
@@ -19,7 +19,6 @@
 #include "vtkMultiThreader.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageMultipleInputFilter, "1.67");
 
 //----------------------------------------------------------------------------
 vtkImageMultipleInputFilter::vtkImageMultipleInputFilter()
diff --git a/Filtering/vtkImageMultipleInputFilter.h b/Filtering/vtkImageMultipleInputFilter.h
index fe55f72ed875bfb27bae4191c7b131dad020455e..feda79a0cbf223a2132e8b2d3892ae4a9b00d973 100644
--- a/Filtering/vtkImageMultipleInputFilter.h
+++ b/Filtering/vtkImageMultipleInputFilter.h
@@ -32,7 +32,7 @@ class vtkMultiThreader;
 class VTK_FILTERING_EXPORT vtkImageMultipleInputFilter : public vtkImageSource
 {
 public:
-  vtkTypeRevisionMacro(vtkImageMultipleInputFilter,vtkImageSource);
+  vtkTypeMacro(vtkImageMultipleInputFilter,vtkImageSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageMultipleInputOutputFilter.cxx b/Filtering/vtkImageMultipleInputOutputFilter.cxx
index 42b513f2600232e643866180a5e2cb1fcbcc7548..d7305e65483238849ddee213af1a1de4320539c0 100644
--- a/Filtering/vtkImageMultipleInputOutputFilter.cxx
+++ b/Filtering/vtkImageMultipleInputOutputFilter.cxx
@@ -18,7 +18,6 @@
 #include "vtkMultiThreader.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageMultipleInputOutputFilter, "1.15");
 
 //----------------------------------------------------------------------------
 vtkImageMultipleInputOutputFilter::vtkImageMultipleInputOutputFilter()
diff --git a/Filtering/vtkImageMultipleInputOutputFilter.h b/Filtering/vtkImageMultipleInputOutputFilter.h
index 99df7939b31eb401184253933c5c280ce6d7e01e..bfe155322ab0611305a7ae56c9e74974bc471eee 100644
--- a/Filtering/vtkImageMultipleInputOutputFilter.h
+++ b/Filtering/vtkImageMultipleInputOutputFilter.h
@@ -32,7 +32,7 @@
 class VTK_FILTERING_EXPORT vtkImageMultipleInputOutputFilter : public vtkImageMultipleInputFilter
 {
 public:
-  vtkTypeRevisionMacro(vtkImageMultipleInputOutputFilter,vtkImageMultipleInputFilter);
+  vtkTypeMacro(vtkImageMultipleInputOutputFilter,vtkImageMultipleInputFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageSource.cxx b/Filtering/vtkImageSource.cxx
index a9c574f3bb89b9e8f423668577ca0051d54c7168..ebc94ae78a392f413ea7bc3e9ec0cf154b07507b 100644
--- a/Filtering/vtkImageSource.cxx
+++ b/Filtering/vtkImageSource.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageSource, "1.64");
 
 //----------------------------------------------------------------------------
 vtkImageSource::vtkImageSource()
diff --git a/Filtering/vtkImageSource.h b/Filtering/vtkImageSource.h
index 723af062e38ab5871c435cf153f020be72925edc..0278b28be92fdbe783f17e704b43b91a4d8325bd 100644
--- a/Filtering/vtkImageSource.h
+++ b/Filtering/vtkImageSource.h
@@ -32,7 +32,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkImageSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkImageSource,vtkSource);
+  vtkTypeMacro(vtkImageSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageToImageFilter.cxx b/Filtering/vtkImageToImageFilter.cxx
index 6d19a7b8e5103b881e7b68e7fe521ab1eebf2da2..6024addd8b4f740484e361ac94028978ee9a9151 100644
--- a/Filtering/vtkImageToImageFilter.cxx
+++ b/Filtering/vtkImageToImageFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageToImageFilter, "1.64");
 
 //----------------------------------------------------------------------------
 vtkImageToImageFilter::vtkImageToImageFilter()
diff --git a/Filtering/vtkImageToImageFilter.h b/Filtering/vtkImageToImageFilter.h
index 31ad0fa7c6e5a0242651c52b6011581d7e894515..0965001407bf863516505514856fc09d847cfd0d 100644
--- a/Filtering/vtkImageToImageFilter.h
+++ b/Filtering/vtkImageToImageFilter.h
@@ -37,7 +37,7 @@ class vtkMultiThreader;
 class VTK_FILTERING_EXPORT vtkImageToImageFilter : public vtkImageSource
 {
 public:
-  vtkTypeRevisionMacro(vtkImageToImageFilter,vtkImageSource);
+  vtkTypeMacro(vtkImageToImageFilter,vtkImageSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImageToStructuredPoints.cxx b/Filtering/vtkImageToStructuredPoints.cxx
index dc45785ced97d5347e837713d83d3b805b808ff1..02fda9286ac222496366132187abed47015907af 100644
--- a/Filtering/vtkImageToStructuredPoints.cxx
+++ b/Filtering/vtkImageToStructuredPoints.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageToStructuredPoints, "1.65");
 vtkStandardNewMacro(vtkImageToStructuredPoints);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkImageToStructuredPoints.h b/Filtering/vtkImageToStructuredPoints.h
index 05f69b39328321a26564246aec618eeef420b808..2fdbdbadecb5c7e3f681342ab905528ffa299e32 100644
--- a/Filtering/vtkImageToStructuredPoints.h
+++ b/Filtering/vtkImageToStructuredPoints.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkImageToStructuredPoints : public vtkImageAlgorithm
 {
 public:
   static vtkImageToStructuredPoints *New();
-  vtkTypeRevisionMacro(vtkImageToStructuredPoints,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageToStructuredPoints,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkImageTwoInputFilter.cxx b/Filtering/vtkImageTwoInputFilter.cxx
index 1a16aeee703eb97bf0bbc8764311d299035004f6..331571056a814907b4cd2e048eab9f1316353eb7 100644
--- a/Filtering/vtkImageTwoInputFilter.cxx
+++ b/Filtering/vtkImageTwoInputFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageTwoInputFilter, "1.28");
 
 //----------------------------------------------------------------------------
 vtkImageTwoInputFilter::vtkImageTwoInputFilter()
diff --git a/Filtering/vtkImageTwoInputFilter.h b/Filtering/vtkImageTwoInputFilter.h
index 392fea106d9c4533bef198f60f61f064f9b52e26..5fc3af90c0105a14e489a2117ef88db9a3d19e6a 100644
--- a/Filtering/vtkImageTwoInputFilter.h
+++ b/Filtering/vtkImageTwoInputFilter.h
@@ -28,7 +28,7 @@
 class VTK_FILTERING_EXPORT vtkImageTwoInputFilter : public vtkImageMultipleInputFilter
 {
 public:
-  vtkTypeRevisionMacro(vtkImageTwoInputFilter,vtkImageMultipleInputFilter);
+  vtkTypeMacro(vtkImageTwoInputFilter,vtkImageMultipleInputFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkImplicitBoolean.cxx b/Filtering/vtkImplicitBoolean.cxx
index b0391d8414e71840c9707a83df3875a014386da5..72442fd4983176f7abcc50f7cdd2f02ec72c7007 100644
--- a/Filtering/vtkImplicitBoolean.cxx
+++ b/Filtering/vtkImplicitBoolean.cxx
@@ -19,7 +19,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImplicitBoolean, "1.36");
 vtkStandardNewMacro(vtkImplicitBoolean);
 
 // Construct with union operation.
diff --git a/Filtering/vtkImplicitBoolean.h b/Filtering/vtkImplicitBoolean.h
index 3ab82eb29299697924304af817b806bd7b92e96e..148bc5fa86996583d8165a6a58b0d397353e20dc 100644
--- a/Filtering/vtkImplicitBoolean.h
+++ b/Filtering/vtkImplicitBoolean.h
@@ -44,7 +44,7 @@ class vtkImplicitFunctionCollection;
 class VTK_FILTERING_EXPORT vtkImplicitBoolean : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitBoolean,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitBoolean,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImplicitDataSet.cxx b/Filtering/vtkImplicitDataSet.cxx
index 14801e9c1ef275856393506f2c4160ec0d06c064..c7a3eb438c7f28fe7042713c17f860764dba5fe3 100644
--- a/Filtering/vtkImplicitDataSet.cxx
+++ b/Filtering/vtkImplicitDataSet.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImplicitDataSet, "1.27");
 vtkStandardNewMacro(vtkImplicitDataSet);
 vtkCxxSetObjectMacro(vtkImplicitDataSet,DataSet,vtkDataSet);
 
diff --git a/Filtering/vtkImplicitDataSet.h b/Filtering/vtkImplicitDataSet.h
index 6f6cbaac62be1178a6723970f8fb8b49a16b3d56..ce7b971274bee690d212091c2c8d1a704dbe2e1e 100644
--- a/Filtering/vtkImplicitDataSet.h
+++ b/Filtering/vtkImplicitDataSet.h
@@ -44,7 +44,7 @@ class vtkDataSet;
 class VTK_FILTERING_EXPORT vtkImplicitDataSet : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitDataSet,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitDataSet,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkImplicitHalo.cxx b/Filtering/vtkImplicitHalo.cxx
index be11c9c72624b29c2ee7df8b2fb00f4566d8a6e6..f8f46c4409409c0c7950ee81fdf932acd14ab6ee 100644
--- a/Filtering/vtkImplicitHalo.cxx
+++ b/Filtering/vtkImplicitHalo.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkImplicitHalo, "1.1");
 vtkStandardNewMacro(vtkImplicitHalo);
 
 // ----------------------------------------------------------------------------
diff --git a/Filtering/vtkImplicitHalo.h b/Filtering/vtkImplicitHalo.h
index ad6c063f1bde448358af4b464e89618ff0250c57..9bba9954cf425a380b272ec509049f7747230ef9 100644
--- a/Filtering/vtkImplicitHalo.h
+++ b/Filtering/vtkImplicitHalo.h
@@ -38,7 +38,7 @@ public:
   // Center=(0.0,0.0,0.0), Radius=1.0, FadeOut=0.01
   static vtkImplicitHalo *New();
 
-  vtkTypeRevisionMacro(vtkImplicitHalo,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitHalo,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Filtering/vtkImplicitSelectionLoop.cxx b/Filtering/vtkImplicitSelectionLoop.cxx
index b319098e6ee58769e0e0533decfee031d51a5c92..5a0564cb1499573d1c4d23c52048d1e0bdee20c8 100644
--- a/Filtering/vtkImplicitSelectionLoop.cxx
+++ b/Filtering/vtkImplicitSelectionLoop.cxx
@@ -22,7 +22,6 @@
 #include "vtkPoints.h"
 #include "vtkPolygon.h"
 
-vtkCxxRevisionMacro(vtkImplicitSelectionLoop, "1.21");
 vtkStandardNewMacro(vtkImplicitSelectionLoop);
 vtkCxxSetObjectMacro(vtkImplicitSelectionLoop, Loop,vtkPoints);
 
diff --git a/Filtering/vtkImplicitSelectionLoop.h b/Filtering/vtkImplicitSelectionLoop.h
index 5272b910b8bbdeff68bc9711336815b177009394..f922881ee6dd0f59305d3c929fecef1450cabab4 100644
--- a/Filtering/vtkImplicitSelectionLoop.h
+++ b/Filtering/vtkImplicitSelectionLoop.h
@@ -55,7 +55,7 @@ class VTK_FILTERING_EXPORT vtkImplicitSelectionLoop : public vtkImplicitFunction
 public:
   // Description:
   // Standard VTK methods for printing and type information.
-  vtkTypeRevisionMacro(vtkImplicitSelectionLoop,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitSelectionLoop,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImplicitSum.cxx b/Filtering/vtkImplicitSum.cxx
index ba9c2c7aeaf5442a03d89bd4fd7e681dbc5849eb..e054bbd24090943613755501b2ac465409c985b2 100644
--- a/Filtering/vtkImplicitSum.cxx
+++ b/Filtering/vtkImplicitSum.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImplicitSum, "1.7");
 vtkStandardNewMacro(vtkImplicitSum);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkImplicitSum.h b/Filtering/vtkImplicitSum.h
index e5cd3aa5c1ba1957afd6fb8dc2a70f8bfaa63524..9a258304edc0fd6a8061e4653e11b27f2801bca6 100644
--- a/Filtering/vtkImplicitSum.h
+++ b/Filtering/vtkImplicitSum.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkImplicitSum : public vtkImplicitFunction
 public:
   static vtkImplicitSum *New();
 
-  vtkTypeRevisionMacro(vtkImplicitSum,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitSum,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkImplicitVolume.cxx b/Filtering/vtkImplicitVolume.cxx
index 50236e67e70bd2d376c6a28387b015506ea60311..283adf9b28089472038f5cf7b77e86ce6da17fbc 100644
--- a/Filtering/vtkImplicitVolume.cxx
+++ b/Filtering/vtkImplicitVolume.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointData.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkImplicitVolume, "1.34");
 vtkStandardNewMacro(vtkImplicitVolume);
 vtkCxxSetObjectMacro(vtkImplicitVolume,Volume,vtkImageData);
 
diff --git a/Filtering/vtkImplicitVolume.h b/Filtering/vtkImplicitVolume.h
index 70650e36b694f1a11f0138efcd20c811215fcbdb..f19bb787a398cb64a3bc3509ce535e4d6dbe33f1 100644
--- a/Filtering/vtkImplicitVolume.h
+++ b/Filtering/vtkImplicitVolume.h
@@ -45,7 +45,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkImplicitVolume : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitVolume,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitVolume,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkImplicitWindowFunction.cxx b/Filtering/vtkImplicitWindowFunction.cxx
index 76ae4b8937d6969c120ce3c6c5cafbec96067df2..6f32b8f24a36531b559fd099976ea4b2fe12bba5 100644
--- a/Filtering/vtkImplicitWindowFunction.cxx
+++ b/Filtering/vtkImplicitWindowFunction.cxx
@@ -17,7 +17,6 @@
 #include "vtkGarbageCollector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImplicitWindowFunction, "1.21");
 vtkStandardNewMacro(vtkImplicitWindowFunction);
 vtkCxxSetObjectMacro(vtkImplicitWindowFunction,ImplicitFunction,vtkImplicitFunction);
 
diff --git a/Filtering/vtkImplicitWindowFunction.h b/Filtering/vtkImplicitWindowFunction.h
index 3773641b26638b375f28609d0c25d9ae90de41d9..4f34b419937af281b07ecc77c2725c54d19cbd7c 100644
--- a/Filtering/vtkImplicitWindowFunction.h
+++ b/Filtering/vtkImplicitWindowFunction.h
@@ -35,7 +35,7 @@
 class VTK_FILTERING_EXPORT vtkImplicitWindowFunction : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitWindowFunction,vtkImplicitFunction);
+  vtkTypeMacro(vtkImplicitWindowFunction,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkInEdgeIterator.cxx b/Filtering/vtkInEdgeIterator.cxx
index 1afb08c470a1f910db2904d7e1833e566e557026..652c7519152217b380180076b4326159d9af5bad 100644
--- a/Filtering/vtkInEdgeIterator.cxx
+++ b/Filtering/vtkInEdgeIterator.cxx
@@ -25,7 +25,6 @@
 #include "vtkGraphEdge.h"
 
 vtkCxxSetObjectMacro(vtkInEdgeIterator, Graph, vtkGraph);
-vtkCxxRevisionMacro(vtkInEdgeIterator, "1.2");
 vtkStandardNewMacro(vtkInEdgeIterator);
 //----------------------------------------------------------------------------
 vtkInEdgeIterator::vtkInEdgeIterator()
diff --git a/Filtering/vtkInEdgeIterator.h b/Filtering/vtkInEdgeIterator.h
index f48ba15ee52b2a1b07fb85764bbbecbfe9612a6e..11937b02686c9e73cc8350e5a09cc543ba4f1761 100644
--- a/Filtering/vtkInEdgeIterator.h
+++ b/Filtering/vtkInEdgeIterator.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkInEdgeIterator : public vtkObject
 {
 public:
   static vtkInEdgeIterator *New();
-  vtkTypeRevisionMacro(vtkInEdgeIterator, vtkObject);
+  vtkTypeMacro(vtkInEdgeIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkIncrementalOctreeNode.cxx b/Filtering/vtkIncrementalOctreeNode.cxx
index 7c5b0612be3da629116268334b80856890bb20c4..828542cebca3faaba1f1e1be35b08a26a3edc8bd 100644
--- a/Filtering/vtkIncrementalOctreeNode.cxx
+++ b/Filtering/vtkIncrementalOctreeNode.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkIncrementalOctreeNode.h"
 
-vtkCxxRevisionMacro( vtkIncrementalOctreeNode, "1.7" );
 vtkStandardNewMacro( vtkIncrementalOctreeNode );
 
 vtkCxxSetObjectMacro( vtkIncrementalOctreeNode, PointIdSet, vtkIdList );
diff --git a/Filtering/vtkIncrementalOctreeNode.h b/Filtering/vtkIncrementalOctreeNode.h
index 2d9a4ea320943868712d19c126f0d8192ae25155..1e888f81a81d3fc4f792f61931864498f448d874 100644
--- a/Filtering/vtkIncrementalOctreeNode.h
+++ b/Filtering/vtkIncrementalOctreeNode.h
@@ -64,7 +64,7 @@ class vtkIdList;
 class VTK_FILTERING_EXPORT vtkIncrementalOctreeNode : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro( vtkIncrementalOctreeNode, vtkObject );
+  vtkTypeMacro( vtkIncrementalOctreeNode, vtkObject );
   void PrintSelf( ostream & os, vtkIndent indent );
 
   static vtkIncrementalOctreeNode * New();
diff --git a/Filtering/vtkIncrementalOctreePointLocator.cxx b/Filtering/vtkIncrementalOctreePointLocator.cxx
index 2784fc6041bf19b49565c0ff0e25317d6463f0f6..d2849d0407c69b497a4bb80eb2dd910dba10ae8f 100644
--- a/Filtering/vtkIncrementalOctreePointLocator.cxx
+++ b/Filtering/vtkIncrementalOctreePointLocator.cxx
@@ -31,7 +31,6 @@
 #include <vtkstd/queue>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro( vtkIncrementalOctreePointLocator, "1.3" );
 vtkStandardNewMacro( vtkIncrementalOctreePointLocator );
 
 // ---------------------------------------------------------------------------
diff --git a/Filtering/vtkIncrementalOctreePointLocator.h b/Filtering/vtkIncrementalOctreePointLocator.h
index 45bcc54848bfceba74ae30430d5e6e01cd310f22..103fae654eb4dfc296500b36d653ea75184d6924 100644
--- a/Filtering/vtkIncrementalOctreePointLocator.h
+++ b/Filtering/vtkIncrementalOctreePointLocator.h
@@ -57,7 +57,7 @@ class VTK_FILTERING_EXPORT vtkIncrementalOctreePointLocator : public vtkIncremen
 {
 public:
  
-  vtkTypeRevisionMacro( vtkIncrementalOctreePointLocator, vtkIncrementalPointLocator );
+  vtkTypeMacro( vtkIncrementalOctreePointLocator, vtkIncrementalPointLocator );
   void PrintSelf( ostream & os, vtkIndent indent );
 
   static vtkIncrementalOctreePointLocator * New();
diff --git a/Filtering/vtkIncrementalPointLocator.cxx b/Filtering/vtkIncrementalPointLocator.cxx
index 377474434c01dbfc55b853e41b096163abd3f171..ae4afb7a9534c7646c6aa3f73a4f4c6ff5a5f114 100644
--- a/Filtering/vtkIncrementalPointLocator.cxx
+++ b/Filtering/vtkIncrementalPointLocator.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro( vtkIncrementalPointLocator, "1.1" );
 
 vtkIncrementalPointLocator::vtkIncrementalPointLocator()
 {
diff --git a/Filtering/vtkIncrementalPointLocator.h b/Filtering/vtkIncrementalPointLocator.h
index fb928bc0d07f9cedebaf14f8de2a31cdec36cedd..c929d3a214c7e4c014cd5410837e3b4b3c596a25 100644
--- a/Filtering/vtkIncrementalPointLocator.h
+++ b/Filtering/vtkIncrementalPointLocator.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkIncrementalPointLocator : public vtkAbstractPointL
 {
 public:
 
-  vtkTypeRevisionMacro( vtkIncrementalPointLocator, vtkAbstractPointLocator );
+  vtkTypeMacro( vtkIncrementalPointLocator, vtkAbstractPointLocator );
   void PrintSelf( ostream & os, vtkIndent indent );
   
   // Description:
diff --git a/Filtering/vtkInformationExecutivePortKey.cxx b/Filtering/vtkInformationExecutivePortKey.cxx
index 3c490b051c5b3e84e0b6c1f5b73d1812701d2ced..220125f78d339f4fe18deb5deebfeb10b0edf2ad 100644
--- a/Filtering/vtkInformationExecutivePortKey.cxx
+++ b/Filtering/vtkInformationExecutivePortKey.cxx
@@ -18,7 +18,6 @@
 #include "vtkInformation.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkInformationExecutivePortKey, "1.9");
 
 //----------------------------------------------------------------------------
 vtkInformationExecutivePortKey::vtkInformationExecutivePortKey(const char* name, const char* location):
diff --git a/Filtering/vtkInformationExecutivePortKey.h b/Filtering/vtkInformationExecutivePortKey.h
index c56e4bc4a737a6221a98a14da3b5b6136aebecfc..e11297bb40208bebd0fd301a4e77ab30733f2c5a 100644
--- a/Filtering/vtkInformationExecutivePortKey.h
+++ b/Filtering/vtkInformationExecutivePortKey.h
@@ -30,7 +30,7 @@ class vtkExecutive;
 class VTK_FILTERING_EXPORT vtkInformationExecutivePortKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationExecutivePortKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationExecutivePortKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationExecutivePortKey(const char* name, const char* location);
diff --git a/Filtering/vtkInformationExecutivePortVectorKey.cxx b/Filtering/vtkInformationExecutivePortVectorKey.cxx
index b194044ed45bdd647aff4ddafe4b05f81ad35e17..c76a93559894d1e6f79d97ad30aaa85d713a1d05 100644
--- a/Filtering/vtkInformationExecutivePortVectorKey.cxx
+++ b/Filtering/vtkInformationExecutivePortVectorKey.cxx
@@ -26,7 +26,6 @@
 // make garbage collecting easier but results in a weak reference.
 #define VTK_USE_SINGLE_REF 1
 
-vtkCxxRevisionMacro(vtkInformationExecutivePortVectorKey, "1.11");
 
 //----------------------------------------------------------------------------
 vtkInformationExecutivePortVectorKey::vtkInformationExecutivePortVectorKey(const char* name, const char* location):
diff --git a/Filtering/vtkInformationExecutivePortVectorKey.h b/Filtering/vtkInformationExecutivePortVectorKey.h
index c9a3b642aeae4c0f4d58e4c7618fb19d58ebd232..48717b226b5a44b2995a4a45c7558cd9d47016a3 100644
--- a/Filtering/vtkInformationExecutivePortVectorKey.h
+++ b/Filtering/vtkInformationExecutivePortVectorKey.h
@@ -30,7 +30,7 @@ class vtkExecutive;
 class VTK_FILTERING_EXPORT vtkInformationExecutivePortVectorKey : public vtkInformationKey
 {
 public:
-  vtkTypeRevisionMacro(vtkInformationExecutivePortVectorKey,vtkInformationKey);
+  vtkTypeMacro(vtkInformationExecutivePortVectorKey,vtkInformationKey);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkInformationExecutivePortVectorKey(const char* name, const char* location);
diff --git a/Filtering/vtkInterpolatedVelocityField.cxx b/Filtering/vtkInterpolatedVelocityField.cxx
index 1c3a6c78ec70d12ce2fd5b1a58c17a74dd8da67b..a43d7ce21e505de5031dbd546f07773eb278d0c0 100644
--- a/Filtering/vtkInterpolatedVelocityField.cxx
+++ b/Filtering/vtkInterpolatedVelocityField.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro( vtkInterpolatedVelocityField, "1.13" );
 vtkStandardNewMacro( vtkInterpolatedVelocityField ); 
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkInterpolatedVelocityField.h b/Filtering/vtkInterpolatedVelocityField.h
index 4ad8a0dffb591b159216c1b2960432df3fa94044..7b1a84d9587c72f4fb0ae4ba57b536d7262e8514 100644
--- a/Filtering/vtkInterpolatedVelocityField.h
+++ b/Filtering/vtkInterpolatedVelocityField.h
@@ -57,7 +57,7 @@ class VTK_FILTERING_EXPORT vtkInterpolatedVelocityField
   : public vtkAbstractInterpolatedVelocityField
 {
 public:
-  vtkTypeRevisionMacro( vtkInterpolatedVelocityField, 
+  vtkTypeMacro( vtkInterpolatedVelocityField,
                         vtkAbstractInterpolatedVelocityField );
   void PrintSelf( ostream & os, vtkIndent indent );
 
diff --git a/Filtering/vtkKdNode.cxx b/Filtering/vtkKdNode.cxx
index b428d4d1e26ac6364a0e23eb2d14094d02ba729c..c6c32f145db9bfa8490e04d8113fbf27cefb3e25 100644
--- a/Filtering/vtkKdNode.cxx
+++ b/Filtering/vtkKdNode.cxx
@@ -26,7 +26,6 @@
 #include "vtkPlanesIntersection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkKdNode, "1.3");
 vtkStandardNewMacro(vtkKdNode);
 vtkCxxSetObjectMacro(vtkKdNode, Left, vtkKdNode);
 vtkCxxSetObjectMacro(vtkKdNode, Right, vtkKdNode);
diff --git a/Filtering/vtkKdNode.h b/Filtering/vtkKdNode.h
index 59f45774b7a88f089374923e4ed6ea10ec8a495a..2036b233b32db2f3476eb0c128da544db7695315 100644
--- a/Filtering/vtkKdNode.h
+++ b/Filtering/vtkKdNode.h
@@ -38,7 +38,7 @@ class vtkPlanesIntersection;
 class VTK_FILTERING_EXPORT vtkKdNode : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkKdNode, vtkObject);
+  vtkTypeMacro(vtkKdNode, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkKdNode *New();
diff --git a/Filtering/vtkKdTree.cxx b/Filtering/vtkKdTree.cxx
index 3330cca4b6ef960ef977bbbb407470a999033304..0af180526f23b94a842e9b9ee20645baf00bff11 100644
--- a/Filtering/vtkKdTree.cxx
+++ b/Filtering/vtkKdTree.cxx
@@ -51,7 +51,6 @@
 #include <vtkstd/queue>
 #include <vtkstd/set>
 
-vtkCxxRevisionMacro(vtkKdTree, "1.7");
 
 // Timing data ---------------------------------------------
 
diff --git a/Filtering/vtkKdTree.h b/Filtering/vtkKdTree.h
index 19784a77b14ae1ca3a1d7ec90587e5971590d06c..48743c34bb05f21928b30067f8a340078b226f0b 100644
--- a/Filtering/vtkKdTree.h
+++ b/Filtering/vtkKdTree.h
@@ -71,7 +71,7 @@ class vtkDataSetCollection;
 class VTK_FILTERING_EXPORT vtkKdTree : public vtkLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkKdTree, vtkLocator);
+  vtkTypeMacro(vtkKdTree, vtkLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkKdTree *New();
diff --git a/Filtering/vtkKdTreePointLocator.cxx b/Filtering/vtkKdTreePointLocator.cxx
index fdb72be57d73053844a8caea664a9e3809fede92..6e3036814e6b213d55866f70713aeb951b459c5b 100644
--- a/Filtering/vtkKdTreePointLocator.cxx
+++ b/Filtering/vtkKdTreePointLocator.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointSet.h"
 
-vtkCxxRevisionMacro(vtkKdTreePointLocator, "1.1");
 vtkStandardNewMacro(vtkKdTreePointLocator);
 
 vtkKdTreePointLocator::vtkKdTreePointLocator()
diff --git a/Filtering/vtkKdTreePointLocator.h b/Filtering/vtkKdTreePointLocator.h
index 8a06e586d24475dd89f2eee8f8ed29960edf39a8..a863d50086c567e1325be801fff05f87d9185e69 100644
--- a/Filtering/vtkKdTreePointLocator.h
+++ b/Filtering/vtkKdTreePointLocator.h
@@ -31,7 +31,7 @@ class vtkKdTree;
 class VTK_FILTERING_EXPORT vtkKdTreePointLocator : public vtkAbstractPointLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkKdTreePointLocator,vtkAbstractPointLocator);
+  vtkTypeMacro(vtkKdTreePointLocator,vtkAbstractPointLocator);
   static vtkKdTreePointLocator* New();
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Filtering/vtkKochanekSpline.cxx b/Filtering/vtkKochanekSpline.cxx
index b4c1bcc27a228df0431843b3e3667e9da751a955..24c460709c366e4456e304efbd55c313a5c77492 100644
--- a/Filtering/vtkKochanekSpline.cxx
+++ b/Filtering/vtkKochanekSpline.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPiecewiseFunction.h"
 
-vtkCxxRevisionMacro(vtkKochanekSpline, "1.28");
 vtkStandardNewMacro(vtkKochanekSpline);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkKochanekSpline.h b/Filtering/vtkKochanekSpline.h
index 3edf1f85b7c992c0c32704e2def5a64e323880b3..337bc19cfadd2ca8e7fd3da851aa6cb26a6c7418 100644
--- a/Filtering/vtkKochanekSpline.h
+++ b/Filtering/vtkKochanekSpline.h
@@ -48,7 +48,7 @@
 class VTK_FILTERING_EXPORT vtkKochanekSpline : public vtkSpline
 {
 public:
-  vtkTypeRevisionMacro(vtkKochanekSpline,vtkSpline);
+  vtkTypeMacro(vtkKochanekSpline,vtkSpline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkLine.cxx b/Filtering/vtkLine.cxx
index 49538c695667a06fb2fb59a1f21f32c3faa8fdff..0e9e4cfcca4c3f6b1cb2345020f40e30050ce868 100644
--- a/Filtering/vtkLine.cxx
+++ b/Filtering/vtkLine.cxx
@@ -22,7 +22,6 @@
 #include "vtkIncrementalPointLocator.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkLine, "1.6");
 vtkStandardNewMacro(vtkLine);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkLine.h b/Filtering/vtkLine.h
index 732daa0853ecdd08d054bb734a483ddc429adbee..58e7003bf7fa36bb279ec8b5992ef8fd2045b599 100644
--- a/Filtering/vtkLine.h
+++ b/Filtering/vtkLine.h
@@ -26,7 +26,7 @@ class VTK_FILTERING_EXPORT vtkLine : public vtkCell
 {
 public:
   static vtkLine *New();
-  vtkTypeRevisionMacro(vtkLine,vtkCell);
+  vtkTypeMacro(vtkLine,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkLocator.cxx b/Filtering/vtkLocator.cxx
index c7da9d7ecbdaa98ae67aae96f4d5f5019dcc92d3..11a2bfc8afb0a0717a148870fd04fb4bfa239138 100644
--- a/Filtering/vtkLocator.cxx
+++ b/Filtering/vtkLocator.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataSet.h"
 #include "vtkGarbageCollector.h"
 
-vtkCxxRevisionMacro(vtkLocator, "1.6");
 
 vtkCxxSetObjectMacro(vtkLocator,DataSet,vtkDataSet);
 
diff --git a/Filtering/vtkLocator.h b/Filtering/vtkLocator.h
index 562421a1e076807c28def8cd834295a7d2b3cb78..95444de3cb45f25fd2be000fef96e861d5381b65 100644
--- a/Filtering/vtkLocator.h
+++ b/Filtering/vtkLocator.h
@@ -58,7 +58,7 @@ class vtkPolyData;
 class VTK_FILTERING_EXPORT vtkLocator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkLocator,vtkObject);
+  vtkTypeMacro(vtkLocator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMapper2D.cxx b/Filtering/vtkMapper2D.cxx
index 7164f513f8395b3b912899a93036b85c80723a38..c82cca866c5bc8e4916912cfb1726f6ca1399118 100644
--- a/Filtering/vtkMapper2D.cxx
+++ b/Filtering/vtkMapper2D.cxx
@@ -17,7 +17,6 @@
 #include "vtkActor2D.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkMapper2D, "1.1");
 
 void vtkMapper2D::PrintSelf(ostream& os, vtkIndent indent)
 {
diff --git a/Filtering/vtkMapper2D.h b/Filtering/vtkMapper2D.h
index 54372f285a95290487511b202e3b90f22dc27102..845ed969ade412485031cff9c9ec459caf11dde8 100644
--- a/Filtering/vtkMapper2D.h
+++ b/Filtering/vtkMapper2D.h
@@ -31,7 +31,7 @@ class vtkActor2D;
 class VTK_FILTERING_EXPORT vtkMapper2D : public vtkAbstractMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkMapper2D,vtkAbstractMapper);
+  vtkTypeMacro(vtkMapper2D,vtkAbstractMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   virtual void RenderOverlay(vtkViewport*, vtkActor2D*) {};
diff --git a/Filtering/vtkMergePoints.cxx b/Filtering/vtkMergePoints.cxx
index 54c2ed0f5cd02be5477229ed494afc483a9e678b..3606ad9bc3234eed5ac5ef21dd6652c29ff88d7e 100644
--- a/Filtering/vtkMergePoints.cxx
+++ b/Filtering/vtkMergePoints.cxx
@@ -20,7 +20,6 @@
 #include "vtkPoints.h"
 #include "vtkFloatArray.h"
 
-vtkCxxRevisionMacro(vtkMergePoints, "1.42");
 vtkStandardNewMacro(vtkMergePoints);
 
 // Determine whether point given by x[3] has been inserted into points list.
diff --git a/Filtering/vtkMergePoints.h b/Filtering/vtkMergePoints.h
index 334518fbd767e04365d94f014311102b748a075f..0bd305546328d8a8889f1d967db017c639d2d27f 100644
--- a/Filtering/vtkMergePoints.h
+++ b/Filtering/vtkMergePoints.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkMergePoints : public vtkPointLocator
 {
 public:
   static vtkMergePoints *New();
-  vtkTypeRevisionMacro(vtkMergePoints,vtkPointLocator);
+  vtkTypeMacro(vtkMergePoints,vtkPointLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkModifiedBSPTree.cxx b/Filtering/vtkModifiedBSPTree.cxx
index 0c279b3882f4ea6209a134982fbebca0c42d2999..846d8259d442e86ec8ba5c5d045181bdfc071642 100644
--- a/Filtering/vtkModifiedBSPTree.cxx
+++ b/Filtering/vtkModifiedBSPTree.cxx
@@ -25,7 +25,6 @@
 #include "vtkIdListCollection.h"
 //
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkModifiedBSPTree, "1.12");
 vtkStandardNewMacro(vtkModifiedBSPTree);
 //----------------------------------------------------------------------------
 //
diff --git a/Filtering/vtkModifiedBSPTree.h b/Filtering/vtkModifiedBSPTree.h
index 5aa4a68e0c0afb37792922a1c08b6c488204458d..069e285ad2d7a92ac2c8e0265ec62706140f70cf 100644
--- a/Filtering/vtkModifiedBSPTree.h
+++ b/Filtering/vtkModifiedBSPTree.h
@@ -155,7 +155,7 @@ class VTK_FILTERING_EXPORT vtkModifiedBSPTree : public vtkAbstractCellLocator {
   public:
   // Description:
   // Standard Type-Macro
-  vtkTypeRevisionMacro(vtkModifiedBSPTree,vtkAbstractCellLocator);
+  vtkTypeMacro(vtkModifiedBSPTree,vtkAbstractCellLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMultiBlockDataSet.cxx b/Filtering/vtkMultiBlockDataSet.cxx
index c8d779288911c07459a926530e89c92365db3ea8..3bc4525c9d908fa1207e8373caa554cd810215a9 100644
--- a/Filtering/vtkMultiBlockDataSet.cxx
+++ b/Filtering/vtkMultiBlockDataSet.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkMultiBlockDataSet);
-vtkCxxRevisionMacro(vtkMultiBlockDataSet, "1.10");
 //----------------------------------------------------------------------------
 vtkMultiBlockDataSet::vtkMultiBlockDataSet()
 {
diff --git a/Filtering/vtkMultiBlockDataSet.h b/Filtering/vtkMultiBlockDataSet.h
index 25b3329715a5b76705058ef06369258a03233221..172a79c30b5f4c617345a78f7d9b6f60b52a7e92 100644
--- a/Filtering/vtkMultiBlockDataSet.h
+++ b/Filtering/vtkMultiBlockDataSet.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkMultiBlockDataSet : public vtkCompositeDataSet
 {
 public:
   static vtkMultiBlockDataSet* New();
-  vtkTypeRevisionMacro(vtkMultiBlockDataSet, vtkCompositeDataSet);
+  vtkTypeMacro(vtkMultiBlockDataSet, vtkCompositeDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMultiBlockDataSetAlgorithm.cxx b/Filtering/vtkMultiBlockDataSetAlgorithm.cxx
index dde4d6072cd9d8ec7c43f7afe42b10eea1f19a5b..36e2b79ce50bda8f7c9f6e8dbb1513203278c0a0 100644
--- a/Filtering/vtkMultiBlockDataSetAlgorithm.cxx
+++ b/Filtering/vtkMultiBlockDataSetAlgorithm.cxx
@@ -23,7 +23,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkMultiBlockDataSetAlgorithm, "1.9");
 vtkStandardNewMacro(vtkMultiBlockDataSetAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkMultiBlockDataSetAlgorithm.h b/Filtering/vtkMultiBlockDataSetAlgorithm.h
index b58f8a7e891c2c2bca0c01e97370387cd54b515a..fe47ca3f5ac74150192dafbef30dbaa91fa79fb9 100644
--- a/Filtering/vtkMultiBlockDataSetAlgorithm.h
+++ b/Filtering/vtkMultiBlockDataSetAlgorithm.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkMultiBlockDataSetAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkMultiBlockDataSetAlgorithm *New();
-  vtkTypeRevisionMacro(vtkMultiBlockDataSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkMultiBlockDataSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMultiPieceDataSet.cxx b/Filtering/vtkMultiPieceDataSet.cxx
index 016ee8297305b1f5f671dbca15cbcdc903b0a65d..123621cb5bb0459b70ebc37b7191ad9b1c131212 100644
--- a/Filtering/vtkMultiPieceDataSet.cxx
+++ b/Filtering/vtkMultiPieceDataSet.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkMultiPieceDataSet);
-vtkCxxRevisionMacro(vtkMultiPieceDataSet, "1.2");
 //----------------------------------------------------------------------------
 vtkMultiPieceDataSet::vtkMultiPieceDataSet()
 {
diff --git a/Filtering/vtkMultiPieceDataSet.h b/Filtering/vtkMultiPieceDataSet.h
index 22b245435ef75f5d0f8417b4d6c5a49e10afcb5e..50a648acca9c4fa0e960669fd05e11b6dfeed616 100644
--- a/Filtering/vtkMultiPieceDataSet.h
+++ b/Filtering/vtkMultiPieceDataSet.h
@@ -37,7 +37,7 @@ class VTK_FILTERING_EXPORT vtkMultiPieceDataSet : public vtkCompositeDataSet
 {
 public:
   static vtkMultiPieceDataSet* New();
-  vtkTypeRevisionMacro(vtkMultiPieceDataSet, vtkCompositeDataSet);
+  vtkTypeMacro(vtkMultiPieceDataSet, vtkCompositeDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMutableDirectedGraph.cxx b/Filtering/vtkMutableDirectedGraph.cxx
index 074cef25a2d1d2c10db1627afcd255c23bdfbacc..39bbd7d4a0f70c6ea867a0152ad551b24512de3a 100644
--- a/Filtering/vtkMutableDirectedGraph.cxx
+++ b/Filtering/vtkMutableDirectedGraph.cxx
@@ -28,7 +28,6 @@
 //----------------------------------------------------------------------------
 // class vtkMutableDirectedGraph
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMutableDirectedGraph, "1.9");
 vtkStandardNewMacro(vtkMutableDirectedGraph);
 //----------------------------------------------------------------------------
 vtkMutableDirectedGraph::vtkMutableDirectedGraph()
diff --git a/Filtering/vtkMutableDirectedGraph.h b/Filtering/vtkMutableDirectedGraph.h
index a0a890de02c7fe15e423ae9e86aa8da526ac50ab..6626ff6419e499c30a04b860eeb25d689c6dfd0b 100644
--- a/Filtering/vtkMutableDirectedGraph.h
+++ b/Filtering/vtkMutableDirectedGraph.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkMutableDirectedGraph : public vtkDirectedGraph
 {
 public:
   static vtkMutableDirectedGraph *New();
-  vtkTypeRevisionMacro(vtkMutableDirectedGraph, vtkDirectedGraph);
+  vtkTypeMacro(vtkMutableDirectedGraph, vtkDirectedGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkMutableUndirectedGraph.cxx b/Filtering/vtkMutableUndirectedGraph.cxx
index 67b2e21a8229eae379e758c6e24bdf9a34abff79..0bead004a2a6140eda917bd4fc74c7427006d044 100644
--- a/Filtering/vtkMutableUndirectedGraph.cxx
+++ b/Filtering/vtkMutableUndirectedGraph.cxx
@@ -29,7 +29,6 @@
 //----------------------------------------------------------------------------
 // class vtkMutableUndirectedGraph
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMutableUndirectedGraph, "1.6");
 vtkStandardNewMacro(vtkMutableUndirectedGraph);
 //----------------------------------------------------------------------------
 vtkMutableUndirectedGraph::vtkMutableUndirectedGraph()
diff --git a/Filtering/vtkMutableUndirectedGraph.h b/Filtering/vtkMutableUndirectedGraph.h
index 142e7ba53f670f1cc76e3b74302f939b0d8726d1..bbfd0b9f78b7afb4eab63c51b9268119f2221637 100644
--- a/Filtering/vtkMutableUndirectedGraph.h
+++ b/Filtering/vtkMutableUndirectedGraph.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkMutableUndirectedGraph : public vtkUndirectedGraph
 {
 public:
   static vtkMutableUndirectedGraph *New();
-  vtkTypeRevisionMacro(vtkMutableUndirectedGraph, vtkUndirectedGraph);
+  vtkTypeMacro(vtkMutableUndirectedGraph, vtkUndirectedGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkNonLinearCell.cxx b/Filtering/vtkNonLinearCell.cxx
index 8613210f3b7f70e4c0d17ede74b4e73f3ed7ccb9..3ac44e9d4f6ce8431e55c85d757c7e0929fc1b46 100644
--- a/Filtering/vtkNonLinearCell.cxx
+++ b/Filtering/vtkNonLinearCell.cxx
@@ -15,7 +15,6 @@
 #include "vtkNonLinearCell.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkNonLinearCell, "1.2");
 
 //----------------------------------------------------------------------------
 vtkNonLinearCell::vtkNonLinearCell()
diff --git a/Filtering/vtkNonLinearCell.h b/Filtering/vtkNonLinearCell.h
index 23362e18745a608818fd2f9ea7e3d5a2a0dea16c..6f5c712846b48d2df4f554523838506d4cd8d4ed 100644
--- a/Filtering/vtkNonLinearCell.h
+++ b/Filtering/vtkNonLinearCell.h
@@ -32,7 +32,7 @@
 class VTK_FILTERING_EXPORT vtkNonLinearCell : public vtkCell
 {
 public:
-  vtkTypeRevisionMacro(vtkNonLinearCell,vtkCell);
+  vtkTypeMacro(vtkNonLinearCell,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkNonMergingPointLocator.cxx b/Filtering/vtkNonMergingPointLocator.cxx
index 16f8f55206ac4d8b0ab3ffed956eb69821e9da7d..c5516d6a37af5bf7f10d65115cfe48c36eef245d 100644
--- a/Filtering/vtkNonMergingPointLocator.cxx
+++ b/Filtering/vtkNonMergingPointLocator.cxx
@@ -17,7 +17,6 @@
 #include "vtkPoints.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro( vtkNonMergingPointLocator, "1.1" );
 vtkStandardNewMacro( vtkNonMergingPointLocator );
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkNonMergingPointLocator.h b/Filtering/vtkNonMergingPointLocator.h
index 2b5ccd130c4445e701f51f80b54e7892f8118e6f..bc9161ca9483abd53fd41958aa38c92cf600bfa0 100644
--- a/Filtering/vtkNonMergingPointLocator.h
+++ b/Filtering/vtkNonMergingPointLocator.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkNonMergingPointLocator : public vtkPointLocator
 public:
   static vtkNonMergingPointLocator * New();
   
-  vtkTypeRevisionMacro( vtkNonMergingPointLocator, vtkPointLocator );
+  vtkTypeMacro( vtkNonMergingPointLocator, vtkPointLocator );
   void PrintSelf( ostream & os, vtkIndent indent );
 
 //BTX
diff --git a/Filtering/vtkOctreePointLocator.cxx b/Filtering/vtkOctreePointLocator.cxx
index 62f920f6613dc663fc2869c02b698f1956e9ca2d..084173db81e0dae531110f49a974e31b06175fe0 100644
--- a/Filtering/vtkOctreePointLocator.cxx
+++ b/Filtering/vtkOctreePointLocator.cxx
@@ -39,7 +39,6 @@
 #include <vtkstd/stack>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkOctreePointLocator, "1.3");
 vtkStandardNewMacro(vtkOctreePointLocator);
 
 // helper class for ordering the points in 
diff --git a/Filtering/vtkOctreePointLocator.h b/Filtering/vtkOctreePointLocator.h
index 4276ad1c3975fd1ca4efece4f54d564ce90b3d8f..904924c012a6b5c9354f0ae43963440c1a1a6cc7 100644
--- a/Filtering/vtkOctreePointLocator.h
+++ b/Filtering/vtkOctreePointLocator.h
@@ -45,7 +45,7 @@ class vtkPolyData;
 class VTK_FILTERING_EXPORT vtkOctreePointLocator : public vtkAbstractPointLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkOctreePointLocator, vtkAbstractPointLocator);
+  vtkTypeMacro(vtkOctreePointLocator, vtkAbstractPointLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkOctreePointLocator *New();
diff --git a/Filtering/vtkOctreePointLocatorNode.cxx b/Filtering/vtkOctreePointLocatorNode.cxx
index 8813f8649c216134abbe59c620765f9dcbe3fe57..66067677679e32d7c0d342cf4234ccbbdfc2e8d0 100644
--- a/Filtering/vtkOctreePointLocatorNode.cxx
+++ b/Filtering/vtkOctreePointLocatorNode.cxx
@@ -26,7 +26,6 @@
 #include "vtkPlanesIntersection.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkOctreePointLocatorNode, "1.2");
 vtkStandardNewMacro(vtkOctreePointLocatorNode);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkOctreePointLocatorNode.h b/Filtering/vtkOctreePointLocatorNode.h
index a19dc5fa63668bb3b5cce9f6926142d8ab071df1..3dd0f21cafe279b239f8007d126c55d4eb88bbb1 100644
--- a/Filtering/vtkOctreePointLocatorNode.h
+++ b/Filtering/vtkOctreePointLocatorNode.h
@@ -42,7 +42,7 @@ class vtkPlanesIntersection;
 class VTK_FILTERING_EXPORT vtkOctreePointLocatorNode : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkOctreePointLocatorNode, vtkObject);
+  vtkTypeMacro(vtkOctreePointLocatorNode, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkOctreePointLocatorNode *New();
diff --git a/Filtering/vtkOrderedTriangulator.cxx b/Filtering/vtkOrderedTriangulator.cxx
index ccb56de6ae5c74fbd2e556c537c2551a0dec4a94..84cb50eec12572f45dc3efd017314f44050653b9 100644
--- a/Filtering/vtkOrderedTriangulator.cxx
+++ b/Filtering/vtkOrderedTriangulator.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/map>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkOrderedTriangulator, "1.10");
 vtkStandardNewMacro(vtkOrderedTriangulator);
 
 #ifdef _WIN32_WCE
diff --git a/Filtering/vtkOrderedTriangulator.h b/Filtering/vtkOrderedTriangulator.h
index a681602c76e34a88194e1f85598fb1dd42f37868..0fb65206d581dd7c2860ef01a886b592e878459d 100644
--- a/Filtering/vtkOrderedTriangulator.h
+++ b/Filtering/vtkOrderedTriangulator.h
@@ -106,7 +106,7 @@ typedef unsigned long   TemplateIDType;
 class VTK_FILTERING_EXPORT vtkOrderedTriangulator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkOrderedTriangulator,vtkObject);
+  vtkTypeMacro(vtkOrderedTriangulator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkOutEdgeIterator.cxx b/Filtering/vtkOutEdgeIterator.cxx
index 3ce1246b9a17fabe563524cb5ce11cadab225d5f..13846681386d43fef4f6916ed3907b55e7e06237 100644
--- a/Filtering/vtkOutEdgeIterator.cxx
+++ b/Filtering/vtkOutEdgeIterator.cxx
@@ -25,7 +25,6 @@
 #include "vtkGraphEdge.h"
 
 vtkCxxSetObjectMacro(vtkOutEdgeIterator, Graph, vtkGraph);
-vtkCxxRevisionMacro(vtkOutEdgeIterator, "1.2");
 vtkStandardNewMacro(vtkOutEdgeIterator);
 //----------------------------------------------------------------------------
 vtkOutEdgeIterator::vtkOutEdgeIterator()
diff --git a/Filtering/vtkOutEdgeIterator.h b/Filtering/vtkOutEdgeIterator.h
index bfab043dc37d7318547a143bab0440eaf5fc12c9..2bc093105cf9c67ffa68003b81dc6793549a5eb9 100644
--- a/Filtering/vtkOutEdgeIterator.h
+++ b/Filtering/vtkOutEdgeIterator.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkOutEdgeIterator : public vtkObject
 {
 public:
   static vtkOutEdgeIterator *New();
-  vtkTypeRevisionMacro(vtkOutEdgeIterator, vtkObject);
+  vtkTypeMacro(vtkOutEdgeIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkParametricSpline.cxx b/Filtering/vtkParametricSpline.cxx
index 3f192842dc4a16dd3dba0ea054c098bccc0f5dad..d11da4a9077ac105a5493592e2046ebba2e9a854 100644
--- a/Filtering/vtkParametricSpline.cxx
+++ b/Filtering/vtkParametricSpline.cxx
@@ -18,7 +18,6 @@
 #include "vtkPoints.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkParametricSpline, "1.8");
 vtkStandardNewMacro(vtkParametricSpline);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkParametricSpline.h b/Filtering/vtkParametricSpline.h
index 32ba531dce7845c781b6aade60d1757173b9328a..5da1ac1bbc64a4dc0f15c873e2c5638c2ef92eca 100644
--- a/Filtering/vtkParametricSpline.h
+++ b/Filtering/vtkParametricSpline.h
@@ -43,7 +43,7 @@ class vtkPoints;
 class VTK_FILTERING_EXPORT vtkParametricSpline : public vtkParametricFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricSpline,vtkParametricFunction);
+  vtkTypeMacro(vtkParametricSpline,vtkParametricFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkPassInputTypeAlgorithm.cxx b/Filtering/vtkPassInputTypeAlgorithm.cxx
index 388c843627366cf7c683a1b6026e5a93c961cb1d..18bb8234988912152cb6ae1e113208744e7689c1 100644
--- a/Filtering/vtkPassInputTypeAlgorithm.cxx
+++ b/Filtering/vtkPassInputTypeAlgorithm.cxx
@@ -29,7 +29,6 @@
 #include "vtkTable.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkPassInputTypeAlgorithm, "1.4");
 vtkStandardNewMacro(vtkPassInputTypeAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPassInputTypeAlgorithm.h b/Filtering/vtkPassInputTypeAlgorithm.h
index a64a5f67b57e235f919e3827e8cb648c11b2eb37..a30ad0ed59d0dd07b5dbb100d929e0819e11ddb8 100644
--- a/Filtering/vtkPassInputTypeAlgorithm.h
+++ b/Filtering/vtkPassInputTypeAlgorithm.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkPassInputTypeAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkPassInputTypeAlgorithm *New();
-  vtkTypeRevisionMacro(vtkPassInputTypeAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkPassInputTypeAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPentagonalPrism.cxx b/Filtering/vtkPentagonalPrism.cxx
index 2e233f338461b6303b04bdd0d448e75ce2652a1f..a7a80dcd887f42e690912948d200c532dbc96ea3 100644
--- a/Filtering/vtkPentagonalPrism.cxx
+++ b/Filtering/vtkPentagonalPrism.cxx
@@ -30,7 +30,6 @@
 #include "vtkMath.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkPentagonalPrism, "1.12");
 vtkStandardNewMacro(vtkPentagonalPrism);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkPentagonalPrism.h b/Filtering/vtkPentagonalPrism.h
index d376cb038a4b87a41c4563898b7ec6d26b25c260..8fd42522e8a8a8abd0161f3c4cacfc1328cc784c 100644
--- a/Filtering/vtkPentagonalPrism.h
+++ b/Filtering/vtkPentagonalPrism.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkPentagonalPrism : public vtkCell3D
 {
 public:
   static vtkPentagonalPrism *New();
-  vtkTypeRevisionMacro(vtkPentagonalPrism,vtkCell3D);
+  vtkTypeMacro(vtkPentagonalPrism,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPerlinNoise.cxx b/Filtering/vtkPerlinNoise.cxx
index 13a52afa64b248a235ccdf4ac1e4cd4ce0d45b49..f3084aad501c41aed95f5a787c5319486e76e94b 100644
--- a/Filtering/vtkPerlinNoise.cxx
+++ b/Filtering/vtkPerlinNoise.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkPerlinNoise, "1.6");
 vtkStandardNewMacro(vtkPerlinNoise);
 
 // These functions are from Greg Ward's recursive implementation in 
diff --git a/Filtering/vtkPerlinNoise.h b/Filtering/vtkPerlinNoise.h
index 5ab99dee8327fa4abe7ba29a6160eaa88e0c8586..8460eb1aa408d015f909d2adbb060c385e95de7b 100644
--- a/Filtering/vtkPerlinNoise.h
+++ b/Filtering/vtkPerlinNoise.h
@@ -34,7 +34,7 @@
 class VTK_FILTERING_EXPORT vtkPerlinNoise : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkPerlinNoise,vtkImplicitFunction);
+  vtkTypeMacro(vtkPerlinNoise,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkPiecewiseFunction.cxx b/Filtering/vtkPiecewiseFunction.cxx
index afdcefe155cb1d0ce23752efcc3a6639f4617532..217570a219fc7206cc97a1c3102c6a8ebdad7a74 100644
--- a/Filtering/vtkPiecewiseFunction.cxx
+++ b/Filtering/vtkPiecewiseFunction.cxx
@@ -23,7 +23,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/iterator>
 
-vtkCxxRevisionMacro(vtkPiecewiseFunction, "1.53");
 vtkStandardNewMacro(vtkPiecewiseFunction);
 
 // The Node structure
diff --git a/Filtering/vtkPiecewiseFunction.h b/Filtering/vtkPiecewiseFunction.h
index 0822f20fc34ee20079e276212a2995f5abd00990..49ec36adc21ebfd7a06b98203bbbead43260aba5 100644
--- a/Filtering/vtkPiecewiseFunction.h
+++ b/Filtering/vtkPiecewiseFunction.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkPiecewiseFunction : public vtkDataObject
 {
 public:
   static vtkPiecewiseFunction *New();
-  vtkTypeRevisionMacro(vtkPiecewiseFunction,vtkDataObject);
+  vtkTypeMacro(vtkPiecewiseFunction,vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void DeepCopy( vtkDataObject *f );
diff --git a/Filtering/vtkPiecewiseFunctionAlgorithm.cxx b/Filtering/vtkPiecewiseFunctionAlgorithm.cxx
index b37412a9a254b1d986804a3dc8512ccb669b5f36..ae53e2e98e6b2fa2b203aef6226b8835cc0b644a 100644
--- a/Filtering/vtkPiecewiseFunctionAlgorithm.cxx
+++ b/Filtering/vtkPiecewiseFunctionAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkPiecewiseFunctionAlgorithm, "1.1");
 vtkStandardNewMacro(vtkPiecewiseFunctionAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPiecewiseFunctionAlgorithm.h b/Filtering/vtkPiecewiseFunctionAlgorithm.h
index bde7c09a5a073296750cbc62400f01ee774a52b7..b1a728d4bf758cc6f80f22f80260185f0729e7e9 100644
--- a/Filtering/vtkPiecewiseFunctionAlgorithm.h
+++ b/Filtering/vtkPiecewiseFunctionAlgorithm.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkPiecewiseFunctionAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkPiecewiseFunctionAlgorithm *New();
-  vtkTypeRevisionMacro(vtkPiecewiseFunctionAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkPiecewiseFunctionAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPiecewiseFunctionShiftScale.cxx b/Filtering/vtkPiecewiseFunctionShiftScale.cxx
index c9778919a171ec25eb5e47ba4f3fe7c95f29c73a..aebd56dc96d523de7e0d9b745375c1b77b3421d3 100644
--- a/Filtering/vtkPiecewiseFunctionShiftScale.cxx
+++ b/Filtering/vtkPiecewiseFunctionShiftScale.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPiecewiseFunction.h"
 
-vtkCxxRevisionMacro(vtkPiecewiseFunctionShiftScale, "1.6");
 vtkStandardNewMacro(vtkPiecewiseFunctionShiftScale);
 
 vtkPiecewiseFunctionShiftScale::vtkPiecewiseFunctionShiftScale()
diff --git a/Filtering/vtkPiecewiseFunctionShiftScale.h b/Filtering/vtkPiecewiseFunctionShiftScale.h
index c7571e4043651089f35fa14b15b2b358f65afb93..529f417c9afbd3a29322e467413931777d70d30b 100644
--- a/Filtering/vtkPiecewiseFunctionShiftScale.h
+++ b/Filtering/vtkPiecewiseFunctionShiftScale.h
@@ -28,7 +28,7 @@ class VTK_FILTERING_EXPORT vtkPiecewiseFunctionShiftScale : public vtkPiecewiseF
 {
 public:
   static vtkPiecewiseFunctionShiftScale *New();
-  vtkTypeRevisionMacro(vtkPiecewiseFunctionShiftScale, vtkPiecewiseFunctionAlgorithm);
+  vtkTypeMacro(vtkPiecewiseFunctionShiftScale, vtkPiecewiseFunctionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   vtkSetMacro(PositionShift, double);
diff --git a/Filtering/vtkPixel.cxx b/Filtering/vtkPixel.cxx
index ee3624736c859a70cbaa5a8af818c349be8147a5..24de3fea87981dd16ae3a9d23821c834f691c4a3 100644
--- a/Filtering/vtkPixel.cxx
+++ b/Filtering/vtkPixel.cxx
@@ -26,7 +26,6 @@
 #include "vtkCellData.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkPixel, "1.5");
 vtkStandardNewMacro(vtkPixel);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPixel.h b/Filtering/vtkPixel.h
index f8e512e281f2e459b3dd2544eaeb9c61251a2f93..87837733dbf44dcd121e75ca20e479f6f15dfb89 100644
--- a/Filtering/vtkPixel.h
+++ b/Filtering/vtkPixel.h
@@ -31,7 +31,7 @@ class VTK_FILTERING_EXPORT vtkPixel : public vtkCell
 {
 public:
   static vtkPixel *New();
-  vtkTypeRevisionMacro(vtkPixel,vtkCell);
+  vtkTypeMacro(vtkPixel,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPlanesIntersection.cxx b/Filtering/vtkPlanesIntersection.cxx
index b3b564f4fb86019d0250b2048d58de4a2d0aba67..0ba25014666994468c8f99db69c6eca4f2c33d79 100644
--- a/Filtering/vtkPlanesIntersection.cxx
+++ b/Filtering/vtkPlanesIntersection.cxx
@@ -24,7 +24,6 @@
 #include "vtkCell.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPlanesIntersection, "1.2");
 vtkStandardNewMacro(vtkPlanesIntersection);
 
 // Experiment shows that we get plane equation values on the
diff --git a/Filtering/vtkPlanesIntersection.h b/Filtering/vtkPlanesIntersection.h
index 2e874ef68991989b2463df9a853d956e797b80e2..ff1ddf4b4eaf0c7f743f88459ec817a48ffe490c 100644
--- a/Filtering/vtkPlanesIntersection.h
+++ b/Filtering/vtkPlanesIntersection.h
@@ -47,7 +47,7 @@ class vtkCell;
 
 class VTK_FILTERING_EXPORT vtkPlanesIntersection : public vtkPlanes
 {
-  vtkTypeRevisionMacro(vtkPlanesIntersection, vtkPlanes);
+  vtkTypeMacro(vtkPlanesIntersection, vtkPlanes);
 
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Filtering/vtkPointData.cxx b/Filtering/vtkPointData.cxx
index 163abd8da5cc5cacba556e7c4173d1a7b73f2e86..8ec11ca9792c1492b5c2aec345145c63e0763baf 100644
--- a/Filtering/vtkPointData.cxx
+++ b/Filtering/vtkPointData.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataArray.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPointData, "1.2");
 vtkStandardNewMacro(vtkPointData);
 
 void vtkPointData::NullPoint (vtkIdType ptId)
diff --git a/Filtering/vtkPointData.h b/Filtering/vtkPointData.h
index 7c33138a06693aae4b04d0b5d8911eacaacc2772..3dad7e95ded10ab2d9d15576afa27b69cc310812 100644
--- a/Filtering/vtkPointData.h
+++ b/Filtering/vtkPointData.h
@@ -29,7 +29,7 @@ class VTK_FILTERING_EXPORT vtkPointData : public vtkDataSetAttributes
 public:
   static vtkPointData *New();
 
-  vtkTypeRevisionMacro(vtkPointData,vtkDataSetAttributes);
+  vtkTypeMacro(vtkPointData,vtkDataSetAttributes);
   void PrintSelf(ostream& os, vtkIndent indent);
   void NullPoint(vtkIdType ptId);
 
diff --git a/Filtering/vtkPointLocator.cxx b/Filtering/vtkPointLocator.cxx
index 3bacb223c7faad1953452c903703b3084702e260..f5143719f4b28bbc02a835d39ec05a6a031a33d7 100644
--- a/Filtering/vtkPointLocator.cxx
+++ b/Filtering/vtkPointLocator.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPointLocator, "1.6");
 vtkStandardNewMacro(vtkPointLocator);
 
 static const int VTK_INITIAL_SIZE=1000;
diff --git a/Filtering/vtkPointLocator.h b/Filtering/vtkPointLocator.h
index 93b44f912d0937d51550ecd1036feb5d7da945cb..f49708e98e0c3161e66be923440dea3da29cff19 100644
--- a/Filtering/vtkPointLocator.h
+++ b/Filtering/vtkPointLocator.h
@@ -51,7 +51,7 @@ public:
   // 25 points per bucket.
   static vtkPointLocator *New();
 
-  vtkTypeRevisionMacro(vtkPointLocator,vtkIncrementalPointLocator);
+  vtkTypeMacro(vtkPointLocator,vtkIncrementalPointLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPointSet.cxx b/Filtering/vtkPointSet.cxx
index 0b99942ba953c55e3562a78dbe5cf71cd76cdeb8..9d0ea221abc4d3d87e6deb33aa53fbc2bdee89b4 100644
--- a/Filtering/vtkPointSet.cxx
+++ b/Filtering/vtkPointSet.cxx
@@ -28,7 +28,6 @@
 
 #include <vtkstd/set>
 
-vtkCxxRevisionMacro(vtkPointSet, "1.14");
 
 vtkCxxSetObjectMacro(vtkPointSet,Points,vtkPoints);
 
diff --git a/Filtering/vtkPointSet.h b/Filtering/vtkPointSet.h
index 65528cfa0a69f445d5cd4068468e020ea7448f07..7d1ba6fcd83fc38c4c00c302a09b7679fb32b262 100644
--- a/Filtering/vtkPointSet.h
+++ b/Filtering/vtkPointSet.h
@@ -35,7 +35,7 @@ class vtkPointLocator;
 class VTK_FILTERING_EXPORT vtkPointSet : public vtkDataSet
 {
 public:
-  vtkTypeRevisionMacro(vtkPointSet,vtkDataSet);
+  vtkTypeMacro(vtkPointSet,vtkDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPointSetAlgorithm.cxx b/Filtering/vtkPointSetAlgorithm.cxx
index 08a1c7ee218be0befe3e33b4b5c3a68dd299114b..6eb1fd3014c388fe0c4bf18cd6f4b15679314965 100644
--- a/Filtering/vtkPointSetAlgorithm.cxx
+++ b/Filtering/vtkPointSetAlgorithm.cxx
@@ -24,7 +24,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkPointSetAlgorithm, "1.4");
 vtkStandardNewMacro(vtkPointSetAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPointSetAlgorithm.h b/Filtering/vtkPointSetAlgorithm.h
index 325d2074a36182b3eab62dd18d03aed75233be1f..ff30498afa3f4e5e382785ce3c03b23df9ccf5d4 100644
--- a/Filtering/vtkPointSetAlgorithm.h
+++ b/Filtering/vtkPointSetAlgorithm.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkPointSetAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkPointSetAlgorithm *New();
-  vtkTypeRevisionMacro(vtkPointSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkPointSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPointSetSource.cxx b/Filtering/vtkPointSetSource.cxx
index 2a2d4441150abbe642d725d3ad26fa8bc0efc1d9..df0d14cc80cefb09e3d83559eed8f2ba7031070e 100644
--- a/Filtering/vtkPointSetSource.cxx
+++ b/Filtering/vtkPointSetSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointSet.h"
 
-vtkCxxRevisionMacro(vtkPointSetSource, "1.14");
 
 //----------------------------------------------------------------------------
 vtkPointSetSource::vtkPointSetSource()
diff --git a/Filtering/vtkPointSetSource.h b/Filtering/vtkPointSetSource.h
index 62d3f453ad9651ea653d00df85ab36d9430f7f80..d12c65fe176d2a284ed7da43b85e9eba06eff035 100644
--- a/Filtering/vtkPointSetSource.h
+++ b/Filtering/vtkPointSetSource.h
@@ -26,7 +26,7 @@ class vtkPointSet;
 class VTK_FILTERING_EXPORT vtkPointSetSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkPointSetSource,vtkSource);
+  vtkTypeMacro(vtkPointSetSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPointSetToPointSetFilter.cxx b/Filtering/vtkPointSetToPointSetFilter.cxx
index 7f78808527be82e8205c10a5104e571746aacdc7..3da5eecf7ab819bdd75ace9a042ecf6e56c0ca68 100644
--- a/Filtering/vtkPointSetToPointSetFilter.cxx
+++ b/Filtering/vtkPointSetToPointSetFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkPointSetToPointSetFilter, "1.62");
 
 //----------------------------------------------------------------------------
 // Construct object.
diff --git a/Filtering/vtkPointSetToPointSetFilter.h b/Filtering/vtkPointSetToPointSetFilter.h
index b544450762b92e01b9207998559955703cb2d04b..0d53a65346095e6f25835c18ef608dffccc66d07 100644
--- a/Filtering/vtkPointSetToPointSetFilter.h
+++ b/Filtering/vtkPointSetToPointSetFilter.h
@@ -46,7 +46,7 @@ class vtkUnstructuredGrid;
 class VTK_FILTERING_EXPORT vtkPointSetToPointSetFilter : public vtkPointSetSource
 {
 public:
-  vtkTypeRevisionMacro(vtkPointSetToPointSetFilter,vtkPointSetSource);
+  vtkTypeMacro(vtkPointSetToPointSetFilter,vtkPointSetSource);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkPointsProjectedHull.cxx b/Filtering/vtkPointsProjectedHull.cxx
index f50e1167772ba2ddd536f2c9656706b3e4454e33..65dcdea77f5843e5aa946e49daf7942675d2df0d 100644
--- a/Filtering/vtkPointsProjectedHull.cxx
+++ b/Filtering/vtkPointsProjectedHull.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointsProjectedHull.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPointsProjectedHull, "1.2");
 vtkStandardNewMacro(vtkPointsProjectedHull);
 
 static const int xdim=0, ydim=1, zdim=2;
diff --git a/Filtering/vtkPointsProjectedHull.h b/Filtering/vtkPointsProjectedHull.h
index 30bd5c5c9e3f7726f0c80de29f2137a9962165d7..1229385352eef218bea7990d5cc7004e3891d3cd 100644
--- a/Filtering/vtkPointsProjectedHull.h
+++ b/Filtering/vtkPointsProjectedHull.h
@@ -33,7 +33,7 @@
 
 class VTK_FILTERING_EXPORT vtkPointsProjectedHull : public vtkPoints
 {
-    vtkTypeRevisionMacro(vtkPointsProjectedHull, vtkPoints);
+    vtkTypeMacro(vtkPointsProjectedHull, vtkPoints);
 
 public:
     void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Filtering/vtkPolyData.cxx b/Filtering/vtkPolyData.cxx
index 0e13d25834884b29e5d38e1804912c00adb7203e..5b1675ed3d04498767ddd71887d66f41a966ad2e 100644
--- a/Filtering/vtkPolyData.cxx
+++ b/Filtering/vtkPolyData.cxx
@@ -33,7 +33,6 @@
 #include "vtkTriangleStrip.h"
 #include "vtkVertex.h"
 
-vtkCxxRevisionMacro(vtkPolyData, "1.15");
 vtkStandardNewMacro(vtkPolyData);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolyData.h b/Filtering/vtkPolyData.h
index e278a7a58799f10f62bd5bab8cf6db5baac5d8f2..893b2d0e215dc0a85d7925a6e971287c7a616ab8 100644
--- a/Filtering/vtkPolyData.h
+++ b/Filtering/vtkPolyData.h
@@ -74,7 +74,7 @@ class VTK_FILTERING_EXPORT vtkPolyData : public vtkPointSet
 public:
   static vtkPolyData *New();
 
-  vtkTypeRevisionMacro(vtkPolyData,vtkPointSet);
+  vtkTypeMacro(vtkPolyData,vtkPointSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyDataAlgorithm.cxx b/Filtering/vtkPolyDataAlgorithm.cxx
index 6b1a9a8a1114b264ac73dcbc8d74e04116914673..4c14693ae1eae6d7c27e3018264330db28ee6a76 100644
--- a/Filtering/vtkPolyDataAlgorithm.cxx
+++ b/Filtering/vtkPolyDataAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkPolyDataAlgorithm, "1.20");
 vtkStandardNewMacro(vtkPolyDataAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolyDataAlgorithm.h b/Filtering/vtkPolyDataAlgorithm.h
index 4bbcafb234dd704bee22b0800f45f4cbd6bc7f03..92d905725d3bc5053b771706d5e6010d509e1ab6 100644
--- a/Filtering/vtkPolyDataAlgorithm.h
+++ b/Filtering/vtkPolyDataAlgorithm.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkPolyDataAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkPolyDataAlgorithm *New();
-  vtkTypeRevisionMacro(vtkPolyDataAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkPolyDataAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyDataCollection.cxx b/Filtering/vtkPolyDataCollection.cxx
index ea498b1648f5e0bf118f036aa28e9104fec12786..396805cfba48e2de45e0dd4280267ad48782c014 100644
--- a/Filtering/vtkPolyDataCollection.cxx
+++ b/Filtering/vtkPolyDataCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkPolyDataCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPolyDataCollection, "1.8");
 vtkStandardNewMacro(vtkPolyDataCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolyDataCollection.h b/Filtering/vtkPolyDataCollection.h
index bd39ff600561c272480019b0da5fa46f93256795..33ea600e89d1eaf92f0c521d66c8f6f761e9158c 100644
--- a/Filtering/vtkPolyDataCollection.h
+++ b/Filtering/vtkPolyDataCollection.h
@@ -31,7 +31,7 @@ class VTK_FILTERING_EXPORT vtkPolyDataCollection : public vtkCollection
 {
 public:
   static vtkPolyDataCollection *New();
-  vtkTypeRevisionMacro(vtkPolyDataCollection,vtkCollection);
+  vtkTypeMacro(vtkPolyDataCollection,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyDataSource.cxx b/Filtering/vtkPolyDataSource.cxx
index 0b35b25640b5f0d49b9e67520066c1ad84dfc0e8..f7a2bfb7218196c4ccd721e4e56692256ec2936a 100644
--- a/Filtering/vtkPolyDataSource.cxx
+++ b/Filtering/vtkPolyDataSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPolyDataSource, "1.13");
 
 //----------------------------------------------------------------------------
 vtkPolyDataSource::vtkPolyDataSource()
diff --git a/Filtering/vtkPolyDataSource.h b/Filtering/vtkPolyDataSource.h
index b7368b55f9cf306c1c514a0a82ced1d656acafc6..8cc7f06ac1f693bf1b36f027b430adc7219f4572 100644
--- a/Filtering/vtkPolyDataSource.h
+++ b/Filtering/vtkPolyDataSource.h
@@ -33,7 +33,7 @@ class vtkPolyData;
 class VTK_FILTERING_EXPORT vtkPolyDataSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataSource,vtkSource);
+  vtkTypeMacro(vtkPolyDataSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyDataToPolyDataFilter.cxx b/Filtering/vtkPolyDataToPolyDataFilter.cxx
index 75f6047112e87270323e73c80b3892970acbd87c..cb8a8bcd9780fb90dcc593f03b4c13c753f20230 100644
--- a/Filtering/vtkPolyDataToPolyDataFilter.cxx
+++ b/Filtering/vtkPolyDataToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPolyDataToPolyDataFilter, "1.20");
 
 //----------------------------------------------------------------------------
 vtkPolyDataToPolyDataFilter::vtkPolyDataToPolyDataFilter() 
diff --git a/Filtering/vtkPolyDataToPolyDataFilter.h b/Filtering/vtkPolyDataToPolyDataFilter.h
index 49241a3556a60bd7f791e8350796935411087c5c..a39c92a5c9ef5a1bfe42eb5e2194ac67e0bfa93f 100644
--- a/Filtering/vtkPolyDataToPolyDataFilter.h
+++ b/Filtering/vtkPolyDataToPolyDataFilter.h
@@ -41,7 +41,7 @@ class vtkPolyData;
 class VTK_FILTERING_EXPORT vtkPolyDataToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkPolyDataToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyLine.cxx b/Filtering/vtkPolyLine.cxx
index 429d84ef1700060269bab80876aab96aa5af976c..4051911964d98bc6e644579f239f29647cedb889 100644
--- a/Filtering/vtkPolyLine.cxx
+++ b/Filtering/vtkPolyLine.cxx
@@ -24,7 +24,6 @@
 
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkPolyLine, "1.9");
 vtkStandardNewMacro(vtkPolyLine);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolyLine.h b/Filtering/vtkPolyLine.h
index 7b092d428a1c5465c54257af12120418aeceeaea..0ba047d1b9c3b36dbebb1ad1db08cb3b6f1f59ba 100644
--- a/Filtering/vtkPolyLine.h
+++ b/Filtering/vtkPolyLine.h
@@ -33,7 +33,7 @@ class VTK_FILTERING_EXPORT vtkPolyLine : public vtkCell
 {
 public:
   static vtkPolyLine *New();
-  vtkTypeRevisionMacro(vtkPolyLine,vtkCell);
+  vtkTypeMacro(vtkPolyLine,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolyVertex.cxx b/Filtering/vtkPolyVertex.cxx
index 22ab7cc06d9423a2f7778854c20bca59dfb168e7..dbd9719c5d3f42d47f492aff75ae83ef1f4aa0ff 100644
--- a/Filtering/vtkPolyVertex.cxx
+++ b/Filtering/vtkPolyVertex.cxx
@@ -23,7 +23,6 @@
 #include "vtkPoints.h"
 #include "vtkVertex.h"
 
-vtkCxxRevisionMacro(vtkPolyVertex, "1.3");
 vtkStandardNewMacro(vtkPolyVertex);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolyVertex.h b/Filtering/vtkPolyVertex.h
index 374657c0e7b0f9ee0bdfee15bfe70c941d22d6a3..05f88d68476efc1193441431460f09517cb751c5 100644
--- a/Filtering/vtkPolyVertex.h
+++ b/Filtering/vtkPolyVertex.h
@@ -29,7 +29,7 @@ class VTK_FILTERING_EXPORT vtkPolyVertex : public vtkCell
 {
 public:
   static vtkPolyVertex *New();
-  vtkTypeRevisionMacro(vtkPolyVertex,vtkCell);
+  vtkTypeMacro(vtkPolyVertex,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPolygon.cxx b/Filtering/vtkPolygon.cxx
index eaefe31f39163d1f1972d3b44d8fa1e1ad52a5b3..769c694442f59bfdd8a912a010598eceee178d31 100644
--- a/Filtering/vtkPolygon.cxx
+++ b/Filtering/vtkPolygon.cxx
@@ -30,7 +30,6 @@
 #include "vtkIncrementalPointLocator.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkPolygon, "1.12");
 vtkStandardNewMacro(vtkPolygon);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkPolygon.h b/Filtering/vtkPolygon.h
index 12bab32f2f536342ac8b38f23ce2814747bb8b67..f5a25571074be677b50123299f996fd1edd980ef 100644
--- a/Filtering/vtkPolygon.h
+++ b/Filtering/vtkPolygon.h
@@ -36,7 +36,7 @@ class VTK_FILTERING_EXPORT vtkPolygon : public vtkCell
 {
 public:
   static vtkPolygon *New();
-  vtkTypeRevisionMacro(vtkPolygon,vtkCell);
+  vtkTypeMacro(vtkPolygon,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkProcessObject.cxx b/Filtering/vtkProcessObject.cxx
index 843f006e3e3f2bb671cb8cc9a6a7da49d6d16177..cdeca70333de897328bfe8c44ff21688a7013382 100644
--- a/Filtering/vtkProcessObject.cxx
+++ b/Filtering/vtkProcessObject.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkSource.h"
 
-vtkCxxRevisionMacro(vtkProcessObject, "1.7");
 
 //----------------------------------------------------------------------------
 vtkProcessObject::vtkProcessObject()
diff --git a/Filtering/vtkProcessObject.h b/Filtering/vtkProcessObject.h
index 076154e95a2c60e79d0f59239aa706d4b4d3ab47..eacf946de5f83c0a1b230015d6da52da35a9bd7a 100644
--- a/Filtering/vtkProcessObject.h
+++ b/Filtering/vtkProcessObject.h
@@ -49,7 +49,7 @@ class vtkDataObject;
 class VTK_FILTERING_EXPORT vtkProcessObject : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkProcessObject,vtkAlgorithm);
+  vtkTypeMacro(vtkProcessObject,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPropAssembly.cxx b/Filtering/vtkPropAssembly.cxx
index a48eb19234beea967b79c52506ee5b5995da45c1..2ff54b939107362aee630d9e619fa214e49addbd 100644
--- a/Filtering/vtkPropAssembly.cxx
+++ b/Filtering/vtkPropAssembly.cxx
@@ -23,7 +23,6 @@
 #include "vtkPropCollection.h"
 #include "vtkViewport.h"
 
-vtkCxxRevisionMacro(vtkPropAssembly, "1.7");
 vtkStandardNewMacro(vtkPropAssembly);
 
 // Construct object with no children.
diff --git a/Filtering/vtkPropAssembly.h b/Filtering/vtkPropAssembly.h
index 8094c521999a3ffbe752f0f3d88f909ccbbcd17e..155c155f13011184c05aef7256e70a4bfd78fb21 100644
--- a/Filtering/vtkPropAssembly.h
+++ b/Filtering/vtkPropAssembly.h
@@ -46,7 +46,7 @@
 class VTK_FILTERING_EXPORT vtkPropAssembly : public vtkProp
 {
 public:
-  vtkTypeRevisionMacro(vtkPropAssembly,vtkProp);
+  vtkTypeMacro(vtkPropAssembly,vtkProp);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkPyramid.cxx b/Filtering/vtkPyramid.cxx
index c8adc084f5009916c9f1578cdf5f5de4cf86c718..060628bb5a0fb406c440c8ee5fa027eaf99ccc06 100644
--- a/Filtering/vtkPyramid.cxx
+++ b/Filtering/vtkPyramid.cxx
@@ -25,7 +25,6 @@
 #include "vtkTriangle.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkPyramid, "1.5");
 vtkStandardNewMacro(vtkPyramid);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkPyramid.h b/Filtering/vtkPyramid.h
index dbf28cbee7ef3c373cb83fa21a89a994ef719a13..99cf2d2255ac8b9cd62a40243fc8e363b8a053d0 100644
--- a/Filtering/vtkPyramid.h
+++ b/Filtering/vtkPyramid.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkPyramid : public vtkCell3D
 {
 public:
   static vtkPyramid *New();
-  vtkTypeRevisionMacro(vtkPyramid,vtkCell3D);
+  vtkTypeMacro(vtkPyramid,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuad.cxx b/Filtering/vtkQuad.cxx
index 0c48c03d2db77289797cd8f7bf4606b1b787358d..44731db74808e9b1e97b80ae5ac9d09e87cdd1ba 100644
--- a/Filtering/vtkQuad.cxx
+++ b/Filtering/vtkQuad.cxx
@@ -25,7 +25,6 @@
 #include "vtkIncrementalPointLocator.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuad, "1.6");
 vtkStandardNewMacro(vtkQuad);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkQuad.h b/Filtering/vtkQuad.h
index 206cebf6607b9b414ffddb9eaab8f7c6323738f7..265e62b29c778235114f7ed005b0b2edc89f308f 100644
--- a/Filtering/vtkQuad.h
+++ b/Filtering/vtkQuad.h
@@ -32,7 +32,7 @@ class VTK_FILTERING_EXPORT vtkQuad : public vtkCell
 {
 public:
   static vtkQuad *New();
-  vtkTypeRevisionMacro(vtkQuad,vtkCell);
+  vtkTypeMacro(vtkQuad,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticEdge.cxx b/Filtering/vtkQuadraticEdge.cxx
index e5c05bbce6b450be28d3747ad9bac90eccb8ddee..7ba55fec91d28b9a0a1a740887234eb8d7d71271 100644
--- a/Filtering/vtkQuadraticEdge.cxx
+++ b/Filtering/vtkQuadraticEdge.cxx
@@ -20,7 +20,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticEdge, "1.8");
 vtkStandardNewMacro(vtkQuadraticEdge);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticEdge.h b/Filtering/vtkQuadraticEdge.h
index d8210356b7a46892012a8a17e8da1a0b59cbd687..120fb46874523220b8d81a861b1eb2c12ab7e8b4 100644
--- a/Filtering/vtkQuadraticEdge.h
+++ b/Filtering/vtkQuadraticEdge.h
@@ -37,7 +37,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticEdge : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticEdge *New();
-  vtkTypeRevisionMacro(vtkQuadraticEdge,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticEdge,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticHexahedron.cxx b/Filtering/vtkQuadraticHexahedron.cxx
index c0ce420e292ea655a66d4342833e4aa4b23ca7e3..f987d31d4693a700b2c63161a7a05bb33fda1611 100644
--- a/Filtering/vtkQuadraticHexahedron.cxx
+++ b/Filtering/vtkQuadraticHexahedron.cxx
@@ -24,7 +24,6 @@
 #include "vtkQuadraticQuad.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticHexahedron, "1.16");
 vtkStandardNewMacro(vtkQuadraticHexahedron);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticHexahedron.h b/Filtering/vtkQuadraticHexahedron.h
index 7de532c33daa255fdd5a6cb1d73640710fab5685..d2074930dcb6bf8cf995fcc502e2e0981530f004 100644
--- a/Filtering/vtkQuadraticHexahedron.h
+++ b/Filtering/vtkQuadraticHexahedron.h
@@ -42,7 +42,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticHexahedron : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticHexahedron *New();
-  vtkTypeRevisionMacro(vtkQuadraticHexahedron,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticHexahedron,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticLinearQuad.cxx b/Filtering/vtkQuadraticLinearQuad.cxx
index ecd1c47d2511226b2cb100afb0378e9d89751d93..67380451a00657fa1eec2b0e79ed1137e4d97c7c 100644
--- a/Filtering/vtkQuadraticLinearQuad.cxx
+++ b/Filtering/vtkQuadraticLinearQuad.cxx
@@ -26,7 +26,6 @@
 #include "vtkQuadraticEdge.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro (vtkQuadraticLinearQuad, "1.9");
 vtkStandardNewMacro (vtkQuadraticLinearQuad);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticLinearQuad.h b/Filtering/vtkQuadraticLinearQuad.h
index 375912e15cdf869530be615547f115fe5924ca7a..df186e056edda25bd298ce31f941fb6ba5bf017a 100644
--- a/Filtering/vtkQuadraticLinearQuad.h
+++ b/Filtering/vtkQuadraticLinearQuad.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticLinearQuad : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticLinearQuad *New();
-  vtkTypeRevisionMacro(vtkQuadraticLinearQuad, vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticLinearQuad, vtkNonLinearCell);
   void PrintSelf(ostream & os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticLinearWedge.cxx b/Filtering/vtkQuadraticLinearWedge.cxx
index 20d3b59bd2af6d2b42b93d0cf4559431c44ddf9d..efb9f1ae3d0c6ba752db5364d8f6719ce25bbf23 100644
--- a/Filtering/vtkQuadraticLinearWedge.cxx
+++ b/Filtering/vtkQuadraticLinearWedge.cxx
@@ -28,7 +28,6 @@
 #include "vtkQuadraticTriangle.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro (vtkQuadraticLinearWedge, "1.12");
 vtkStandardNewMacro (vtkQuadraticLinearWedge);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticLinearWedge.h b/Filtering/vtkQuadraticLinearWedge.h
index 04e5f5c4c21ef947f09d140603cf0002266c6a9c..68b35a75915a678b137bfbcd5187c2bdd0e0cc75 100644
--- a/Filtering/vtkQuadraticLinearWedge.h
+++ b/Filtering/vtkQuadraticLinearWedge.h
@@ -49,7 +49,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticLinearWedge : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticLinearWedge *New ();
-  vtkTypeRevisionMacro (vtkQuadraticLinearWedge, vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticLinearWedge,vtkNonLinearCell);
   void PrintSelf (ostream & os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticPyramid.cxx b/Filtering/vtkQuadraticPyramid.cxx
index 80d5c52c456332b236d4db00f777b9982045e824..aae58a5668302b026fc681971faf225ab1caad4f 100644
--- a/Filtering/vtkQuadraticPyramid.cxx
+++ b/Filtering/vtkQuadraticPyramid.cxx
@@ -26,7 +26,6 @@
 #include "vtkQuadraticTriangle.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticPyramid, "1.19");
 vtkStandardNewMacro(vtkQuadraticPyramid);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticPyramid.h b/Filtering/vtkQuadraticPyramid.h
index e03c56aec5444cf784266b95f8ec61e62e7cf853..b9e4cf9bccd0f0043d03c50391a0ca9658cffbb9 100644
--- a/Filtering/vtkQuadraticPyramid.h
+++ b/Filtering/vtkQuadraticPyramid.h
@@ -49,7 +49,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticPyramid : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticPyramid *New();
-  vtkTypeRevisionMacro(vtkQuadraticPyramid,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticPyramid,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticQuad.cxx b/Filtering/vtkQuadraticQuad.cxx
index 9a04ba90bab1033d6ead0f16ac49a2f4e622fae3..fa5f97c8a0a5e68b30da90210131662d14cb9538 100644
--- a/Filtering/vtkQuadraticQuad.cxx
+++ b/Filtering/vtkQuadraticQuad.cxx
@@ -23,7 +23,6 @@
 #include "vtkQuadraticEdge.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticQuad, "1.12");
 vtkStandardNewMacro(vtkQuadraticQuad);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticQuad.h b/Filtering/vtkQuadraticQuad.h
index cda726d21969ef2f26008bed09a8b363e0d4716e..2ea06f3ca341016cbdc8486b719827b701123701 100644
--- a/Filtering/vtkQuadraticQuad.h
+++ b/Filtering/vtkQuadraticQuad.h
@@ -41,7 +41,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticQuad : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticQuad *New();
-  vtkTypeRevisionMacro(vtkQuadraticQuad,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticQuad,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticTetra.cxx b/Filtering/vtkQuadraticTetra.cxx
index bde67f60b96eb1ad94037705d67e292195468ebe..e28994f9d2600264fb3f52b01c10cd9e1a3f12e3 100644
--- a/Filtering/vtkQuadraticTetra.cxx
+++ b/Filtering/vtkQuadraticTetra.cxx
@@ -22,7 +22,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticTetra, "1.12");
 vtkStandardNewMacro(vtkQuadraticTetra);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticTetra.h b/Filtering/vtkQuadraticTetra.h
index bc0f6110d2dfbe25b4897560dfb0973e0ddbd8ab..9cfdf498ec0cea0b807b0a730ab193cf7291b33e 100644
--- a/Filtering/vtkQuadraticTetra.h
+++ b/Filtering/vtkQuadraticTetra.h
@@ -41,7 +41,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticTetra : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticTetra *New();
-  vtkTypeRevisionMacro(vtkQuadraticTetra,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticTetra,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticTriangle.cxx b/Filtering/vtkQuadraticTriangle.cxx
index 0b70ddebce541c6b8ece70d5ca537e4619243716..6c5d5b5785bc0832042e3c655d14ed63c19d5e80 100644
--- a/Filtering/vtkQuadraticTriangle.cxx
+++ b/Filtering/vtkQuadraticTriangle.cxx
@@ -22,7 +22,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticTriangle, "1.9");
 vtkStandardNewMacro(vtkQuadraticTriangle);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticTriangle.h b/Filtering/vtkQuadraticTriangle.h
index 9a87e32184ef5456dd6bbece807e8d80db0acddc..ff2bd8983812638e83b105b4c0fd9c5743098cc8 100644
--- a/Filtering/vtkQuadraticTriangle.h
+++ b/Filtering/vtkQuadraticTriangle.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticTriangle : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticTriangle *New();
-  vtkTypeRevisionMacro(vtkQuadraticTriangle,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticTriangle,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkQuadraticWedge.cxx b/Filtering/vtkQuadraticWedge.cxx
index 8523a6414fa815397954daa8a0678425eeed0b2f..109dc0ffd53ec6c140127316a957681434a7e71e 100644
--- a/Filtering/vtkQuadraticWedge.cxx
+++ b/Filtering/vtkQuadraticWedge.cxx
@@ -25,7 +25,6 @@
 #include "vtkQuadraticTriangle.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkQuadraticWedge, "1.15");
 vtkStandardNewMacro(vtkQuadraticWedge);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkQuadraticWedge.h b/Filtering/vtkQuadraticWedge.h
index c39c4b23993ce848d5c554a4450ed869e3b78459..fc7f3e49cac9bfef0a18eb6c6698ede2d6d1371e 100644
--- a/Filtering/vtkQuadraticWedge.h
+++ b/Filtering/vtkQuadraticWedge.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkQuadraticWedge : public vtkNonLinearCell
 {
 public:
   static vtkQuadraticWedge *New();
-  vtkTypeRevisionMacro(vtkQuadraticWedge,vtkNonLinearCell);
+  vtkTypeMacro(vtkQuadraticWedge,vtkNonLinearCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkRectilinearGrid.cxx b/Filtering/vtkRectilinearGrid.cxx
index c35e14dc637803893785213f4888b29069c6b199..a97df5102353b9d99af51c5887c148269755e787 100644
--- a/Filtering/vtkRectilinearGrid.cxx
+++ b/Filtering/vtkRectilinearGrid.cxx
@@ -30,7 +30,6 @@
 #include "vtkVertex.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGrid, "1.13");
 vtkStandardNewMacro(vtkRectilinearGrid);
 
 vtkCxxSetObjectMacro(vtkRectilinearGrid,XCoordinates,vtkDataArray);
diff --git a/Filtering/vtkRectilinearGrid.h b/Filtering/vtkRectilinearGrid.h
index fca55049ef95556ec07784ca6fc7d78738a1566f..ed02fe6a49da657f1d37aede9e7a6ab62afe7880 100644
--- a/Filtering/vtkRectilinearGrid.h
+++ b/Filtering/vtkRectilinearGrid.h
@@ -47,7 +47,7 @@ class VTK_FILTERING_EXPORT vtkRectilinearGrid : public vtkDataSet
 public:
   static vtkRectilinearGrid *New();
 
-  vtkTypeRevisionMacro(vtkRectilinearGrid,vtkDataSet);
+  vtkTypeMacro(vtkRectilinearGrid,vtkDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkRectilinearGridAlgorithm.cxx b/Filtering/vtkRectilinearGridAlgorithm.cxx
index 6123e3b77006601ba68777f8f4da57034b009824..b291e36cd3605d5fafb6868c527fd05ed4293ff3 100644
--- a/Filtering/vtkRectilinearGridAlgorithm.cxx
+++ b/Filtering/vtkRectilinearGridAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridAlgorithm, "1.3");
 vtkStandardNewMacro(vtkRectilinearGridAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkRectilinearGridAlgorithm.h b/Filtering/vtkRectilinearGridAlgorithm.h
index a01b37b1bc89aaaebecef6410cbe61ae43a757a5..09ecbfdd2ff25da05938a1609705347c306a618c 100644
--- a/Filtering/vtkRectilinearGridAlgorithm.h
+++ b/Filtering/vtkRectilinearGridAlgorithm.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkRectilinearGridAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkRectilinearGridAlgorithm *New();
-  vtkTypeRevisionMacro(vtkRectilinearGridAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkRectilinearGridAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkRectilinearGridSource.cxx b/Filtering/vtkRectilinearGridSource.cxx
index 90c9177fca976a08f3fd1658f7b215e9252dfb14..b4846b3799e26830c0bbbc03b7e7434547c3d9de 100644
--- a/Filtering/vtkRectilinearGridSource.cxx
+++ b/Filtering/vtkRectilinearGridSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRectilinearGrid.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridSource, "1.22");
 
 //----------------------------------------------------------------------------
 vtkRectilinearGridSource::vtkRectilinearGridSource()
diff --git a/Filtering/vtkRectilinearGridSource.h b/Filtering/vtkRectilinearGridSource.h
index f47bc8e345f7fce5957b1ee9e8446418cbc3f826..5120ef91aa98cfdfa2374e5b3cf799506edb2c98 100644
--- a/Filtering/vtkRectilinearGridSource.h
+++ b/Filtering/vtkRectilinearGridSource.h
@@ -30,7 +30,7 @@ class vtkRectilinearGrid;
 class VTK_FILTERING_EXPORT vtkRectilinearGridSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkRectilinearGridSource,vtkSource);
+  vtkTypeMacro(vtkRectilinearGridSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkRectilinearGridToPolyDataFilter.cxx b/Filtering/vtkRectilinearGridToPolyDataFilter.cxx
index a11845f6e15128e188d9cfbe787c4437feae7455..8e219aaa1b7cf3f812cfe9ea7ba4acca7f3b5849 100644
--- a/Filtering/vtkRectilinearGridToPolyDataFilter.cxx
+++ b/Filtering/vtkRectilinearGridToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkRectilinearGrid.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridToPolyDataFilter, "1.18");
 
 //----------------------------------------------------------------------------
 vtkRectilinearGridToPolyDataFilter::vtkRectilinearGridToPolyDataFilter()
diff --git a/Filtering/vtkRectilinearGridToPolyDataFilter.h b/Filtering/vtkRectilinearGridToPolyDataFilter.h
index 0d3962c99cf796d1b13119425b4d2c4681b6eca8..20245e6d47ec8211e38c5db55a189e849be7b8dc 100644
--- a/Filtering/vtkRectilinearGridToPolyDataFilter.h
+++ b/Filtering/vtkRectilinearGridToPolyDataFilter.h
@@ -30,7 +30,7 @@ class vtkRectilinearGrid;
 class VTK_FILTERING_EXPORT vtkRectilinearGridToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkRectilinearGridToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkRectilinearGridToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkScalarTree.cxx b/Filtering/vtkScalarTree.cxx
index 99a1e8207cc82e1c1f8b8359669b2aeb7e59c144..f8812f59812214bd6397c75ee37d2f8fb94b0fb9 100644
--- a/Filtering/vtkScalarTree.cxx
+++ b/Filtering/vtkScalarTree.cxx
@@ -18,7 +18,6 @@
 #include "vtkGarbageCollector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkScalarTree, "1.32");
 vtkCxxSetObjectMacro(vtkScalarTree,DataSet,vtkDataSet);
 
 // Instantiate scalar tree with maximum level of 20 and branching
diff --git a/Filtering/vtkScalarTree.h b/Filtering/vtkScalarTree.h
index 4205d86cddfa22a933deed068a468d38fd89b02a..f7a502675e31419abd546964abe56d58b633d0e2 100644
--- a/Filtering/vtkScalarTree.h
+++ b/Filtering/vtkScalarTree.h
@@ -43,7 +43,7 @@ class vtkTimeStamp;
 class VTK_FILTERING_EXPORT vtkScalarTree : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkScalarTree,vtkObject);
+  vtkTypeMacro(vtkScalarTree,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSelection.cxx b/Filtering/vtkSelection.cxx
index dc87e328e99775b5c83fb908ba41262aac4f79e3..247d7c0cb1567a4fc9111bef737aa33508e04276 100644
--- a/Filtering/vtkSelection.cxx
+++ b/Filtering/vtkSelection.cxx
@@ -38,7 +38,6 @@ struct vtkSelectionInternals
 };
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkSelection, "1.30");
 vtkStandardNewMacro(vtkSelection);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkSelection.h b/Filtering/vtkSelection.h
index 240fa09be7129065d2749a6b535e53f731559851..5d4561a6fc59460ae6d3703b3203f1bc4d91bf71 100644
--- a/Filtering/vtkSelection.h
+++ b/Filtering/vtkSelection.h
@@ -35,7 +35,7 @@ struct vtkSelectionInternals;
 class VTK_FILTERING_EXPORT vtkSelection : public vtkDataObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSelection,vtkDataObject);
+  vtkTypeMacro(vtkSelection,vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkSelection* New();
 
diff --git a/Filtering/vtkSelectionAlgorithm.cxx b/Filtering/vtkSelectionAlgorithm.cxx
index 9ef9678e66811fb76506178fb2266ed3ac426670..b4a86912693031f3306bfed262dd4b294b621357 100644
--- a/Filtering/vtkSelectionAlgorithm.cxx
+++ b/Filtering/vtkSelectionAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkSelectionAlgorithm, "1.1");
 vtkStandardNewMacro(vtkSelectionAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkSelectionAlgorithm.h b/Filtering/vtkSelectionAlgorithm.h
index f4c9d2a542fdc1e8e18f91469914e4d25e2a1852..aee01deb8898eaed49d36e2922287c63bc86ade3 100644
--- a/Filtering/vtkSelectionAlgorithm.h
+++ b/Filtering/vtkSelectionAlgorithm.h
@@ -47,7 +47,7 @@ class VTK_FILTERING_EXPORT vtkSelectionAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkSelectionAlgorithm *New();
-  vtkTypeRevisionMacro(vtkSelectionAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkSelectionAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSelectionNode.cxx b/Filtering/vtkSelectionNode.cxx
index 4ce9e47985bd9d34acf330c53dc8e720423e3c56..61feb488520494467ed607c598b186ce9fc06f0b 100644
--- a/Filtering/vtkSelectionNode.cxx
+++ b/Filtering/vtkSelectionNode.cxx
@@ -26,7 +26,6 @@
 #include "vtkProp.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkSelectionNode, "1.7");
 vtkStandardNewMacro(vtkSelectionNode);
 vtkCxxSetObjectMacro(vtkSelectionNode, SelectionData, vtkDataSetAttributes);
 
diff --git a/Filtering/vtkSelectionNode.h b/Filtering/vtkSelectionNode.h
index bae460e19e8df81e374462fb7eb8f6b5c516b642..68f12f1abb030e2c940d04b52005fa35e6039fde 100644
--- a/Filtering/vtkSelectionNode.h
+++ b/Filtering/vtkSelectionNode.h
@@ -59,7 +59,7 @@ class vtkTable;
 class VTK_FILTERING_EXPORT vtkSelectionNode : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSelectionNode,vtkObject);
+  vtkTypeMacro(vtkSelectionNode,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkSelectionNode* New();
 
diff --git a/Filtering/vtkSimpleCellTessellator.cxx b/Filtering/vtkSimpleCellTessellator.cxx
index 7848b9d64bd02b15c656247e79cbe71cdc7fb1f0..adcddf9ec617422f724a9203c6c00c3d3ebdb798 100644
--- a/Filtering/vtkSimpleCellTessellator.cxx
+++ b/Filtering/vtkSimpleCellTessellator.cxx
@@ -371,7 +371,6 @@ static int TRIANGLE_VERTEX_STATE[3]={5,  // 1 0 1
                                      3,  // 0 1 1
                                      6}; // 1 1 0
 
-vtkCxxRevisionMacro(vtkSimpleCellTessellator, "1.25");
 vtkStandardNewMacro(vtkSimpleCellTessellator);
 //-----------------------------------------------------------------------------
 //
diff --git a/Filtering/vtkSimpleCellTessellator.h b/Filtering/vtkSimpleCellTessellator.h
index 67bb5fe94c8bb91dc4dea499163c764ba3a3bb4d..e1b8bc77c995299ee44a5a2a7b0e7eda81e8fac0 100644
--- a/Filtering/vtkSimpleCellTessellator.h
+++ b/Filtering/vtkSimpleCellTessellator.h
@@ -65,7 +65,7 @@ class VTK_FILTERING_EXPORT vtkSimpleCellTessellator : public vtkGenericCellTesse
 {
 public:
   static vtkSimpleCellTessellator *New();
-  vtkTypeRevisionMacro(vtkSimpleCellTessellator,vtkGenericCellTessellator);
+  vtkTypeMacro(vtkSimpleCellTessellator,vtkGenericCellTessellator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSimpleImageToImageFilter.cxx b/Filtering/vtkSimpleImageToImageFilter.cxx
index 0fbbb3159a6e1f5a7bc754c188dd7b3677d4b8b9..717cc7691554c1bd1f9aadf1d3f9a7449192f99b 100644
--- a/Filtering/vtkSimpleImageToImageFilter.cxx
+++ b/Filtering/vtkSimpleImageToImageFilter.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkSimpleImageToImageFilter, "1.16");
 
 //----------------------------------------------------------------------------
 vtkSimpleImageToImageFilter::vtkSimpleImageToImageFilter()
diff --git a/Filtering/vtkSimpleImageToImageFilter.h b/Filtering/vtkSimpleImageToImageFilter.h
index fe3ec987fb8e3be6658c21e784bd2731870f1ed0..a77d9908e7fdb966861b71b695f521ce932e2c01 100644
--- a/Filtering/vtkSimpleImageToImageFilter.h
+++ b/Filtering/vtkSimpleImageToImageFilter.h
@@ -42,7 +42,7 @@
 class VTK_FILTERING_EXPORT vtkSimpleImageToImageFilter : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSimpleImageToImageFilter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkSimpleImageToImageFilter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Filtering/vtkSimpleScalarTree.cxx b/Filtering/vtkSimpleScalarTree.cxx
index 7fbfeccb7ab11042d832ef254cb13b4394375046..69b5318f330d67f9bc24ab5c50af06689e93b9d3 100644
--- a/Filtering/vtkSimpleScalarTree.cxx
+++ b/Filtering/vtkSimpleScalarTree.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkSimpleScalarTree, "1.9");
 vtkStandardNewMacro(vtkSimpleScalarTree);
 
 class vtkScalarNode {};
diff --git a/Filtering/vtkSimpleScalarTree.h b/Filtering/vtkSimpleScalarTree.h
index 9a1280263cacc7f9d3bf07c31fbbb61c63ed431d..45c44c57eda7e6e98d3ec77f83718280ecf37abc 100644
--- a/Filtering/vtkSimpleScalarTree.h
+++ b/Filtering/vtkSimpleScalarTree.h
@@ -48,7 +48,7 @@ public:
 
   // Description:
   // Standard type related macros and PrintSelf() method.
-  vtkTypeRevisionMacro(vtkSimpleScalarTree,vtkScalarTree);
+  vtkTypeMacro(vtkSimpleScalarTree,vtkScalarTree);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSmoothErrorMetric.cxx b/Filtering/vtkSmoothErrorMetric.cxx
index b38666f8435ef4a79b0dd3232bdcbd8a6feac14f..a6bf6835979c65b26daad56c971e52dd22d00ca1 100644
--- a/Filtering/vtkSmoothErrorMetric.cxx
+++ b/Filtering/vtkSmoothErrorMetric.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkSmoothErrorMetric,"1.2");
 vtkStandardNewMacro(vtkSmoothErrorMetric);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkSmoothErrorMetric.h b/Filtering/vtkSmoothErrorMetric.h
index dfb0210c8e1363f978c06e56054de1f492bc097f..55b7f9eaec9a93f7832fa1fff93896e3013f8edd 100644
--- a/Filtering/vtkSmoothErrorMetric.h
+++ b/Filtering/vtkSmoothErrorMetric.h
@@ -42,7 +42,7 @@ public:
   
   // Description:
   // Standard VTK type and error macros.
-  vtkTypeRevisionMacro(vtkSmoothErrorMetric,vtkGenericSubdivisionErrorMetric);
+  vtkTypeMacro(vtkSmoothErrorMetric,vtkGenericSubdivisionErrorMetric);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkSource.cxx b/Filtering/vtkSource.cxx
index a4f0ea57952dfa02cee1a911bacd794af3ec886f..57f4d83d6330b9c1068d60c1e122c59f9282a87a 100644
--- a/Filtering/vtkSource.cxx
+++ b/Filtering/vtkSource.cxx
@@ -26,7 +26,6 @@
 
 #include "vtkImageData.h"
 
-vtkCxxRevisionMacro(vtkSource, "1.18");
 
 class vtkSourceToDataSetFriendship
 {
diff --git a/Filtering/vtkSource.h b/Filtering/vtkSource.h
index b98d5c0533cd3b998d950babfe2cf5fc58164c80..aea1b5292d3d288e7b2dffa0a3ae8ef3c940c00d 100644
--- a/Filtering/vtkSource.h
+++ b/Filtering/vtkSource.h
@@ -50,7 +50,7 @@ class vtkDataObjectToSourceFriendship;
 class VTK_FILTERING_EXPORT vtkSource : public vtkProcessObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSource,vtkProcessObject);
+  vtkTypeMacro(vtkSource,vtkProcessObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSphere.cxx b/Filtering/vtkSphere.cxx
index ab77018f2f1006fbf387bbc4252670cc6432b9b4..e9c0ba9ac52bf13e327d97944ddea28cbb21ce8b 100644
--- a/Filtering/vtkSphere.cxx
+++ b/Filtering/vtkSphere.cxx
@@ -16,7 +16,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkSphere, "1.32");
 vtkStandardNewMacro(vtkSphere);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkSphere.h b/Filtering/vtkSphere.h
index fee58a68d31ea113a2ae43f0c06e75d27707b5a4..3e980ae0c909533cb3551385c447a679481c2fd6 100644
--- a/Filtering/vtkSphere.h
+++ b/Filtering/vtkSphere.h
@@ -27,7 +27,7 @@
 class VTK_FILTERING_EXPORT vtkSphere : public vtkImplicitFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkSphere,vtkImplicitFunction);
+  vtkTypeMacro(vtkSphere,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Filtering/vtkSpline.cxx b/Filtering/vtkSpline.cxx
index 0ff518e8c6ad5cf2125857fe317bfecaa8e21b37..c5e84bf0362225071766d4c822d3ceb9ce642455 100644
--- a/Filtering/vtkSpline.cxx
+++ b/Filtering/vtkSpline.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkPiecewiseFunction.h"
 
-vtkCxxRevisionMacro(vtkSpline, "1.28");
 
 //----------------------------------------------------------------------------
 // Construct a spline wth the folloing defaults:
diff --git a/Filtering/vtkSpline.h b/Filtering/vtkSpline.h
index f280aecf40921867e799b239eb73684a3ef974c5..23d6716c4eda3b0a87fc386480c56634a399e635 100644
--- a/Filtering/vtkSpline.h
+++ b/Filtering/vtkSpline.h
@@ -59,7 +59,7 @@ class vtkPiecewiseFunction;
 class VTK_FILTERING_EXPORT vtkSpline : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSpline,vtkObject);
+  vtkTypeMacro(vtkSpline,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStreamingDemandDrivenPipeline.cxx b/Filtering/vtkStreamingDemandDrivenPipeline.cxx
index 6404d052341dde5824ac0818e8c405534d43e0b1..2987f24b14e155b899a8a5c8da642b5fef6b611c 100644
--- a/Filtering/vtkStreamingDemandDrivenPipeline.cxx
+++ b/Filtering/vtkStreamingDemandDrivenPipeline.cxx
@@ -33,7 +33,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkStreamingDemandDrivenPipeline, "1.64");
 vtkStandardNewMacro(vtkStreamingDemandDrivenPipeline);
 
 vtkInformationKeyMacro(vtkStreamingDemandDrivenPipeline, CONTINUE_EXECUTING, Integer);
diff --git a/Filtering/vtkStreamingDemandDrivenPipeline.h b/Filtering/vtkStreamingDemandDrivenPipeline.h
index e597fb3491f9645a1f5482ffb2ec00a9ddacc969..efb28eb5ccbe7820a1af039bd9745fd09556db86 100644
--- a/Filtering/vtkStreamingDemandDrivenPipeline.h
+++ b/Filtering/vtkStreamingDemandDrivenPipeline.h
@@ -38,7 +38,7 @@ class VTK_FILTERING_EXPORT vtkStreamingDemandDrivenPipeline : public vtkDemandDr
 {
 public:
   static vtkStreamingDemandDrivenPipeline* New();
-  vtkTypeRevisionMacro(vtkStreamingDemandDrivenPipeline,vtkDemandDrivenPipeline);
+  vtkTypeMacro(vtkStreamingDemandDrivenPipeline,vtkDemandDrivenPipeline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredGrid.cxx b/Filtering/vtkStructuredGrid.cxx
index 9d28abc5e062fc2f7476996ae83df358329aac4d..7aa744a78ead00168c8d54353ddf957db69f9205 100644
--- a/Filtering/vtkStructuredGrid.cxx
+++ b/Filtering/vtkStructuredGrid.cxx
@@ -29,7 +29,6 @@
 #include "vtkQuad.h"
 #include "vtkVertex.h"
 
-vtkCxxRevisionMacro(vtkStructuredGrid, "1.11");
 vtkStandardNewMacro(vtkStructuredGrid);
 
 vtkCxxSetObjectMacro(vtkStructuredGrid,
diff --git a/Filtering/vtkStructuredGrid.h b/Filtering/vtkStructuredGrid.h
index 6b00cbb2c7a635900850d324772e45d584722598..03da5d9ca4742b0fbe524cf463d542ce997eb3cd 100644
--- a/Filtering/vtkStructuredGrid.h
+++ b/Filtering/vtkStructuredGrid.h
@@ -56,7 +56,7 @@ class VTK_FILTERING_EXPORT vtkStructuredGrid : public vtkPointSet
 public:
   static vtkStructuredGrid *New();
 
-  vtkTypeRevisionMacro(vtkStructuredGrid,vtkPointSet);
+  vtkTypeMacro(vtkStructuredGrid,vtkPointSet);
   void PrintSelf(ostream& os, vtkIndent indent);
  
   // Description:
diff --git a/Filtering/vtkStructuredGridAlgorithm.cxx b/Filtering/vtkStructuredGridAlgorithm.cxx
index 765ea20258679e4726183ad3628351c9150916d9..8ded30df80493bb959f2e7b5c8cf4d096b14e3b1 100644
--- a/Filtering/vtkStructuredGridAlgorithm.cxx
+++ b/Filtering/vtkStructuredGridAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridAlgorithm, "1.3");
 vtkStandardNewMacro(vtkStructuredGridAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkStructuredGridAlgorithm.h b/Filtering/vtkStructuredGridAlgorithm.h
index 8a049dce8e64bcaf7cba057bf33d81994549336d..c144ae05fa480ae8ba69fadf0db9d8d3706f98c3 100644
--- a/Filtering/vtkStructuredGridAlgorithm.h
+++ b/Filtering/vtkStructuredGridAlgorithm.h
@@ -44,7 +44,7 @@ class VTK_FILTERING_EXPORT vtkStructuredGridAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkStructuredGridAlgorithm *New();
-  vtkTypeRevisionMacro(vtkStructuredGridAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkStructuredGridAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredGridSource.cxx b/Filtering/vtkStructuredGridSource.cxx
index ee52ba2a8a1c716e7b857a7af036540a06e0f94b..2f3867edb4a875c3c52733a3c587df06f3438e05 100644
--- a/Filtering/vtkStructuredGridSource.cxx
+++ b/Filtering/vtkStructuredGridSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridSource, "1.32");
 
 //----------------------------------------------------------------------------
 vtkStructuredGridSource::vtkStructuredGridSource()
diff --git a/Filtering/vtkStructuredGridSource.h b/Filtering/vtkStructuredGridSource.h
index 8e71c415f9466c4fc22c6a5944029fd1151919f7..472ca1e3ca5a621a10ce2f2582f5475e482be85e 100644
--- a/Filtering/vtkStructuredGridSource.h
+++ b/Filtering/vtkStructuredGridSource.h
@@ -30,7 +30,7 @@ class vtkStructuredGrid;
 class VTK_FILTERING_EXPORT vtkStructuredGridSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredGridSource,vtkSource);
+  vtkTypeMacro(vtkStructuredGridSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredGridToPolyDataFilter.cxx b/Filtering/vtkStructuredGridToPolyDataFilter.cxx
index 6a0979cdd090ffbb91d86a42c4febc90c1542bcc..d86a9aae52d94819002a60b273262afb7c595215 100644
--- a/Filtering/vtkStructuredGridToPolyDataFilter.cxx
+++ b/Filtering/vtkStructuredGridToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridToPolyDataFilter, "1.18");
 
 //----------------------------------------------------------------------------
 vtkStructuredGridToPolyDataFilter::vtkStructuredGridToPolyDataFilter()
diff --git a/Filtering/vtkStructuredGridToPolyDataFilter.h b/Filtering/vtkStructuredGridToPolyDataFilter.h
index dec2592731c08b2a669a52b3ccfcb4f5b32abfed..83c4a68862eb9db82380eee54a09817cf4c50c28 100644
--- a/Filtering/vtkStructuredGridToPolyDataFilter.h
+++ b/Filtering/vtkStructuredGridToPolyDataFilter.h
@@ -30,7 +30,7 @@ class vtkStructuredGrid;
 class VTK_FILTERING_EXPORT vtkStructuredGridToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredGridToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkStructuredGridToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredGridToStructuredGridFilter.cxx b/Filtering/vtkStructuredGridToStructuredGridFilter.cxx
index 41ecc733dc8bfbdc9c0baf0b35a48a08e14d5969..d422d36c659c905408dffb6e78d8fe5c544073e1 100644
--- a/Filtering/vtkStructuredGridToStructuredGridFilter.cxx
+++ b/Filtering/vtkStructuredGridToStructuredGridFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridToStructuredGridFilter, "1.23");
 
 // ----------------------------------------------------------------------------
 vtkStructuredGridToStructuredGridFilter::vtkStructuredGridToStructuredGridFilter()
diff --git a/Filtering/vtkStructuredGridToStructuredGridFilter.h b/Filtering/vtkStructuredGridToStructuredGridFilter.h
index 11c11057424c73ed58a5260c27053a7da4bb550d..f6d776b1301d755c263b6fc078fc6d61bad2ed86 100644
--- a/Filtering/vtkStructuredGridToStructuredGridFilter.h
+++ b/Filtering/vtkStructuredGridToStructuredGridFilter.h
@@ -29,7 +29,7 @@
 class VTK_FILTERING_EXPORT vtkStructuredGridToStructuredGridFilter : public vtkStructuredGridSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredGridToStructuredGridFilter,vtkStructuredGridSource);
+  vtkTypeMacro(vtkStructuredGridToStructuredGridFilter,vtkStructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredPoints.cxx b/Filtering/vtkStructuredPoints.cxx
index 9665a3c416fc6d69bca615274728693661dcbf7e..d302afd52f96e06e3ae9d3f85b11af0ebd44ee77 100644
--- a/Filtering/vtkStructuredPoints.cxx
+++ b/Filtering/vtkStructuredPoints.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkStructuredPoints, "1.1");
 vtkStandardNewMacro(vtkStructuredPoints);
 
 vtkStructuredPoints::vtkStructuredPoints()
diff --git a/Filtering/vtkStructuredPoints.h b/Filtering/vtkStructuredPoints.h
index da7b7be8980d93796bf26e6ad404b005dd2938bb..839fa0246642aa4ff5689c0eef18bb3a0ca0735b 100644
--- a/Filtering/vtkStructuredPoints.h
+++ b/Filtering/vtkStructuredPoints.h
@@ -34,7 +34,7 @@ class VTK_FILTERING_EXPORT vtkStructuredPoints : public vtkImageData
 {
 public:
   static vtkStructuredPoints *New();
-  vtkTypeRevisionMacro(vtkStructuredPoints,vtkImageData);
+  vtkTypeMacro(vtkStructuredPoints,vtkImageData);
 
   // Description:
   // To simplify filter superclasses,
diff --git a/Filtering/vtkStructuredPointsCollection.cxx b/Filtering/vtkStructuredPointsCollection.cxx
index e6cd2eedc7ec494b538270e6c08a290fcabf4688..364a5fa066f4b4ee1f9aa4d683293546399f9bb8 100644
--- a/Filtering/vtkStructuredPointsCollection.cxx
+++ b/Filtering/vtkStructuredPointsCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkStructuredPointsCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsCollection, "1.8");
 vtkStandardNewMacro(vtkStructuredPointsCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkStructuredPointsCollection.h b/Filtering/vtkStructuredPointsCollection.h
index 5c8390eb8334bb60062511d120ff6679959c899a..abd09026252f4907e2c26bd51110032956a8efd5 100644
--- a/Filtering/vtkStructuredPointsCollection.h
+++ b/Filtering/vtkStructuredPointsCollection.h
@@ -28,7 +28,7 @@ class VTK_FILTERING_EXPORT vtkStructuredPointsCollection : public vtkCollection
 {
 public:
   static vtkStructuredPointsCollection *New();
-  vtkTypeRevisionMacro(vtkStructuredPointsCollection,vtkCollection);
+  vtkTypeMacro(vtkStructuredPointsCollection,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredPointsSource.cxx b/Filtering/vtkStructuredPointsSource.cxx
index f9f96947fdea2446bf61188d286ee8af76ff323b..9756a3a8d1ad3827e1d3c19d5978f82803b83c12 100644
--- a/Filtering/vtkStructuredPointsSource.cxx
+++ b/Filtering/vtkStructuredPointsSource.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointData.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsSource, "1.40");
 
 //----------------------------------------------------------------------------
 vtkStructuredPointsSource::vtkStructuredPointsSource()
diff --git a/Filtering/vtkStructuredPointsSource.h b/Filtering/vtkStructuredPointsSource.h
index 96d3ededbdbd70d7474e89d416d0a6407afdacb4..6c8dd69a9798f4aa5c3677271bdedfa0273c33a6 100644
--- a/Filtering/vtkStructuredPointsSource.h
+++ b/Filtering/vtkStructuredPointsSource.h
@@ -30,7 +30,7 @@ class vtkStructuredPoints;
 class VTK_FILTERING_EXPORT vtkStructuredPointsSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredPointsSource,vtkSource);
+  vtkTypeMacro(vtkStructuredPointsSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredPointsToPolyDataFilter.cxx b/Filtering/vtkStructuredPointsToPolyDataFilter.cxx
index 5f20845734e872ec113d5449c9b19ead4bfadb2c..315b1c88739ff8e1d1868d6678344bdbd8f4f646 100644
--- a/Filtering/vtkStructuredPointsToPolyDataFilter.cxx
+++ b/Filtering/vtkStructuredPointsToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsToPolyDataFilter, "1.31");
 
 //----------------------------------------------------------------------------
 vtkStructuredPointsToPolyDataFilter::vtkStructuredPointsToPolyDataFilter()
diff --git a/Filtering/vtkStructuredPointsToPolyDataFilter.h b/Filtering/vtkStructuredPointsToPolyDataFilter.h
index 88d7aa0a68924a675ce0d765d01c31b527e185ec..eae7c57965a762988d96e12a50b1e6d9f8cd9de3 100644
--- a/Filtering/vtkStructuredPointsToPolyDataFilter.h
+++ b/Filtering/vtkStructuredPointsToPolyDataFilter.h
@@ -32,7 +32,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkStructuredPointsToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredPointsToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkStructuredPointsToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredPointsToStructuredPointsFilter.cxx b/Filtering/vtkStructuredPointsToStructuredPointsFilter.cxx
index ce165a157804cf2d8c708531f34439a34e3d7349..14b713b914674c96443247c12616ebee9b70e8c8 100644
--- a/Filtering/vtkStructuredPointsToStructuredPointsFilter.cxx
+++ b/Filtering/vtkStructuredPointsToStructuredPointsFilter.cxx
@@ -18,7 +18,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsToStructuredPointsFilter, "1.33");
 
 // ----------------------------------------------------------------------------
 vtkStructuredPointsToStructuredPointsFilter::vtkStructuredPointsToStructuredPointsFilter()
diff --git a/Filtering/vtkStructuredPointsToStructuredPointsFilter.h b/Filtering/vtkStructuredPointsToStructuredPointsFilter.h
index 944c61cdcc8d283eb0932b07e12628ff8638b784..ce685a455bef37a2e597c8b6797314cd16228fd0 100644
--- a/Filtering/vtkStructuredPointsToStructuredPointsFilter.h
+++ b/Filtering/vtkStructuredPointsToStructuredPointsFilter.h
@@ -32,7 +32,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkStructuredPointsToStructuredPointsFilter : public vtkStructuredPointsSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredPointsToStructuredPointsFilter,vtkStructuredPointsSource);
+  vtkTypeMacro(vtkStructuredPointsToStructuredPointsFilter,vtkStructuredPointsSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkStructuredPointsToUnstructuredGridFilter.cxx b/Filtering/vtkStructuredPointsToUnstructuredGridFilter.cxx
index bcd89cc5eb1c2ad3e7ea7fa019d17d58dc675e26..07b0d46268f0c1e0176a5decdcc1a6b5893c2a5b 100644
--- a/Filtering/vtkStructuredPointsToUnstructuredGridFilter.cxx
+++ b/Filtering/vtkStructuredPointsToUnstructuredGridFilter.cxx
@@ -18,7 +18,6 @@
 #include "vtkInformation.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsToUnstructuredGridFilter, "1.18");
 
 //----------------------------------------------------------------------------
 vtkStructuredPointsToUnstructuredGridFilter::vtkStructuredPointsToUnstructuredGridFilter()
diff --git a/Filtering/vtkStructuredPointsToUnstructuredGridFilter.h b/Filtering/vtkStructuredPointsToUnstructuredGridFilter.h
index 944c81b2cf114e555f2307aae3c4b00243f2d5b7..2a42d0aa79148d68e346a031bb233ddbcad9fad6 100644
--- a/Filtering/vtkStructuredPointsToUnstructuredGridFilter.h
+++ b/Filtering/vtkStructuredPointsToUnstructuredGridFilter.h
@@ -31,7 +31,7 @@ class vtkImageData;
 class VTK_FILTERING_EXPORT vtkStructuredPointsToUnstructuredGridFilter : public vtkUnstructuredGridSource
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredPointsToUnstructuredGridFilter,vtkUnstructuredGridSource);
+  vtkTypeMacro(vtkStructuredPointsToUnstructuredGridFilter,vtkUnstructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkSuperquadric.cxx b/Filtering/vtkSuperquadric.cxx
index 9b8f281793c6d6a7beb1bc862ecdd463a9a711fc..914e91c10e3f5dc0b4e233e9f367a691cab7f3c4 100644
--- a/Filtering/vtkSuperquadric.cxx
+++ b/Filtering/vtkSuperquadric.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSuperquadric, "1.18");
 vtkStandardNewMacro(vtkSuperquadric);
 
 // Construct with superquadric radius of 0.5, toroidal off, center at 0.0,
diff --git a/Filtering/vtkSuperquadric.h b/Filtering/vtkSuperquadric.h
index 475e33e534dcd7683f8e79af3e1e1ae48dd6975a..904c4f78b82f482b7b46b7433a5c9decc3cc6377 100644
--- a/Filtering/vtkSuperquadric.h
+++ b/Filtering/vtkSuperquadric.h
@@ -51,7 +51,7 @@ public:
   // scale (1,1,1), size 0.5, phi roundness 1.0, and theta roundness 0.0.
   static vtkSuperquadric *New();
 
-  vtkTypeRevisionMacro(vtkSuperquadric,vtkImplicitFunction);
+  vtkTypeMacro(vtkSuperquadric,vtkImplicitFunction);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // ImplicitFunction interface
diff --git a/Filtering/vtkTable.cxx b/Filtering/vtkTable.cxx
index 1301d4c015ac5a34cfb932e5d4c73453ccfdd610..2de3840cd8aaeea771f273705c6a8fb2392b5f3f 100644
--- a/Filtering/vtkTable.cxx
+++ b/Filtering/vtkTable.cxx
@@ -35,7 +35,6 @@
 // Standard functions
 //
 
-vtkCxxRevisionMacro(vtkTable, "1.30");
 vtkStandardNewMacro(vtkTable);
 vtkCxxSetObjectMacro(vtkTable, RowData, vtkDataSetAttributes);
 
diff --git a/Filtering/vtkTable.h b/Filtering/vtkTable.h
index bb983a590103e0e78fa4766eb6dd6f0fb2d55817..3c407dcce812f1d06e04977184d1dd48c2ea079a 100644
--- a/Filtering/vtkTable.h
+++ b/Filtering/vtkTable.h
@@ -58,7 +58,7 @@ class VTK_FILTERING_EXPORT vtkTable : public vtkDataObject
 {
 public:
   static vtkTable* New();
-  vtkTypeRevisionMacro(vtkTable, vtkDataObject);
+  vtkTypeMacro(vtkTable, vtkDataObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTableAlgorithm.cxx b/Filtering/vtkTableAlgorithm.cxx
index a1f1405267b8ffc5ee0388c7cdd14efce2f79d73..dc837d8923ec1cd22dea1568ed7b0fc863330ebc 100644
--- a/Filtering/vtkTableAlgorithm.cxx
+++ b/Filtering/vtkTableAlgorithm.cxx
@@ -28,7 +28,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkTableAlgorithm, "1.3");
 vtkStandardNewMacro(vtkTableAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTableAlgorithm.h b/Filtering/vtkTableAlgorithm.h
index a01ec9d00ca9aff3c06d682646add9ffda28c35c..02c2cc4ad2e7e85cf5419dbfa4c14d85b971927e 100644
--- a/Filtering/vtkTableAlgorithm.h
+++ b/Filtering/vtkTableAlgorithm.h
@@ -51,7 +51,7 @@ class VTK_FILTERING_EXPORT vtkTableAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkTableAlgorithm *New();
-  vtkTypeRevisionMacro(vtkTableAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkTableAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTemporalDataSet.cxx b/Filtering/vtkTemporalDataSet.cxx
index c46ac6faf85f3f14c933b319045d5b7cb8cc9a9c..60f832a02c0b9bb35e60b4820c9362c053b6a1a0 100644
--- a/Filtering/vtkTemporalDataSet.cxx
+++ b/Filtering/vtkTemporalDataSet.cxx
@@ -21,7 +21,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTemporalDataSet, "1.3");
 vtkStandardNewMacro(vtkTemporalDataSet);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTemporalDataSet.h b/Filtering/vtkTemporalDataSet.h
index 06b9f1f5586f97b83e80956052e04a493a8c9655..1dd113fee1fd39d47fec0a3ff4d15c341ee7df15 100644
--- a/Filtering/vtkTemporalDataSet.h
+++ b/Filtering/vtkTemporalDataSet.h
@@ -31,7 +31,7 @@ class VTK_FILTERING_EXPORT vtkTemporalDataSet : public vtkCompositeDataSet
 public:
   static vtkTemporalDataSet *New();
 
-  vtkTypeRevisionMacro(vtkTemporalDataSet,vtkCompositeDataSet);
+  vtkTypeMacro(vtkTemporalDataSet,vtkCompositeDataSet);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTemporalDataSetAlgorithm.cxx b/Filtering/vtkTemporalDataSetAlgorithm.cxx
index 8016f1fe9a2e4a2bb8d262518d427753ec7545ee..c9295169f3ba2f9ae1a0c3e98555f5d6810a6933 100644
--- a/Filtering/vtkTemporalDataSetAlgorithm.cxx
+++ b/Filtering/vtkTemporalDataSetAlgorithm.cxx
@@ -23,7 +23,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTemporalDataSetAlgorithm, "1.4");
 vtkStandardNewMacro(vtkTemporalDataSetAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTemporalDataSetAlgorithm.h b/Filtering/vtkTemporalDataSetAlgorithm.h
index afeb483a4ae78360ad80e64203794b2ae2f54a96..4791cf084c095cb1b47b597ea278a67c5df417f6 100644
--- a/Filtering/vtkTemporalDataSetAlgorithm.h
+++ b/Filtering/vtkTemporalDataSetAlgorithm.h
@@ -30,7 +30,7 @@ class VTK_FILTERING_EXPORT vtkTemporalDataSetAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkTemporalDataSetAlgorithm *New();
-  vtkTypeRevisionMacro(vtkTemporalDataSetAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkTemporalDataSetAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTetra.cxx b/Filtering/vtkTetra.cxx
index 76cb2e76bf179dbfa7a4fb8ebe19735404781f1e..6199c983b910ad75a74462694f5b0a2e533c6b59 100644
--- a/Filtering/vtkTetra.cxx
+++ b/Filtering/vtkTetra.cxx
@@ -24,7 +24,6 @@
 #include "vtkTriangle.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkTetra, "1.9");
 vtkStandardNewMacro(vtkTetra);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTetra.h b/Filtering/vtkTetra.h
index 77b06979f2fde2294eb0ff5743f2c217cf4a755b..da8ba26f28d2f7076bf392e859ceba54416a121a 100644
--- a/Filtering/vtkTetra.h
+++ b/Filtering/vtkTetra.h
@@ -38,7 +38,7 @@ class VTK_FILTERING_EXPORT vtkTetra : public vtkCell3D
 {
 public:
   static vtkTetra *New();
-  vtkTypeRevisionMacro(vtkTetra,vtkCell3D);
+  vtkTypeMacro(vtkTetra,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkThreadedImageAlgorithm.cxx b/Filtering/vtkThreadedImageAlgorithm.cxx
index 93361264cb9669a7eabb2222c09d30eea50524a2..bd2fd6fa1ace2e241e7d6fb79f72250627631132 100644
--- a/Filtering/vtkThreadedImageAlgorithm.cxx
+++ b/Filtering/vtkThreadedImageAlgorithm.cxx
@@ -26,7 +26,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkThreadedImageAlgorithm, "1.12");
 
 //----------------------------------------------------------------------------
 vtkThreadedImageAlgorithm::vtkThreadedImageAlgorithm()
diff --git a/Filtering/vtkThreadedImageAlgorithm.h b/Filtering/vtkThreadedImageAlgorithm.h
index 34d86b5dc94bca35fefeadde83943a35ff3ae45d..144d941d20800cae3c05cebd12ef07a4bc7a68f3 100644
--- a/Filtering/vtkThreadedImageAlgorithm.h
+++ b/Filtering/vtkThreadedImageAlgorithm.h
@@ -33,7 +33,7 @@ class vtkMultiThreader;
 class VTK_FILTERING_EXPORT vtkThreadedImageAlgorithm : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkThreadedImageAlgorithm,vtkImageAlgorithm);
+  vtkTypeMacro(vtkThreadedImageAlgorithm,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkThreadedStreamingPipeline.cxx b/Filtering/vtkThreadedStreamingPipeline.cxx
index 09bf4db7784f604dbb06a87c4d5850bf41e8cb20..ec39832ad7f29862a5a4f7108cc27ea6aea2889f 100644
--- a/Filtering/vtkThreadedStreamingPipeline.cxx
+++ b/Filtering/vtkThreadedStreamingPipeline.cxx
@@ -50,7 +50,6 @@
 #include <vtksys/hash_set.hxx>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkThreadedStreamingPipeline, "1.6");
 vtkStandardNewMacro(vtkThreadedStreamingPipeline);
 
 vtkInformationKeyMacro(vtkThreadedStreamingPipeline, AUTO_PROPAGATE, Integer);
diff --git a/Filtering/vtkThreadedStreamingPipeline.h b/Filtering/vtkThreadedStreamingPipeline.h
index fe814c185c2f004bd328fcaefab381b5a1ce0057..824b71c0eb01e3c60bc25d115fc735ed1c3bb231 100644
--- a/Filtering/vtkThreadedStreamingPipeline.h
+++ b/Filtering/vtkThreadedStreamingPipeline.h
@@ -49,7 +49,7 @@ class VTK_FILTERING_EXPORT vtkThreadedStreamingPipeline : public vtkCompositeDat
 {
 public:
   static vtkThreadedStreamingPipeline* New();
-  vtkTypeRevisionMacro(vtkThreadedStreamingPipeline,vtkCompositeDataPipeline);
+  vtkTypeMacro(vtkThreadedStreamingPipeline,vtkCompositeDataPipeline);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTree.cxx b/Filtering/vtkTree.cxx
index 37833fbdff1ef0acaa5e81963fcfc32f7d7bb1e5..4d3b4f2af0b21061c615f887fa3f138ab942a78f 100644
--- a/Filtering/vtkTree.cxx
+++ b/Filtering/vtkTree.cxx
@@ -30,7 +30,6 @@
 
 using vtksys_stl::vector;
 
-vtkCxxRevisionMacro(vtkTree, "1.12");
 vtkStandardNewMacro(vtkTree);
 //----------------------------------------------------------------------------
 vtkTree::vtkTree()
diff --git a/Filtering/vtkTree.h b/Filtering/vtkTree.h
index 19f5202d0b366a49844bd9282cab96e5b2895ec0..3aa8e4d9cc914a3f8c30b05806bee85aea1ae8a3 100644
--- a/Filtering/vtkTree.h
+++ b/Filtering/vtkTree.h
@@ -51,7 +51,7 @@ class VTK_FILTERING_EXPORT vtkTree : public vtkDirectedAcyclicGraph
 {
 public:
   static vtkTree *New();
-  vtkTypeRevisionMacro(vtkTree, vtkDirectedAcyclicGraph);
+  vtkTypeMacro(vtkTree, vtkDirectedAcyclicGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTreeAlgorithm.cxx b/Filtering/vtkTreeAlgorithm.cxx
index 49fd169027908ad07de45bb312ce69c667b0c640..90a736d45c7ad6e6ae5cd0cd9e8cf06198448571 100644
--- a/Filtering/vtkTreeAlgorithm.cxx
+++ b/Filtering/vtkTreeAlgorithm.cxx
@@ -26,7 +26,6 @@
 #include "vtkTree.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTreeAlgorithm, "1.4");
 vtkStandardNewMacro(vtkTreeAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTreeAlgorithm.h b/Filtering/vtkTreeAlgorithm.h
index d04b4b560bdb2291061e7067253d6484fbad2c51..fc3237ab4dd7ffaf68f430a4b2157798a178d66b 100644
--- a/Filtering/vtkTreeAlgorithm.h
+++ b/Filtering/vtkTreeAlgorithm.h
@@ -48,7 +48,7 @@ class VTK_FILTERING_EXPORT vtkTreeAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkTreeAlgorithm *New();
-  vtkTypeRevisionMacro(vtkTreeAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkTreeAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTreeDFSIterator.cxx b/Filtering/vtkTreeDFSIterator.cxx
index 4628bbf5aa145cdd77e0d885c313dbfe49e85134..c17f8899550bedaf673ee77e132bdaec9036896c 100644
--- a/Filtering/vtkTreeDFSIterator.cxx
+++ b/Filtering/vtkTreeDFSIterator.cxx
@@ -41,7 +41,6 @@ public:
   stack<vtkTreeDFSIteratorPosition> Stack;
 };
 
-vtkCxxRevisionMacro(vtkTreeDFSIterator, "1.8");
 vtkStandardNewMacro(vtkTreeDFSIterator);
 
 vtkTreeDFSIterator::vtkTreeDFSIterator()
diff --git a/Filtering/vtkTreeDFSIterator.h b/Filtering/vtkTreeDFSIterator.h
index ea42411acc753dad60744fb5d46c5d044dc61334..b3c3df98988e5789fcc4b782332dcba6ad9f6136 100644
--- a/Filtering/vtkTreeDFSIterator.h
+++ b/Filtering/vtkTreeDFSIterator.h
@@ -46,7 +46,7 @@ class VTK_FILTERING_EXPORT vtkTreeDFSIterator : public vtkObject
 {
 public:
   static vtkTreeDFSIterator* New();
-  vtkTypeRevisionMacro(vtkTreeDFSIterator, vtkObject);
+  vtkTypeMacro(vtkTreeDFSIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Filtering/vtkTriQuadraticHexahedron.cxx b/Filtering/vtkTriQuadraticHexahedron.cxx
index 3f8253ebe15a808790917e5f06a5b777fd907cbc..8745857ae5f328bbf62f43ed2c29232d8a3d705c 100644
--- a/Filtering/vtkTriQuadraticHexahedron.cxx
+++ b/Filtering/vtkTriQuadraticHexahedron.cxx
@@ -26,7 +26,6 @@
 #include "vtkBiQuadraticQuad.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro (vtkTriQuadraticHexahedron, "1.13");
 vtkStandardNewMacro (vtkTriQuadraticHexahedron);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTriQuadraticHexahedron.h b/Filtering/vtkTriQuadraticHexahedron.h
index 105d2e88213fe3450172ad8fc44fd51481ecb013..ec5dccfd49a00783525c43a222186b16c5d2bbaa 100644
--- a/Filtering/vtkTriQuadraticHexahedron.h
+++ b/Filtering/vtkTriQuadraticHexahedron.h
@@ -79,7 +79,7 @@ class VTK_FILTERING_EXPORT vtkTriQuadraticHexahedron : public vtkNonLinearCell
 {
 public:
   static vtkTriQuadraticHexahedron *New ();
-  vtkTypeRevisionMacro (vtkTriQuadraticHexahedron, vtkNonLinearCell);
+  vtkTypeMacro(vtkTriQuadraticHexahedron,vtkNonLinearCell);
   void PrintSelf (ostream & os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTriangle.cxx b/Filtering/vtkTriangle.cxx
index 976d882838ea92cd28154c98b2fb3ea4bda75a16..bb184df262b301972a84912ab8209900666ebbf8 100644
--- a/Filtering/vtkTriangle.cxx
+++ b/Filtering/vtkTriangle.cxx
@@ -26,7 +26,6 @@
 #include "vtkPolygon.h"
 #include "vtkQuadric.h"
 
-vtkCxxRevisionMacro(vtkTriangle, "1.11");
 vtkStandardNewMacro(vtkTriangle);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTriangle.h b/Filtering/vtkTriangle.h
index 0dafb0fdf6611c6d7293456efa7901f458614582..a30975f14aaf763ec3d68e6db5a4ea9c7fd823b0 100644
--- a/Filtering/vtkTriangle.h
+++ b/Filtering/vtkTriangle.h
@@ -32,7 +32,7 @@ class VTK_FILTERING_EXPORT vtkTriangle : public vtkCell
 {
 public:
   static vtkTriangle *New();
-  vtkTypeRevisionMacro(vtkTriangle,vtkCell);
+  vtkTypeMacro(vtkTriangle,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTriangleStrip.cxx b/Filtering/vtkTriangleStrip.cxx
index a64f048577b439d3b9306c4196c204420e7a5f0f..c1d475c2fd545e7fcf89ba11180272845786c875 100644
--- a/Filtering/vtkTriangleStrip.cxx
+++ b/Filtering/vtkTriangleStrip.cxx
@@ -22,7 +22,6 @@
 #include "vtkPoints.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkTriangleStrip, "1.4");
 vtkStandardNewMacro(vtkTriangleStrip);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkTriangleStrip.h b/Filtering/vtkTriangleStrip.h
index 06563be915404b4c43b3736da607952ed2c9026f..41db834aa3e4b7aee6736ed9744c98197e8ae7fd 100644
--- a/Filtering/vtkTriangleStrip.h
+++ b/Filtering/vtkTriangleStrip.h
@@ -34,7 +34,7 @@ class VTK_FILTERING_EXPORT vtkTriangleStrip : public vtkCell
 {
 public:
   static vtkTriangleStrip *New();
-  vtkTypeRevisionMacro(vtkTriangleStrip,vtkCell);
+  vtkTypeMacro(vtkTriangleStrip,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkTrivialProducer.cxx b/Filtering/vtkTrivialProducer.cxx
index 593e3c3598cb02df937103b6c53a137d4dd1061e..a068f3eb85bbb127808f46926bad83c8c823e1d3 100644
--- a/Filtering/vtkTrivialProducer.cxx
+++ b/Filtering/vtkTrivialProducer.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkDataObject.h"
 
-vtkCxxRevisionMacro(vtkTrivialProducer, "1.14");
 vtkStandardNewMacro(vtkTrivialProducer);
 
 // This compile-time switch determines whether the update extent is
diff --git a/Filtering/vtkTrivialProducer.h b/Filtering/vtkTrivialProducer.h
index 67f62a9ced11063dc3a883605cf700e75988921d..65ecc4b8c0a71d6fa1695be8e355eb2e2a732cce 100644
--- a/Filtering/vtkTrivialProducer.h
+++ b/Filtering/vtkTrivialProducer.h
@@ -31,7 +31,7 @@ class VTK_FILTERING_EXPORT vtkTrivialProducer : public vtkAlgorithm
 {
 public:
   static vtkTrivialProducer *New();
-  vtkTypeRevisionMacro(vtkTrivialProducer,vtkAlgorithm);
+  vtkTypeMacro(vtkTrivialProducer,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUndirectedGraph.cxx b/Filtering/vtkUndirectedGraph.cxx
index c76a18a5d56594fcc223ccbe889d019dbdc98026..161e6d03d5f2492f116128d5d06e06888d99a72b 100644
--- a/Filtering/vtkUndirectedGraph.cxx
+++ b/Filtering/vtkUndirectedGraph.cxx
@@ -31,7 +31,6 @@
 //----------------------------------------------------------------------------
 // class vtkUndirectedGraph
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUndirectedGraph, "1.4");
 vtkStandardNewMacro(vtkUndirectedGraph);
 //----------------------------------------------------------------------------
 vtkUndirectedGraph::vtkUndirectedGraph()
diff --git a/Filtering/vtkUndirectedGraph.h b/Filtering/vtkUndirectedGraph.h
index 87fed69b049559871f74d60f8850908e97ed4325..4d39b668f2a6b4242bb2b8f2d19944c21c918fc8 100644
--- a/Filtering/vtkUndirectedGraph.h
+++ b/Filtering/vtkUndirectedGraph.h
@@ -45,7 +45,7 @@ class VTK_FILTERING_EXPORT vtkUndirectedGraph : public vtkGraph
 {
 public:
   static vtkUndirectedGraph *New();
-  vtkTypeRevisionMacro(vtkUndirectedGraph, vtkGraph);
+  vtkTypeMacro(vtkUndirectedGraph, vtkGraph);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUndirectedGraphAlgorithm.cxx b/Filtering/vtkUndirectedGraphAlgorithm.cxx
index 5faf10f4deb3c0d35686cb6f2b557b15fa2e1978..617043e3bebc6882d2f017ef327f50c453b7b00e 100644
--- a/Filtering/vtkUndirectedGraphAlgorithm.cxx
+++ b/Filtering/vtkUndirectedGraphAlgorithm.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkUndirectedGraphAlgorithm, "1.2");
 vtkStandardNewMacro(vtkUndirectedGraphAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkUndirectedGraphAlgorithm.h b/Filtering/vtkUndirectedGraphAlgorithm.h
index a07fc594b2cdf98c2b377537a836f689c575b368..ddca65290afc65e333a8a9a806cd75078d901bb1 100644
--- a/Filtering/vtkUndirectedGraphAlgorithm.h
+++ b/Filtering/vtkUndirectedGraphAlgorithm.h
@@ -52,7 +52,7 @@ class VTK_FILTERING_EXPORT vtkUndirectedGraphAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkUndirectedGraphAlgorithm *New();
-  vtkTypeRevisionMacro(vtkUndirectedGraphAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkUndirectedGraphAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUniformGrid.cxx b/Filtering/vtkUniformGrid.cxx
index de3ecce42f52771802fbb00fd94733e11f482f89..3def5350b92f043689ce347a97af6890fb1ee9b4 100644
--- a/Filtering/vtkUniformGrid.cxx
+++ b/Filtering/vtkUniformGrid.cxx
@@ -32,7 +32,6 @@
 #include "vtkVertex.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkUniformGrid, "1.20");
 vtkStandardNewMacro(vtkUniformGrid);
 
 vtkCxxSetObjectMacro(vtkUniformGrid, PointVisibility,
diff --git a/Filtering/vtkUniformGrid.h b/Filtering/vtkUniformGrid.h
index 28006bb0501f90075c62fb92e1f176e382a38106..24b1ebf54ad8269437401f1b12a2cf5f36be3552 100644
--- a/Filtering/vtkUniformGrid.h
+++ b/Filtering/vtkUniformGrid.h
@@ -33,7 +33,7 @@ public:
   // Description:
   // Construct an empty uniform grid.
   static vtkUniformGrid *New();
-  vtkTypeRevisionMacro(vtkUniformGrid,vtkImageData);
+  vtkTypeMacro(vtkUniformGrid,vtkImageData);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUnstructuredGrid.cxx b/Filtering/vtkUnstructuredGrid.cxx
index 1469a5684f5c1f745702b2bc02b7e0b9b6beadec..0a2efb06a9abe8a1cba4c156e641d7b62cb5fe96 100644
--- a/Filtering/vtkUnstructuredGrid.cxx
+++ b/Filtering/vtkUnstructuredGrid.cxx
@@ -58,7 +58,6 @@
 #include "vtkBiQuadraticQuadraticHexahedron.h"
 #include "vtkBiQuadraticTriangle.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGrid, "1.16");
 vtkStandardNewMacro(vtkUnstructuredGrid);
 
 vtkUnstructuredGrid::vtkUnstructuredGrid ()
diff --git a/Filtering/vtkUnstructuredGrid.h b/Filtering/vtkUnstructuredGrid.h
index f474c24ad8faf109cb611df841f1e92a5b7dbcc4..99ef90887ad6489ac59bc0786bc103fe7aa1cb3f 100644
--- a/Filtering/vtkUnstructuredGrid.h
+++ b/Filtering/vtkUnstructuredGrid.h
@@ -69,7 +69,7 @@ class VTK_FILTERING_EXPORT vtkUnstructuredGrid : public vtkPointSet
 public:
   static vtkUnstructuredGrid *New();
 
-  vtkTypeRevisionMacro(vtkUnstructuredGrid,vtkPointSet);
+  vtkTypeMacro(vtkUnstructuredGrid,vtkPointSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUnstructuredGridAlgorithm.cxx b/Filtering/vtkUnstructuredGridAlgorithm.cxx
index 5e0b3c5adf5eee3724e91a5403b6b7dd3aa5caf8..a9e63652e91c5129d4a66c8cde4549d1d88c363f 100644
--- a/Filtering/vtkUnstructuredGridAlgorithm.cxx
+++ b/Filtering/vtkUnstructuredGridAlgorithm.cxx
@@ -21,7 +21,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridAlgorithm, "1.6");
 vtkStandardNewMacro(vtkUnstructuredGridAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkUnstructuredGridAlgorithm.h b/Filtering/vtkUnstructuredGridAlgorithm.h
index 02ebd70a66c97e7b4c1e1f01b439bdbed3058535..a2bb4419dec0e97a4fe5479bde9ddc7b2b049239 100644
--- a/Filtering/vtkUnstructuredGridAlgorithm.h
+++ b/Filtering/vtkUnstructuredGridAlgorithm.h
@@ -43,7 +43,7 @@ class VTK_FILTERING_EXPORT vtkUnstructuredGridAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkUnstructuredGridAlgorithm *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkUnstructuredGridAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUnstructuredGridSource.cxx b/Filtering/vtkUnstructuredGridSource.cxx
index 7af8277ba2a00459cf39e99169332dcbf725ae68..4576372289d6b0cf819dee2be34620cb57b58d62 100644
--- a/Filtering/vtkUnstructuredGridSource.cxx
+++ b/Filtering/vtkUnstructuredGridSource.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridSource, "1.31");
 
 //----------------------------------------------------------------------------
 vtkUnstructuredGridSource::vtkUnstructuredGridSource()
diff --git a/Filtering/vtkUnstructuredGridSource.h b/Filtering/vtkUnstructuredGridSource.h
index e3452d9506bd7174f78e632c7a9363e5e54a8c28..809d9ab0ec475b90f07a787ceb3e9ed735dbeb5d 100644
--- a/Filtering/vtkUnstructuredGridSource.h
+++ b/Filtering/vtkUnstructuredGridSource.h
@@ -30,7 +30,7 @@ class vtkUnstructuredGrid;
 class VTK_FILTERING_EXPORT vtkUnstructuredGridSource : public vtkSource
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridSource,vtkSource);
+  vtkTypeMacro(vtkUnstructuredGridSource,vtkSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUnstructuredGridToPolyDataFilter.cxx b/Filtering/vtkUnstructuredGridToPolyDataFilter.cxx
index 36da9781a7aa3951b41b3933c612049866be7888..dc59cb8ebb1ca9644911ad03d8156044082aa341 100644
--- a/Filtering/vtkUnstructuredGridToPolyDataFilter.cxx
+++ b/Filtering/vtkUnstructuredGridToPolyDataFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridToPolyDataFilter, "1.11");
 
 //----------------------------------------------------------------------------
 vtkUnstructuredGridToPolyDataFilter::vtkUnstructuredGridToPolyDataFilter()
diff --git a/Filtering/vtkUnstructuredGridToPolyDataFilter.h b/Filtering/vtkUnstructuredGridToPolyDataFilter.h
index 2d418e37b895fac76713bdd2eff9f398e5089afa..38c76290f3871c3f7b414c1b844966d605be891e 100644
--- a/Filtering/vtkUnstructuredGridToPolyDataFilter.h
+++ b/Filtering/vtkUnstructuredGridToPolyDataFilter.h
@@ -31,7 +31,7 @@ class vtkUnstructuredGrid;
 class VTK_FILTERING_EXPORT vtkUnstructuredGridToPolyDataFilter : public vtkPolyDataSource
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridToPolyDataFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkUnstructuredGridToPolyDataFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.cxx b/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.cxx
index ec1932d91c1cb45e2c652239cd9abc103f8b43d8..e719b1bbe4d6f29e4e72f655537ed6b496503da6 100644
--- a/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.cxx
+++ b/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.cxx
@@ -17,7 +17,6 @@
 #include "vtkInformation.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridToUnstructuredGridFilter, "1.16");
 
 // ----------------------------------------------------------------------------
 vtkUnstructuredGridToUnstructuredGridFilter::vtkUnstructuredGridToUnstructuredGridFilter()
diff --git a/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.h b/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.h
index 4de8866b82a8b3263b73619cd391cb1d8762a39a..1c6b91bd8e75935eec98f47421ef1c901080f28a 100644
--- a/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.h
+++ b/Filtering/vtkUnstructuredGridToUnstructuredGridFilter.h
@@ -26,7 +26,7 @@
 class VTK_FILTERING_EXPORT vtkUnstructuredGridToUnstructuredGridFilter : public vtkUnstructuredGridSource
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridToUnstructuredGridFilter,vtkUnstructuredGridSource);
+  vtkTypeMacro(vtkUnstructuredGridToUnstructuredGridFilter,vtkUnstructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkVertex.cxx b/Filtering/vtkVertex.cxx
index 92583ce2f24b7bc7f5b88de31c2154a4df000d7b..09f423bb9f297fbc4376b62dbdbdc6d555b44f8d 100644
--- a/Filtering/vtkVertex.cxx
+++ b/Filtering/vtkVertex.cxx
@@ -22,7 +22,6 @@
 #include "vtkIncrementalPointLocator.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkVertex, "1.3");
 vtkStandardNewMacro(vtkVertex);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkVertex.h b/Filtering/vtkVertex.h
index 808e1d3227ec2948fbe4a04588101aaab16e9b38..ee16a69a2ffd9599726c3741d17a32b4a7618c00 100644
--- a/Filtering/vtkVertex.h
+++ b/Filtering/vtkVertex.h
@@ -27,7 +27,7 @@ class VTK_FILTERING_EXPORT vtkVertex : public vtkCell
 {
 public:
   static vtkVertex *New();
-  vtkTypeRevisionMacro(vtkVertex,vtkCell);
+  vtkTypeMacro(vtkVertex,vtkCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkVertexListIterator.cxx b/Filtering/vtkVertexListIterator.cxx
index d5bd2e9d57faf7ed5cceb81429418c03b3440144..eafa9b5c51ea1a8935446e59bff0177bdd0dafeb 100644
--- a/Filtering/vtkVertexListIterator.cxx
+++ b/Filtering/vtkVertexListIterator.cxx
@@ -26,7 +26,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkGraph.h"
 
-vtkCxxRevisionMacro(vtkVertexListIterator, "1.3");
 vtkStandardNewMacro(vtkVertexListIterator);
 //----------------------------------------------------------------------------
 vtkVertexListIterator::vtkVertexListIterator()
diff --git a/Filtering/vtkVertexListIterator.h b/Filtering/vtkVertexListIterator.h
index f29aecfc1385ed2869405be2736838b1085d068f..f37f2a94a559ef0753c7a3a8e85fe84706c10c16 100644
--- a/Filtering/vtkVertexListIterator.h
+++ b/Filtering/vtkVertexListIterator.h
@@ -41,7 +41,7 @@ class VTK_FILTERING_EXPORT vtkVertexListIterator : public vtkObject
 {
 public:
   static vtkVertexListIterator *New();
-  vtkTypeRevisionMacro(vtkVertexListIterator, vtkObject);
+  vtkTypeMacro(vtkVertexListIterator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkViewDependentErrorMetric.cxx b/Filtering/vtkViewDependentErrorMetric.cxx
index f2f2fd3a4503d6b5be0d03eb6903ad4a1bf43b97..8fc8734c768b1187f364a2540b950e5e0de7c2fd 100644
--- a/Filtering/vtkViewDependentErrorMetric.cxx
+++ b/Filtering/vtkViewDependentErrorMetric.cxx
@@ -24,7 +24,6 @@
 #include "vtkCoordinate.h"
 #include "vtkViewport.h"
 
-vtkCxxRevisionMacro(vtkViewDependentErrorMetric,"1.7");
 vtkStandardNewMacro(vtkViewDependentErrorMetric);
 
 //-----------------------------------------------------------------------------
diff --git a/Filtering/vtkViewDependentErrorMetric.h b/Filtering/vtkViewDependentErrorMetric.h
index 295a879b111b995aee23f2afa126ffaf3011d83a..fc46b7154176f01283969c468b9ffb7cbed752e8 100644
--- a/Filtering/vtkViewDependentErrorMetric.h
+++ b/Filtering/vtkViewDependentErrorMetric.h
@@ -41,7 +41,7 @@ public:
   
   // Description:
   // Standard VTK type and error macros.
-  vtkTypeRevisionMacro(vtkViewDependentErrorMetric,vtkGenericSubdivisionErrorMetric);
+  vtkTypeMacro(vtkViewDependentErrorMetric,vtkGenericSubdivisionErrorMetric);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Filtering/vtkViewport.cxx b/Filtering/vtkViewport.cxx
index cac18181cbbc4a62b14b628e86ab2558bcd4f620..79dc0d57fa34bd1862bac026e878109b135c4340 100644
--- a/Filtering/vtkViewport.cxx
+++ b/Filtering/vtkViewport.cxx
@@ -20,7 +20,6 @@
 #include "vtkPropCollection.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkViewport, "1.14");
 
 //----------------------------------------------------------------------------
 // Create a vtkViewport with a black background, a white ambient light,
diff --git a/Filtering/vtkViewport.h b/Filtering/vtkViewport.h
index 4f1868b2cb90714a407432e91d2b87a53320b2af..7089ef84811d75a99f2d783e816eab6177b778d2 100644
--- a/Filtering/vtkViewport.h
+++ b/Filtering/vtkViewport.h
@@ -40,7 +40,7 @@ class vtkWindow;
 class VTK_FILTERING_EXPORT vtkViewport : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkViewport,vtkObject);
+  vtkTypeMacro(vtkViewport,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkVoxel.cxx b/Filtering/vtkVoxel.cxx
index 4a31498a1d02eba9e6ac325b09a27a657fc0d3b5..bc81ded0410c890ff4a4b39b00a449321273da1e 100644
--- a/Filtering/vtkVoxel.cxx
+++ b/Filtering/vtkVoxel.cxx
@@ -25,7 +25,6 @@
 #include "vtkPoints.h"
 #include "vtkBox.h"
 
-vtkCxxRevisionMacro(vtkVoxel, "1.5");
 vtkStandardNewMacro(vtkVoxel);
 
 //----------------------------------------------------------------------------
diff --git a/Filtering/vtkVoxel.h b/Filtering/vtkVoxel.h
index f3c36a7bad2e41ec9e3d9e538d0f2d5f5dbf91c2..74b636be961612aeca44bc487334a4b3cb1c6c99 100644
--- a/Filtering/vtkVoxel.h
+++ b/Filtering/vtkVoxel.h
@@ -35,7 +35,7 @@ class VTK_FILTERING_EXPORT vtkVoxel : public vtkCell3D
 {
 public:
   static vtkVoxel *New();
-  vtkTypeRevisionMacro(vtkVoxel,vtkCell3D);
+  vtkTypeMacro(vtkVoxel,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Filtering/vtkWedge.cxx b/Filtering/vtkWedge.cxx
index 52809c70dd5128fac8421eda5c3b87ef80f26eb6..7f84d4838d81104ab782a35e6678452527c0d622 100644
--- a/Filtering/vtkWedge.cxx
+++ b/Filtering/vtkWedge.cxx
@@ -25,7 +25,6 @@
 #include "vtkTriangle.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkWedge, "1.8");
 vtkStandardNewMacro(vtkWedge);
 
 static const double VTK_DIVERGED = 1.e6;
diff --git a/Filtering/vtkWedge.h b/Filtering/vtkWedge.h
index 47a3c77911921b1c4664317e7d43234246abbabb..1f09668139a124eeb53eed9fdfe9c7ba54b7ff94 100644
--- a/Filtering/vtkWedge.h
+++ b/Filtering/vtkWedge.h
@@ -40,7 +40,7 @@ class VTK_FILTERING_EXPORT vtkWedge : public vtkCell3D
 {
 public:
   static vtkWedge *New();
-  vtkTypeRevisionMacro(vtkWedge,vtkCell3D);
+  vtkTypeMacro(vtkWedge,vtkCell3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtAnnotationView.cxx b/GUISupport/Qt/vtkQtAnnotationView.cxx
index 25fe391bdad0b986ae08aeb247c1cdfef672b290..0407d9ec0af1a9b548341463d21a173277646b67 100644
--- a/GUISupport/Qt/vtkQtAnnotationView.cxx
+++ b/GUISupport/Qt/vtkQtAnnotationView.cxx
@@ -50,7 +50,6 @@
 
 #include <vtkstd/set>
 
-vtkCxxRevisionMacro(vtkQtAnnotationView, "1.7");
 vtkStandardNewMacro(vtkQtAnnotationView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtAnnotationView.h b/GUISupport/Qt/vtkQtAnnotationView.h
index 3f39fa4b50a664b653367dd6e6eb1281046ec78d..0e567ddc30510c96804c58854d271ae15939fdd0 100644
--- a/GUISupport/Qt/vtkQtAnnotationView.h
+++ b/GUISupport/Qt/vtkQtAnnotationView.h
@@ -44,7 +44,7 @@ Q_OBJECT
 
 public:
   static vtkQtAnnotationView *New();
-  vtkTypeRevisionMacro(vtkQtAnnotationView, vtkQtView);
+  vtkTypeMacro(vtkQtAnnotationView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GUISupport/Qt/vtkQtBarChartView.cxx b/GUISupport/Qt/vtkQtBarChartView.cxx
index 7a7d8d4cb6f498e046c97d49673c539377bff0b8..86951a4a2b9b1174ac3ede687c8758a857675100 100644
--- a/GUISupport/Qt/vtkQtBarChartView.cxx
+++ b/GUISupport/Qt/vtkQtBarChartView.cxx
@@ -31,7 +31,6 @@
 #include "vtkQtChartWidget.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtBarChartView, "1.6");
 vtkStandardNewMacro(vtkQtBarChartView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtBarChartView.h b/GUISupport/Qt/vtkQtBarChartView.h
index a10827d6ebdcbc1c7aea13f01eb28e6c228d08a2..490918f42540ef19f2295f06e1bd2ea777ff4f06 100644
--- a/GUISupport/Qt/vtkQtBarChartView.h
+++ b/GUISupport/Qt/vtkQtBarChartView.h
@@ -40,7 +40,7 @@ Q_OBJECT
 
 public:
   static vtkQtBarChartView *New();
-  vtkTypeRevisionMacro(vtkQtBarChartView, vtkQtChartView);
+  vtkTypeMacro(vtkQtBarChartView, vtkQtChartView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtChartRepresentation.cxx b/GUISupport/Qt/vtkQtChartRepresentation.cxx
index a210048564256c2879d9d6c694e98d831aedefe8..d225f144a111a66d8061abd4dd31ee1bcbf4bc87 100644
--- a/GUISupport/Qt/vtkQtChartRepresentation.cxx
+++ b/GUISupport/Qt/vtkQtChartRepresentation.cxx
@@ -49,7 +49,6 @@ public:
 };
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtChartRepresentation, "1.8");
 vtkStandardNewMacro(vtkQtChartRepresentation);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtChartRepresentation.h b/GUISupport/Qt/vtkQtChartRepresentation.h
index 8f3a170c311fc4dc1eea2a481c2eace7347d4e95..501a42f4fe090e01a7ed21942a51919b9592635f 100644
--- a/GUISupport/Qt/vtkQtChartRepresentation.h
+++ b/GUISupport/Qt/vtkQtChartRepresentation.h
@@ -36,7 +36,7 @@ class QVTK_EXPORT vtkQtChartRepresentation : public vtkQtTableRepresentation
 {
 public:
   static vtkQtChartRepresentation *New();
-  vtkTypeRevisionMacro(vtkQtChartRepresentation, vtkQtTableRepresentation);
+  vtkTypeMacro(vtkQtChartRepresentation, vtkQtTableRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/GUISupport/Qt/vtkQtChartView.cxx b/GUISupport/Qt/vtkQtChartView.cxx
index 4e91da277c60279e32ed9192294bb5bad6ddd1ae..963d0ffb2227779164e969cd0c9a13824911c384 100644
--- a/GUISupport/Qt/vtkQtChartView.cxx
+++ b/GUISupport/Qt/vtkQtChartView.cxx
@@ -107,7 +107,6 @@ private:
 };
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtChartView, "1.3");
 
 //----------------------------------------------------------------------------
 vtkQtChartView::vtkQtChartView()
diff --git a/GUISupport/Qt/vtkQtChartView.h b/GUISupport/Qt/vtkQtChartView.h
index 31cc76a2bb72dfa4549dfcf486228751423ecfc6..9c84461d0fab3052f3a23fad92c2d7027e604851 100644
--- a/GUISupport/Qt/vtkQtChartView.h
+++ b/GUISupport/Qt/vtkQtChartView.h
@@ -48,7 +48,7 @@ class QVTK_EXPORT vtkQtChartView : public vtkQtView
 Q_OBJECT
 
 public:
-  vtkTypeRevisionMacro(vtkQtChartView, vtkQtView);
+  vtkTypeMacro(vtkQtChartView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GUISupport/Qt/vtkQtLineChartView.cxx b/GUISupport/Qt/vtkQtLineChartView.cxx
index a3aa459ff7c325915d2d7497083d25fd48404a8b..2efc30ad03142319f743f2a0eb3d5a21a9e83e50 100644
--- a/GUISupport/Qt/vtkQtLineChartView.cxx
+++ b/GUISupport/Qt/vtkQtLineChartView.cxx
@@ -37,7 +37,6 @@
 #include "vtkObjectFactory.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtLineChartView, "1.8");
 vtkStandardNewMacro(vtkQtLineChartView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtLineChartView.h b/GUISupport/Qt/vtkQtLineChartView.h
index 3c9092f6296c826c464e9b236fe031eb6592042c..b4bf5a2a4637a74fce52572a7b22731a0f50d479 100644
--- a/GUISupport/Qt/vtkQtLineChartView.h
+++ b/GUISupport/Qt/vtkQtLineChartView.h
@@ -40,7 +40,7 @@ Q_OBJECT
 
 public:
   static vtkQtLineChartView *New();
-  vtkTypeRevisionMacro(vtkQtLineChartView, vtkQtChartView);
+  vtkTypeMacro(vtkQtLineChartView, vtkQtChartView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtListView.cxx b/GUISupport/Qt/vtkQtListView.cxx
index 6759a84198bfc3acdad7335b22cb8038144bbfe3..873a25dfd66ef9a15b5cea8525df6779b3b9aadb 100644
--- a/GUISupport/Qt/vtkQtListView.cxx
+++ b/GUISupport/Qt/vtkQtListView.cxx
@@ -48,7 +48,6 @@
 #include "vtkTable.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkQtListView, "1.9");
 vtkStandardNewMacro(vtkQtListView);
 
 
diff --git a/GUISupport/Qt/vtkQtListView.h b/GUISupport/Qt/vtkQtListView.h
index 44ea96ba107491b60688886d4fe0a8d8bf681161..af2686a58d578d5add56ba008cc62bc379e5aad3 100644
--- a/GUISupport/Qt/vtkQtListView.h
+++ b/GUISupport/Qt/vtkQtListView.h
@@ -49,7 +49,7 @@ Q_OBJECT
 
 public:
   static vtkQtListView *New();
-  vtkTypeRevisionMacro(vtkQtListView, vtkQtView);
+  vtkTypeMacro(vtkQtListView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GUISupport/Qt/vtkQtRecordView.cxx b/GUISupport/Qt/vtkQtRecordView.cxx
index 363833e8a5b97755b1b0b9f3b7921cf450abc85a..5588b15971a59d8c4562ac06d6f8298ab9fabc2d 100644
--- a/GUISupport/Qt/vtkQtRecordView.cxx
+++ b/GUISupport/Qt/vtkQtRecordView.cxx
@@ -37,7 +37,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkQtRecordView, "1.11");
 vtkStandardNewMacro(vtkQtRecordView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtRecordView.h b/GUISupport/Qt/vtkQtRecordView.h
index 7a66299c8008104b01a277d7eed4560e4007b2f0..1332d6de491dab54e48204ffd404f6aa73e4ef3c 100644
--- a/GUISupport/Qt/vtkQtRecordView.h
+++ b/GUISupport/Qt/vtkQtRecordView.h
@@ -45,7 +45,7 @@ Q_OBJECT
 
 public:
   static vtkQtRecordView *New();
-  vtkTypeRevisionMacro(vtkQtRecordView, vtkQtView);
+  vtkTypeMacro(vtkQtRecordView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtRichTextView.cxx b/GUISupport/Qt/vtkQtRichTextView.cxx
index ecb7480d2636dd9ca2e0bae44c911a0d583ae21f..f1170471899824378db2a104539be5698c834779 100644
--- a/GUISupport/Qt/vtkQtRichTextView.cxx
+++ b/GUISupport/Qt/vtkQtRichTextView.cxx
@@ -55,7 +55,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <QHttpRequestHeader>
 #include <QUrl>
 
-vtkCxxRevisionMacro(vtkQtRichTextView, "1.20");
 vtkStandardNewMacro(vtkQtRichTextView);
 
 /////////////////////////////////////////////////////////////////////////////
diff --git a/GUISupport/Qt/vtkQtRichTextView.h b/GUISupport/Qt/vtkQtRichTextView.h
index af407c74980770125aea17597d9c0fd9b99c8e89..db916ff918204b73aaa7e3fcb7b833236a831642 100644
--- a/GUISupport/Qt/vtkQtRichTextView.h
+++ b/GUISupport/Qt/vtkQtRichTextView.h
@@ -43,7 +43,7 @@ Q_OBJECT
 
 public:
   static vtkQtRichTextView *New();
-  vtkTypeRevisionMacro(vtkQtRichTextView, vtkQtView);
+  vtkTypeMacro(vtkQtRichTextView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtSQLDatabase.cxx b/GUISupport/Qt/vtkQtSQLDatabase.cxx
index 38a7a576a6a98d29ef474517887450b3790baa23..df0af4c60a607a5a3743307f1179122807b9560a 100644
--- a/GUISupport/Qt/vtkQtSQLDatabase.cxx
+++ b/GUISupport/Qt/vtkQtSQLDatabase.cxx
@@ -36,7 +36,6 @@
 #include <vtksys/SystemTools.hxx>
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkQtSQLDatabase, "1.6");
 vtkStandardNewMacro(vtkQtSQLDatabase);
 
 int vtkQtSQLDatabase::id = 0;
diff --git a/GUISupport/Qt/vtkQtSQLDatabase.h b/GUISupport/Qt/vtkQtSQLDatabase.h
index 066fa05816d4cf72aa7a5813b083353bd1f51696..b0e02c22ec6bbdea7e55091c748581c7d0df407f 100644
--- a/GUISupport/Qt/vtkQtSQLDatabase.h
+++ b/GUISupport/Qt/vtkQtSQLDatabase.h
@@ -41,7 +41,7 @@ class QVTK_EXPORT vtkQtSQLDatabase : public vtkSQLDatabase
 {
 public:
   static vtkQtSQLDatabase* New();
-  vtkTypeRevisionMacro(vtkQtSQLDatabase, vtkSQLDatabase);
+  vtkTypeMacro(vtkQtSQLDatabase, vtkSQLDatabase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtSQLQuery.cxx b/GUISupport/Qt/vtkQtSQLQuery.cxx
index 211d45cc5c5e61e57a71ac78d9c7421c28951989..9216450ce278f1d5614a55288c1878baf749419a 100644
--- a/GUISupport/Qt/vtkQtSQLQuery.cxx
+++ b/GUISupport/Qt/vtkQtSQLQuery.cxx
@@ -47,7 +47,6 @@ public:
 };
 
 
-vtkCxxRevisionMacro(vtkQtSQLQuery, "1.3");
 vtkStandardNewMacro(vtkQtSQLQuery);
 
 vtkQtSQLQuery::vtkQtSQLQuery()
diff --git a/GUISupport/Qt/vtkQtSQLQuery.h b/GUISupport/Qt/vtkQtSQLQuery.h
index 786337cd37a6cbff876fadef21eadb418e34c08d..0444b05f36e3967f3649339957683fcb7ea1a066 100644
--- a/GUISupport/Qt/vtkQtSQLQuery.h
+++ b/GUISupport/Qt/vtkQtSQLQuery.h
@@ -40,7 +40,7 @@ class QVTK_EXPORT vtkQtSQLQuery : public vtkSQLQuery
 {
 public:
   static vtkQtSQLQuery* New();
-  vtkTypeRevisionMacro(vtkQtSQLQuery, vtkSQLQuery);
+  vtkTypeMacro(vtkQtSQLQuery, vtkSQLQuery);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtStackedChartView.cxx b/GUISupport/Qt/vtkQtStackedChartView.cxx
index f8865e680f24088abfadc3ec45321513aec2883e..cbb7808d0ec2034ccdcd76db7a1047061e9dd281 100644
--- a/GUISupport/Qt/vtkQtStackedChartView.cxx
+++ b/GUISupport/Qt/vtkQtStackedChartView.cxx
@@ -32,7 +32,6 @@
 
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtStackedChartView, "1.3");
 vtkStandardNewMacro(vtkQtStackedChartView);
 
 //-----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtStackedChartView.h b/GUISupport/Qt/vtkQtStackedChartView.h
index 4a84c00caae1a7eed34c362e8b159cf78f71582a..48026bb64daba133d40fd6ea36a2b7469404df55 100644
--- a/GUISupport/Qt/vtkQtStackedChartView.h
+++ b/GUISupport/Qt/vtkQtStackedChartView.h
@@ -34,7 +34,7 @@ Q_OBJECT
 
 public:
   static vtkQtStackedChartView *New();
-  vtkTypeRevisionMacro(vtkQtStackedChartView, vtkQtChartView);
+  vtkTypeMacro(vtkQtStackedChartView, vtkQtChartView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtStatisticalBoxChartView.cxx b/GUISupport/Qt/vtkQtStatisticalBoxChartView.cxx
index 433caf029702ba8d87ca28435dbae8b80579c289..12dd45b964bf43de80e5458070678f05b98e4762 100644
--- a/GUISupport/Qt/vtkQtStatisticalBoxChartView.cxx
+++ b/GUISupport/Qt/vtkQtStatisticalBoxChartView.cxx
@@ -32,7 +32,6 @@
 
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtStatisticalBoxChartView, "1.3");
 vtkStandardNewMacro(vtkQtStatisticalBoxChartView);
 
 //-----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtStatisticalBoxChartView.h b/GUISupport/Qt/vtkQtStatisticalBoxChartView.h
index 1047ef6c4bd595d7e5bfa211d902fcede2d7158d..ad278230e3bc4f373b306c95f7c8ff90811de8d0 100644
--- a/GUISupport/Qt/vtkQtStatisticalBoxChartView.h
+++ b/GUISupport/Qt/vtkQtStatisticalBoxChartView.h
@@ -34,7 +34,7 @@ Q_OBJECT
 
 public:
   static vtkQtStatisticalBoxChartView *New();
-  vtkTypeRevisionMacro(vtkQtStatisticalBoxChartView, vtkQtChartView);
+  vtkTypeMacro(vtkQtStatisticalBoxChartView, vtkQtChartView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtTableRepresentation.cxx b/GUISupport/Qt/vtkQtTableRepresentation.cxx
index d116ec44e237016dbf6c32102667f6539fc8a9c9..f2549f9eea7f30750edfc1316ab950c5e1f487c6 100644
--- a/GUISupport/Qt/vtkQtTableRepresentation.cxx
+++ b/GUISupport/Qt/vtkQtTableRepresentation.cxx
@@ -35,7 +35,6 @@
 #include <assert.h>
 
 // ----------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkQtTableRepresentation, "1.10");
 
 // ----------------------------------------------------------------------
 vtkCxxSetObjectMacro(vtkQtTableRepresentation, ColorTable, vtkLookupTable);
diff --git a/GUISupport/Qt/vtkQtTableRepresentation.h b/GUISupport/Qt/vtkQtTableRepresentation.h
index c82d0533c80b1687bc35ac7ec4ee91e70c63321c..c8196054f6bbfb84c08d83dcff5b67e3f501d4db 100644
--- a/GUISupport/Qt/vtkQtTableRepresentation.h
+++ b/GUISupport/Qt/vtkQtTableRepresentation.h
@@ -61,7 +61,7 @@ class vtkQtTableModelAdapter;
 class QVTK_EXPORT vtkQtTableRepresentation : public vtkDataRepresentation
 {
 public:
-  vtkTypeRevisionMacro(vtkQtTableRepresentation, vtkDataRepresentation);
+  vtkTypeMacro(vtkQtTableRepresentation, vtkDataRepresentation);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/GUISupport/Qt/vtkQtTableView.cxx b/GUISupport/Qt/vtkQtTableView.cxx
index 6f9fe69177797ae6dd367e89717cf40ff89c1aca..d29b57405a5d5825ecca6973509f64e55fa87ed7 100644
--- a/GUISupport/Qt/vtkQtTableView.cxx
+++ b/GUISupport/Qt/vtkQtTableView.cxx
@@ -49,7 +49,6 @@
 #include "vtkTable.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkQtTableView, "1.23");
 vtkStandardNewMacro(vtkQtTableView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtTableView.h b/GUISupport/Qt/vtkQtTableView.h
index 322203cd15c8880065f61f6bca6b254d4284ff4d..af771586adec2d282e8a928c163609d730a44ceb 100644
--- a/GUISupport/Qt/vtkQtTableView.h
+++ b/GUISupport/Qt/vtkQtTableView.h
@@ -51,7 +51,7 @@ Q_OBJECT
 
 public:
   static vtkQtTableView *New();
-  vtkTypeRevisionMacro(vtkQtTableView, vtkQtView);
+  vtkTypeMacro(vtkQtTableView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GUISupport/Qt/vtkQtTimePointUtility.cxx b/GUISupport/Qt/vtkQtTimePointUtility.cxx
index d026b7157b157b5e13c43cfb78143221a7edcf06..3a1ba174004f356cf8c715d5fee82fbf3443bf53 100644
--- a/GUISupport/Qt/vtkQtTimePointUtility.cxx
+++ b/GUISupport/Qt/vtkQtTimePointUtility.cxx
@@ -22,7 +22,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkQtTimePointUtility, "1.2");
 
 QDateTime vtkQtTimePointUtility::TimePointToQDateTime(vtkTypeUInt64 time)
 {
diff --git a/GUISupport/Qt/vtkQtTimePointUtility.h b/GUISupport/Qt/vtkQtTimePointUtility.h
index 6a0f7509f04227da00cda49213f5b9a235d3ad14..26863bc9ee22262c4e31d87de28497e71eb99940 100644
--- a/GUISupport/Qt/vtkQtTimePointUtility.h
+++ b/GUISupport/Qt/vtkQtTimePointUtility.h
@@ -32,7 +32,7 @@
 class QVTK_EXPORT vtkQtTimePointUtility : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkQtTimePointUtility,vtkObject);
+  vtkTypeMacro(vtkQtTimePointUtility,vtkObject);
 
   static QDateTime TimePointToQDateTime(vtkTypeUInt64 time);
   static vtkTypeUInt64 QDateTimeToTimePoint(QDateTime time);  
diff --git a/GUISupport/Qt/vtkQtTreeView.cxx b/GUISupport/Qt/vtkQtTreeView.cxx
index 6ac6a40fe1da1a63cc0d13e94a689d77571f33bb..da71ec6f9e884eda5e7f270b0d8f12e538e82dc0 100644
--- a/GUISupport/Qt/vtkQtTreeView.cxx
+++ b/GUISupport/Qt/vtkQtTreeView.cxx
@@ -47,7 +47,6 @@
 #include "vtkTree.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkQtTreeView, "1.32");
 vtkStandardNewMacro(vtkQtTreeView);
 
 //----------------------------------------------------------------------------
diff --git a/GUISupport/Qt/vtkQtTreeView.h b/GUISupport/Qt/vtkQtTreeView.h
index a339fc42e47e4938688a9648682662fc169ad6b4..7dae637a53c3822544f94cd5929d96cf3ef3122f 100644
--- a/GUISupport/Qt/vtkQtTreeView.h
+++ b/GUISupport/Qt/vtkQtTreeView.h
@@ -59,7 +59,7 @@ signals:
 
 public:
   static vtkQtTreeView *New();
-  vtkTypeRevisionMacro(vtkQtTreeView, vtkQtView);
+  vtkTypeMacro(vtkQtTreeView, vtkQtView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GUISupport/Qt/vtkQtView.cxx b/GUISupport/Qt/vtkQtView.cxx
index 6d6b61a0bf611926883d85930952ea61d5e71e86..d9fe0cbe8cc06ab4a6887fc87ebca9a166a776bf 100644
--- a/GUISupport/Qt/vtkQtView.cxx
+++ b/GUISupport/Qt/vtkQtView.cxx
@@ -16,7 +16,6 @@
 #include <QPixmap>
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkQtView, "1.5");
 
 //----------------------------------------------------------------------------
 vtkQtView::vtkQtView()
diff --git a/GUISupport/Qt/vtkQtView.h b/GUISupport/Qt/vtkQtView.h
index bafce6148dad078060758cc86a84fadf419d6433..8f3fc875b5ec2aa80349fff8c39e8846d5ea5dc9 100644
--- a/GUISupport/Qt/vtkQtView.h
+++ b/GUISupport/Qt/vtkQtView.h
@@ -31,7 +31,7 @@ class QVTK_EXPORT vtkQtView : public QObject, public vtkView
 Q_OBJECT
 public:
 
-  vtkTypeRevisionMacro(vtkQtView, vtkView);
+  vtkTypeMacro(vtkQtView, vtkView);
   void PrintSelf(ostream& os, vtkIndent indent);
       
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx
index 2395e0b7cc39d3c00136aac968cfcca45f354d4b..f03a39f6e288cc54e1f61d3da9dedd8d95892637 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.cxx
@@ -34,7 +34,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkBridgeAttribute, "1.7");
 vtkStandardNewMacro(vtkBridgeAttribute);
 
 void vtkBridgeAttribute::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h b/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h
index 980386823327ab6ba8ccf2dfc927db146b7e269e..1ea1b28ed0d8b8a12f0ea81a80dbafe517832b12 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeAttribute.h
@@ -34,7 +34,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeAttribute : public vtkGenericAttribute
 {
  public:
   static vtkBridgeAttribute *New();
-  vtkTypeRevisionMacro(vtkBridgeAttribute,vtkGenericAttribute);
+  vtkTypeMacro(vtkBridgeAttribute,vtkGenericAttribute);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx
index ddf36c09fe010abb1ca9e5fe7df0a7af55463dd6..90a85f3f09020e871a31c312895609b6d1adf381 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCell.cxx
@@ -68,7 +68,6 @@
 # include "vtkQuadraticPyramid.h"
 
 
-vtkCxxRevisionMacro(vtkBridgeCell, "1.20");
 
 vtkStandardNewMacro(vtkBridgeCell);
 
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCell.h b/GenericFiltering/Testing/Cxx/vtkBridgeCell.h
index e5bd90d454714844e0184c7f4cdabd849f4ee5bd..2a83cb8bbdaf2b7ec14d5a6c001650e30e3776bb 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCell.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCell.h
@@ -33,7 +33,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCell : public vtkGenericAdaptorCell
 {
 public:
   static vtkBridgeCell *New();
-  vtkTypeRevisionMacro(vtkBridgeCell,vtkGenericAdaptorCell);
+  vtkTypeMacro(vtkBridgeCell,vtkGenericAdaptorCell);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx
index 8ae4eaaffb08dde07437b56203f318fb153dbf88..aa5303d2c39d6d534954c189761c5f8f335229fd 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.cxx
@@ -33,7 +33,6 @@
 #include "vtkBridgeCellIteratorOnCellBoundaries.h"
 #include "vtkBridgeCellIteratorOnCellList.h"
 
-vtkCxxRevisionMacro(vtkBridgeCellIterator, "1.2");
 vtkStandardNewMacro(vtkBridgeCellIterator);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h
index d4381a1db389cdb12084c592fb1bd343333ff1da..cf0753dd94c89551360670ade8a93290e6e9f368 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIterator.h
@@ -41,7 +41,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCellIterator : public vtkGenericCellIterator
 {
 public:
   static vtkBridgeCellIterator *New();
-  vtkTypeRevisionMacro(vtkBridgeCellIterator,vtkGenericCellIterator);
+  vtkTypeMacro(vtkBridgeCellIterator,vtkGenericCellIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx
index 65cba4b226a3b7f7025009601ba789b016d85f8d..354ee1dd1ede6b499cdd5ad3d0c0671880dc504b 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.cxx
@@ -28,7 +28,6 @@
 #include "vtkVertex.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkBridgeCellIteratorOnCellBoundaries, "1.3");
 vtkStandardNewMacro(vtkBridgeCellIteratorOnCellBoundaries);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h
index 6c02214eceb562a6100e033c83813236a7277f2b..fb07fc615c6db9bd10714022da667a7f515701f1 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellBoundaries.h
@@ -32,7 +32,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCellIteratorOnCellBoundaries : public vtkBridge
 {
 public:
   static vtkBridgeCellIteratorOnCellBoundaries *New();
-  vtkTypeRevisionMacro(vtkBridgeCellIteratorOnCellBoundaries,
+  vtkTypeMacro(vtkBridgeCellIteratorOnCellBoundaries,
                        vtkBridgeCellIteratorStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx
index d5b557e103f01bd0dfce21609272ab968aa193b0..764e93a59fecc4d40782253fd81df2afe74294d6 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.cxx
@@ -28,7 +28,6 @@
 #include "vtkVertex.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkBridgeCellIteratorOnCellList, "1.1");
 vtkStandardNewMacro(vtkBridgeCellIteratorOnCellList);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h
index b041308d3fed9a0181139fb8672c7294ff3f4813..9ed412fe1ab6ebe9e9ced697156c28123939fff1 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnCellList.h
@@ -31,7 +31,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCellIteratorOnCellList : public vtkBridgeCellIt
 {
 public:
   static vtkBridgeCellIteratorOnCellList *New();
-  vtkTypeRevisionMacro(vtkBridgeCellIteratorOnCellList,
+  vtkTypeMacro(vtkBridgeCellIteratorOnCellList,
                        vtkBridgeCellIteratorStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx
index 011e13d24cecc158f1f2c936e6c903c879a5a11c..e5228cf8a5ff2831b323830382b0b52ea7c5026a 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.cxx
@@ -26,7 +26,6 @@
 #include "vtkDataSet.h"
 #include "vtkCell.h"
 
-vtkCxxRevisionMacro(vtkBridgeCellIteratorOnDataSet, "1.2");
 vtkStandardNewMacro(vtkBridgeCellIteratorOnDataSet);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h
index 72fd1da3f6daf7409cdcdaf19954a1ad9060008c..0af3c5e54078168a2ea4513c3883490c737461eb 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOnDataSet.h
@@ -30,7 +30,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCellIteratorOnDataSet : public vtkBridgeCellIte
 {
 public:
   static vtkBridgeCellIteratorOnDataSet *New();
-  vtkTypeRevisionMacro(vtkBridgeCellIteratorOnDataSet,
+  vtkTypeMacro(vtkBridgeCellIteratorOnDataSet,
                        vtkBridgeCellIteratorStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx
index e9756d7ce736611295a8d2b7afac97166a6c9bcc..8afd3d164977a27cffd18c2b30a72d51f46c38c6 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.cxx
@@ -32,7 +32,6 @@
 #include "vtkVertex.h"
 #include "vtkPolyVertex.h"
 
-vtkCxxRevisionMacro(vtkBridgeCellIteratorOne, "1.1");
 vtkStandardNewMacro(vtkBridgeCellIteratorOne);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h
index 4d7110adf90f963d077597bd9666fc88c5280032..f693338626fea5a065caf10dcdba5c03adcc4fca 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorOne.h
@@ -32,7 +32,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeCellIteratorOne : public vtkBridgeCellIteratorS
 {
 public:
   static vtkBridgeCellIteratorOne *New();
-  vtkTypeRevisionMacro(vtkBridgeCellIteratorOne,
+  vtkTypeMacro(vtkBridgeCellIteratorOne,
                        vtkBridgeCellIteratorStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx
index 4f54ac3c6eab382ef6bbf7c850a824c3194ec5ea..eeff53ae4b96e6969b275d719a46ddd55532b66d 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.cxx
@@ -26,7 +26,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkBridgeCellIteratorStrategy, "1.1");
 
 //-----------------------------------------------------------------------------
 void vtkBridgeCellIteratorStrategy::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h
index 157aa9ba4f7a6de2778ec6d2dbc5805a093e3e68..a26b92d754499a84b7cb87341f075edb87226979 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeCellIteratorStrategy.h
@@ -36,7 +36,7 @@ class vtkIdList;
 class VTK_BRIDGE_EXPORT vtkBridgeCellIteratorStrategy : public vtkGenericCellIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkBridgeCellIteratorStrategy,vtkGenericCellIterator);
+  vtkTypeMacro(vtkBridgeCellIteratorStrategy,vtkGenericCellIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx b/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx
index f40c22f98db4b72a0d39b1b30e12cf790f2abf29..f7b566ffffcbcf2780f5d01de60139d0d759c915 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.cxx
@@ -38,7 +38,6 @@
 #include "vtkGenericEdgeTable.h"
 #include "vtkSimpleCellTessellator.h"
 
-vtkCxxRevisionMacro(vtkBridgeDataSet, "1.8");
 vtkStandardNewMacro(vtkBridgeDataSet);
 
 //----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h b/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h
index 2e0afa2454e9e29bc9490cb534df316de0b80246..e4b685a39da23e22d42b1cd47e7e9ee9d2f0520d 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgeDataSet.h
@@ -29,7 +29,7 @@ class VTK_BRIDGE_EXPORT vtkBridgeDataSet : public vtkGenericDataSet
 {
 public:
   static vtkBridgeDataSet *New();
-  vtkTypeRevisionMacro(vtkBridgeDataSet,vtkGenericDataSet);
+  vtkTypeMacro(vtkBridgeDataSet,vtkGenericDataSet);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx b/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx
index 93683b33ab81ce1d44f8bd4b6eb8656abdb615e8..2e305721b8e104e021a769e5d401df26e34ecc1b 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.cxx
@@ -31,7 +31,6 @@
 #include "vtkBridgePointIteratorOne.h"
 #include "vtkBridgePointIteratorOnCell.h"
 
-vtkCxxRevisionMacro(vtkBridgePointIterator, "1.2");
 vtkStandardNewMacro(vtkBridgePointIterator);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h b/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h
index 42f1971b905815115faa8c741fa968594f255aad..5951b648c44bc07fd462e37ea248ac48c352f9f0 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIterator.h
@@ -36,7 +36,7 @@ class VTK_BRIDGE_EXPORT vtkBridgePointIterator : public vtkGenericPointIterator
 {
 public:
   static vtkBridgePointIterator *New();
-  vtkTypeRevisionMacro(vtkBridgePointIterator,vtkGenericPointIterator);
+  vtkTypeMacro(vtkBridgePointIterator,vtkGenericPointIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx
index 5398db4a5894e12f32b64c481e5cdb4af3edc1c4..621fa3721d9f8b5f7cdf2a3dcb0e385747177bd3 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.cxx
@@ -30,7 +30,6 @@
 #include "vtkBridgeCell.h"
 #include "vtkCell.h"
 
-vtkCxxRevisionMacro(vtkBridgePointIteratorOnCell, "1.2");
 vtkStandardNewMacro(vtkBridgePointIteratorOnCell);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h
index a01226b2a3f2ddbc218b994d3e77647e1d0cd78b..880f0afb9820c4081d5e97ae0f48257db532f6c9 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnCell.h
@@ -32,7 +32,7 @@ class VTK_BRIDGE_EXPORT vtkBridgePointIteratorOnCell : public vtkGenericPointIte
 {
 public:
   static vtkBridgePointIteratorOnCell *New();
-  vtkTypeRevisionMacro(vtkBridgePointIteratorOnCell,vtkGenericPointIterator);
+  vtkTypeMacro(vtkBridgePointIteratorOnCell,vtkGenericPointIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx
index f22d302be93be759293e988246dd3dfce0a82003..8e1c04726d0fcd2b94f11d612dd356ab4922bb5f 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.cxx
@@ -27,7 +27,6 @@
 #include "vtkBridgeDataSet.h"
 #include "vtkDataSet.h"
 
-vtkCxxRevisionMacro(vtkBridgePointIteratorOnDataSet, "1.1");
 vtkStandardNewMacro(vtkBridgePointIteratorOnDataSet);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h
index ceb66a2c83cb0ee4b2d6e1342770fc91510b3901..6423f2fd38420c5a3552c70ff5b84483e81586d9 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOnDataSet.h
@@ -31,7 +31,7 @@ class VTK_BRIDGE_EXPORT vtkBridgePointIteratorOnDataSet : public vtkGenericPoint
 {
 public:
   static vtkBridgePointIteratorOnDataSet *New();
-  vtkTypeRevisionMacro(vtkBridgePointIteratorOnDataSet,vtkGenericPointIterator);
+  vtkTypeMacro(vtkBridgePointIteratorOnDataSet,vtkGenericPointIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx
index be6c45299ddb6afbe189063e028fe600d9c83418..d2fd391a5f527cc6d5b142a5b1f0518646cac4b5 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.cxx
@@ -27,7 +27,6 @@
 #include "vtkBridgeDataSet.h"
 #include "vtkDataSet.h"
 
-vtkCxxRevisionMacro(vtkBridgePointIteratorOne, "1.1");
 vtkStandardNewMacro(vtkBridgePointIteratorOne);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h
index dcf0be1b198dd3f2b102f35c5959db55d2542c8b..4f13e60e77d206ce7d0a138bb39875a26456a2a3 100644
--- a/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h
+++ b/GenericFiltering/Testing/Cxx/vtkBridgePointIteratorOne.h
@@ -28,7 +28,7 @@ class VTK_BRIDGE_EXPORT vtkBridgePointIteratorOne : public vtkGenericPointIterat
 {
 public:
   static vtkBridgePointIteratorOne *New();
-  vtkTypeRevisionMacro(vtkBridgePointIteratorOne,vtkGenericPointIterator);
+  vtkTypeMacro(vtkBridgePointIteratorOne,vtkGenericPointIterator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/GenericFiltering/vtkGenericClip.cxx b/GenericFiltering/vtkGenericClip.cxx
index 69cd4b8c2f951109505fb649db0400443602556c..b0b9c013d89679b81ca1c0043177f538caf729e6 100644
--- a/GenericFiltering/vtkGenericClip.cxx
+++ b/GenericFiltering/vtkGenericClip.cxx
@@ -40,7 +40,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkGenericClip, "1.10");
 vtkStandardNewMacro(vtkGenericClip);
 vtkCxxSetObjectMacro(vtkGenericClip,ClipFunction,vtkImplicitFunction);
 vtkCxxSetObjectMacro(vtkGenericClip,Locator,vtkIncrementalPointLocator);
diff --git a/GenericFiltering/vtkGenericClip.h b/GenericFiltering/vtkGenericClip.h
index 3fe358ef7600f8e6315086a1f71bfb050eff4c35..0e5d9d69d994ca0fe3f5ef91b986740848b8dc46 100644
--- a/GenericFiltering/vtkGenericClip.h
+++ b/GenericFiltering/vtkGenericClip.h
@@ -69,7 +69,7 @@ class vtkIncrementalPointLocator;
 class VTK_GENERIC_FILTERING_EXPORT vtkGenericClip : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericClip,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkGenericClip,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/vtkGenericContourFilter.cxx b/GenericFiltering/vtkGenericContourFilter.cxx
index 37b364f4eeab951785c4e33d3f7a7d66eead5329..3800f0acf96e8c1ef127348ad729458636c93fec 100644
--- a/GenericFiltering/vtkGenericContourFilter.cxx
+++ b/GenericFiltering/vtkGenericContourFilter.cxx
@@ -36,7 +36,6 @@
 #include "vtkGenericCellTessellator.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkGenericContourFilter, "1.10");
 vtkStandardNewMacro(vtkGenericContourFilter);
 
 vtkCxxSetObjectMacro(vtkGenericContourFilter,Locator,vtkIncrementalPointLocator);
diff --git a/GenericFiltering/vtkGenericContourFilter.h b/GenericFiltering/vtkGenericContourFilter.h
index 6f12eca9108f37826b360ee43f83e20b2614fc40..d766192af2bf367a74132c60f1ec486ffa105535 100644
--- a/GenericFiltering/vtkGenericContourFilter.h
+++ b/GenericFiltering/vtkGenericContourFilter.h
@@ -50,7 +50,7 @@ class vtkCellData;
 class VTK_GENERIC_FILTERING_EXPORT vtkGenericContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericContourFilter,
+  vtkTypeMacro(vtkGenericContourFilter,
                        vtkPolyDataAlgorithm);
   
   void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/GenericFiltering/vtkGenericCutter.cxx b/GenericFiltering/vtkGenericCutter.cxx
index 692aabc8e2e883c9cade6ae807aff860fef3b6a7..ef0cb6ce76c7663178a73d90cf4d0f739936d8eb 100644
--- a/GenericFiltering/vtkGenericCutter.cxx
+++ b/GenericFiltering/vtkGenericCutter.cxx
@@ -40,7 +40,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkGenericCutter, "1.10");
 vtkStandardNewMacro(vtkGenericCutter);
 vtkCxxSetObjectMacro(vtkGenericCutter,CutFunction,vtkImplicitFunction);
 vtkCxxSetObjectMacro(vtkGenericCutter,Locator,vtkIncrementalPointLocator);
diff --git a/GenericFiltering/vtkGenericCutter.h b/GenericFiltering/vtkGenericCutter.h
index 75c95fcae9f4781b1ab6ad913db774bf74ba91dc..e182d58d85fc97acf90383bbf0f44c964c1622b9 100644
--- a/GenericFiltering/vtkGenericCutter.h
+++ b/GenericFiltering/vtkGenericCutter.h
@@ -56,7 +56,7 @@ class vtkCellData;
 class VTK_GENERIC_FILTERING_EXPORT vtkGenericCutter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericCutter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGenericCutter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/vtkGenericDataSetTessellator.cxx b/GenericFiltering/vtkGenericDataSetTessellator.cxx
index da3b7ee8aba31e7fa3dfe8647196d726a084cbe9..846f29851a32781113348a9fe6660632a4aa0be1 100644
--- a/GenericFiltering/vtkGenericDataSetTessellator.cxx
+++ b/GenericFiltering/vtkGenericDataSetTessellator.cxx
@@ -34,7 +34,6 @@
 #include "vtkGenericCellTessellator.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkGenericDataSetTessellator, "1.16");
 vtkStandardNewMacro(vtkGenericDataSetTessellator);
 
 vtkCxxSetObjectMacro(vtkGenericDataSetTessellator,Locator,vtkIncrementalPointLocator);
diff --git a/GenericFiltering/vtkGenericDataSetTessellator.h b/GenericFiltering/vtkGenericDataSetTessellator.h
index bdd7358758eeed551d43272769c53e7596634f71..8fb9c2ab7820763b3065132ac51010f950ec9fed 100644
--- a/GenericFiltering/vtkGenericDataSetTessellator.h
+++ b/GenericFiltering/vtkGenericDataSetTessellator.h
@@ -44,7 +44,7 @@ public:
   // Description:
   // Standard VTK methods.
   static vtkGenericDataSetTessellator *New();
-  vtkTypeRevisionMacro(vtkGenericDataSetTessellator,
+  vtkTypeMacro(vtkGenericDataSetTessellator,
                        vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/GenericFiltering/vtkGenericGeometryFilter.cxx b/GenericFiltering/vtkGenericGeometryFilter.cxx
index 914d5d0dd8c7d1374e60480ab3456d2aa90e64ec..706a798b45d5496f7065fa6549977389a635fa88 100644
--- a/GenericFiltering/vtkGenericGeometryFilter.cxx
+++ b/GenericFiltering/vtkGenericGeometryFilter.cxx
@@ -40,7 +40,6 @@
 #include "vtkGenericCellTessellator.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkGenericGeometryFilter, "1.16");
 vtkStandardNewMacro(vtkGenericGeometryFilter);
 
 vtkCxxSetObjectMacro(vtkGenericGeometryFilter,Locator,vtkIncrementalPointLocator);
diff --git a/GenericFiltering/vtkGenericGeometryFilter.h b/GenericFiltering/vtkGenericGeometryFilter.h
index 02323cbabd2a5391f8ae822d267b2ec2d3b1b6ca..feda525d68f506f80e86f20542fdf7b43e8b7fcc 100644
--- a/GenericFiltering/vtkGenericGeometryFilter.h
+++ b/GenericFiltering/vtkGenericGeometryFilter.h
@@ -53,7 +53,7 @@ class VTK_GENERIC_FILTERING_EXPORT vtkGenericGeometryFilter : public vtkPolyData
 {
 public:
   static vtkGenericGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkGenericGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGenericGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/vtkGenericGlyph3DFilter.cxx b/GenericFiltering/vtkGenericGlyph3DFilter.cxx
index 7136f9c40dbe70cb28c86c1e30edc5e2aca6f15e..65b855fcfaabe3b0034bfd861622c360f602661a 100644
--- a/GenericFiltering/vtkGenericGlyph3DFilter.cxx
+++ b/GenericFiltering/vtkGenericGlyph3DFilter.cxx
@@ -35,7 +35,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkTransform.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkGenericGlyph3DFilter, "1.8");
 vtkStandardNewMacro(vtkGenericGlyph3DFilter);
 
 // Construct object with scaling on, scaling mode is by scalar value,
diff --git a/GenericFiltering/vtkGenericGlyph3DFilter.h b/GenericFiltering/vtkGenericGlyph3DFilter.h
index 26eb2d593c3ee44ea5c1aba641971194b0ac1c5e..0aea9740b898d0143fde6f155461cafc5c5fd464 100644
--- a/GenericFiltering/vtkGenericGlyph3DFilter.h
+++ b/GenericFiltering/vtkGenericGlyph3DFilter.h
@@ -93,7 +93,7 @@
 class VTK_GENERIC_FILTERING_EXPORT vtkGenericGlyph3DFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericGlyph3DFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGenericGlyph3DFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/GenericFiltering/vtkGenericOutlineFilter.cxx b/GenericFiltering/vtkGenericOutlineFilter.cxx
index f2224adb22418d3b51ecf580365b31bfbcf6f372..abd581506c4d60d4645933260fc058dd3ff14df0 100644
--- a/GenericFiltering/vtkGenericOutlineFilter.cxx
+++ b/GenericFiltering/vtkGenericOutlineFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkOutlineSource.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkGenericOutlineFilter, "1.3");
 vtkStandardNewMacro(vtkGenericOutlineFilter);
 
 //-----------------------------------------------------------------------------
diff --git a/GenericFiltering/vtkGenericOutlineFilter.h b/GenericFiltering/vtkGenericOutlineFilter.h
index 82cb84ea0807cdb2e90e83a213785a9be53dcace..6ca05f6a13c2fb3e0ac4d0a1dbbb4c4f6f5b9e54 100644
--- a/GenericFiltering/vtkGenericOutlineFilter.h
+++ b/GenericFiltering/vtkGenericOutlineFilter.h
@@ -34,7 +34,7 @@ class VTK_GENERIC_FILTERING_EXPORT vtkGenericOutlineFilter : public vtkPolyDataA
 {
 public:
   static vtkGenericOutlineFilter *New();
-  vtkTypeRevisionMacro(vtkGenericOutlineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGenericOutlineFilter,vtkPolyDataAlgorithm);
 
 protected:
   vtkGenericOutlineFilter();
diff --git a/GenericFiltering/vtkGenericProbeFilter.cxx b/GenericFiltering/vtkGenericProbeFilter.cxx
index 35a55d377371bc710c00977de562438118b1e695..a9d055a37817b59843b1c046fb26333de7c9a972 100644
--- a/GenericFiltering/vtkGenericProbeFilter.cxx
+++ b/GenericFiltering/vtkGenericProbeFilter.cxx
@@ -30,7 +30,6 @@
 #include "vtkGenericAttributeCollection.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkGenericProbeFilter, "1.7");
 vtkStandardNewMacro(vtkGenericProbeFilter);
 
 //----------------------------------------------------------------------------
diff --git a/GenericFiltering/vtkGenericProbeFilter.h b/GenericFiltering/vtkGenericProbeFilter.h
index de015501a5f7ccf5c0a7fe955b568d0d767562cc..6ab7da9676d21adb6a44131b20c937dec6d8a5f5 100644
--- a/GenericFiltering/vtkGenericProbeFilter.h
+++ b/GenericFiltering/vtkGenericProbeFilter.h
@@ -49,7 +49,7 @@ class VTK_GENERIC_FILTERING_EXPORT vtkGenericProbeFilter : public vtkDataSetAlgo
 {
 public:
   static vtkGenericProbeFilter *New();
-  vtkTypeRevisionMacro(vtkGenericProbeFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkGenericProbeFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/GenericFiltering/vtkGenericStreamTracer.cxx b/GenericFiltering/vtkGenericStreamTracer.cxx
index 4b573a4329e4289acfc6e5ddcc6b1e6fe0758fb2..6e9b0202e0ca645e49cc2a02c18a480f255b4603 100644
--- a/GenericFiltering/vtkGenericStreamTracer.cxx
+++ b/GenericFiltering/vtkGenericStreamTracer.cxx
@@ -36,7 +36,6 @@
 #include "vtkExecutive.h" // for GetExecutive()
 #include "vtkInformationVector.h"
 
-vtkCxxRevisionMacro(vtkGenericStreamTracer, "1.5");
 vtkStandardNewMacro(vtkGenericStreamTracer);
 vtkCxxSetObjectMacro(vtkGenericStreamTracer,Integrator,vtkInitialValueProblemSolver);
 vtkCxxSetObjectMacro(vtkGenericStreamTracer,InterpolatorPrototype,vtkGenericInterpolatedVelocityField);
diff --git a/GenericFiltering/vtkGenericStreamTracer.h b/GenericFiltering/vtkGenericStreamTracer.h
index 6278a1b3b0c9fb758381c4da0fa99b368e5cedde..aecd8d4f044fc37615d86d024c6428b89fecb2ec 100644
--- a/GenericFiltering/vtkGenericStreamTracer.h
+++ b/GenericFiltering/vtkGenericStreamTracer.h
@@ -79,7 +79,7 @@ class vtkGenericDataSet;
 class VTK_GENERIC_FILTERING_EXPORT vtkGenericStreamTracer : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericStreamTracer,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGenericStreamTracer,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkCompassRepresentation.cxx b/Geovis/vtkCompassRepresentation.cxx
index 5fe102ab9413fa56d1741b5e5bfdb6c6a48085a5..05a252c15035513226d4f1fd6bf11eb04ba566f4 100644
--- a/Geovis/vtkCompassRepresentation.cxx
+++ b/Geovis/vtkCompassRepresentation.cxx
@@ -44,7 +44,6 @@
 
 #include <sstream>
 
-vtkCxxRevisionMacro(vtkCompassRepresentation, "1.3");
 vtkStandardNewMacro(vtkCompassRepresentation);
 
 //----------------------------------------------------------------------
diff --git a/Geovis/vtkCompassRepresentation.h b/Geovis/vtkCompassRepresentation.h
index f44e1caeb777f91412b6c03b29a230bf47a9a562..8fbf3b5a84d910c1e188149cde5b6dc47d77209f 100644
--- a/Geovis/vtkCompassRepresentation.h
+++ b/Geovis/vtkCompassRepresentation.h
@@ -58,7 +58,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkCompassRepresentation,
+  vtkTypeMacro(vtkCompassRepresentation,
                        vtkContinuousValueWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Geovis/vtkCompassWidget.cxx b/Geovis/vtkCompassWidget.cxx
index e4b908c75aeb4e019e37551fa6f28811d61783a3..ad76266e226673963baede83620e081ee236e632 100644
--- a/Geovis/vtkCompassWidget.cxx
+++ b/Geovis/vtkCompassWidget.cxx
@@ -32,7 +32,6 @@
 #include "vtkWidgetEventTranslator.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkCompassWidget, "1.3");
 vtkStandardNewMacro(vtkCompassWidget);
 
 //------------------------------------------------------------
diff --git a/Geovis/vtkCompassWidget.h b/Geovis/vtkCompassWidget.h
index 665113847c5cebedb3438f3243218ac7a0dca894..b70437b1705383b81fe29c552cf469167d050ca3 100644
--- a/Geovis/vtkCompassWidget.h
+++ b/Geovis/vtkCompassWidget.h
@@ -74,7 +74,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkCompassWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkCompassWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoAdaptiveArcs.cxx b/Geovis/vtkGeoAdaptiveArcs.cxx
index 57b464a00a8327812a22358d939ff7ebcef87802..7f56f5bc8f9a3872a97a75b5116b333011caff3b 100644
--- a/Geovis/vtkGeoAdaptiveArcs.cxx
+++ b/Geovis/vtkGeoAdaptiveArcs.cxx
@@ -39,7 +39,6 @@
 #include <vtksys/stl/map>
 using vtksys_stl::map;
 
-vtkCxxRevisionMacro(vtkGeoAdaptiveArcs, "1.8");
 vtkStandardNewMacro(vtkGeoAdaptiveArcs);
 
 //-------------------------------------------------------------------------
diff --git a/Geovis/vtkGeoAdaptiveArcs.h b/Geovis/vtkGeoAdaptiveArcs.h
index 95e89ef408267dacc27eb219db4d4e81082782f2..07b7358bd158f6cbb264e5569ed8a6459ea20324 100644
--- a/Geovis/vtkGeoAdaptiveArcs.h
+++ b/Geovis/vtkGeoAdaptiveArcs.h
@@ -37,7 +37,7 @@ class VTK_GEOVIS_EXPORT vtkGeoAdaptiveArcs : public vtkPolyDataAlgorithm
 public:
   static vtkGeoAdaptiveArcs *New();
 
-  vtkTypeRevisionMacro(vtkGeoAdaptiveArcs,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeoAdaptiveArcs,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoAlignedImageRepresentation.cxx b/Geovis/vtkGeoAlignedImageRepresentation.cxx
index 40eb85813fc478c01aa8ce942705418013b5d6a6..3f548329499df5d97463ee7ecca45da0886a6cff 100644
--- a/Geovis/vtkGeoAlignedImageRepresentation.cxx
+++ b/Geovis/vtkGeoAlignedImageRepresentation.cxx
@@ -130,7 +130,6 @@ vtkGeoAlignedImageRepresentationFind(vtkGeoSource* source, vtkGeoImageNode* p, d
 }
 
 vtkStandardNewMacro(vtkGeoAlignedImageRepresentation);
-vtkCxxRevisionMacro(vtkGeoAlignedImageRepresentation, "1.13");
 vtkCxxSetObjectMacro(vtkGeoAlignedImageRepresentation, GeoSource, vtkGeoSource);
 //----------------------------------------------------------------------------
 vtkGeoAlignedImageRepresentation::vtkGeoAlignedImageRepresentation()
diff --git a/Geovis/vtkGeoAlignedImageRepresentation.h b/Geovis/vtkGeoAlignedImageRepresentation.h
index e607abd1aafa550ebef6d6fc5904b297eecb471e..3226be8f4b3fbc062cd64b5402e347fdf65d2cc7 100644
--- a/Geovis/vtkGeoAlignedImageRepresentation.h
+++ b/Geovis/vtkGeoAlignedImageRepresentation.h
@@ -38,7 +38,7 @@ class VTK_GEOVIS_EXPORT vtkGeoAlignedImageRepresentation : public vtkDataReprese
 {
 public:
   static vtkGeoAlignedImageRepresentation *New();
-  vtkTypeRevisionMacro(vtkGeoAlignedImageRepresentation,vtkDataRepresentation);
+  vtkTypeMacro(vtkGeoAlignedImageRepresentation,vtkDataRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoAlignedImageSource.cxx b/Geovis/vtkGeoAlignedImageSource.cxx
index 52160b6f7bd465dfc42726ff2aab092a7920c191..f0532d6b0f51ef04de255141338383546bc9eebf 100644
--- a/Geovis/vtkGeoAlignedImageSource.cxx
+++ b/Geovis/vtkGeoAlignedImageSource.cxx
@@ -33,7 +33,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkGeoAlignedImageSource, "1.10");
 vtkStandardNewMacro(vtkGeoAlignedImageSource);
 vtkCxxSetObjectMacro(vtkGeoAlignedImageSource, Image, vtkImageData);
 
diff --git a/Geovis/vtkGeoAlignedImageSource.h b/Geovis/vtkGeoAlignedImageSource.h
index 3321691c1a72f0b3a97b68a1fc94b72d22066722..fff062887238cc1fd902efb3bcd93f794173cd8a 100644
--- a/Geovis/vtkGeoAlignedImageSource.h
+++ b/Geovis/vtkGeoAlignedImageSource.h
@@ -40,7 +40,7 @@ class VTK_GEOVIS_EXPORT vtkGeoAlignedImageSource : public vtkGeoSource
 {
 public:
   static vtkGeoAlignedImageSource *New();
-  vtkTypeRevisionMacro(vtkGeoAlignedImageSource, vtkGeoSource);
+  vtkTypeMacro(vtkGeoAlignedImageSource, vtkGeoSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoArcs.cxx b/Geovis/vtkGeoArcs.cxx
index 4d1952bccdfff238d08661eb6855aa84b6e5f3ec..9d8f7c8c1406d79aeb4316ad999e3a366d3adc35 100644
--- a/Geovis/vtkGeoArcs.cxx
+++ b/Geovis/vtkGeoArcs.cxx
@@ -33,7 +33,6 @@
 #include <vtksys/stl/map>
 using vtksys_stl::map;
 
-vtkCxxRevisionMacro(vtkGeoArcs, "1.6");
 vtkStandardNewMacro(vtkGeoArcs);
 
 vtkGeoArcs::vtkGeoArcs()
diff --git a/Geovis/vtkGeoArcs.h b/Geovis/vtkGeoArcs.h
index 07ce596bdef8319263e494290fa847c1fa3d327f..0641f2b2095535e55589069ffea24899757cefbb 100644
--- a/Geovis/vtkGeoArcs.h
+++ b/Geovis/vtkGeoArcs.h
@@ -34,7 +34,7 @@ class VTK_GEOVIS_EXPORT vtkGeoArcs : public vtkPolyDataAlgorithm
 public:
   static vtkGeoArcs *New();
 
-  vtkTypeRevisionMacro(vtkGeoArcs,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeoArcs,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoAssignCoordinates.cxx b/Geovis/vtkGeoAssignCoordinates.cxx
index b01f564d368836cddf7812a755401d3d84a8e620..92876b59d4787b5cf15aa7cad9704c62988a1994 100644
--- a/Geovis/vtkGeoAssignCoordinates.cxx
+++ b/Geovis/vtkGeoAssignCoordinates.cxx
@@ -34,7 +34,6 @@
 #include "vtkPoints.h"
 
 vtkCxxSetObjectMacro(vtkGeoAssignCoordinates, Transform, vtkAbstractTransform);
-vtkCxxRevisionMacro(vtkGeoAssignCoordinates, "1.4");
 vtkStandardNewMacro(vtkGeoAssignCoordinates);
 
 vtkGeoAssignCoordinates::vtkGeoAssignCoordinates()
diff --git a/Geovis/vtkGeoAssignCoordinates.h b/Geovis/vtkGeoAssignCoordinates.h
index 9c357122997d82c1fbaff734a9f62704e5eddde6..8cfd7d78018c710a4e27e3e2b6d0084eaa4207e8 100644
--- a/Geovis/vtkGeoAssignCoordinates.h
+++ b/Geovis/vtkGeoAssignCoordinates.h
@@ -41,7 +41,7 @@ class VTK_GEOVIS_EXPORT vtkGeoAssignCoordinates : public vtkPassInputTypeAlgorit
 public:
   static vtkGeoAssignCoordinates *New();
 
-  vtkTypeRevisionMacro(vtkGeoAssignCoordinates, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkGeoAssignCoordinates, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoCamera.cxx b/Geovis/vtkGeoCamera.cxx
index daac242ff9a650be714e675946c5a9c5aa175df3..6f5607656ce7172acea106d323874708cc2c5b66 100644
--- a/Geovis/vtkGeoCamera.cxx
+++ b/Geovis/vtkGeoCamera.cxx
@@ -27,7 +27,6 @@
 #include "vtkTransform.h"
 #include <float.h>
 
-vtkCxxRevisionMacro(vtkGeoCamera, "1.12");
 vtkStandardNewMacro(vtkGeoCamera);
 
 
diff --git a/Geovis/vtkGeoCamera.h b/Geovis/vtkGeoCamera.h
index 5908d7e221fde0dde24a70c53f6e6b922447b660..2f871c0a0ffd29385d63efebe26e6ce0d2238807 100644
--- a/Geovis/vtkGeoCamera.h
+++ b/Geovis/vtkGeoCamera.h
@@ -80,7 +80,7 @@ class VTK_GEOVIS_EXPORT vtkGeoCamera : public vtkObject
 {
 public:
   static vtkGeoCamera *New();
-  vtkTypeRevisionMacro(vtkGeoCamera, vtkObject);
+  vtkTypeMacro(vtkGeoCamera, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoFileImageSource.cxx b/Geovis/vtkGeoFileImageSource.cxx
index 07136c299226ae8a150750b5e659637cfe9e64ac..29c22a63b9a456f5c2869a41b9e2e82c0997e933 100644
--- a/Geovis/vtkGeoFileImageSource.cxx
+++ b/Geovis/vtkGeoFileImageSource.cxx
@@ -37,7 +37,6 @@
 #include <vtksys/stl/utility>
 
 vtkStandardNewMacro(vtkGeoFileImageSource);
-vtkCxxRevisionMacro(vtkGeoFileImageSource, "1.3");
 //----------------------------------------------------------------------------
 vtkGeoFileImageSource::vtkGeoFileImageSource()
 {
diff --git a/Geovis/vtkGeoFileImageSource.h b/Geovis/vtkGeoFileImageSource.h
index 7e3bf27013a0ed28e2ed374b20b8a9c56a68d26c..e6f5ed4157c930cb549192c135dd00529c2b9bc8 100644
--- a/Geovis/vtkGeoFileImageSource.h
+++ b/Geovis/vtkGeoFileImageSource.h
@@ -35,7 +35,7 @@ class VTK_GEOVIS_EXPORT vtkGeoFileImageSource : public vtkGeoSource
 {
 public:
   static vtkGeoFileImageSource *New();
-  vtkTypeRevisionMacro(vtkGeoFileImageSource,vtkGeoSource);
+  vtkTypeMacro(vtkGeoFileImageSource,vtkGeoSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGeoFileImageSource();
diff --git a/Geovis/vtkGeoFileTerrainSource.cxx b/Geovis/vtkGeoFileTerrainSource.cxx
index e2641d1acd3d3d4cca852e9701e77bf592ddc6c5..f8800b646b4f62885fca4f6240dc5105a64da963 100644
--- a/Geovis/vtkGeoFileTerrainSource.cxx
+++ b/Geovis/vtkGeoFileTerrainSource.cxx
@@ -33,7 +33,6 @@
 #include <vtksys/stl/utility>
 
 vtkStandardNewMacro(vtkGeoFileTerrainSource);
-vtkCxxRevisionMacro(vtkGeoFileTerrainSource, "1.2");
 //----------------------------------------------------------------------------
 vtkGeoFileTerrainSource::vtkGeoFileTerrainSource()
 {
diff --git a/Geovis/vtkGeoFileTerrainSource.h b/Geovis/vtkGeoFileTerrainSource.h
index b5760d2142463e7f839db0029485ce2387ae7933..c5cdfc6902b28f747b18991b59f89f682119bbf7 100644
--- a/Geovis/vtkGeoFileTerrainSource.h
+++ b/Geovis/vtkGeoFileTerrainSource.h
@@ -35,7 +35,7 @@ class VTK_GEOVIS_EXPORT vtkGeoFileTerrainSource : public vtkGeoSource
 {
 public:
   static vtkGeoFileTerrainSource *New();
-  vtkTypeRevisionMacro(vtkGeoFileTerrainSource,vtkGeoSource);
+  vtkTypeMacro(vtkGeoFileTerrainSource,vtkGeoSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGeoFileTerrainSource();
diff --git a/Geovis/vtkGeoGlobeSource.cxx b/Geovis/vtkGeoGlobeSource.cxx
index 8253e9bd78819d209942667e410acdcb0268d4e1..fec5a3522adc9a8020bb97bc1dd6eed7c6d8a15c 100644
--- a/Geovis/vtkGeoGlobeSource.cxx
+++ b/Geovis/vtkGeoGlobeSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkSmartPointer.h"
 
 vtkStandardNewMacro(vtkGeoGlobeSource);
-vtkCxxRevisionMacro(vtkGeoGlobeSource, "1.2");
 //----------------------------------------------------------------------------
 vtkGeoGlobeSource::vtkGeoGlobeSource()
 {
diff --git a/Geovis/vtkGeoGlobeSource.h b/Geovis/vtkGeoGlobeSource.h
index 4cf5d578f3cfc6feb73ef7f98a5b538809c3668f..9fd5f7e745b36000d1089de6db439e1d2e44dae4 100644
--- a/Geovis/vtkGeoGlobeSource.h
+++ b/Geovis/vtkGeoGlobeSource.h
@@ -31,7 +31,7 @@ class VTK_GEOVIS_EXPORT vtkGeoGlobeSource : public vtkGeoSource
 {
 public:
   static vtkGeoGlobeSource *New();
-  vtkTypeRevisionMacro(vtkGeoGlobeSource,vtkGeoSource);
+  vtkTypeMacro(vtkGeoGlobeSource,vtkGeoSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoGraticule.cxx b/Geovis/vtkGeoGraticule.cxx
index ec6e59d2a677b5e032e7da0a95340369fd4dd29d..c0502d711dfd96091c331b69092a5c904340e055 100644
--- a/Geovis/vtkGeoGraticule.cxx
+++ b/Geovis/vtkGeoGraticule.cxx
@@ -34,7 +34,6 @@
 #include <vtkstd/vector>
 
 vtkStandardNewMacro(vtkGeoGraticule);
-vtkCxxRevisionMacro(vtkGeoGraticule,"1.3");
 
 double vtkGeoGraticule::LatitudeLevelTics[12] =
 {
diff --git a/Geovis/vtkGeoGraticule.h b/Geovis/vtkGeoGraticule.h
index 41888d42af632b739d822d82b45582c5dfe91e9c..c257be492204ad11a6fe7ee60922b4f6ed228e6f 100644
--- a/Geovis/vtkGeoGraticule.h
+++ b/Geovis/vtkGeoGraticule.h
@@ -40,7 +40,7 @@ class VTK_GEOVIS_EXPORT vtkGeoGraticule : public vtkPolyDataAlgorithm
 public:
   static vtkGeoGraticule* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkGeoGraticule,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeoGraticule,vtkPolyDataAlgorithm);
 
   // Description:
   // The latitude bounds of the graticule.
diff --git a/Geovis/vtkGeoImageNode.cxx b/Geovis/vtkGeoImageNode.cxx
index 1fce875ba423f6473c1f276966c47d0660318ba6..9829e3418e211fd4ad46e31ec9ffbc7a543f6665 100644
--- a/Geovis/vtkGeoImageNode.cxx
+++ b/Geovis/vtkGeoImageNode.cxx
@@ -24,7 +24,6 @@
 #include "vtkXMLImageDataReader.h"
 #include "vtkXMLImageDataWriter.h"
 
-vtkCxxRevisionMacro(vtkGeoImageNode, "1.8");
 vtkStandardNewMacro(vtkGeoImageNode);
 
 
diff --git a/Geovis/vtkGeoImageNode.h b/Geovis/vtkGeoImageNode.h
index 533f14efe3e8f486763b9b043d2b58b2004538c6..b94eccdc80332fbf69f5777c268e8c93dd45628a 100644
--- a/Geovis/vtkGeoImageNode.h
+++ b/Geovis/vtkGeoImageNode.h
@@ -40,7 +40,7 @@ class VTK_GEOVIS_EXPORT vtkGeoImageNode : public vtkGeoTreeNode
 {
 public:
   static vtkGeoImageNode *New();
-  vtkTypeRevisionMacro(vtkGeoImageNode, vtkGeoTreeNode);
+  vtkTypeMacro(vtkGeoImageNode, vtkGeoTreeNode);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Decription:
diff --git a/Geovis/vtkGeoInteractorStyle.cxx b/Geovis/vtkGeoInteractorStyle.cxx
index bc257a6b7d1cf5c30bde6c9e991a3610e6d8ccb5..e650dac774237176a61b6c19e392ad0117f3caed 100644
--- a/Geovis/vtkGeoInteractorStyle.cxx
+++ b/Geovis/vtkGeoInteractorStyle.cxx
@@ -45,7 +45,6 @@
 
 #include <float.h>
 
-vtkCxxRevisionMacro(vtkGeoInteractorStyle, "1.12");
 vtkStandardNewMacro(vtkGeoInteractorStyle);
 
 namespace
diff --git a/Geovis/vtkGeoInteractorStyle.h b/Geovis/vtkGeoInteractorStyle.h
index 0c2417063a61ddcb9c1c8ea58bb3a21c356930ee..ead40755b2ab44311b31a68cc964f56adf90777a 100644
--- a/Geovis/vtkGeoInteractorStyle.h
+++ b/Geovis/vtkGeoInteractorStyle.h
@@ -44,7 +44,7 @@ class VTK_GEOVIS_EXPORT vtkGeoInteractorStyle :
 {
 public:
   static vtkGeoInteractorStyle *New();
-  vtkTypeRevisionMacro(vtkGeoInteractorStyle, 
+  vtkTypeMacro(vtkGeoInteractorStyle,
                        vtkInteractorStyleTrackballCamera);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Geovis/vtkGeoProjection.cxx b/Geovis/vtkGeoProjection.cxx
index 11d1559f2c0ea4f03b0661af57ad1f0cd4a88b42..8f0bca77b2d17699f241d6123d4216e1b77464bd 100644
--- a/Geovis/vtkGeoProjection.cxx
+++ b/Geovis/vtkGeoProjection.cxx
@@ -27,7 +27,6 @@
 #include "vtk_libproj4.h"
 
 vtkStandardNewMacro(vtkGeoProjection);
-vtkCxxRevisionMacro(vtkGeoProjection,"1.1");
 
 static int vtkGeoProjectionNumProj = -1;
 
diff --git a/Geovis/vtkGeoProjection.h b/Geovis/vtkGeoProjection.h
index 70025bb0156ee257a668ac28abb428f28b061fd0..596cec04403d18ac8b5bb7e66a62ab48d1975559 100644
--- a/Geovis/vtkGeoProjection.h
+++ b/Geovis/vtkGeoProjection.h
@@ -36,7 +36,7 @@ class VTK_GEOVIS_EXPORT vtkGeoProjection : public vtkObject
 public:
   static vtkGeoProjection* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkGeoProjection,vtkObject);
+  vtkTypeMacro(vtkGeoProjection,vtkObject);
 
   // Description:
   // Returns the number of projections that this class offers.
diff --git a/Geovis/vtkGeoProjectionSource.cxx b/Geovis/vtkGeoProjectionSource.cxx
index 91b81f23815df733ea9f64a4583c0f48d11fe515..c01cdc8a6b9bd321b18fe0d71e4ac1b34030a7bc 100644
--- a/Geovis/vtkGeoProjectionSource.cxx
+++ b/Geovis/vtkGeoProjectionSource.cxx
@@ -86,7 +86,6 @@
 
 
 vtkStandardNewMacro(vtkGeoProjectionSource);
-vtkCxxRevisionMacro(vtkGeoProjectionSource, "1.12");
 vtkCxxSetObjectMacro(vtkGeoProjectionSource, Transform, vtkAbstractTransform);
 //----------------------------------------------------------------------------
 vtkGeoProjectionSource::vtkGeoProjectionSource()
diff --git a/Geovis/vtkGeoProjectionSource.h b/Geovis/vtkGeoProjectionSource.h
index d369f285d835456192dfdf7e8fe066b3d3cc38df..df594cf9ec1c62f1c913a9d4b622853a37f3aa62 100644
--- a/Geovis/vtkGeoProjectionSource.h
+++ b/Geovis/vtkGeoProjectionSource.h
@@ -35,7 +35,7 @@ class VTK_GEOVIS_EXPORT vtkGeoProjectionSource : public vtkGeoSource
 {
 public:
   static vtkGeoProjectionSource *New();
-  vtkTypeRevisionMacro(vtkGeoProjectionSource,vtkGeoSource);
+  vtkTypeMacro(vtkGeoProjectionSource,vtkGeoSource);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   vtkGeoProjectionSource();
diff --git a/Geovis/vtkGeoRandomGraphSource.cxx b/Geovis/vtkGeoRandomGraphSource.cxx
index 07d818f3bca66ba393e398fe804d47ad760ab2a8..32dbb1b126a61cc104d51add48a17426ed4f432e 100644
--- a/Geovis/vtkGeoRandomGraphSource.cxx
+++ b/Geovis/vtkGeoRandomGraphSource.cxx
@@ -28,7 +28,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkGeoRandomGraphSource, "1.1");
 vtkStandardNewMacro(vtkGeoRandomGraphSource);
 
 // ----------------------------------------------------------------------
diff --git a/Geovis/vtkGeoRandomGraphSource.h b/Geovis/vtkGeoRandomGraphSource.h
index 0fcfb021997aac2eb02f338e06998a1d9618bbe2..84323aabc3026282676f3302f36db41562a57329 100644
--- a/Geovis/vtkGeoRandomGraphSource.h
+++ b/Geovis/vtkGeoRandomGraphSource.h
@@ -43,7 +43,7 @@ class VTK_GEOVIS_EXPORT vtkGeoRandomGraphSource : public vtkRandomGraphSource
 {
 public:
   static vtkGeoRandomGraphSource* New();
-  vtkTypeRevisionMacro(vtkGeoRandomGraphSource,vtkRandomGraphSource);
+  vtkTypeMacro(vtkGeoRandomGraphSource,vtkRandomGraphSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Geovis/vtkGeoSampleArcs.cxx b/Geovis/vtkGeoSampleArcs.cxx
index 18a1efc8110f7b9b6eb54d6ab5b9200229996df3..94f0a29c6c115885dfb201f75ebc3bb588443670 100644
--- a/Geovis/vtkGeoSampleArcs.cxx
+++ b/Geovis/vtkGeoSampleArcs.cxx
@@ -39,7 +39,6 @@
 #include <vtksys/stl/map>
 using vtksys_stl::map;
 
-vtkCxxRevisionMacro(vtkGeoSampleArcs, "1.9");
 vtkStandardNewMacro(vtkGeoSampleArcs);
 
 vtkGeoSampleArcs::vtkGeoSampleArcs()
diff --git a/Geovis/vtkGeoSampleArcs.h b/Geovis/vtkGeoSampleArcs.h
index a8ec001d7f50d521cd359b8c5dc66d351d28de13..a01576f98b0ef40c1b4dbed9831e8873cd5af306 100644
--- a/Geovis/vtkGeoSampleArcs.h
+++ b/Geovis/vtkGeoSampleArcs.h
@@ -36,7 +36,7 @@ class VTK_GEOVIS_EXPORT vtkGeoSampleArcs : public vtkPolyDataAlgorithm
 public:
   static vtkGeoSampleArcs *New();
 
-  vtkTypeRevisionMacro(vtkGeoSampleArcs,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeoSampleArcs,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoSource.cxx b/Geovis/vtkGeoSource.cxx
index 20865941bf4d748d4323609ad894f3bbcd81a932..a5f848e21443b272eee740e9d1c2249907011354 100644
--- a/Geovis/vtkGeoSource.cxx
+++ b/Geovis/vtkGeoSource.cxx
@@ -72,7 +72,6 @@ public:
   vtksys_stl::vector<int> ThreadIds;
 };
 
-vtkCxxRevisionMacro(vtkGeoSource, "1.8");
 vtkGeoSource::vtkGeoSource()
 {
   this->InputSet = vtkCollection::New();
diff --git a/Geovis/vtkGeoSource.h b/Geovis/vtkGeoSource.h
index b7b5d755845f8679ce2f364873ae2ad690822fae..eb803143cbf62069757d05f160452d4fe6c889f1 100644
--- a/Geovis/vtkGeoSource.h
+++ b/Geovis/vtkGeoSource.h
@@ -50,7 +50,7 @@ class vtkMutexLock;
 class VTK_GEOVIS_EXPORT vtkGeoSource : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGeoSource,vtkObject);
+  vtkTypeMacro(vtkGeoSource,vtkObject);
 
   vtkGeoSource();
   ~vtkGeoSource();
diff --git a/Geovis/vtkGeoSphereTransform.cxx b/Geovis/vtkGeoSphereTransform.cxx
index 6ba22cf09adaa4a3df936f026de8f81b2bb240f0..dc8cfc2454effb4faedab84e270d733c17c3cd57 100644
--- a/Geovis/vtkGeoSphereTransform.cxx
+++ b/Geovis/vtkGeoSphereTransform.cxx
@@ -28,7 +28,6 @@
 #include "vtkPoints.h"
 
 vtkStandardNewMacro(vtkGeoSphereTransform);
-vtkCxxRevisionMacro(vtkGeoSphereTransform,"1.3");
 
 vtkGeoSphereTransform::vtkGeoSphereTransform()
 {
diff --git a/Geovis/vtkGeoSphereTransform.h b/Geovis/vtkGeoSphereTransform.h
index 16a610cdf03b97c607f1c596725063f4f22f5c59..8686cbd15de7073cb14a8d2515d881339b27d484 100644
--- a/Geovis/vtkGeoSphereTransform.h
+++ b/Geovis/vtkGeoSphereTransform.h
@@ -37,7 +37,7 @@ class VTK_GEOVIS_EXPORT vtkGeoSphereTransform : public vtkAbstractTransform
 public:
   static vtkGeoSphereTransform* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkGeoSphereTransform,vtkAbstractTransform);
+  vtkTypeMacro(vtkGeoSphereTransform,vtkAbstractTransform);
 
   // Description:
   // Invert the transformation.
diff --git a/Geovis/vtkGeoTerrain.cxx b/Geovis/vtkGeoTerrain.cxx
index adbf77b6282db0d2e28a155218e9d3e2220c9976..648380b3f680c0e363c66443f0a604fa84c8515a 100644
--- a/Geovis/vtkGeoTerrain.cxx
+++ b/Geovis/vtkGeoTerrain.cxx
@@ -62,7 +62,6 @@
 #include <vtksys/stl/utility>
 
 vtkStandardNewMacro(vtkGeoTerrain);
-vtkCxxRevisionMacro(vtkGeoTerrain, "1.23");
 vtkCxxSetObjectMacro(vtkGeoTerrain, GeoSource, vtkGeoSource);
 vtkCxxSetObjectMacro(vtkGeoTerrain, GeoCamera, vtkGeoCamera);
 //----------------------------------------------------------------------------
diff --git a/Geovis/vtkGeoTerrain.h b/Geovis/vtkGeoTerrain.h
index 8caa43e5d8495603c418f747352d9044fbc3b410..0c21f50e48eadc24bca7fb9473332f7ac2fdd285 100644
--- a/Geovis/vtkGeoTerrain.h
+++ b/Geovis/vtkGeoTerrain.h
@@ -45,7 +45,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTerrain : public vtkObject
 {
 public:
   static vtkGeoTerrain *New();
-  vtkTypeRevisionMacro(vtkGeoTerrain,vtkObject);
+  vtkTypeMacro(vtkGeoTerrain,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoTerrain2D.cxx b/Geovis/vtkGeoTerrain2D.cxx
index 9a21cfb757101eeb537eb6580135df17707fdd72..f97ac87348c7b15de80e7e196464e2a073a4da80 100644
--- a/Geovis/vtkGeoTerrain2D.cxx
+++ b/Geovis/vtkGeoTerrain2D.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderer.h"
 
 vtkStandardNewMacro(vtkGeoTerrain2D);
-vtkCxxRevisionMacro(vtkGeoTerrain2D, "1.5");
 //----------------------------------------------------------------------------
 vtkGeoTerrain2D::vtkGeoTerrain2D()
 {
diff --git a/Geovis/vtkGeoTerrain2D.h b/Geovis/vtkGeoTerrain2D.h
index 309d28af0416b59a940db5636f12ac1cc1364816..ca9a05769b904c7bf7fade32f8638530a53bccc7 100644
--- a/Geovis/vtkGeoTerrain2D.h
+++ b/Geovis/vtkGeoTerrain2D.h
@@ -44,7 +44,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTerrain2D : public vtkGeoTerrain
 {
 public:
   static vtkGeoTerrain2D *New();
-  vtkTypeRevisionMacro(vtkGeoTerrain2D,vtkGeoTerrain);
+  vtkTypeMacro(vtkGeoTerrain2D,vtkGeoTerrain);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoTerrainNode.cxx b/Geovis/vtkGeoTerrainNode.cxx
index 17b22c05afe6044940cc8e376ed710e3b5ba3457..1b463dc5a91eb60528f2d2d4875936e42712092f 100644
--- a/Geovis/vtkGeoTerrainNode.cxx
+++ b/Geovis/vtkGeoTerrainNode.cxx
@@ -26,7 +26,6 @@
 #include "vtkGeoMath.h"
 #include "vtkGeoTerrainNode.h"
 
-vtkCxxRevisionMacro(vtkGeoTerrainNode, "1.8");
 vtkStandardNewMacro(vtkGeoTerrainNode);
 
 
diff --git a/Geovis/vtkGeoTerrainNode.h b/Geovis/vtkGeoTerrainNode.h
index 266c23f31e9a2f65e1a04ceb280d6af40945ea9b..da88987db10912121943551cb4e9cf2326420381 100644
--- a/Geovis/vtkGeoTerrainNode.h
+++ b/Geovis/vtkGeoTerrainNode.h
@@ -36,7 +36,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTerrainNode : public vtkGeoTreeNode
 {
 public:
   static vtkGeoTerrainNode *New();
-  vtkTypeRevisionMacro(vtkGeoTerrainNode, vtkGeoTreeNode);
+  vtkTypeMacro(vtkGeoTerrainNode, vtkGeoTreeNode);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Decription:
diff --git a/Geovis/vtkGeoTransform.cxx b/Geovis/vtkGeoTransform.cxx
index a437bb1e09346b888afed9e18b0be6a377c80b0d..0f96fe688c4243a7c7f735d34fc5043298ecd0f5 100644
--- a/Geovis/vtkGeoTransform.cxx
+++ b/Geovis/vtkGeoTransform.cxx
@@ -29,7 +29,6 @@
 #include "vtk_libproj4.h"
 
 vtkStandardNewMacro(vtkGeoTransform);
-vtkCxxRevisionMacro(vtkGeoTransform,"1.3");
 vtkCxxSetObjectMacro(vtkGeoTransform, SourceProjection, vtkGeoProjection);
 vtkCxxSetObjectMacro(vtkGeoTransform, DestinationProjection, vtkGeoProjection);
 
diff --git a/Geovis/vtkGeoTransform.h b/Geovis/vtkGeoTransform.h
index 083a652e0a902baac75bcd9918038a3ef27585bd..a4dc87fc92d0db11b0f9e8c1bf305bfb8b4ee6f2 100644
--- a/Geovis/vtkGeoTransform.h
+++ b/Geovis/vtkGeoTransform.h
@@ -34,7 +34,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTransform : public vtkAbstractTransform
 public:
   static vtkGeoTransform* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkGeoTransform,vtkAbstractTransform);
+  vtkTypeMacro(vtkGeoTransform,vtkAbstractTransform);
 
   // Description:
   // The source geographic projection.
diff --git a/Geovis/vtkGeoTreeNode.cxx b/Geovis/vtkGeoTreeNode.cxx
index 164bc804da53f290b091158d342918d80004a5af..d75e21f3a28d8696a5d78422a3e08502dd17828c 100644
--- a/Geovis/vtkGeoTreeNode.cxx
+++ b/Geovis/vtkGeoTreeNode.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkGeoTreeNode.h"
 
-vtkCxxRevisionMacro(vtkGeoTreeNode, "1.7");
 vtkStandardNewMacro(vtkGeoTreeNode);
 
 
diff --git a/Geovis/vtkGeoTreeNode.h b/Geovis/vtkGeoTreeNode.h
index 434ac86431d1ff65bcf72afd6dafa5e8b841fd71..e6618ed4e16c629a25c14e6b9bf5f9ac63a1c14b 100644
--- a/Geovis/vtkGeoTreeNode.h
+++ b/Geovis/vtkGeoTreeNode.h
@@ -43,7 +43,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTreeNode : public vtkObject
 {
 public:
   static vtkGeoTreeNode *New();
-  vtkTypeRevisionMacro(vtkGeoTreeNode, vtkObject);
+  vtkTypeMacro(vtkGeoTreeNode, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Geovis/vtkGeoTreeNodeCache.cxx b/Geovis/vtkGeoTreeNodeCache.cxx
index 9e2d8de117b58d1d7242226852c27623f260ba61..ba1f462682d2dfb2413bf05a1911dfa9d5d75ac1 100644
--- a/Geovis/vtkGeoTreeNodeCache.cxx
+++ b/Geovis/vtkGeoTreeNodeCache.cxx
@@ -25,7 +25,6 @@
 #include "vtkSmartPointer.h"
 
 vtkStandardNewMacro(vtkGeoTreeNodeCache);
-vtkCxxRevisionMacro(vtkGeoTreeNodeCache, "1.4");
 //----------------------------------------------------------------------------
 vtkGeoTreeNodeCache::vtkGeoTreeNodeCache()
 {
diff --git a/Geovis/vtkGeoTreeNodeCache.h b/Geovis/vtkGeoTreeNodeCache.h
index 71570b44ea1022a8243f0d86a7ff3588b0c03d06..8efd4b6846c382b660f48ba8faec0d8424c1d65f 100644
--- a/Geovis/vtkGeoTreeNodeCache.h
+++ b/Geovis/vtkGeoTreeNodeCache.h
@@ -37,7 +37,7 @@ class VTK_GEOVIS_EXPORT vtkGeoTreeNodeCache : public vtkObject
 {
 public:
   static vtkGeoTreeNodeCache *New();
-  vtkTypeRevisionMacro(vtkGeoTreeNodeCache,vtkObject);
+  vtkTypeMacro(vtkGeoTreeNodeCache,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoView.cxx b/Geovis/vtkGeoView.cxx
index 714322a10b34371bc0334c8aaa685c96359922fa..a521c4837a237239bd5cd3f7e3ccbfc85b1d6d1b 100644
--- a/Geovis/vtkGeoView.cxx
+++ b/Geovis/vtkGeoView.cxx
@@ -44,7 +44,6 @@
 
 #include "vtkgl.h"
 
-vtkCxxRevisionMacro(vtkGeoView, "1.19");
 vtkStandardNewMacro(vtkGeoView);
 vtkCxxSetObjectMacro(vtkGeoView, Terrain, vtkGeoTerrain);
 //----------------------------------------------------------------------------
diff --git a/Geovis/vtkGeoView.h b/Geovis/vtkGeoView.h
index ac8e5512e050f0041a85996e64ee2b10de65c7be..e4ce99001fa9568a7b89205a5da93faea70e3e6c 100644
--- a/Geovis/vtkGeoView.h
+++ b/Geovis/vtkGeoView.h
@@ -56,7 +56,7 @@ class VTK_GEOVIS_EXPORT vtkGeoView : public vtkRenderView
 {
 public:
   static vtkGeoView *New();
-  vtkTypeRevisionMacro(vtkGeoView, vtkRenderView);
+  vtkTypeMacro(vtkGeoView, vtkRenderView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Geovis/vtkGeoView2D.cxx b/Geovis/vtkGeoView2D.cxx
index ec71fede9013ccd9cefa844255cb1f6e8f6e82aa..e658d263d408bef3d363b9a7a0a11897f85456d1 100644
--- a/Geovis/vtkGeoView2D.cxx
+++ b/Geovis/vtkGeoView2D.cxx
@@ -31,7 +31,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkGeoView2D, "1.6");
 vtkStandardNewMacro(vtkGeoView2D);
 vtkCxxSetObjectMacro(vtkGeoView2D, Surface, vtkGeoTerrain2D);
 
diff --git a/Geovis/vtkGeoView2D.h b/Geovis/vtkGeoView2D.h
index 0ce256e58ed1d5ca78c70a8e7aabe993bbc8566b..a0aedeae8812b3376e69b36752ecb77fbfc02e48 100644
--- a/Geovis/vtkGeoView2D.h
+++ b/Geovis/vtkGeoView2D.h
@@ -47,7 +47,7 @@ class VTK_GEOVIS_EXPORT vtkGeoView2D : public vtkRenderView
 {
 public:
   static vtkGeoView2D *New();
-  vtkTypeRevisionMacro(vtkGeoView2D,vtkRenderView);
+  vtkTypeMacro(vtkGeoView2D,vtkRenderView);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   vtkGeoView2D();
diff --git a/Geovis/vtkGlobeSource.cxx b/Geovis/vtkGlobeSource.cxx
index 3808b7f890525da1c3ca0bfc5f04cc6abc088ed0..93aeb0e49a5aa2ac03079209e8dcc8ccfd2ef32e 100644
--- a/Geovis/vtkGlobeSource.cxx
+++ b/Geovis/vtkGlobeSource.cxx
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkGlobeSource, "1.9");
 vtkStandardNewMacro(vtkGlobeSource);
 
   // 0=NE, 1=SE, 2=SW, 3=NW
diff --git a/Geovis/vtkGlobeSource.h b/Geovis/vtkGlobeSource.h
index 820c74e732e434bcda33347c9174b2e61825fa20..de79e63e92e22a75672db48e4e8ad63c1aad3c18 100644
--- a/Geovis/vtkGlobeSource.h
+++ b/Geovis/vtkGlobeSource.h
@@ -42,7 +42,7 @@ class vtkFloatArray;
 class VTK_GEOVIS_EXPORT vtkGlobeSource : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkGlobeSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGlobeSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Graphics/Testing/Cxx/TestTessellator.cxx b/Graphics/Testing/Cxx/TestTessellator.cxx
index 2da7c4450a5c26729935715317bac2d7e0ffaf1f..44508f55a8ead6b43405469cc7345d3963d85334 100644
--- a/Graphics/Testing/Cxx/TestTessellator.cxx
+++ b/Graphics/Testing/Cxx/TestTessellator.cxx
@@ -2508,7 +2508,7 @@ class vtkTestTessellatorSubdivision
   : public vtkEdgeSubdivisionCriterion
 {
   public:
-    vtkTypeRevisionMacro(vtkTestTessellatorSubdivision,vtkEdgeSubdivisionCriterion);
+    vtkTypeMacro(vtkTestTessellatorSubdivision,vtkEdgeSubdivisionCriterion);
     static vtkTestTessellatorSubdivision* New();
     virtual void PrintSelf( ostream& os, vtkIndent indent );
 
@@ -2562,7 +2562,6 @@ class vtkTestTessellatorSubdivision
 
 };
 
-vtkCxxRevisionMacro(vtkTestTessellatorSubdivision,"1.7");
 vtkStandardNewMacro(vtkTestTessellatorSubdivision);
 
 static int test_list[] =
diff --git a/Graphics/vtkAnnotationLink.cxx b/Graphics/vtkAnnotationLink.cxx
index ad4c5408c5c594d1ec804d0659f7156f106601fb..f3df834771fa782980a64b8a2b8e7678e241813f 100644
--- a/Graphics/vtkAnnotationLink.cxx
+++ b/Graphics/vtkAnnotationLink.cxx
@@ -27,7 +27,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkAnnotationLink, "1.11");
 vtkStandardNewMacro(vtkAnnotationLink);
 //vtkCxxSetObjectMacro(vtkAnnotationLink, AnnotationLayers, vtkAnnotationLayers);
 
diff --git a/Graphics/vtkAnnotationLink.h b/Graphics/vtkAnnotationLink.h
index 92959ea8ed7c5ed795cc44050c7f4eac2141a9b2..20b46e43acf655a040df39f0d0f942efa96a9f1c 100644
--- a/Graphics/vtkAnnotationLink.h
+++ b/Graphics/vtkAnnotationLink.h
@@ -54,7 +54,7 @@ class VTK_GRAPHICS_EXPORT vtkAnnotationLink : public vtkAnnotationLayersAlgorith
 {
 public:
   static vtkAnnotationLink *New();
-  vtkTypeRevisionMacro(vtkAnnotationLink, vtkAnnotationLayersAlgorithm);
+  vtkTypeMacro(vtkAnnotationLink, vtkAnnotationLayersAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkAppendCompositeDataLeaves.cxx b/Graphics/vtkAppendCompositeDataLeaves.cxx
index 430874009dbf85638fe6ea5c37dd3550a86c3796..d13b093225c93e8369f6278dd8a44ba75963ef15 100644
--- a/Graphics/vtkAppendCompositeDataLeaves.cxx
+++ b/Graphics/vtkAppendCompositeDataLeaves.cxx
@@ -30,7 +30,6 @@
 #include "vtkPolyData.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkAppendCompositeDataLeaves, "1.3");
 vtkStandardNewMacro(vtkAppendCompositeDataLeaves);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkAppendCompositeDataLeaves.h b/Graphics/vtkAppendCompositeDataLeaves.h
index 3bc1dc2c8483f6f1a7d2965ec23c83dd4addf5a7..6abe3f9a017f5c7ea67fc52907596e077df83416 100644
--- a/Graphics/vtkAppendCompositeDataLeaves.h
+++ b/Graphics/vtkAppendCompositeDataLeaves.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkAppendCompositeDataLeaves : public vtkCompositeData
 public:
   static vtkAppendCompositeDataLeaves* New();
 
-  vtkTypeRevisionMacro(vtkAppendCompositeDataLeaves,vtkCompositeDataSetAlgorithm);
+  vtkTypeMacro(vtkAppendCompositeDataLeaves,vtkCompositeDataSetAlgorithm);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Graphics/vtkAppendFilter.cxx b/Graphics/vtkAppendFilter.cxx
index 0cc2aa7993193e09dd6970df58edc2dfdea1c7da..7b672a897bc8743085325c02533bfaa0dcfc67f7 100644
--- a/Graphics/vtkAppendFilter.cxx
+++ b/Graphics/vtkAppendFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkIncrementalOctreePointLocator.h"
 
-vtkCxxRevisionMacro(vtkAppendFilter, "1.77");
 vtkStandardNewMacro(vtkAppendFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkAppendFilter.h b/Graphics/vtkAppendFilter.h
index b8d3f57a54b9158f38571ba920ddf8bbe5712c62..256faa2bdcf4ed56ac4f46bceba1a1209a765abd 100644
--- a/Graphics/vtkAppendFilter.h
+++ b/Graphics/vtkAppendFilter.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkAppendFilter : public vtkUnstructuredGridAlgorithm
 public:
   static vtkAppendFilter *New();
 
-  vtkTypeRevisionMacro(vtkAppendFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkAppendFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkAppendPolyData.cxx b/Graphics/vtkAppendPolyData.cxx
index e703a25814578dc3ba226f824c9d5850e7d0a197..d81383f9176dc83432a9255cc6272e7c2894e630 100644
--- a/Graphics/vtkAppendPolyData.cxx
+++ b/Graphics/vtkAppendPolyData.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkAppendPolyData, "1.109");
 vtkStandardNewMacro(vtkAppendPolyData);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkAppendPolyData.h b/Graphics/vtkAppendPolyData.h
index d346e56154ca80eab22a7d5ad8bb32a4a08993dc..2d823faaeae0bc549594cc485aa9ec9cd75000b3 100644
--- a/Graphics/vtkAppendPolyData.h
+++ b/Graphics/vtkAppendPolyData.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkAppendPolyData : public vtkPolyDataAlgorithm
 public:
   static vtkAppendPolyData *New();
 
-  vtkTypeRevisionMacro(vtkAppendPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkAppendPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkAppendSelection.cxx b/Graphics/vtkAppendSelection.cxx
index 3b1a2c1832a5ec0534d6353e37005bc4aa412650..a8a5757d2d5a1c4e1d6ffd15f1594633ad9dc9eb 100644
--- a/Graphics/vtkAppendSelection.cxx
+++ b/Graphics/vtkAppendSelection.cxx
@@ -27,7 +27,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkAppendSelection, "1.7");
 vtkStandardNewMacro(vtkAppendSelection);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkAppendSelection.h b/Graphics/vtkAppendSelection.h
index 281669b8c2973ef5879b6b98b950badc0fbd95ba..91c94721d1d6eefaffb307486ab9774ab10be905 100644
--- a/Graphics/vtkAppendSelection.h
+++ b/Graphics/vtkAppendSelection.h
@@ -35,7 +35,7 @@ class VTK_GRAPHICS_EXPORT vtkAppendSelection : public vtkSelectionAlgorithm
 public:
   static vtkAppendSelection *New();
 
-  vtkTypeRevisionMacro(vtkAppendSelection,vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkAppendSelection,vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkApproximatingSubdivisionFilter.cxx b/Graphics/vtkApproximatingSubdivisionFilter.cxx
index 894ec9405e23c44c8e190e8fb86fbcef08135673..009770f975489f847894fdbce01b952ab0d33e78 100644
--- a/Graphics/vtkApproximatingSubdivisionFilter.cxx
+++ b/Graphics/vtkApproximatingSubdivisionFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkApproximatingSubdivisionFilter, "1.33");
 
 // Construct object with number of subdivisions set to 1.
 vtkApproximatingSubdivisionFilter::vtkApproximatingSubdivisionFilter()
diff --git a/Graphics/vtkApproximatingSubdivisionFilter.h b/Graphics/vtkApproximatingSubdivisionFilter.h
index d7f8eda744cc9ae1a3c4239d39a2aa2c4e284e4c..3eb8f201338e16f3bbcf680c6c947508a0a385a1 100644
--- a/Graphics/vtkApproximatingSubdivisionFilter.h
+++ b/Graphics/vtkApproximatingSubdivisionFilter.h
@@ -36,7 +36,7 @@ class vtkPointData;
 class VTK_GRAPHICS_EXPORT vtkApproximatingSubdivisionFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkApproximatingSubdivisionFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkApproximatingSubdivisionFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkArcSource.cxx b/Graphics/vtkArcSource.cxx
index 5220c0b87d026d06d0e7dd585e00bfc7ba6a328b..92f68c002122033f5114a7e0c281825144740112 100644
--- a/Graphics/vtkArcSource.cxx
+++ b/Graphics/vtkArcSource.cxx
@@ -26,7 +26,6 @@
 #include "vtkMath.h"
 
 #include <math.h>
-vtkCxxRevisionMacro(vtkArcSource, "1.5");
 vtkStandardNewMacro(vtkArcSource);
 
 // --------------------------------------------------------------------------
diff --git a/Graphics/vtkArcSource.h b/Graphics/vtkArcSource.h
index 7bc4f541b167baf0fe73de448c389c78863de17f..816926bb9938d8a0830eacf12a20448242222890 100644
--- a/Graphics/vtkArcSource.h
+++ b/Graphics/vtkArcSource.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkArcSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkArcSource *New();
-  vtkTypeRevisionMacro(vtkArcSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkArcSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkArrayCalculator.cxx b/Graphics/vtkArrayCalculator.cxx
index 67e84e39c08fdcce91755c57e6741dcc186d1c3b..a2db7aee8a576271899e8094130f671c54d56074 100644
--- a/Graphics/vtkArrayCalculator.cxx
+++ b/Graphics/vtkArrayCalculator.cxx
@@ -28,7 +28,6 @@
 #include "vtkPolyData.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkArrayCalculator, "1.51");
 vtkStandardNewMacro(vtkArrayCalculator);
 
 vtkArrayCalculator::vtkArrayCalculator()
diff --git a/Graphics/vtkArrayCalculator.h b/Graphics/vtkArrayCalculator.h
index d7545315e7bfb64b81102720c74dbffd89af091d..7946a909f23d4deb91c71800c6bcaf35fa95d939 100644
--- a/Graphics/vtkArrayCalculator.h
+++ b/Graphics/vtkArrayCalculator.h
@@ -71,7 +71,7 @@ class vtkFunctionParser;
 class VTK_GRAPHICS_EXPORT vtkArrayCalculator : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkArrayCalculator,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkArrayCalculator,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkArrayCalculator *New();
diff --git a/Graphics/vtkArrowSource.cxx b/Graphics/vtkArrowSource.cxx
index 45114d2ea6ac60a9f1e933ae2ae8bb8d4196d0db..c8a7565da4eac5e7a5a9dc66aeb92e1ae5903ade 100644
--- a/Graphics/vtkArrowSource.cxx
+++ b/Graphics/vtkArrowSource.cxx
@@ -24,7 +24,6 @@
 #include "vtkTransform.h"
 #include "vtkTransformFilter.h"
 
-vtkCxxRevisionMacro(vtkArrowSource, "1.8");
 vtkStandardNewMacro(vtkArrowSource);
 
 vtkArrowSource::vtkArrowSource()
diff --git a/Graphics/vtkArrowSource.h b/Graphics/vtkArrowSource.h
index 42dec08e7f3fc54b4a66c9da8d2d25f8c7b11773..a39a889e7c114469f5ff1f3fbc23e5b62804e02b 100644
--- a/Graphics/vtkArrowSource.h
+++ b/Graphics/vtkArrowSource.h
@@ -35,7 +35,7 @@ public:
   // Construct cone with angle of 45 degrees.
   static vtkArrowSource *New();
 
-  vtkTypeRevisionMacro(vtkArrowSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkArrowSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
     
   // Description:
diff --git a/Graphics/vtkAssignAttribute.cxx b/Graphics/vtkAssignAttribute.cxx
index 04d4ecf3d4dcd3afc087d6d8c8ca6137d9c973d0..f280cee6e5e6e198431e3d56003118eed706be7d 100644
--- a/Graphics/vtkAssignAttribute.cxx
+++ b/Graphics/vtkAssignAttribute.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkAssignAttribute, "1.24");
 vtkStandardNewMacro(vtkAssignAttribute);
 
 char vtkAssignAttribute::AttributeLocationNames[vtkAssignAttribute::NUM_ATTRIBUTE_LOCS][12] 
diff --git a/Graphics/vtkAssignAttribute.h b/Graphics/vtkAssignAttribute.h
index 9ea1610d132040b0368eeffdf6fbfa0d11e2f654..0d5f7f30c957621991131981028458ac0d081fd2 100644
--- a/Graphics/vtkAssignAttribute.h
+++ b/Graphics/vtkAssignAttribute.h
@@ -63,7 +63,7 @@ class vtkFieldData;
 class VTK_GRAPHICS_EXPORT vtkAssignAttribute : public vtkPassInputTypeAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkAssignAttribute,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkAssignAttribute,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkAttributeDataToFieldDataFilter.cxx b/Graphics/vtkAttributeDataToFieldDataFilter.cxx
index 17b8bc6a53684d803968abd356c9c6f8cc8481bf..be8e8bcef5c1ab7c049ad73674f7b3290f97ada5 100644
--- a/Graphics/vtkAttributeDataToFieldDataFilter.cxx
+++ b/Graphics/vtkAttributeDataToFieldDataFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkAttributeDataToFieldDataFilter, "1.19");
 vtkStandardNewMacro(vtkAttributeDataToFieldDataFilter);
 
 // Instantiate object.
diff --git a/Graphics/vtkAttributeDataToFieldDataFilter.h b/Graphics/vtkAttributeDataToFieldDataFilter.h
index 2815004ba912b08caa262dd2b914bfe52c55a85e..9429ae08e81148f2e49d5559e72fdd3f00f916f8 100644
--- a/Graphics/vtkAttributeDataToFieldDataFilter.h
+++ b/Graphics/vtkAttributeDataToFieldDataFilter.h
@@ -44,7 +44,7 @@ class VTK_GRAPHICS_EXPORT vtkAttributeDataToFieldDataFilter : public vtkDataSetA
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkAttributeDataToFieldDataFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkAttributeDataToFieldDataFilter,vtkDataSetAlgorithm);
 
   // Description:
   // Construct this object.
diff --git a/Graphics/vtkAxes.cxx b/Graphics/vtkAxes.cxx
index e84b1e0c0bf0fa5a903fb426d36b4bcac6b4e5af..6fa9aa6d69cbf4b824a2b3b0469eb17374ab1833 100644
--- a/Graphics/vtkAxes.cxx
+++ b/Graphics/vtkAxes.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkAxes, "1.45");
 vtkStandardNewMacro(vtkAxes);
 
 
diff --git a/Graphics/vtkAxes.h b/Graphics/vtkAxes.h
index 04ab86a71efb973f84121d95f60d0252be09e5ec..99c14d418da8c10d228d22176ca1832cc686ebe5 100644
--- a/Graphics/vtkAxes.h
+++ b/Graphics/vtkAxes.h
@@ -29,7 +29,7 @@ class VTK_GRAPHICS_EXPORT vtkAxes : public vtkPolyDataAlgorithm
 public:
   static vtkAxes *New();
 
-  vtkTypeRevisionMacro(vtkAxes,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkAxes,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkBandedPolyDataContourFilter.cxx b/Graphics/vtkBandedPolyDataContourFilter.cxx
index 59a9d5bf2a8d58d776a16e498ddea7942f81b695..5250b206a48781eba013d28981dbce4393bc33f7 100644
--- a/Graphics/vtkBandedPolyDataContourFilter.cxx
+++ b/Graphics/vtkBandedPolyDataContourFilter.cxx
@@ -29,7 +29,6 @@
 
 #include <float.h>
 
-vtkCxxRevisionMacro(vtkBandedPolyDataContourFilter, "1.58");
 vtkStandardNewMacro(vtkBandedPolyDataContourFilter);
 
 // Construct object.
diff --git a/Graphics/vtkBandedPolyDataContourFilter.h b/Graphics/vtkBandedPolyDataContourFilter.h
index 417e0468d29b6889f7ad7db474941766b5d7f3eb..580e25514465b2d7eae935213edfa9b203df53d3 100644
--- a/Graphics/vtkBandedPolyDataContourFilter.h
+++ b/Graphics/vtkBandedPolyDataContourFilter.h
@@ -54,7 +54,7 @@ class vtkDoubleArray;
 class VTK_GRAPHICS_EXPORT vtkBandedPolyDataContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkBandedPolyDataContourFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkBandedPolyDataContourFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkBlankStructuredGrid.cxx b/Graphics/vtkBlankStructuredGrid.cxx
index 6a8575240b72638bb3ca23890848bd78c7a13ebb..c69fdd99cd87970567424bb6a0b07363b5225ae0 100644
--- a/Graphics/vtkBlankStructuredGrid.cxx
+++ b/Graphics/vtkBlankStructuredGrid.cxx
@@ -22,7 +22,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkBlankStructuredGrid, "1.15");
 vtkStandardNewMacro(vtkBlankStructuredGrid);
 
 // Construct object to extract all of the input data.
diff --git a/Graphics/vtkBlankStructuredGrid.h b/Graphics/vtkBlankStructuredGrid.h
index e203a0171f1f51f57a29caca8ae230702d0f5df0..aa20300dc2d0557aa23134e2e798d2a5414cb301 100644
--- a/Graphics/vtkBlankStructuredGrid.h
+++ b/Graphics/vtkBlankStructuredGrid.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkBlankStructuredGrid : public vtkStructuredGridAlgor
 {
 public:
   static vtkBlankStructuredGrid *New();
-  vtkTypeRevisionMacro(vtkBlankStructuredGrid,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkBlankStructuredGrid,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkBlankStructuredGridWithImage.cxx b/Graphics/vtkBlankStructuredGridWithImage.cxx
index cf8346dc3314f987fa42e337a61bb15ca3512734..96664d241c64b0404ebd4087a3f94326755926d5 100644
--- a/Graphics/vtkBlankStructuredGridWithImage.cxx
+++ b/Graphics/vtkBlankStructuredGridWithImage.cxx
@@ -25,7 +25,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkBlankStructuredGridWithImage, "1.15");
 vtkStandardNewMacro(vtkBlankStructuredGridWithImage);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkBlankStructuredGridWithImage.h b/Graphics/vtkBlankStructuredGridWithImage.h
index ac4bc291782ff4928ba2838a1ae1ea8ff85372d3..0ac4d7025c863213e7a7abd39c8dbd23b4af3752 100644
--- a/Graphics/vtkBlankStructuredGridWithImage.h
+++ b/Graphics/vtkBlankStructuredGridWithImage.h
@@ -37,7 +37,7 @@ class VTK_GRAPHICS_EXPORT vtkBlankStructuredGridWithImage : public vtkStructured
 {
 public:
   static vtkBlankStructuredGridWithImage *New();
-  vtkTypeRevisionMacro(vtkBlankStructuredGridWithImage,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkBlankStructuredGridWithImage,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkBlockIdScalars.cxx b/Graphics/vtkBlockIdScalars.cxx
index 7c2ade1c63815c06491c4e8486050eed0da340f7..1ee4c0cdd3962b78e1d52f7d1232b5080bc4839e 100644
--- a/Graphics/vtkBlockIdScalars.cxx
+++ b/Graphics/vtkBlockIdScalars.cxx
@@ -24,7 +24,6 @@
 #include "vtkUnsignedCharArray.h"
 
 vtkStandardNewMacro(vtkBlockIdScalars);
-vtkCxxRevisionMacro(vtkBlockIdScalars, "1.1");
 //----------------------------------------------------------------------------
 vtkBlockIdScalars::vtkBlockIdScalars()
 {
diff --git a/Graphics/vtkBlockIdScalars.h b/Graphics/vtkBlockIdScalars.h
index 7c098efe54e4bb7f886335fc0ea60bc5a98e7ea9..d829932f95121d449378fbb536abbd651b668422 100644
--- a/Graphics/vtkBlockIdScalars.h
+++ b/Graphics/vtkBlockIdScalars.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkBlockIdScalars : public vtkMultiBlockDataSetAlgorit
 {
 public:
   static vtkBlockIdScalars* New();
-  vtkTypeRevisionMacro(vtkBlockIdScalars, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkBlockIdScalars, vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Graphics/vtkBoxClipDataSet.cxx b/Graphics/vtkBoxClipDataSet.cxx
index 1f3ef0df9ee85f76617c598299f9c77c5a906b3b..c657ceaaeaad6dc33dbf7d54724d0dec595d6154 100644
--- a/Graphics/vtkBoxClipDataSet.cxx
+++ b/Graphics/vtkBoxClipDataSet.cxx
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkBoxClipDataSet, "1.28");
 vtkStandardNewMacro(vtkBoxClipDataSet);
 
 vtkCxxSetObjectMacro(vtkBoxClipDataSet, Locator, vtkIncrementalPointLocator)
diff --git a/Graphics/vtkBoxClipDataSet.h b/Graphics/vtkBoxClipDataSet.h
index 1b57a82a80c8bead8d4573000376df6f8ae1f4ec..710b5530fc5ae7e28bb4043fb7d651bbc8d0ca8f 100644
--- a/Graphics/vtkBoxClipDataSet.h
+++ b/Graphics/vtkBoxClipDataSet.h
@@ -61,7 +61,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkBoxClipDataSet : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkBoxClipDataSet,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkBoxClipDataSet,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkBrownianPoints.cxx b/Graphics/vtkBrownianPoints.cxx
index 90f9fb56ee9893389191c4571cb34ba3219873e4..569ecf4564c9d06fcc8e042915c7dee4c5c9b665 100644
--- a/Graphics/vtkBrownianPoints.cxx
+++ b/Graphics/vtkBrownianPoints.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkBrownianPoints, "1.43");
 vtkStandardNewMacro(vtkBrownianPoints);
 
 vtkBrownianPoints::vtkBrownianPoints()
diff --git a/Graphics/vtkBrownianPoints.h b/Graphics/vtkBrownianPoints.h
index 2e1f9bc94baa1a50981664860f9754e52e6dee3a..9789f8598091c45163510c75ffe2df5ccd89a721 100644
--- a/Graphics/vtkBrownianPoints.h
+++ b/Graphics/vtkBrownianPoints.h
@@ -30,7 +30,7 @@ public:
   // Create instance with minimum speed 0.0, maximum speed 1.0.
   static vtkBrownianPoints *New();
 
-  vtkTypeRevisionMacro(vtkBrownianPoints,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkBrownianPoints,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkButterflySubdivisionFilter.cxx b/Graphics/vtkButterflySubdivisionFilter.cxx
index 62117d1c48081d20f69cabf86eb8f2ec38c2d50a..df58b1ec8c8944567e009475a508eb0c7646ff72 100644
--- a/Graphics/vtkButterflySubdivisionFilter.cxx
+++ b/Graphics/vtkButterflySubdivisionFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkButterflySubdivisionFilter, "1.17");
 vtkStandardNewMacro(vtkButterflySubdivisionFilter);
 
 static double butterflyWeights[8] =
diff --git a/Graphics/vtkButterflySubdivisionFilter.h b/Graphics/vtkButterflySubdivisionFilter.h
index 6238a421473941f752d1fad3f8faf29e4c557a0b..f79e15c6536cb5cc75b484912da8d7e5a7a1312d 100644
--- a/Graphics/vtkButterflySubdivisionFilter.h
+++ b/Graphics/vtkButterflySubdivisionFilter.h
@@ -54,7 +54,7 @@ public:
   // Description:
   // Construct object with NumberOfSubdivisions set to 1.
   static vtkButterflySubdivisionFilter *New();
-  vtkTypeRevisionMacro(vtkButterflySubdivisionFilter,vtkInterpolatingSubdivisionFilter);
+  vtkTypeMacro(vtkButterflySubdivisionFilter,vtkInterpolatingSubdivisionFilter);
 
 protected:
   vtkButterflySubdivisionFilter () {};
diff --git a/Graphics/vtkButtonSource.cxx b/Graphics/vtkButtonSource.cxx
index 47eeaa9b9406ce4ee3709a166510429e4c5f489c..24e6b3c043c63dd54be4aec7c4fa53cb40eebf9d 100644
--- a/Graphics/vtkButtonSource.cxx
+++ b/Graphics/vtkButtonSource.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkButtonSource.h"
 
-vtkCxxRevisionMacro(vtkButtonSource, "1.12");
 
 // Construct 
 vtkButtonSource::vtkButtonSource()
diff --git a/Graphics/vtkButtonSource.h b/Graphics/vtkButtonSource.h
index afa5792f8b100cd14f80e890b068110cb271d6e4..2dfea1dbcc20323a687ac2d216523180da81b70e 100644
--- a/Graphics/vtkButtonSource.h
+++ b/Graphics/vtkButtonSource.h
@@ -51,7 +51,7 @@ class VTK_GRAPHICS_EXPORT vtkButtonSource : public vtkPolyDataAlgorithm
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkButtonSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkButtonSource,vtkPolyDataAlgorithm);
 
   // Description:
   // Specify a point defining the origin (center) of the button.
diff --git a/Graphics/vtkCellCenters.cxx b/Graphics/vtkCellCenters.cxx
index e51bb0aaccff4e9e8aa4945359f05e3639b9708d..57ef4e6a7fc548279e652c8b330a14128376c63d 100644
--- a/Graphics/vtkCellCenters.cxx
+++ b/Graphics/vtkCellCenters.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkCellArray.h"
 
-vtkCxxRevisionMacro(vtkCellCenters, "1.30");
 vtkStandardNewMacro(vtkCellCenters);
 
 // Construct object with vertex cell generation turned off.
diff --git a/Graphics/vtkCellCenters.h b/Graphics/vtkCellCenters.h
index f952bbe071ee4058b8dcfdc074117fc10d10c435..0c03b8962d7a3dfe60867beb960565f3b32e5e36 100644
--- a/Graphics/vtkCellCenters.h
+++ b/Graphics/vtkCellCenters.h
@@ -37,7 +37,7 @@
 class VTK_GRAPHICS_EXPORT vtkCellCenters : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkCellCenters,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCellCenters,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCellDataToPointData.cxx b/Graphics/vtkCellDataToPointData.cxx
index db478a160eb445c0c817cfe41eadeab8849a42c1..6e72e8b7b48ba38741e5e85616302cb063c1a3e7 100644
--- a/Graphics/vtkCellDataToPointData.cxx
+++ b/Graphics/vtkCellDataToPointData.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkCellDataToPointData, "1.38");
 vtkStandardNewMacro(vtkCellDataToPointData);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkCellDataToPointData.h b/Graphics/vtkCellDataToPointData.h
index 07131b13621a1adf7fe8395b273808ecbc07f05b..dfb84d57b68f17357efae020cbee824d690c31e3 100644
--- a/Graphics/vtkCellDataToPointData.h
+++ b/Graphics/vtkCellDataToPointData.h
@@ -41,7 +41,7 @@ class VTK_GRAPHICS_EXPORT vtkCellDataToPointData : public vtkDataSetAlgorithm
 {
 public:
   static vtkCellDataToPointData *New();
-  vtkTypeRevisionMacro(vtkCellDataToPointData,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkCellDataToPointData,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCellDerivatives.cxx b/Graphics/vtkCellDerivatives.cxx
index 08c3c720d0d338a44094c59bb352ae59ba8a1594..70e3dbd85820498f83e4f10b680449df7325ff81 100644
--- a/Graphics/vtkCellDerivatives.cxx
+++ b/Graphics/vtkCellDerivatives.cxx
@@ -27,7 +27,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCellDerivatives, "1.31");
 vtkStandardNewMacro(vtkCellDerivatives);
 
 vtkCellDerivatives::vtkCellDerivatives()
diff --git a/Graphics/vtkCellDerivatives.h b/Graphics/vtkCellDerivatives.h
index a8c0a81b4ffdb0d960dd162afe7919870bb20506..272938d67273fb0d0c7d948aa37a4eca13058d22 100644
--- a/Graphics/vtkCellDerivatives.h
+++ b/Graphics/vtkCellDerivatives.h
@@ -54,7 +54,7 @@
 class VTK_GRAPHICS_EXPORT vtkCellDerivatives : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkCellDerivatives,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkCellDerivatives,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCleanPolyData.cxx b/Graphics/vtkCleanPolyData.cxx
index 6619ea242b69ef1c44fde06e0eb51953fbb4a51e..7321aae9db4f7726fa1b2141562688cea8b69ec4 100644
--- a/Graphics/vtkCleanPolyData.cxx
+++ b/Graphics/vtkCleanPolyData.cxx
@@ -25,7 +25,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkCleanPolyData, "1.82");
 vtkStandardNewMacro(vtkCleanPolyData);
 
 //---------------------------------------------------------------------------
diff --git a/Graphics/vtkCleanPolyData.h b/Graphics/vtkCleanPolyData.h
index 3a40c71abc2334d4017382026e435654fb0ba382..3937407d13d3634d2a56fe61ef9cd599af34140b 100644
--- a/Graphics/vtkCleanPolyData.h
+++ b/Graphics/vtkCleanPolyData.h
@@ -66,7 +66,7 @@ class VTK_GRAPHICS_EXPORT vtkCleanPolyData : public vtkPolyDataAlgorithm
 public:
   static vtkCleanPolyData *New();
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkCleanPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCleanPolyData,vtkPolyDataAlgorithm);
 
   // Description:
   // By default ToleranceIsAbsolute is false and Tolerance is
diff --git a/Graphics/vtkClipClosedSurface.cxx b/Graphics/vtkClipClosedSurface.cxx
index 5eb39754d3530099b448a3ab32db4ce550acd77a..492e6bd6c4eff24336a587ade661bc2ae4f9fa63 100644
--- a/Graphics/vtkClipClosedSurface.cxx
+++ b/Graphics/vtkClipClosedSurface.cxx
@@ -40,7 +40,6 @@
 #include <vtkstd/map>
 #include <vtkstd/utility>
 
-vtkCxxRevisionMacro(vtkClipClosedSurface, "1.14");
 vtkStandardNewMacro(vtkClipClosedSurface);
 
 vtkCxxSetObjectMacro(vtkClipClosedSurface,ClippingPlanes,vtkPlaneCollection);
diff --git a/Graphics/vtkClipClosedSurface.h b/Graphics/vtkClipClosedSurface.h
index 41f6f925dae27e8d259cb4ff96a8196fed9169d7..6365f7a8a80e8774fdb145bfd3118354bb2d6894 100644
--- a/Graphics/vtkClipClosedSurface.h
+++ b/Graphics/vtkClipClosedSurface.h
@@ -54,7 +54,7 @@ class VTK_GRAPHICS_EXPORT vtkClipClosedSurface : public vtkPolyDataAlgorithm
 {
 public:
   static vtkClipClosedSurface *New();
-  vtkTypeRevisionMacro(vtkClipClosedSurface,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkClipClosedSurface,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkClipConvexPolyData.cxx b/Graphics/vtkClipConvexPolyData.cxx
index 3c10b9cfc1bac9c4fd3c6fa50ac8924a099ebbf9..1d91e57efa39176b5cf046f686cdab44f9740bba 100644
--- a/Graphics/vtkClipConvexPolyData.cxx
+++ b/Graphics/vtkClipConvexPolyData.cxx
@@ -28,7 +28,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/iterator>
 
-vtkCxxRevisionMacro(vtkClipConvexPolyData,"1.4");
 vtkStandardNewMacro(vtkClipConvexPolyData);
 
 vtkCxxSetObjectMacro(vtkClipConvexPolyData,Planes,vtkPlaneCollection);
diff --git a/Graphics/vtkClipConvexPolyData.h b/Graphics/vtkClipConvexPolyData.h
index 51f737a894ffeb55a8e2d802be63f9634eb96d16..8b769d6e97f4fec081ad85a8aa5649ccf95c3e4c 100644
--- a/Graphics/vtkClipConvexPolyData.h
+++ b/Graphics/vtkClipConvexPolyData.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkClipConvexPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkClipConvexPolyData *New();
-  vtkTypeRevisionMacro(vtkClipConvexPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkClipConvexPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkClipDataSet.cxx b/Graphics/vtkClipDataSet.cxx
index 69e1845f7978325263db0790de76750384934be5..7205cf0f8f15d355e4a47c025193bea0bbfd6d67 100644
--- a/Graphics/vtkClipDataSet.cxx
+++ b/Graphics/vtkClipDataSet.cxx
@@ -39,7 +39,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkClipDataSet, "1.59");
 vtkStandardNewMacro(vtkClipDataSet);
 vtkCxxSetObjectMacro(vtkClipDataSet,ClipFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkClipDataSet.h b/Graphics/vtkClipDataSet.h
index 6265a4763d60ee592d96b36a60a8198e9994b227..1954e6ce0d4e2de0a4f2d209d24e480a7dc132a8 100644
--- a/Graphics/vtkClipDataSet.h
+++ b/Graphics/vtkClipDataSet.h
@@ -66,7 +66,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkClipDataSet : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkClipDataSet,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkClipDataSet,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkClipHyperOctree.cxx b/Graphics/vtkClipHyperOctree.cxx
index aa54e86cbd9cb48564d194a776ba2b815fa67e0b..97160fb16a57f9d5f5a28a44903f1b257fa05bba 100644
--- a/Graphics/vtkClipHyperOctree.cxx
+++ b/Graphics/vtkClipHyperOctree.cxx
@@ -44,7 +44,6 @@
 #include <math.h>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkClipHyperOctree, "1.9");
 vtkStandardNewMacro(vtkClipHyperOctree);
 vtkCxxSetObjectMacro(vtkClipHyperOctree,ClipFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkClipHyperOctree.h b/Graphics/vtkClipHyperOctree.h
index 4ce19dc60763499305e9fd0764710e6443caec15..f9c9b933844bf4c80a7ab6e5317cd636e825a262 100644
--- a/Graphics/vtkClipHyperOctree.h
+++ b/Graphics/vtkClipHyperOctree.h
@@ -78,7 +78,7 @@ class vtkHyperOctreeClipCutPointsGrabber;
 class VTK_GRAPHICS_EXPORT vtkClipHyperOctree : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkClipHyperOctree,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkClipHyperOctree,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkClipPolyData.cxx b/Graphics/vtkClipPolyData.cxx
index bfebb7b3e1a80ec09e03db8826e78814d3f892c9..2d47bad6f45c471381b26e8244024d467cd9c623 100644
--- a/Graphics/vtkClipPolyData.cxx
+++ b/Graphics/vtkClipPolyData.cxx
@@ -32,7 +32,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkClipPolyData, "1.61");
 vtkStandardNewMacro(vtkClipPolyData);
 vtkCxxSetObjectMacro(vtkClipPolyData,ClipFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkClipPolyData.h b/Graphics/vtkClipPolyData.h
index d6ac789d73ab3653d20801a63a34aad76c152c6c..16de8185e3884ddbb806153cef948730efd697fc 100644
--- a/Graphics/vtkClipPolyData.h
+++ b/Graphics/vtkClipPolyData.h
@@ -64,7 +64,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkClipPolyData : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkClipPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkClipPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkClipVolume.cxx b/Graphics/vtkClipVolume.cxx
index 15d55c7b14948cf9b9ba9a151ec87e41f7f5f586..6cee86537f08400e97d8420c136dc3958a82f1c2 100644
--- a/Graphics/vtkClipVolume.cxx
+++ b/Graphics/vtkClipVolume.cxx
@@ -35,7 +35,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkClipVolume, "1.75");
 vtkStandardNewMacro(vtkClipVolume);
 vtkCxxSetObjectMacro(vtkClipVolume,ClipFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkClipVolume.h b/Graphics/vtkClipVolume.h
index 62b0a301412b0b45d9f4232cc8a73c8c3040a162..9a7f66679e52b92402bc71a984686b5abe2e9be1 100644
--- a/Graphics/vtkClipVolume.h
+++ b/Graphics/vtkClipVolume.h
@@ -79,7 +79,7 @@ class vtkUnsignedCharArray;
 class VTK_GRAPHICS_EXPORT vtkClipVolume : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkClipVolume,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkClipVolume,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCoincidentPoints.cxx b/Graphics/vtkCoincidentPoints.cxx
index 05a302908445b2d117d603faa3763a10617e6c59..b6b93d7e6e95493e22492289c38f9d7d60f64f14 100644
--- a/Graphics/vtkCoincidentPoints.cxx
+++ b/Graphics/vtkCoincidentPoints.cxx
@@ -99,7 +99,6 @@ public:
 // vtkCoincidentPoints
 
 vtkStandardNewMacro(vtkCoincidentPoints);
-vtkCxxRevisionMacro(vtkCoincidentPoints,"1.1");
 
 vtkCoincidentPoints::vtkCoincidentPoints()
 {
diff --git a/Graphics/vtkCoincidentPoints.h b/Graphics/vtkCoincidentPoints.h
index b686c3dd70d1dde458171965a2aa3d8d9d15ac07..16bb2b0b35d588b6e42da22c7ca11479020ce25b 100644
--- a/Graphics/vtkCoincidentPoints.h
+++ b/Graphics/vtkCoincidentPoints.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkCoincidentPoints : public vtkObject
 {
 public:
   static vtkCoincidentPoints* New();
-  vtkTypeRevisionMacro(vtkCoincidentPoints,vtkObject);
+  vtkTypeMacro(vtkCoincidentPoints,vtkObject);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Graphics/vtkCompositeDataGeometryFilter.cxx b/Graphics/vtkCompositeDataGeometryFilter.cxx
index 83a7677ab2d5ae5cd451cae4db6bbd2f67818175..83f3ddb6cfa7d5c72dedc820b05d79d9cc5c144b 100644
--- a/Graphics/vtkCompositeDataGeometryFilter.cxx
+++ b/Graphics/vtkCompositeDataGeometryFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkCompositeDataSet.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCompositeDataGeometryFilter, "1.1");
 vtkStandardNewMacro(vtkCompositeDataGeometryFilter);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkCompositeDataGeometryFilter.h b/Graphics/vtkCompositeDataGeometryFilter.h
index 38752163019cc929b703dd5e20c4a26a450cf7ff..21a12c3f07324bd0db911122f70ed1ac0106cc0d 100644
--- a/Graphics/vtkCompositeDataGeometryFilter.h
+++ b/Graphics/vtkCompositeDataGeometryFilter.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkCompositeDataGeometryFilter : public vtkPolyDataAlg
 {
 public:
   static vtkCompositeDataGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkCompositeDataGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCompositeDataGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCompositeDataProbeFilter.cxx b/Graphics/vtkCompositeDataProbeFilter.cxx
index 830c0d1482cfc97152bbaeac93ef1021da28a7d5..f40b9a48c288891e590b72aac83d91dc625fba4b 100644
--- a/Graphics/vtkCompositeDataProbeFilter.cxx
+++ b/Graphics/vtkCompositeDataProbeFilter.cxx
@@ -28,7 +28,6 @@
 #include "vtkSmartPointer.h"
 
 vtkStandardNewMacro(vtkCompositeDataProbeFilter);
-vtkCxxRevisionMacro(vtkCompositeDataProbeFilter, "1.5");
 //----------------------------------------------------------------------------
 vtkCompositeDataProbeFilter::vtkCompositeDataProbeFilter()
 {
diff --git a/Graphics/vtkCompositeDataProbeFilter.h b/Graphics/vtkCompositeDataProbeFilter.h
index 58fa79b5efdee6d9286ffef97f055fab209d15c3..c2373b3216508849f8ccacbbf970842883a1d3b2 100644
--- a/Graphics/vtkCompositeDataProbeFilter.h
+++ b/Graphics/vtkCompositeDataProbeFilter.h
@@ -42,7 +42,7 @@ class VTK_GRAPHICS_EXPORT vtkCompositeDataProbeFilter : public vtkProbeFilter
 {
 public:
   static vtkCompositeDataProbeFilter* New();
-  vtkTypeRevisionMacro(vtkCompositeDataProbeFilter, vtkProbeFilter);
+  vtkTypeMacro(vtkCompositeDataProbeFilter, vtkProbeFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkConeSource.cxx b/Graphics/vtkConeSource.cxx
index 931d74c510b56fef79de6febe8bb2201073f7c94..71a11b20c078aeb0d9b67647b5e4b603e36df12c 100644
--- a/Graphics/vtkConeSource.cxx
+++ b/Graphics/vtkConeSource.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkConeSource, "1.77");
 vtkStandardNewMacro(vtkConeSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkConeSource.h b/Graphics/vtkConeSource.h
index 7f36a9167ab697e5b180463906753b0f642835b6..639f7f1d76a68534e6ead38579ace8e29420cacd 100644
--- a/Graphics/vtkConeSource.h
+++ b/Graphics/vtkConeSource.h
@@ -34,7 +34,7 @@
 class VTK_GRAPHICS_EXPORT vtkConeSource : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkConeSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkConeSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkConnectivityFilter.cxx b/Graphics/vtkConnectivityFilter.cxx
index a5b6efea16d1138209893ed1b166987aec4e8bd2..d50ed510cd99e922e7c3eda3b3f3d90ebd9a4e4c 100644
--- a/Graphics/vtkConnectivityFilter.cxx
+++ b/Graphics/vtkConnectivityFilter.cxx
@@ -29,7 +29,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkIdTypeArray.h"
 
-vtkCxxRevisionMacro(vtkConnectivityFilter, "1.75");
 vtkStandardNewMacro(vtkConnectivityFilter);
 
 // Construct with default extraction mode to extract largest regions.
diff --git a/Graphics/vtkConnectivityFilter.h b/Graphics/vtkConnectivityFilter.h
index d1b31a0496bb665c09fa23c1800309adfff18bba..6813ec92cd509d3117bf5fd7a4dc078b7fb5dcbe 100644
--- a/Graphics/vtkConnectivityFilter.h
+++ b/Graphics/vtkConnectivityFilter.h
@@ -65,7 +65,7 @@ class vtkIntArray;
 class VTK_GRAPHICS_EXPORT vtkConnectivityFilter : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkConnectivityFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkConnectivityFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkContourFilter.cxx b/Graphics/vtkContourFilter.cxx
index 4c371f9743d3b7a12deaf21a46e38aeb5b7d26d4..906807f8667781be82c37828b902db69e2f3a78e 100644
--- a/Graphics/vtkContourFilter.cxx
+++ b/Graphics/vtkContourFilter.cxx
@@ -44,7 +44,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkContourFilter, "1.133");
 vtkStandardNewMacro(vtkContourFilter);
 vtkCxxSetObjectMacro(vtkContourFilter,ScalarTree,vtkScalarTree);
 
diff --git a/Graphics/vtkContourFilter.h b/Graphics/vtkContourFilter.h
index 761e469c69808da85f3fd504c6b6c0fc81318bfc..969b3cc59783288c5d22dddb3a59c9a899c1abd2 100644
--- a/Graphics/vtkContourFilter.h
+++ b/Graphics/vtkContourFilter.h
@@ -58,7 +58,7 @@ class vtkRectilinearSynchronizedTemplates;
 class VTK_GRAPHICS_EXPORT vtkContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkContourFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkContourFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkContourGrid.cxx b/Graphics/vtkContourGrid.cxx
index b1ca3f3dd70cd89d7686edb25389fec270327a2b..f19c5e3ba35a978750663316aa682ff5a3aa653b 100644
--- a/Graphics/vtkContourGrid.cxx
+++ b/Graphics/vtkContourGrid.cxx
@@ -33,7 +33,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkContourGrid, "1.35");
 vtkStandardNewMacro(vtkContourGrid);
 
 // Construct object with initial range (0,1) and single contour value
diff --git a/Graphics/vtkContourGrid.h b/Graphics/vtkContourGrid.h
index bec49a4bf65e0c31a4c276f1ca6904a0ad048fdd..4afbb6dbd27200508d38a7f518c98ff1f99976dc 100644
--- a/Graphics/vtkContourGrid.h
+++ b/Graphics/vtkContourGrid.h
@@ -57,7 +57,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkContourGrid : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkContourGrid,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkContourGrid,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkConvertSelection.cxx b/Graphics/vtkConvertSelection.cxx
index e2035e771c525df69e44379a5dc2343b7fd27ac7..bd04a7adb9cfd333f1548e501a2af1b9afa71636 100644
--- a/Graphics/vtkConvertSelection.cxx
+++ b/Graphics/vtkConvertSelection.cxx
@@ -55,7 +55,6 @@
 
 vtkCxxSetObjectMacro(vtkConvertSelection, ArrayNames, vtkStringArray);
 
-vtkCxxRevisionMacro(vtkConvertSelection, "1.30");
 vtkStandardNewMacro(vtkConvertSelection);
 //----------------------------------------------------------------------------
 vtkConvertSelection::vtkConvertSelection()
diff --git a/Graphics/vtkConvertSelection.h b/Graphics/vtkConvertSelection.h
index 296c25dc16c20acc769876c2dc349f657d32d677..b8549ef022ca595c9aa9f7ff779e0b2e8a4523e4 100644
--- a/Graphics/vtkConvertSelection.h
+++ b/Graphics/vtkConvertSelection.h
@@ -44,7 +44,7 @@ class VTK_GRAPHICS_EXPORT vtkConvertSelection : public vtkSelectionAlgorithm
 {
 public:
   static vtkConvertSelection *New();
-  vtkTypeRevisionMacro(vtkConvertSelection, vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkConvertSelection, vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCubeSource.cxx b/Graphics/vtkCubeSource.cxx
index 3fc3df1a769d3a1b0f8b9f7dbc9bbeba40325e39..117d11509a6a47fc04b46c6a60bd117e52c13f1e 100644
--- a/Graphics/vtkCubeSource.cxx
+++ b/Graphics/vtkCubeSource.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCubeSource, "1.53");
 vtkStandardNewMacro(vtkCubeSource);
 
 vtkCubeSource::vtkCubeSource(double xL, double yL, double zL)
diff --git a/Graphics/vtkCubeSource.h b/Graphics/vtkCubeSource.h
index cd7444951e2ff6a46d2f0ca8b56d3edf6855a3f1..8853f276df25189d462264547817451aaba310df 100644
--- a/Graphics/vtkCubeSource.h
+++ b/Graphics/vtkCubeSource.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkCubeSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkCubeSource *New();
-  vtkTypeRevisionMacro(vtkCubeSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCubeSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCursor2D.cxx b/Graphics/vtkCursor2D.cxx
index 5eaba5258bbd032f1d8d2a4ce48fb4a661b9544f..00b7e4f0bc9268c703032e65cc24e3c45bdad23b 100644
--- a/Graphics/vtkCursor2D.cxx
+++ b/Graphics/vtkCursor2D.cxx
@@ -20,7 +20,6 @@
 #include "vtkPolyData.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCursor2D, "1.3");
 vtkStandardNewMacro(vtkCursor2D);
 
 //---------------------------------------------------------------------------
diff --git a/Graphics/vtkCursor2D.h b/Graphics/vtkCursor2D.h
index a0df020c52d32d25ba307be4437e943f013e6aa0..8300d8477f01070892bdff2792e69eb7fd411aae 100644
--- a/Graphics/vtkCursor2D.h
+++ b/Graphics/vtkCursor2D.h
@@ -33,7 +33,7 @@
 class VTK_GRAPHICS_EXPORT vtkCursor2D : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkCursor2D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCursor2D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCursor3D.cxx b/Graphics/vtkCursor3D.cxx
index 66c9118f42941cdf7e1580761323b4ecf02bf57e..a2eb7b79e7dc310b57f50e5787dc73fbf1d57c16 100644
--- a/Graphics/vtkCursor3D.cxx
+++ b/Graphics/vtkCursor3D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCursor3D, "1.47");
 vtkStandardNewMacro(vtkCursor3D);
 
 // Construct with model bounds = (-1,1,-1,1,-1,1), focal point = (0,0,0),
diff --git a/Graphics/vtkCursor3D.h b/Graphics/vtkCursor3D.h
index 215860c611eeda1b266bae96b52f825ef4960ea8..fac2e632798d93ac8561edeb5ae0d9d13eaddcfb 100644
--- a/Graphics/vtkCursor3D.h
+++ b/Graphics/vtkCursor3D.h
@@ -32,7 +32,7 @@
 class VTK_GRAPHICS_EXPORT vtkCursor3D : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkCursor3D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCursor3D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCurvatures.cxx b/Graphics/vtkCurvatures.cxx
index ec8b763995c9aee9db80f89852af576bc160b939..3599be2ccd8b98f60665296f98787d3a601aeb64 100644
--- a/Graphics/vtkCurvatures.cxx
+++ b/Graphics/vtkCurvatures.cxx
@@ -29,7 +29,6 @@
 #include "vtkTensor.h"
 #include "vtkTriangle.h"
 
-vtkCxxRevisionMacro(vtkCurvatures, "1.16");
 vtkStandardNewMacro(vtkCurvatures);
 
 //------------------------------------------------------------------------------
diff --git a/Graphics/vtkCurvatures.h b/Graphics/vtkCurvatures.h
index 30a0f962940e6e926b676f02fbcda3f990751ed2..5f895130e5d1cc48e75dc28917716315986103af 100644
--- a/Graphics/vtkCurvatures.h
+++ b/Graphics/vtkCurvatures.h
@@ -71,7 +71,7 @@
 class VTK_GRAPHICS_EXPORT vtkCurvatures : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkCurvatures,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCurvatures,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCutter.cxx b/Graphics/vtkCutter.cxx
index 581bcc17634cde763c51c916cfb14034256176a8..9f06de451fa7939db433bd2e854f53fe68756e7e 100644
--- a/Graphics/vtkCutter.cxx
+++ b/Graphics/vtkCutter.cxx
@@ -43,7 +43,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCutter, "1.94");
 vtkStandardNewMacro(vtkCutter);
 vtkCxxSetObjectMacro(vtkCutter,CutFunction,vtkImplicitFunction);
 vtkCxxSetObjectMacro(vtkCutter,Locator,vtkIncrementalPointLocator)
diff --git a/Graphics/vtkCutter.h b/Graphics/vtkCutter.h
index d263a40f1f3fa967172357c0cc43ae60625f553d..164da4ee1f43ca581c6890a13a6b7895b5aab00b 100644
--- a/Graphics/vtkCutter.h
+++ b/Graphics/vtkCutter.h
@@ -59,7 +59,7 @@ class vtkRectilinearSynchronizedTemplates;
 class VTK_GRAPHICS_EXPORT vtkCutter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkCutter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCutter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkCylinderSource.cxx b/Graphics/vtkCylinderSource.cxx
index eedd09fdb61a01789bd0363c57a441d91f89fb84..5dcf0569236981ff7a5f980bb9280bace550076b 100644
--- a/Graphics/vtkCylinderSource.cxx
+++ b/Graphics/vtkCylinderSource.cxx
@@ -25,7 +25,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCylinderSource, "1.55");
 vtkStandardNewMacro(vtkCylinderSource);
 
 vtkCylinderSource::vtkCylinderSource (int res)
diff --git a/Graphics/vtkCylinderSource.h b/Graphics/vtkCylinderSource.h
index 19946dd997da0dc7539be9f6d5664c014663a471..1fbe88ef79b0600d1bd9c0c97543ef154f2d0a45 100644
--- a/Graphics/vtkCylinderSource.h
+++ b/Graphics/vtkCylinderSource.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkCylinderSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkCylinderSource *New();
-  vtkTypeRevisionMacro(vtkCylinderSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCylinderSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDashedStreamLine.cxx b/Graphics/vtkDashedStreamLine.cxx
index b4e663a586152ebfb87596abc231353dc8066c2a..470ea908ca50127fceff539dc56fb0d6a3594a7c 100644
--- a/Graphics/vtkDashedStreamLine.cxx
+++ b/Graphics/vtkDashedStreamLine.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkDashedStreamLine, "1.44");
 vtkStandardNewMacro(vtkDashedStreamLine);
 
 vtkDashedStreamLine::vtkDashedStreamLine()
diff --git a/Graphics/vtkDashedStreamLine.h b/Graphics/vtkDashedStreamLine.h
index 3be9c49473b82154220da77a33ed1a08b60ab825..e9e6a6d720c483710502aa2cf1c3bdd613647641 100644
--- a/Graphics/vtkDashedStreamLine.h
+++ b/Graphics/vtkDashedStreamLine.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkDashedStreamLine : public vtkStreamLine
 {
 public:
   static vtkDashedStreamLine *New();
-  vtkTypeRevisionMacro(vtkDashedStreamLine,vtkStreamLine);
+  vtkTypeMacro(vtkDashedStreamLine,vtkStreamLine);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDataObjectGenerator.cxx b/Graphics/vtkDataObjectGenerator.cxx
index 5988fd33607e1e70e5f2d128ebb55c47bcfd20c1..1be02a03632a5fef8658b8619e01eff99f3c6ddf 100644
--- a/Graphics/vtkDataObjectGenerator.cxx
+++ b/Graphics/vtkDataObjectGenerator.cxx
@@ -41,7 +41,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkDataObjectGenerator, "1.16");
 vtkStandardNewMacro(vtkDataObjectGenerator);
 
 //============================================================================
diff --git a/Graphics/vtkDataObjectGenerator.h b/Graphics/vtkDataObjectGenerator.h
index a4af95c6033d50b30c9d3b5c6dd2382a3229db4b..b28e5ad080f2bbfe9721b0f6b4048c8789ac69a5 100644
--- a/Graphics/vtkDataObjectGenerator.h
+++ b/Graphics/vtkDataObjectGenerator.h
@@ -43,7 +43,7 @@ class VTK_GRAPHICS_EXPORT vtkDataObjectGenerator
 {
  public:
   static vtkDataObjectGenerator *New();
-  vtkTypeRevisionMacro(vtkDataObjectGenerator,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkDataObjectGenerator,vtkDataObjectAlgorithm);
   void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkDataObjectToDataSetFilter.cxx b/Graphics/vtkDataObjectToDataSetFilter.cxx
index ecc06c08a84f64a1cd6f60e88775bba72502ebde..f607fc661524e929c289609e422cd169b4321e8f 100644
--- a/Graphics/vtkDataObjectToDataSetFilter.cxx
+++ b/Graphics/vtkDataObjectToDataSetFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataObjectToDataSetFilter, "1.48");
 vtkStandardNewMacro(vtkDataObjectToDataSetFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkDataObjectToDataSetFilter.h b/Graphics/vtkDataObjectToDataSetFilter.h
index 4b15094de420415b5072e933df0da0ec4003a617..3dd3f25a95f7a5a6f7ca6517aecdd3655fbf7b51 100644
--- a/Graphics/vtkDataObjectToDataSetFilter.h
+++ b/Graphics/vtkDataObjectToDataSetFilter.h
@@ -77,7 +77,7 @@ class VTK_GRAPHICS_EXPORT vtkDataObjectToDataSetFilter : public vtkDataSetAlgori
 {
 public:
   static vtkDataObjectToDataSetFilter *New();
-  vtkTypeRevisionMacro(vtkDataObjectToDataSetFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkDataObjectToDataSetFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx b/Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx
index 990d17b7327dfbe23faa41c3a2f287988150415e..ebeb27e8cf62a697644a6f4494402726d5720836 100644
--- a/Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx
+++ b/Graphics/vtkDataSetEdgeSubdivisionCriterion.cxx
@@ -23,7 +23,6 @@
 # pragma warning (disable: 4996) /* 'vtkstd::_Copy_opt' was declared deprecated */
 #endif
 
-vtkCxxRevisionMacro(vtkDataSetEdgeSubdivisionCriterion,"1.1");
 vtkStandardNewMacro(vtkDataSetEdgeSubdivisionCriterion);
 
 vtkDataSetEdgeSubdivisionCriterion::vtkDataSetEdgeSubdivisionCriterion()
diff --git a/Graphics/vtkDataSetEdgeSubdivisionCriterion.h b/Graphics/vtkDataSetEdgeSubdivisionCriterion.h
index 7aa9d622ed8366b6adf6763ba758b4299594dda2..129baa91462fb3374788e2814553bac54738349c 100644
--- a/Graphics/vtkDataSetEdgeSubdivisionCriterion.h
+++ b/Graphics/vtkDataSetEdgeSubdivisionCriterion.h
@@ -43,7 +43,7 @@ class vtkDataSet;
 class VTK_GRAPHICS_EXPORT vtkDataSetEdgeSubdivisionCriterion : public vtkEdgeSubdivisionCriterion
 {
   public:
-    vtkTypeRevisionMacro(vtkDataSetEdgeSubdivisionCriterion,vtkEdgeSubdivisionCriterion);
+    vtkTypeMacro(vtkDataSetEdgeSubdivisionCriterion,vtkEdgeSubdivisionCriterion);
     static vtkDataSetEdgeSubdivisionCriterion* New();
     virtual void PrintSelf( ostream& os, vtkIndent indent );
 
diff --git a/Graphics/vtkDataSetGradient.cxx b/Graphics/vtkDataSetGradient.cxx
index bca060f66a6db89846518a3da2c9e932c641bea8..0d0fe3927ac67930088afe2fbe4c60f388adfa5a 100644
--- a/Graphics/vtkDataSetGradient.cxx
+++ b/Graphics/vtkDataSetGradient.cxx
@@ -43,7 +43,6 @@
 
 
 // standard constructors and factory
-vtkCxxRevisionMacro(vtkDataSetGradient, "1.8");
 vtkStandardNewMacro(vtkDataSetGradient);
 
 /*!
diff --git a/Graphics/vtkDataSetGradient.h b/Graphics/vtkDataSetGradient.h
index 4cd559af763cf9a3610b09730f7c2a8e4e23e38f..8129fc7c296948ad9b842f5f73fb144e440b1036 100644
--- a/Graphics/vtkDataSetGradient.h
+++ b/Graphics/vtkDataSetGradient.h
@@ -35,7 +35,7 @@ class VTK_GRAPHICS_EXPORT vtkDataSetGradient : public vtkDataSetAlgorithm
 {
  public:
   static vtkDataSetGradient* New();
-  vtkTypeRevisionMacro(vtkDataSetGradient,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkDataSetGradient,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDataSetGradientPrecompute.cxx b/Graphics/vtkDataSetGradientPrecompute.cxx
index 5b6a56306c62f3888b417d5fbebe3ef739bd8153..7cdbabf7db5cf7bcb5557883f5111734890fd64e 100644
--- a/Graphics/vtkDataSetGradientPrecompute.cxx
+++ b/Graphics/vtkDataSetGradientPrecompute.cxx
@@ -37,7 +37,6 @@
 #define VTK_DATASET_GRADIENT_TRIANGLE_OPTIMIZATION
 //#define DEBUG
 
-vtkCxxRevisionMacro(vtkDataSetGradientPrecompute, "1.7");
 vtkStandardNewMacro(vtkDataSetGradientPrecompute);
 
 vtkDataSetGradientPrecompute::vtkDataSetGradientPrecompute()
diff --git a/Graphics/vtkDataSetGradientPrecompute.h b/Graphics/vtkDataSetGradientPrecompute.h
index e3ea16ddc3d04c40bf85a7896974533c3d55032c..06e114ef9a3de28a7e5deca9181cff989d98f1f8 100644
--- a/Graphics/vtkDataSetGradientPrecompute.h
+++ b/Graphics/vtkDataSetGradientPrecompute.h
@@ -34,7 +34,7 @@ class VTK_GRAPHICS_EXPORT vtkDataSetGradientPrecompute : public vtkDataSetAlgori
 {
  public:
   static vtkDataSetGradientPrecompute* New();
-  vtkTypeRevisionMacro(vtkDataSetGradientPrecompute,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkDataSetGradientPrecompute,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static int GradientPrecompute(vtkDataSet* ds);
diff --git a/Graphics/vtkDataSetSurfaceFilter.cxx b/Graphics/vtkDataSetSurfaceFilter.cxx
index 18c7c0a213de3048148e9f29290d160a9dcb878c..cb046b134fe930105c2e71c66e3dcebb61dd1e77 100644
--- a/Graphics/vtkDataSetSurfaceFilter.cxx
+++ b/Graphics/vtkDataSetSurfaceFilter.cxx
@@ -45,7 +45,6 @@ static int sizeofFastQuad(int numPts)
   return static_cast<int>(sizeof(vtkFastGeomQuad)+(numPts-4)*sizeof(vtkIdType));
 }
 
-vtkCxxRevisionMacro(vtkDataSetSurfaceFilter, "1.75");
 vtkStandardNewMacro(vtkDataSetSurfaceFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkDataSetSurfaceFilter.h b/Graphics/vtkDataSetSurfaceFilter.h
index f089c97dbe705008bc59149749afeb936f7240a0..9c7dfdbacee3a88b94f28db8d5cf2da3aee4bfa7 100644
--- a/Graphics/vtkDataSetSurfaceFilter.h
+++ b/Graphics/vtkDataSetSurfaceFilter.h
@@ -48,7 +48,7 @@ class VTK_GRAPHICS_EXPORT vtkDataSetSurfaceFilter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkDataSetSurfaceFilter *New();
-  vtkTypeRevisionMacro(vtkDataSetSurfaceFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDataSetSurfaceFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDataSetToDataObjectFilter.cxx b/Graphics/vtkDataSetToDataObjectFilter.cxx
index c27a44b6ff89b70cb6f7bd47893d2ca04281f3e1..e4382fd61169c06be5e43742cfcb50c9432bac23 100644
--- a/Graphics/vtkDataSetToDataObjectFilter.cxx
+++ b/Graphics/vtkDataSetToDataObjectFilter.cxx
@@ -29,7 +29,6 @@
 #include "vtkStructuredPoints.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkDataSetToDataObjectFilter, "1.35");
 vtkStandardNewMacro(vtkDataSetToDataObjectFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkDataSetToDataObjectFilter.h b/Graphics/vtkDataSetToDataObjectFilter.h
index b8a481248b3e7f53697e99bf2fb2feb3424279cf..bac419ee2ea81ceefc19c45f3408e31f9bd66732 100644
--- a/Graphics/vtkDataSetToDataObjectFilter.h
+++ b/Graphics/vtkDataSetToDataObjectFilter.h
@@ -51,7 +51,7 @@ class vtkDataSet;
 class VTK_GRAPHICS_EXPORT vtkDataSetToDataObjectFilter : public vtkDataObjectAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDataSetToDataObjectFilter,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkDataSetToDataObjectFilter,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDataSetTriangleFilter.cxx b/Graphics/vtkDataSetTriangleFilter.cxx
index d9b4f7ff58ee0763bf093fa935e64e3bf18eb4fb..6a3f88b61ccbd3f0d2fe5f9c50e0277591d0b301 100644
--- a/Graphics/vtkDataSetTriangleFilter.cxx
+++ b/Graphics/vtkDataSetTriangleFilter.cxx
@@ -30,7 +30,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkDataSetTriangleFilter, "1.30");
 vtkStandardNewMacro(vtkDataSetTriangleFilter);
 
 vtkDataSetTriangleFilter::vtkDataSetTriangleFilter()
diff --git a/Graphics/vtkDataSetTriangleFilter.h b/Graphics/vtkDataSetTriangleFilter.h
index 54dbb5bb7dd474c6aee0483377ac936c24eecfbc..2fd25dcdedbfa3f0e5ed8f61e108fe96453f8e14 100644
--- a/Graphics/vtkDataSetTriangleFilter.h
+++ b/Graphics/vtkDataSetTriangleFilter.h
@@ -39,7 +39,7 @@ class VTK_GRAPHICS_EXPORT vtkDataSetTriangleFilter : public vtkUnstructuredGridA
 {
 public:
   static vtkDataSetTriangleFilter *New();
-  vtkTypeRevisionMacro(vtkDataSetTriangleFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkDataSetTriangleFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDecimatePolylineFilter.cxx b/Graphics/vtkDecimatePolylineFilter.cxx
index 15b9db156f93e2607c59338eb7d5223caf598d9d..9ac659467379be645d767a38ef3792b1745c2c3a 100644
--- a/Graphics/vtkDecimatePolylineFilter.cxx
+++ b/Graphics/vtkDecimatePolylineFilter.cxx
@@ -30,7 +30,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/queue>
 
-vtkCxxRevisionMacro(vtkDecimatePolylineFilter, "1.2");
 vtkStandardNewMacro(vtkDecimatePolylineFilter);
 
 //------------------------------------------------------------------
diff --git a/Graphics/vtkDecimatePolylineFilter.h b/Graphics/vtkDecimatePolylineFilter.h
index a76db17c21bb03eebf8ecf918fe74e5f6eca08fc..96f0f43ec71d85b50b5983675b2e9f61e52c59f8 100644
--- a/Graphics/vtkDecimatePolylineFilter.h
+++ b/Graphics/vtkDecimatePolylineFilter.h
@@ -46,7 +46,7 @@ class VTK_GRAPHICS_EXPORT vtkDecimatePolylineFilter : public vtkPolyDataAlgorith
 public:
   // Description:
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkDecimatePolylineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDecimatePolylineFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDecimatePro.cxx b/Graphics/vtkDecimatePro.cxx
index 3656d61d1ecde9fd9d0a015e92f4cbde21073b44..c5e6c3c665fff4c773891bf3ea95f9d684cede2c 100644
--- a/Graphics/vtkDecimatePro.cxx
+++ b/Graphics/vtkDecimatePro.cxx
@@ -28,7 +28,6 @@
 #include "vtkPointData.h"
 #include "vtkCellData.h"
 
-vtkCxxRevisionMacro(vtkDecimatePro, "1.82");
 vtkStandardNewMacro(vtkDecimatePro);
 
 #define VTK_TOLERANCE 1.0e-05
diff --git a/Graphics/vtkDecimatePro.h b/Graphics/vtkDecimatePro.h
index b1f279e990b1b0c1ba03da7bfefe7e15ec69e6f7..7635d62d864baeb89a8667ca0fe5763f2b2677d3 100644
--- a/Graphics/vtkDecimatePro.h
+++ b/Graphics/vtkDecimatePro.h
@@ -86,7 +86,7 @@ class vtkPriorityQueue;
 class VTK_GRAPHICS_EXPORT vtkDecimatePro : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDecimatePro,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDecimatePro,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDelaunay2D.cxx b/Graphics/vtkDelaunay2D.cxx
index 8995d3eaaf450d0d0dceaf6d64dc326a12f92a50..81d9094002734a3f98dbc6ea0fda271f36e83fd5 100644
--- a/Graphics/vtkDelaunay2D.cxx
+++ b/Graphics/vtkDelaunay2D.cxx
@@ -29,7 +29,6 @@
 #include "vtkTriangle.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkDelaunay2D, "1.76");
 vtkStandardNewMacro(vtkDelaunay2D);
 vtkCxxSetObjectMacro(vtkDelaunay2D,Transform,vtkAbstractTransform);
 
diff --git a/Graphics/vtkDelaunay2D.h b/Graphics/vtkDelaunay2D.h
index 8a737a84a36c89a7a9ff823bb8967eb4f1d79fb7..fe42c94f38f0e6205a0ae52beb5f21b577e88fc7 100644
--- a/Graphics/vtkDelaunay2D.h
+++ b/Graphics/vtkDelaunay2D.h
@@ -134,7 +134,7 @@ class vtkPointSet;
 class VTK_GRAPHICS_EXPORT vtkDelaunay2D : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDelaunay2D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDelaunay2D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDelaunay3D.cxx b/Graphics/vtkDelaunay3D.cxx
index 817a9b5269f0965ac3a19efe83c9fe0c51b31b78..1ab64269cb4dbc8dae42ecedbbc1fcdd925ccdca 100644
--- a/Graphics/vtkDelaunay3D.cxx
+++ b/Graphics/vtkDelaunay3D.cxx
@@ -28,7 +28,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkDelaunay3D, "1.76");
 vtkStandardNewMacro(vtkDelaunay3D);
 
 // Structure used to represent sphere around tetrahedron
diff --git a/Graphics/vtkDelaunay3D.h b/Graphics/vtkDelaunay3D.h
index 4b68998e785eb99a26f755e520abe96c6cb91120..f7e3c52fa563f3e018957541bbff53607d4522d3 100644
--- a/Graphics/vtkDelaunay3D.h
+++ b/Graphics/vtkDelaunay3D.h
@@ -97,7 +97,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkDelaunay3D : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDelaunay3D,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkDelaunay3D,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDensifyPolyData.cxx b/Graphics/vtkDensifyPolyData.cxx
index 2c22e1fdaf0da5a100f4d17d5b8dbe017bde12e1..5e48d2ffab3c01d0f3d50d4a44fb61800672b668 100644
--- a/Graphics/vtkDensifyPolyData.cxx
+++ b/Graphics/vtkDensifyPolyData.cxx
@@ -348,7 +348,6 @@ private:
 
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkDensifyPolyData, "1.2");
 vtkStandardNewMacro(vtkDensifyPolyData);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkDensifyPolyData.h b/Graphics/vtkDensifyPolyData.h
index cde6483865f56c0ac25306e14e8e0c8a680dc27a..e2409bed02e93cb4c52b4049c24df306c97b5b06 100644
--- a/Graphics/vtkDensifyPolyData.h
+++ b/Graphics/vtkDensifyPolyData.h
@@ -35,7 +35,7 @@
 class VTK_GRAPHICS_EXPORT vtkDensifyPolyData : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDensifyPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDensifyPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkDensifyPolyData *New();
 
diff --git a/Graphics/vtkDicer.cxx b/Graphics/vtkDicer.cxx
index 3697039a4b6ebcd36ec4a80b6019acab55f323cd..412bfe203f5efc4acea6dd609432d4487bb88fca 100644
--- a/Graphics/vtkDicer.cxx
+++ b/Graphics/vtkDicer.cxx
@@ -17,7 +17,6 @@
 #include "vtkDataSet.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkDicer, "1.34");
 
 // Instantiate object.
 vtkDicer::vtkDicer()
diff --git a/Graphics/vtkDicer.h b/Graphics/vtkDicer.h
index 7de3059a05ca6376a53af245cdefdd40555939df..622674cf8a029cd4fe387e6a283904cdc571c053 100644
--- a/Graphics/vtkDicer.h
+++ b/Graphics/vtkDicer.h
@@ -50,7 +50,7 @@
 class VTK_GRAPHICS_EXPORT vtkDicer : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkDicer,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkDicer,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDijkstraGraphGeodesicPath.cxx b/Graphics/vtkDijkstraGraphGeodesicPath.cxx
index 0b22846821af04f2a8ada432ad4340511bb0b7b8..dbf8c8e057a960876714e5004b20fa95912c695e 100644
--- a/Graphics/vtkDijkstraGraphGeodesicPath.cxx
+++ b/Graphics/vtkDijkstraGraphGeodesicPath.cxx
@@ -28,7 +28,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkDijkstraGraphGeodesicPath, "1.14");
 vtkStandardNewMacro(vtkDijkstraGraphGeodesicPath);
 vtkCxxSetObjectMacro(vtkDijkstraGraphGeodesicPath,RepelVertices,vtkPoints);
 
diff --git a/Graphics/vtkDijkstraGraphGeodesicPath.h b/Graphics/vtkDijkstraGraphGeodesicPath.h
index a4f6c6c81fab19845259fb95561ba6ee7bf95d60..57d40445f16efbd05b324648093b9252d1bcce45 100644
--- a/Graphics/vtkDijkstraGraphGeodesicPath.h
+++ b/Graphics/vtkDijkstraGraphGeodesicPath.h
@@ -51,7 +51,7 @@ public:
 
   // Description:
   // Standard methids for printing and determining type information.
-  vtkTypeRevisionMacro(vtkDijkstraGraphGeodesicPath,vtkGraphGeodesicPath);
+  vtkTypeMacro(vtkDijkstraGraphGeodesicPath,vtkGraphGeodesicPath);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkDijkstraImageGeodesicPath.cxx b/Graphics/vtkDijkstraImageGeodesicPath.cxx
index 899f93c54dbcb2f36c8a096c6e3f370a76116fea..261e35c7798bbba04ca7bda955352e306e58390c 100644
--- a/Graphics/vtkDijkstraImageGeodesicPath.cxx
+++ b/Graphics/vtkDijkstraImageGeodesicPath.cxx
@@ -27,7 +27,6 @@
 
 #include "vtkDijkstraGraphInternals.h"
 
-vtkCxxRevisionMacro(vtkDijkstraImageGeodesicPath, "1.9");
 vtkStandardNewMacro(vtkDijkstraImageGeodesicPath);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkDijkstraImageGeodesicPath.h b/Graphics/vtkDijkstraImageGeodesicPath.h
index 6769eb0111af4682e29c7255bebfc15dc4da6efc..1f4cbd8334a751b3ae650a7d27876c8e89564a73 100644
--- a/Graphics/vtkDijkstraImageGeodesicPath.h
+++ b/Graphics/vtkDijkstraImageGeodesicPath.h
@@ -63,7 +63,7 @@ public:
 
   // Description:
   // Standard methids for printing and determining type information.
-  vtkTypeRevisionMacro( vtkDijkstraImageGeodesicPath, vtkDijkstraGraphGeodesicPath );
+  vtkTypeMacro( vtkDijkstraImageGeodesicPath, vtkDijkstraGraphGeodesicPath );
   void PrintSelf( ostream& os, vtkIndent indent );
   
   // Description:
diff --git a/Graphics/vtkDiscreteMarchingCubes.cxx b/Graphics/vtkDiscreteMarchingCubes.cxx
index 165be7d92ed13e67ecb088dda7d33b7a264a2fd3..f19ae130cca93dc3aa7abf7b57d060a29df6f725 100644
--- a/Graphics/vtkDiscreteMarchingCubes.cxx
+++ b/Graphics/vtkDiscreteMarchingCubes.cxx
@@ -42,7 +42,6 @@
 #define vtkFloatingPointType float
 #endif
 
-vtkCxxRevisionMacro(vtkDiscreteMarchingCubes, "1.4");
 vtkStandardNewMacro(vtkDiscreteMarchingCubes);
 
 // Description:
diff --git a/Graphics/vtkDiscreteMarchingCubes.h b/Graphics/vtkDiscreteMarchingCubes.h
index 206c4a5a99c3eaad6c0d903474adf232a8a308bd..78fe8b7d8c0daae1d5578c9e3a42e8e3b0b5d9dd 100644
--- a/Graphics/vtkDiscreteMarchingCubes.h
+++ b/Graphics/vtkDiscreteMarchingCubes.h
@@ -59,7 +59,7 @@ class VTK_GRAPHICS_EXPORT vtkDiscreteMarchingCubes : public vtkMarchingCubes
 {
 public:
   static vtkDiscreteMarchingCubes *New();
-  vtkTypeRevisionMacro(vtkDiscreteMarchingCubes,vtkMarchingCubes);
+  vtkTypeMacro(vtkDiscreteMarchingCubes,vtkMarchingCubes);
 
 protected:
   vtkDiscreteMarchingCubes();
diff --git a/Graphics/vtkDiskSource.cxx b/Graphics/vtkDiskSource.cxx
index 5e66128cf4cd28d45e216a5e9985d6ee6401c7d8..2df8731a524c32101a9041ac5af70e7bb2b2d70f 100644
--- a/Graphics/vtkDiskSource.cxx
+++ b/Graphics/vtkDiskSource.cxx
@@ -22,7 +22,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkDiskSource, "1.35");
 vtkStandardNewMacro(vtkDiskSource);
 
 vtkDiskSource::vtkDiskSource()
diff --git a/Graphics/vtkDiskSource.h b/Graphics/vtkDiskSource.h
index 5958fce711378ec29978ded890c02e1149167882..4c4139c131f95f73505f3f572d669e51b2cfb54c 100644
--- a/Graphics/vtkDiskSource.h
+++ b/Graphics/vtkDiskSource.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkDiskSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkDiskSource *New();
-  vtkTypeRevisionMacro(vtkDiskSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDiskSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkEdgePoints.cxx b/Graphics/vtkEdgePoints.cxx
index ef5cce8e2cb8d0003f608358cf3aca3c6ceb3abc..032e4104816a5ddb28e0c707a6023bea4ef9c988 100644
--- a/Graphics/vtkEdgePoints.cxx
+++ b/Graphics/vtkEdgePoints.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkEdgePoints, "1.59");
 vtkStandardNewMacro(vtkEdgePoints);
 
 // Construct object with contour value of 0.0.
diff --git a/Graphics/vtkEdgePoints.h b/Graphics/vtkEdgePoints.h
index acc414c1dd6545c710f02f385a88eb952d26490c..471c492388f65dfd7349522ba53e643a2365f11a 100644
--- a/Graphics/vtkEdgePoints.h
+++ b/Graphics/vtkEdgePoints.h
@@ -34,7 +34,7 @@ class vtkMergePoints;
 class VTK_GRAPHICS_EXPORT vtkEdgePoints : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkEdgePoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkEdgePoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkEdgeSubdivisionCriterion.cxx b/Graphics/vtkEdgeSubdivisionCriterion.cxx
index dfba67b2d0bfdb32354b768386fb4270953b8477..b2382d2d72a09e13d4d7daa1bc9a4fbd5b8c4cdc 100644
--- a/Graphics/vtkEdgeSubdivisionCriterion.cxx
+++ b/Graphics/vtkEdgeSubdivisionCriterion.cxx
@@ -12,7 +12,6 @@
 #include "vtkDataSetAttributes.h"
 #include "vtkMatrix4x4.h"
 
-vtkCxxRevisionMacro(vtkEdgeSubdivisionCriterion,"1.1");
 
 void vtkEdgeSubdivisionCriterion::PrintSelf( ostream& os, vtkIndent indent )
 {
diff --git a/Graphics/vtkEdgeSubdivisionCriterion.h b/Graphics/vtkEdgeSubdivisionCriterion.h
index bb4ae99a61976371c0fa06e99614c3d81cbda0a1..a1ac7e353ed1c49ff848e7138a84b65d7dd3d0b5 100644
--- a/Graphics/vtkEdgeSubdivisionCriterion.h
+++ b/Graphics/vtkEdgeSubdivisionCriterion.h
@@ -40,7 +40,7 @@ class vtkStreamingTessellator;
 class VTK_GRAPHICS_EXPORT vtkEdgeSubdivisionCriterion : public vtkObject
 {
   public:
-    vtkTypeRevisionMacro(vtkEdgeSubdivisionCriterion,vtkObject);
+    vtkTypeMacro(vtkEdgeSubdivisionCriterion,vtkObject);
     virtual void PrintSelf( ostream& os, vtkIndent indent );
 
     // Description:
diff --git a/Graphics/vtkElevationFilter.cxx b/Graphics/vtkElevationFilter.cxx
index 7bed3f041c10a81c3ea36468986940c2aaa8f524..4846424c6fca45e3bbda2fdcad4c77b3f75bbf27 100644
--- a/Graphics/vtkElevationFilter.cxx
+++ b/Graphics/vtkElevationFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkElevationFilter, "1.58");
 vtkStandardNewMacro(vtkElevationFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkElevationFilter.h b/Graphics/vtkElevationFilter.h
index d38e1209fd72c7788823e762e334fff0007d1e68..703ed04c8f03cbdda76abcaab0020ca5a86bfaf0 100644
--- a/Graphics/vtkElevationFilter.h
+++ b/Graphics/vtkElevationFilter.h
@@ -29,7 +29,7 @@ class VTK_GRAPHICS_EXPORT vtkElevationFilter : public vtkDataSetAlgorithm
 {
 public:
   static vtkElevationFilter* New();
-  vtkTypeRevisionMacro(vtkElevationFilter, vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkElevationFilter, vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkEllipticalButtonSource.cxx b/Graphics/vtkEllipticalButtonSource.cxx
index 6717c133ae592daf3a77295f2aebaae96f660160..49d41f3c6c7f121d30e2eb408f5f12be9188fbdc 100644
--- a/Graphics/vtkEllipticalButtonSource.cxx
+++ b/Graphics/vtkEllipticalButtonSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkEllipticalButtonSource, "1.5");
 vtkStandardNewMacro(vtkEllipticalButtonSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkEllipticalButtonSource.h b/Graphics/vtkEllipticalButtonSource.h
index 8f551f9c02ef38f4e47077e35e703ed39e259d20..488330d14f3b6fcbcff3ceb69195bea23cd696bb 100644
--- a/Graphics/vtkEllipticalButtonSource.h
+++ b/Graphics/vtkEllipticalButtonSource.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkEllipticalButtonSource : public vtkButtonSource
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkEllipticalButtonSource,vtkButtonSource);
+  vtkTypeMacro(vtkEllipticalButtonSource,vtkButtonSource);
 
   // Description:
   // Construct a circular button with depth 10% of its height.
diff --git a/Graphics/vtkExtractArraysOverTime.cxx b/Graphics/vtkExtractArraysOverTime.cxx
index f0971f26384e8dba7a06dcd44efff05626d85557..737090615f3883bc32db7e8ed3c0206e5361bb87 100644
--- a/Graphics/vtkExtractArraysOverTime.cxx
+++ b/Graphics/vtkExtractArraysOverTime.cxx
@@ -560,7 +560,6 @@ vtkExtractArraysOverTime::vtkInternal::GetOutput(
 }
 
 //****************************************************************************
-vtkCxxRevisionMacro(vtkExtractArraysOverTime, "1.28");
 vtkStandardNewMacro(vtkExtractArraysOverTime);
 //----------------------------------------------------------------------------
 vtkExtractArraysOverTime::vtkExtractArraysOverTime()
diff --git a/Graphics/vtkExtractArraysOverTime.h b/Graphics/vtkExtractArraysOverTime.h
index b9815707062ebe0ac1b1b34fae393cb67bd3c8b9..f6e509e715702525fa969f4e9553bfedbf6fb1f5 100644
--- a/Graphics/vtkExtractArraysOverTime.h
+++ b/Graphics/vtkExtractArraysOverTime.h
@@ -45,7 +45,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractArraysOverTime : public vtkMultiBlockDataSet
 {
 public:
   static vtkExtractArraysOverTime *New();
-  vtkTypeRevisionMacro(vtkExtractArraysOverTime, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractArraysOverTime, vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractBlock.cxx b/Graphics/vtkExtractBlock.cxx
index 2fecba419c2267872fd5d1986374898109b653e8..071452dc4c32b527d052657fe5a69c3e3e956c2f 100644
--- a/Graphics/vtkExtractBlock.cxx
+++ b/Graphics/vtkExtractBlock.cxx
@@ -30,7 +30,6 @@ class vtkExtractBlock::vtkSet : public vtkstd::set<unsigned int>
 };
 
 vtkStandardNewMacro(vtkExtractBlock);
-vtkCxxRevisionMacro(vtkExtractBlock, "1.7");
 vtkInformationKeyMacro(vtkExtractBlock, DONT_PRUNE, Integer);
 //----------------------------------------------------------------------------
 vtkExtractBlock::vtkExtractBlock()
diff --git a/Graphics/vtkExtractBlock.h b/Graphics/vtkExtractBlock.h
index bbff19943368930ae65b26c905a533f014239db5..aca15c67cd4ec992a91de18ba97b5506b07e77a9 100644
--- a/Graphics/vtkExtractBlock.h
+++ b/Graphics/vtkExtractBlock.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractBlock : public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkExtractBlock* New();
-  vtkTypeRevisionMacro(vtkExtractBlock, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractBlock, vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractCells.cxx b/Graphics/vtkExtractCells.cxx
index 8098776ff480f955201ba0a60e49f824876585fa..81a082bbe5e45c0dea3c5ba5f43bd1cfdd62fb41 100644
--- a/Graphics/vtkExtractCells.cxx
+++ b/Graphics/vtkExtractCells.cxx
@@ -34,7 +34,6 @@
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkExtractCells, "1.10");
 vtkStandardNewMacro(vtkExtractCells);
 
 #include <vtkstd/set>
diff --git a/Graphics/vtkExtractCells.h b/Graphics/vtkExtractCells.h
index 8f51a1833a2b78f1f93554dff02ce9327c6e4fb1..c1d0b24c96612511c71271992eeff809a2bb607b 100644
--- a/Graphics/vtkExtractCells.h
+++ b/Graphics/vtkExtractCells.h
@@ -37,7 +37,7 @@ class vtkModelMetadata;
 class VTK_GRAPHICS_EXPORT vtkExtractCells : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractCells, vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkExtractCells, vtkUnstructuredGridAlgorithm);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkExtractCells *New();
diff --git a/Graphics/vtkExtractDataOverTime.cxx b/Graphics/vtkExtractDataOverTime.cxx
index 33a8a573c956c7f060113bebb78ce87e73d5d4a4..956e289134862fb604fbe3009d9be441dd37e89d 100644
--- a/Graphics/vtkExtractDataOverTime.cxx
+++ b/Graphics/vtkExtractDataOverTime.cxx
@@ -22,7 +22,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkExtractDataOverTime, "1.6");
 vtkStandardNewMacro(vtkExtractDataOverTime);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractDataOverTime.h b/Graphics/vtkExtractDataOverTime.h
index 4e6e4b24b3e0dab2ccc8458f04101071ee67087a..0a0e03665ccc6d5e0988cdaa770a3f5c7b191577 100644
--- a/Graphics/vtkExtractDataOverTime.h
+++ b/Graphics/vtkExtractDataOverTime.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractDataOverTime : public vtkPointSetAlgorithm
 {
 public:
   static vtkExtractDataOverTime *New();
-  vtkTypeRevisionMacro(vtkExtractDataOverTime,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkExtractDataOverTime,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractDataSets.cxx b/Graphics/vtkExtractDataSets.cxx
index e73d0d4a6e15a792ab5c45d9c8c0e45023bcb96e..a922c94ccd6734f223c2d8e32c6bcafc2fd2cba9 100644
--- a/Graphics/vtkExtractDataSets.cxx
+++ b/Graphics/vtkExtractDataSets.cxx
@@ -47,7 +47,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkExtractDataSets);
-vtkCxxRevisionMacro(vtkExtractDataSets, "1.1");
 //----------------------------------------------------------------------------
 vtkExtractDataSets::vtkExtractDataSets()
 {
diff --git a/Graphics/vtkExtractDataSets.h b/Graphics/vtkExtractDataSets.h
index c9ce2fe1c45538447d9301e9520fc6414ef516a9..322b3818645fd9aa6da1b7d15e56ac7e1b832f25 100644
--- a/Graphics/vtkExtractDataSets.h
+++ b/Graphics/vtkExtractDataSets.h
@@ -28,7 +28,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractDataSets : public vtkHierarchicalBoxDataSetA
 {
 public:
   static vtkExtractDataSets* New();
-  vtkTypeRevisionMacro(vtkExtractDataSets, vtkHierarchicalBoxDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractDataSets, vtkHierarchicalBoxDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractEdges.cxx b/Graphics/vtkExtractEdges.cxx
index 806c78ea0452cd93d8f58dd0135da1257644ae3e..00f041609ab2e986882767a352975bbd20e29036 100644
--- a/Graphics/vtkExtractEdges.cxx
+++ b/Graphics/vtkExtractEdges.cxx
@@ -27,7 +27,6 @@
 #include "vtkPolyData.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkExtractEdges, "1.56");
 vtkStandardNewMacro(vtkExtractEdges);
 
 // Construct object.
diff --git a/Graphics/vtkExtractEdges.h b/Graphics/vtkExtractEdges.h
index 3ed9010e7df3906825a38349a95b1376696dbce8..df255c14cfcb1ef3ce6495dd078c243c0eba1a8a 100644
--- a/Graphics/vtkExtractEdges.h
+++ b/Graphics/vtkExtractEdges.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractEdges : public vtkPolyDataAlgorithm
 {
 public:
   static vtkExtractEdges *New();
-  vtkTypeRevisionMacro(vtkExtractEdges,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkExtractEdges,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractGeometry.cxx b/Graphics/vtkExtractGeometry.cxx
index 78ca23a332d10a5346fb3a4978b6689a9f455407..35059c3b8a64e58e4cc066fa23defb40a5911558 100644
--- a/Graphics/vtkExtractGeometry.cxx
+++ b/Graphics/vtkExtractGeometry.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractGeometry, "1.59");
 vtkStandardNewMacro(vtkExtractGeometry);
 vtkCxxSetObjectMacro(vtkExtractGeometry,ImplicitFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkExtractGeometry.h b/Graphics/vtkExtractGeometry.h
index ce54241ea8f0f912479bf05035c63b6eb3b03df5..180a9eebe5feadb93725d73a03167fcfca098c32 100644
--- a/Graphics/vtkExtractGeometry.h
+++ b/Graphics/vtkExtractGeometry.h
@@ -42,7 +42,7 @@ class vtkImplicitFunction;
 class VTK_GRAPHICS_EXPORT vtkExtractGeometry : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractGeometry,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkExtractGeometry,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractGrid.cxx b/Graphics/vtkExtractGrid.cxx
index 75256051cb5158f8bc3712d0b80bd60bf92e940e..1b22ec3903f64ae47ac1fc361c88fd6e312b158c 100644
--- a/Graphics/vtkExtractGrid.cxx
+++ b/Graphics/vtkExtractGrid.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractGrid, "1.48");
 vtkStandardNewMacro(vtkExtractGrid);
 
 // Construct object to extract all of the input data.
diff --git a/Graphics/vtkExtractGrid.h b/Graphics/vtkExtractGrid.h
index 60347a631a980855b5b06aeb78bb152ea8ddff5b..9a4e7700e509fe248e5be2bc65bad79c117f2c6d 100644
--- a/Graphics/vtkExtractGrid.h
+++ b/Graphics/vtkExtractGrid.h
@@ -43,7 +43,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractGrid : public vtkStructuredGridAlgorithm
 {
 public:
   static vtkExtractGrid *New();
-  vtkTypeRevisionMacro(vtkExtractGrid,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkExtractGrid,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractLevel.cxx b/Graphics/vtkExtractLevel.cxx
index 2c5424d31f9430e08cee1cf20c1943407875d02f..ef18daacddfb8ad10b3f83b76406f824f47873bf 100644
--- a/Graphics/vtkExtractLevel.cxx
+++ b/Graphics/vtkExtractLevel.cxx
@@ -28,7 +28,6 @@ class vtkExtractLevel::vtkSet : public vtkstd::set<unsigned int>
 };
 
 vtkStandardNewMacro(vtkExtractLevel);
-vtkCxxRevisionMacro(vtkExtractLevel, "1.1");
 //----------------------------------------------------------------------------
 vtkExtractLevel::vtkExtractLevel()
 {
diff --git a/Graphics/vtkExtractLevel.h b/Graphics/vtkExtractLevel.h
index 85bc032cee4574d112f8446cda320635dbd5e6e1..02de7f38a9a12d998fdbca74a505bdd139391ac8 100644
--- a/Graphics/vtkExtractLevel.h
+++ b/Graphics/vtkExtractLevel.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractLevel : public vtkHierarchicalBoxDataSetAlgo
 {
 public:
   static vtkExtractLevel* New();
-  vtkTypeRevisionMacro(vtkExtractLevel, vtkHierarchicalBoxDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractLevel, vtkHierarchicalBoxDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Graphics/vtkExtractPolyDataGeometry.cxx b/Graphics/vtkExtractPolyDataGeometry.cxx
index 613b7e49b6b40318d2b79a3c27f24289c6476080..b0c63402dd06e17453645a148e2314378401a811 100644
--- a/Graphics/vtkExtractPolyDataGeometry.cxx
+++ b/Graphics/vtkExtractPolyDataGeometry.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkExtractPolyDataGeometry, "1.27");
 vtkStandardNewMacro(vtkExtractPolyDataGeometry);
 vtkCxxSetObjectMacro(vtkExtractPolyDataGeometry,
                      ImplicitFunction,vtkImplicitFunction);
diff --git a/Graphics/vtkExtractPolyDataGeometry.h b/Graphics/vtkExtractPolyDataGeometry.h
index accfd5a56947a198337632d853b0b69304e82d3b..5e24b31d8c82ffd19e217651508029c675d84d9b 100644
--- a/Graphics/vtkExtractPolyDataGeometry.h
+++ b/Graphics/vtkExtractPolyDataGeometry.h
@@ -42,7 +42,7 @@ class vtkImplicitFunction;
 class VTK_GRAPHICS_EXPORT vtkExtractPolyDataGeometry : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractPolyDataGeometry,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkExtractPolyDataGeometry,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractRectilinearGrid.cxx b/Graphics/vtkExtractRectilinearGrid.cxx
index 7750771bb6d9c7eb4702635697eb9b09a55583cf..ab2af0b7a0df8259bf8b72725560911f0e2ee410 100644
--- a/Graphics/vtkExtractRectilinearGrid.cxx
+++ b/Graphics/vtkExtractRectilinearGrid.cxx
@@ -23,7 +23,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkExtractRectilinearGrid, "1.12");
 vtkStandardNewMacro(vtkExtractRectilinearGrid);
 
 // Construct object to extract all of the input data.
diff --git a/Graphics/vtkExtractRectilinearGrid.h b/Graphics/vtkExtractRectilinearGrid.h
index 62ab90ea7e9a7b8724a4fe71f86e7703aff93774..b012f0a35d97c0148c57b22b6b000e94e7c38dbc 100644
--- a/Graphics/vtkExtractRectilinearGrid.h
+++ b/Graphics/vtkExtractRectilinearGrid.h
@@ -32,7 +32,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractRectilinearGrid : public vtkRectilinearGridA
 {
 public:
   static vtkExtractRectilinearGrid *New();
-  vtkTypeRevisionMacro(vtkExtractRectilinearGrid,vtkRectilinearGridAlgorithm);
+  vtkTypeMacro(vtkExtractRectilinearGrid,vtkRectilinearGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractSelectedBlock.cxx b/Graphics/vtkExtractSelectedBlock.cxx
index 61175610fc0fa0d2e46d7632b97dde167c14413f..421e9b625f30c2137eabfb40cae71e61a2491d3f 100644
--- a/Graphics/vtkExtractSelectedBlock.cxx
+++ b/Graphics/vtkExtractSelectedBlock.cxx
@@ -25,7 +25,6 @@
 
 #include <vtkstd/set>
 vtkStandardNewMacro(vtkExtractSelectedBlock);
-vtkCxxRevisionMacro(vtkExtractSelectedBlock, "1.5");
 //----------------------------------------------------------------------------
 vtkExtractSelectedBlock::vtkExtractSelectedBlock()
 {
diff --git a/Graphics/vtkExtractSelectedBlock.h b/Graphics/vtkExtractSelectedBlock.h
index ba738b1147529dac03f239dd3a18ad6f0be07766..d270dcb3faafcb227702e7675ca5d555c68b236f 100644
--- a/Graphics/vtkExtractSelectedBlock.h
+++ b/Graphics/vtkExtractSelectedBlock.h
@@ -24,7 +24,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelectedBlock : public vtkExtractSelectionBa
 {
 public:
   static vtkExtractSelectedBlock* New();
-  vtkTypeRevisionMacro(vtkExtractSelectedBlock, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelectedBlock, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Graphics/vtkExtractSelectedFrustum.cxx b/Graphics/vtkExtractSelectedFrustum.cxx
index ae99c4e86fb29cf2bf1823627970d7d604d70314..4b3d8f871fe15979f4c9a18381dcff3f32e93f20 100644
--- a/Graphics/vtkExtractSelectedFrustum.cxx
+++ b/Graphics/vtkExtractSelectedFrustum.cxx
@@ -36,7 +36,6 @@
 #include "vtkSelection.h"
 #include "vtkSelectionNode.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectedFrustum, "1.21");
 vtkStandardNewMacro(vtkExtractSelectedFrustum);
 vtkCxxSetObjectMacro(vtkExtractSelectedFrustum,Frustum,vtkPlanes);
 
diff --git a/Graphics/vtkExtractSelectedFrustum.h b/Graphics/vtkExtractSelectedFrustum.h
index 06b163338c8f9ad128e003a1f208d9cdfb072704..635cdf584bee5f8272a044d73a86642db13d2206 100644
--- a/Graphics/vtkExtractSelectedFrustum.h
+++ b/Graphics/vtkExtractSelectedFrustum.h
@@ -46,7 +46,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelectedFrustum : public vtkExtractSelection
 {
 public:
   static vtkExtractSelectedFrustum *New();
-  vtkTypeRevisionMacro(vtkExtractSelectedFrustum, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelectedFrustum, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractSelectedIds.cxx b/Graphics/vtkExtractSelectedIds.cxx
index 88388a879b9c3afc8cf85b9dcbf2dea8e936d810..b8899cbeda85716cfcca9256fc1b16e984c63f60 100644
--- a/Graphics/vtkExtractSelectedIds.cxx
+++ b/Graphics/vtkExtractSelectedIds.cxx
@@ -34,7 +34,6 @@
 #include "vtkStringArray.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectedIds, "1.31");
 vtkStandardNewMacro(vtkExtractSelectedIds);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractSelectedIds.h b/Graphics/vtkExtractSelectedIds.h
index 4f1892cd38207dd213e64a7f1c392ec8b5f7fb32..cf6ec0b9f1ff5188c10448f4a2437b84a67fbaf3 100644
--- a/Graphics/vtkExtractSelectedIds.h
+++ b/Graphics/vtkExtractSelectedIds.h
@@ -37,7 +37,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelectedIds : public vtkExtractSelectionBase
 {
 public:
   static vtkExtractSelectedIds *New();
-  vtkTypeRevisionMacro(vtkExtractSelectedIds, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelectedIds, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Graphics/vtkExtractSelectedLocations.cxx b/Graphics/vtkExtractSelectedLocations.cxx
index e1efa25d7e33fbc4e6f6411b14d7a1167b09675d..66ce1a120975b49098610498d89baae2baecc0a5 100644
--- a/Graphics/vtkExtractSelectedLocations.cxx
+++ b/Graphics/vtkExtractSelectedLocations.cxx
@@ -33,7 +33,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectedLocations, "1.16");
 vtkStandardNewMacro(vtkExtractSelectedLocations);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractSelectedLocations.h b/Graphics/vtkExtractSelectedLocations.h
index e79a0f9ef1c8da595951301f1975e00330afd252..f368964b05f17e29d40a8cbae556cd9d3f6a8919 100644
--- a/Graphics/vtkExtractSelectedLocations.h
+++ b/Graphics/vtkExtractSelectedLocations.h
@@ -35,7 +35,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelectedLocations : public vtkExtractSelecti
 {
 public:
   static vtkExtractSelectedLocations *New();
-  vtkTypeRevisionMacro(vtkExtractSelectedLocations, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelectedLocations, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Graphics/vtkExtractSelectedPolyDataIds.cxx b/Graphics/vtkExtractSelectedPolyDataIds.cxx
index e7ef0a6b84f60dd91548d0f9a32591c55e350e30..94106b8081e2730207b619283caf82ef64206ff0 100644
--- a/Graphics/vtkExtractSelectedPolyDataIds.cxx
+++ b/Graphics/vtkExtractSelectedPolyDataIds.cxx
@@ -26,7 +26,6 @@
 #include "vtkSelection.h"
 #include "vtkSelectionNode.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectedPolyDataIds, "1.7");
 vtkStandardNewMacro(vtkExtractSelectedPolyDataIds);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractSelectedPolyDataIds.h b/Graphics/vtkExtractSelectedPolyDataIds.h
index db911f3014491040b2d8d5480ae6d9c4cde9ec42..a552ca3f6a8475e7bdc7379159eb7c007c76124d 100644
--- a/Graphics/vtkExtractSelectedPolyDataIds.h
+++ b/Graphics/vtkExtractSelectedPolyDataIds.h
@@ -29,7 +29,7 @@ class vtkSelection;
 class VTK_GRAPHICS_EXPORT vtkExtractSelectedPolyDataIds : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractSelectedPolyDataIds,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkExtractSelectedPolyDataIds,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkExtractSelectedPolyDataIds *New();
 
diff --git a/Graphics/vtkExtractSelectedRows.cxx b/Graphics/vtkExtractSelectedRows.cxx
index 4285b9a975180e9f1a2fe30dc96e94b2c2e8f747..2ac2e5133abe27423ef14e92283b81884682f486 100644
--- a/Graphics/vtkExtractSelectedRows.cxx
+++ b/Graphics/vtkExtractSelectedRows.cxx
@@ -48,7 +48,6 @@
 #include <vtksys/stl/map>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkExtractSelectedRows, "1.3");
 vtkStandardNewMacro(vtkExtractSelectedRows);
 //----------------------------------------------------------------------------
 vtkExtractSelectedRows::vtkExtractSelectedRows()
diff --git a/Graphics/vtkExtractSelectedRows.h b/Graphics/vtkExtractSelectedRows.h
index 0fbaf02cff28ff8c4909ea68a5c2ca3cb743440a..944fd95f20ede161c203d7219c05ffb11c149bd3 100644
--- a/Graphics/vtkExtractSelectedRows.h
+++ b/Graphics/vtkExtractSelectedRows.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelectedRows : public vtkTableAlgorithm
 {
 public:
   static vtkExtractSelectedRows* New();
-  vtkTypeRevisionMacro(vtkExtractSelectedRows,vtkTableAlgorithm);
+  vtkTypeMacro(vtkExtractSelectedRows,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractSelectedThresholds.cxx b/Graphics/vtkExtractSelectedThresholds.cxx
index 96d6382b7eac5c43050c6fc9633b21ff3830de16..ea80b6b6c999be29f19e1c100ebff93d54a7bff9 100644
--- a/Graphics/vtkExtractSelectedThresholds.cxx
+++ b/Graphics/vtkExtractSelectedThresholds.cxx
@@ -31,7 +31,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkSignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectedThresholds, "1.18");
 vtkStandardNewMacro(vtkExtractSelectedThresholds);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractSelectedThresholds.h b/Graphics/vtkExtractSelectedThresholds.h
index d7159ca18449fae66696efadcf8470485f9d7610..139260257202190020c96086c1c0a9d99a974337 100644
--- a/Graphics/vtkExtractSelectedThresholds.h
+++ b/Graphics/vtkExtractSelectedThresholds.h
@@ -40,7 +40,7 @@ class vtkSelectionNode;
 class VTK_GRAPHICS_EXPORT vtkExtractSelectedThresholds : public vtkExtractSelectionBase
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractSelectedThresholds, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelectedThresholds, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractSelection.cxx b/Graphics/vtkExtractSelection.cxx
index 4a3f24fafd06dad1bbb0926f7ea2bc73f836d9d8..3a13be02b7f9609798120b5f1619b329d620f3ce 100644
--- a/Graphics/vtkExtractSelection.cxx
+++ b/Graphics/vtkExtractSelection.cxx
@@ -34,7 +34,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkExtractSelection, "1.29");
 vtkStandardNewMacro(vtkExtractSelection);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractSelection.h b/Graphics/vtkExtractSelection.h
index 6b489ee6a03ccb81665ba813c2936b6b2bf3d3aa..88e74412494ade4f0e513b3d798194d29c5481e5 100644
--- a/Graphics/vtkExtractSelection.h
+++ b/Graphics/vtkExtractSelection.h
@@ -44,7 +44,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractSelection : public vtkExtractSelectionBase
 {
 public:
   static vtkExtractSelection *New();
-  vtkTypeRevisionMacro(vtkExtractSelection, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkExtractSelection, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractSelectionBase.cxx b/Graphics/vtkExtractSelectionBase.cxx
index af7394ed6709974e41bae646dba479e13a36ea94..2bd367aa3f24e9f0c5f0e6120b946dab3169941b 100644
--- a/Graphics/vtkExtractSelectionBase.cxx
+++ b/Graphics/vtkExtractSelectionBase.cxx
@@ -22,7 +22,6 @@
 #include "vtkTable.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractSelectionBase, "1.6");
 //----------------------------------------------------------------------------
 vtkExtractSelectionBase::vtkExtractSelectionBase()
 {
diff --git a/Graphics/vtkExtractSelectionBase.h b/Graphics/vtkExtractSelectionBase.h
index 70620c86a78c090ff6134d5f48ecfcec96e2f11d..405fd66e9dc0ad98f92ba4006ae4d6093ac2bc03 100644
--- a/Graphics/vtkExtractSelectionBase.h
+++ b/Graphics/vtkExtractSelectionBase.h
@@ -26,7 +26,7 @@
 class VTK_GRAPHICS_EXPORT vtkExtractSelectionBase : public vtkDataObjectAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractSelectionBase, vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkExtractSelectionBase, vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractTemporalFieldData.cxx b/Graphics/vtkExtractTemporalFieldData.cxx
index 83a455e39b51e633736d69b59ab3d1d3e75b29e8..868509f230be9f71ab19947054f0484dd355dc21 100644
--- a/Graphics/vtkExtractTemporalFieldData.cxx
+++ b/Graphics/vtkExtractTemporalFieldData.cxx
@@ -33,7 +33,6 @@
 
 
 
-vtkCxxRevisionMacro(vtkExtractTemporalFieldData, "1.7");
 vtkStandardNewMacro(vtkExtractTemporalFieldData);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractTemporalFieldData.h b/Graphics/vtkExtractTemporalFieldData.h
index 747434964fb843d868dea1964003ccfca7710fe8..533277b68eca2f8bf19bf111bc7450fa71abd187 100644
--- a/Graphics/vtkExtractTemporalFieldData.h
+++ b/Graphics/vtkExtractTemporalFieldData.h
@@ -42,7 +42,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractTemporalFieldData : public vtkTableAlgorithm
 {
 public:
   static vtkExtractTemporalFieldData *New();
-  vtkTypeRevisionMacro(vtkExtractTemporalFieldData,vtkTableAlgorithm);
+  vtkTypeMacro(vtkExtractTemporalFieldData,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractTensorComponents.cxx b/Graphics/vtkExtractTensorComponents.cxx
index 3a42e4f8090ba0681e66b93f384180e9ad71addb..5312fe7975797d8d117fcb8e6713840add079c9f 100644
--- a/Graphics/vtkExtractTensorComponents.cxx
+++ b/Graphics/vtkExtractTensorComponents.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkExtractTensorComponents, "1.32");
 vtkStandardNewMacro(vtkExtractTensorComponents);
 
 //---------------------------------------------------------------------------
diff --git a/Graphics/vtkExtractTensorComponents.h b/Graphics/vtkExtractTensorComponents.h
index 3541bebc0ae78cbc2975d8c4d3dbb34882139cb8..9e9cc98154dcfe3dea08310f54b3f87efdf3f851 100644
--- a/Graphics/vtkExtractTensorComponents.h
+++ b/Graphics/vtkExtractTensorComponents.h
@@ -49,7 +49,7 @@
 class VTK_GRAPHICS_EXPORT vtkExtractTensorComponents : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractTensorComponents,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractTensorComponents,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractUnstructuredGrid.cxx b/Graphics/vtkExtractUnstructuredGrid.cxx
index 1ccc794de054eced177e2411d5bfc37db320ba97..f8b6a006f37f6c0cea93e5423cccd8bb5005baf5 100644
--- a/Graphics/vtkExtractUnstructuredGrid.cxx
+++ b/Graphics/vtkExtractUnstructuredGrid.cxx
@@ -25,7 +25,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkExtractUnstructuredGrid, "1.39");
 vtkStandardNewMacro(vtkExtractUnstructuredGrid);
 
 // Construct with all types of clipping turned off.
diff --git a/Graphics/vtkExtractUnstructuredGrid.h b/Graphics/vtkExtractUnstructuredGrid.h
index 02779b15fa5fa8e7bb51131c4836f8d4fbf5770a..5130d92a3443df8b0c0ea0e30183c7f43262bc8a 100644
--- a/Graphics/vtkExtractUnstructuredGrid.h
+++ b/Graphics/vtkExtractUnstructuredGrid.h
@@ -43,7 +43,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkExtractUnstructuredGrid : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractUnstructuredGrid,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkExtractUnstructuredGrid,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkExtractVectorComponents.cxx b/Graphics/vtkExtractVectorComponents.cxx
index c30b0f6e829530db060dff7da9ca1b7fcb4c1a0b..e1097a7f3b5c9c5a64bcce5224de26682d8e3f9a 100644
--- a/Graphics/vtkExtractVectorComponents.cxx
+++ b/Graphics/vtkExtractVectorComponents.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkExtractVectorComponents, "1.53");
 vtkStandardNewMacro(vtkExtractVectorComponents);
 
 vtkExtractVectorComponents::vtkExtractVectorComponents()
diff --git a/Graphics/vtkExtractVectorComponents.h b/Graphics/vtkExtractVectorComponents.h
index 125e12e913f96877cf023ab180405dbe19d63e1e..1240a29b696e7ab0aeff844bb7ad0343876205c2 100644
--- a/Graphics/vtkExtractVectorComponents.h
+++ b/Graphics/vtkExtractVectorComponents.h
@@ -39,7 +39,7 @@ class VTK_GRAPHICS_EXPORT vtkExtractVectorComponents : public vtkDataSetAlgorith
 {
 public:
   static vtkExtractVectorComponents *New();
-  vtkTypeRevisionMacro(vtkExtractVectorComponents,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractVectorComponents,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkFeatureEdges.cxx b/Graphics/vtkFeatureEdges.cxx
index 58f7e4d06ed23be8a7bfda9130830e443802870e..4a7ae3bdc775ed7144ee5d1ff006f2382124c67a 100644
--- a/Graphics/vtkFeatureEdges.cxx
+++ b/Graphics/vtkFeatureEdges.cxx
@@ -30,7 +30,6 @@
 #include "vtkPointData.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkFeatureEdges, "1.77");
 vtkStandardNewMacro(vtkFeatureEdges);
 
 // Construct object with feature angle = 30; all types of edges, except 
diff --git a/Graphics/vtkFeatureEdges.h b/Graphics/vtkFeatureEdges.h
index d82c3d88bcf28637ba65abeacd2f58b518c4124f..c5c130429256371861362eee6d15c2ce2631981e 100644
--- a/Graphics/vtkFeatureEdges.h
+++ b/Graphics/vtkFeatureEdges.h
@@ -42,7 +42,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkFeatureEdges : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkFeatureEdges,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkFeatureEdges,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkFieldDataToAttributeDataFilter.cxx b/Graphics/vtkFieldDataToAttributeDataFilter.cxx
index 24ba33143e849551fedcbdf13a0e5abbb947897b..f97ed6da9133f6f3630d725277174934d144bb64 100644
--- a/Graphics/vtkFieldDataToAttributeDataFilter.cxx
+++ b/Graphics/vtkFieldDataToAttributeDataFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkFieldDataToAttributeDataFilter, "1.40");
 vtkStandardNewMacro(vtkFieldDataToAttributeDataFilter);
 
 // Instantiate object with no input and no defined output.
diff --git a/Graphics/vtkFieldDataToAttributeDataFilter.h b/Graphics/vtkFieldDataToAttributeDataFilter.h
index becae8f16f2410d167106beee1dacf3f857ecf66..fc22c44fcb1a19078e3bea2f1b16d6540108762d 100644
--- a/Graphics/vtkFieldDataToAttributeDataFilter.h
+++ b/Graphics/vtkFieldDataToAttributeDataFilter.h
@@ -69,7 +69,7 @@ class VTK_GRAPHICS_EXPORT vtkFieldDataToAttributeDataFilter : public vtkDataSetA
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkFieldDataToAttributeDataFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkFieldDataToAttributeDataFilter,vtkDataSetAlgorithm);
 
   // Description:
   // Construct object with input field set to the data object field, and the
diff --git a/Graphics/vtkFillHolesFilter.cxx b/Graphics/vtkFillHolesFilter.cxx
index ea74dcc3165a43921965c41973700c087543117d..d8c45b7692cc82cf23f0d056de008d560c438799 100644
--- a/Graphics/vtkFillHolesFilter.cxx
+++ b/Graphics/vtkFillHolesFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkSphere.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkFillHolesFilter, "1.4");
 vtkStandardNewMacro(vtkFillHolesFilter);
 
 //------------------------------------------------------------------------
diff --git a/Graphics/vtkFillHolesFilter.h b/Graphics/vtkFillHolesFilter.h
index d1491a0277d498953519ff986d7abf301d13e4b8..40445412af9f8522d56669abb57aaeef0c8a62e2 100644
--- a/Graphics/vtkFillHolesFilter.h
+++ b/Graphics/vtkFillHolesFilter.h
@@ -45,7 +45,7 @@ public:
   // Description:
   // Standard methods for instantiation, type information and printing.
   static vtkFillHolesFilter *New();
-  vtkTypeRevisionMacro(vtkFillHolesFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkFillHolesFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkFrustumSource.cxx b/Graphics/vtkFrustumSource.cxx
index 18dacdb2ea1f6199e0fe051190c52046f416a938..3ed61d89c2e4154ef7f0f47e0c7e7ee32654df30 100644
--- a/Graphics/vtkFrustumSource.cxx
+++ b/Graphics/vtkFrustumSource.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformationVector.h"
 #include "vtkCellArray.h"
 
-vtkCxxRevisionMacro(vtkFrustumSource, "1.2");
 vtkStandardNewMacro(vtkFrustumSource);
 vtkCxxSetObjectMacro(vtkFrustumSource,Planes,vtkPlanes);
 
diff --git a/Graphics/vtkFrustumSource.h b/Graphics/vtkFrustumSource.h
index 399a8ac668bf287c21d5de840c2778788afc48d9..7ee240fe3261a0c10d79b01ef6fa74808b5a2710 100644
--- a/Graphics/vtkFrustumSource.h
+++ b/Graphics/vtkFrustumSource.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkFrustumSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkFrustumSource *New();
-  vtkTypeRevisionMacro(vtkFrustumSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkFrustumSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkGeodesicPath.cxx b/Graphics/vtkGeodesicPath.cxx
index 149c9825b971fbc22216e5bae047500ac1bdcf8f..d958a7f716d1b0c6c7d38dec04eb0b6ce72463b5 100644
--- a/Graphics/vtkGeodesicPath.cxx
+++ b/Graphics/vtkGeodesicPath.cxx
@@ -20,7 +20,6 @@
 #include "vtkPolyData.h"
 #include "vtkExecutive.h"
 
-vtkCxxRevisionMacro(vtkGeodesicPath, "1.1");
 
 //-----------------------------------------------------------------------------
 vtkGeodesicPath::vtkGeodesicPath()
diff --git a/Graphics/vtkGeodesicPath.h b/Graphics/vtkGeodesicPath.h
index 9eff0551dfe58f8614999bceb22583179e9fdaee..ff68b50118aa8a28abf90be5b28efa1715b71c70 100644
--- a/Graphics/vtkGeodesicPath.h
+++ b/Graphics/vtkGeodesicPath.h
@@ -30,7 +30,7 @@ public:
 
   // Description:
   // Standard methids for printing and determining type information.
-  vtkTypeRevisionMacro(vtkGeodesicPath,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeodesicPath,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual double GetGeodesicLength() = 0;
diff --git a/Graphics/vtkGeometryFilter.cxx b/Graphics/vtkGeometryFilter.cxx
index db9be43e2ed3617d8925eba0f1d533a330e893b6..147ca73aefc4e88cfbb181824a34e18897ce1b2c 100644
--- a/Graphics/vtkGeometryFilter.cxx
+++ b/Graphics/vtkGeometryFilter.cxx
@@ -36,7 +36,6 @@
 #include "vtkWedge.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkGeometryFilter, "1.111");
 vtkStandardNewMacro(vtkGeometryFilter);
 vtkCxxSetObjectMacro(vtkGeometryFilter, Locator, vtkIncrementalPointLocator)
 
diff --git a/Graphics/vtkGeometryFilter.h b/Graphics/vtkGeometryFilter.h
index d7e7a4fed9f60af1c18e9b5950b2a6f3628b16ee..708626b31fb99fc2ae3a18afa14398a81e772a51 100644
--- a/Graphics/vtkGeometryFilter.h
+++ b/Graphics/vtkGeometryFilter.h
@@ -52,7 +52,7 @@ class VTK_GRAPHICS_EXPORT vtkGeometryFilter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkGlyph2D.cxx b/Graphics/vtkGlyph2D.cxx
index 57cb1a36f8828411395351128936caddbfd2c092..cb04806e63a2e4258bdf5fc015b75f0b7e9846d3 100644
--- a/Graphics/vtkGlyph2D.cxx
+++ b/Graphics/vtkGlyph2D.cxx
@@ -25,7 +25,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkGlyph2D, "1.27");
 vtkStandardNewMacro(vtkGlyph2D);
 
 int vtkGlyph2D::RequestData(
diff --git a/Graphics/vtkGlyph2D.h b/Graphics/vtkGlyph2D.h
index 55fd35e6c049f405b9bfc64aa7bcf0cddc5b27b9..4eb27e28a2270813f58f3b4f99a6e6d297cf9c34 100644
--- a/Graphics/vtkGlyph2D.h
+++ b/Graphics/vtkGlyph2D.h
@@ -32,7 +32,7 @@
 class VTK_GRAPHICS_EXPORT vtkGlyph2D : public vtkGlyph3D
 {
 public:
-  vtkTypeRevisionMacro(vtkGlyph2D,vtkGlyph3D);
+  vtkTypeMacro(vtkGlyph2D,vtkGlyph3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkGlyph3D.cxx b/Graphics/vtkGlyph3D.cxx
index feab44b0af54c6c8d1450582d6769413bc0f221c..4bf739b51e78429dbaa3fa4bfad723a564e5d0ac 100644
--- a/Graphics/vtkGlyph3D.cxx
+++ b/Graphics/vtkGlyph3D.cxx
@@ -30,7 +30,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkGlyph3D, "1.127");
 vtkStandardNewMacro(vtkGlyph3D);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkGlyph3D.h b/Graphics/vtkGlyph3D.h
index 52e1d8524f9c19f90c06d12767800cf91b0daeaf..becb6c1435d08a73255f670ea8f7d74c202dae7a 100644
--- a/Graphics/vtkGlyph3D.h
+++ b/Graphics/vtkGlyph3D.h
@@ -94,7 +94,7 @@
 class VTK_GRAPHICS_EXPORT vtkGlyph3D : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGlyph3D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGlyph3D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkGlyphSource2D.cxx b/Graphics/vtkGlyphSource2D.cxx
index 26394984b9b494758fd0c6e3ca27936d115b8203..5542fe47d34bac47fa0f0918ddc6b2e1a55febf7 100644
--- a/Graphics/vtkGlyphSource2D.cxx
+++ b/Graphics/vtkGlyphSource2D.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkGlyphSource2D, "1.19");
 vtkStandardNewMacro(vtkGlyphSource2D);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkGlyphSource2D.h b/Graphics/vtkGlyphSource2D.h
index ee5d2a19c033d5c5bddafc71b50ba7bbbb80a4bd..aeb0a4cc603ded8346f4a0ea805216075af6c2ef 100644
--- a/Graphics/vtkGlyphSource2D.h
+++ b/Graphics/vtkGlyphSource2D.h
@@ -50,7 +50,7 @@ class vtkCellArray;
 class VTK_GRAPHICS_EXPORT vtkGlyphSource2D : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkGlyphSource2D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGlyphSource2D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkGradientFilter.cxx b/Graphics/vtkGradientFilter.cxx
index b7d832412746a0d0e74a8124473b410fa07359fe..b3fb1387c493b86da8dc1844001b7dfb56c1cd8b 100644
--- a/Graphics/vtkGradientFilter.cxx
+++ b/Graphics/vtkGradientFilter.cxx
@@ -42,7 +42,6 @@
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkGradientFilter, "1.14");
 vtkStandardNewMacro(vtkGradientFilter);
 
 namespace 
diff --git a/Graphics/vtkGradientFilter.h b/Graphics/vtkGradientFilter.h
index 232d289fb4d33630095b88b7a54ebe6ab03dbed2..058e76128701aaec24e1829e13d7979dd1a8e592 100644
--- a/Graphics/vtkGradientFilter.h
+++ b/Graphics/vtkGradientFilter.h
@@ -38,7 +38,7 @@
 class VTK_GRAPHICS_EXPORT vtkGradientFilter : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGradientFilter, vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkGradientFilter, vtkDataSetAlgorithm);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkGradientFilter *New();
diff --git a/Graphics/vtkGraphGeodesicPath.cxx b/Graphics/vtkGraphGeodesicPath.cxx
index 8b5e9af81654b11ee80f02d38902bb62c1f5aeda..cd8b4b6046330790f20002d5ffeabfa2045dddc7 100644
--- a/Graphics/vtkGraphGeodesicPath.cxx
+++ b/Graphics/vtkGraphGeodesicPath.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkExecutive.h"
 
-vtkCxxRevisionMacro(vtkGraphGeodesicPath, "1.3");
 
 //-----------------------------------------------------------------------------
 vtkGraphGeodesicPath::vtkGraphGeodesicPath()
diff --git a/Graphics/vtkGraphGeodesicPath.h b/Graphics/vtkGraphGeodesicPath.h
index 0de7d5ffae870f30e96f08bbf6b2ac1f704f1100..278a209a06f047b924aaefe546d8c5ee9c0e8241 100644
--- a/Graphics/vtkGraphGeodesicPath.h
+++ b/Graphics/vtkGraphGeodesicPath.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkGraphGeodesicPath : public vtkGeodesicPath
 public:
   // Description:
   // Standard methids for printing and determining type information.
-  vtkTypeRevisionMacro(vtkGraphGeodesicPath,vtkGeodesicPath);
+  vtkTypeMacro(vtkGraphGeodesicPath,vtkGeodesicPath);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkGraphLayoutFilter.cxx b/Graphics/vtkGraphLayoutFilter.cxx
index 0f444a39c01bf1595b426fca0e382a583e261f61..a9566c319f341c8c9f62f135e481f0f0e94802bb 100644
--- a/Graphics/vtkGraphLayoutFilter.cxx
+++ b/Graphics/vtkGraphLayoutFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkGraphLayoutFilter, "1.16");
 vtkStandardNewMacro(vtkGraphLayoutFilter);
 
 vtkGraphLayoutFilter::vtkGraphLayoutFilter()
diff --git a/Graphics/vtkGraphLayoutFilter.h b/Graphics/vtkGraphLayoutFilter.h
index c55d1ae143102eb9b4106f0377cdfdc522b1bb4b..0c5b52b5f2b0f2c2500d25e3383ef6b4b7f8ade8 100644
--- a/Graphics/vtkGraphLayoutFilter.h
+++ b/Graphics/vtkGraphLayoutFilter.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkGraphLayoutFilter : public vtkPolyDataAlgorithm
 public:
   static vtkGraphLayoutFilter *New();
 
-  vtkTypeRevisionMacro(vtkGraphLayoutFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGraphLayoutFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkGraphToPoints.cxx b/Graphics/vtkGraphToPoints.cxx
index 2b1ba54366853f451e74aa74db482a169bc78778..d128d25e6f13a8c75fbeb616405a7ce262ef140b 100644
--- a/Graphics/vtkGraphToPoints.cxx
+++ b/Graphics/vtkGraphToPoints.cxx
@@ -27,7 +27,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkGraphToPoints, "1.2");
 vtkStandardNewMacro(vtkGraphToPoints);
 
 vtkGraphToPoints::vtkGraphToPoints()
diff --git a/Graphics/vtkGraphToPoints.h b/Graphics/vtkGraphToPoints.h
index 8ab4d13790f9790ce263d21c0bbfbb3f2bcb4ace..b30c79c0187a5cb6fce709ae93e83364e733e314 100644
--- a/Graphics/vtkGraphToPoints.h
+++ b/Graphics/vtkGraphToPoints.h
@@ -34,7 +34,7 @@ class VTK_GRAPHICS_EXPORT vtkGraphToPoints : public vtkPolyDataAlgorithm
 {
 public:
   static vtkGraphToPoints *New();
-  vtkTypeRevisionMacro(vtkGraphToPoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGraphToPoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/Graphics/vtkGraphToPolyData.cxx b/Graphics/vtkGraphToPolyData.cxx
index 0af6b1b56ba82481d04ec02f18194c60c45d89cd..7d7c36eeaf1f9bb07b22e14974d9ad1e6914b130 100644
--- a/Graphics/vtkGraphToPolyData.cxx
+++ b/Graphics/vtkGraphToPolyData.cxx
@@ -41,7 +41,6 @@
 #include <vtksys/stl/utility>
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkGraphToPolyData, "1.3");
 vtkStandardNewMacro(vtkGraphToPolyData);
 
 vtkGraphToPolyData::vtkGraphToPolyData()
diff --git a/Graphics/vtkGraphToPolyData.h b/Graphics/vtkGraphToPolyData.h
index fa1a966bb2d2f0036868bfc2d03b3ecfd05fe10e..5d276acca7251a2e28429614ad29914da972cbaa 100644
--- a/Graphics/vtkGraphToPolyData.h
+++ b/Graphics/vtkGraphToPolyData.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkGraphToPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkGraphToPolyData *New();
-  vtkTypeRevisionMacro(vtkGraphToPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGraphToPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkGridSynchronizedTemplates3D.cxx b/Graphics/vtkGridSynchronizedTemplates3D.cxx
index 31c26288f9a76b4b5d70a3b686172642f028e998..569961bfe735b847940ec11ac84208d191195dc2 100644
--- a/Graphics/vtkGridSynchronizedTemplates3D.cxx
+++ b/Graphics/vtkGridSynchronizedTemplates3D.cxx
@@ -40,7 +40,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkGridSynchronizedTemplates3D, "1.10");
 vtkStandardNewMacro(vtkGridSynchronizedTemplates3D);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkGridSynchronizedTemplates3D.h b/Graphics/vtkGridSynchronizedTemplates3D.h
index e4affdc6a23937c292cf0c8790035b0e5e370c38..e4f93d19962e5b911778a81ebe2c2a479fc13bd4 100644
--- a/Graphics/vtkGridSynchronizedTemplates3D.h
+++ b/Graphics/vtkGridSynchronizedTemplates3D.h
@@ -37,7 +37,7 @@ class VTK_GRAPHICS_EXPORT vtkGridSynchronizedTemplates3D : public vtkPolyDataAlg
 {
 public:
   static vtkGridSynchronizedTemplates3D *New();
-  vtkTypeRevisionMacro(vtkGridSynchronizedTemplates3D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGridSynchronizedTemplates3D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHedgeHog.cxx b/Graphics/vtkHedgeHog.cxx
index d9433f3ee158de075f78ce772b08788e8740bd85..1627ec4de5373fa6a02d69f68146d28f1ad83c1c 100644
--- a/Graphics/vtkHedgeHog.cxx
+++ b/Graphics/vtkHedgeHog.cxx
@@ -22,7 +22,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkHedgeHog, "1.47");
 vtkStandardNewMacro(vtkHedgeHog);
 
 vtkHedgeHog::vtkHedgeHog()
diff --git a/Graphics/vtkHedgeHog.h b/Graphics/vtkHedgeHog.h
index dff2bb125bfee034acc0d06dc3f5f079a8ac9d18..efa423ab51f42dc66341698aa1d72eed512973ac 100644
--- a/Graphics/vtkHedgeHog.h
+++ b/Graphics/vtkHedgeHog.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkHedgeHog : public vtkPolyDataAlgorithm
 {
 public:
   static vtkHedgeHog *New();
-  vtkTypeRevisionMacro(vtkHedgeHog,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHedgeHog,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHierarchicalDataExtractDataSets.cxx b/Graphics/vtkHierarchicalDataExtractDataSets.cxx
index a2615f5dca523b1f7c82a82a5da30f945711f8c9..006d92ac2190c629aec7ce5a28a99219b464cd56 100644
--- a/Graphics/vtkHierarchicalDataExtractDataSets.cxx
+++ b/Graphics/vtkHierarchicalDataExtractDataSets.cxx
@@ -15,7 +15,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkHierarchicalDataExtractDataSets.h"
 
 #include "vtkObjectFactory.h"
-vtkCxxRevisionMacro(vtkHierarchicalDataExtractDataSets, "1.3");
 vtkStandardNewMacro(vtkHierarchicalDataExtractDataSets);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHierarchicalDataExtractDataSets.h b/Graphics/vtkHierarchicalDataExtractDataSets.h
index 9162d4c1ae137014255ac1851551001b2687d9a7..e7aeadedd2e382138f8fbd7cacc7cfe732ac731f 100644
--- a/Graphics/vtkHierarchicalDataExtractDataSets.h
+++ b/Graphics/vtkHierarchicalDataExtractDataSets.h
@@ -32,7 +32,7 @@ class VTK_GRAPHICS_EXPORT vtkHierarchicalDataExtractDataSets :
   public vtkExtractDataSets 
 {
 public:
-  vtkTypeRevisionMacro(vtkHierarchicalDataExtractDataSets,vtkExtractDataSets);
+  vtkTypeMacro(vtkHierarchicalDataExtractDataSets,vtkExtractDataSets);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkHierarchicalDataExtractDataSets *New();
 
diff --git a/Graphics/vtkHierarchicalDataExtractLevel.cxx b/Graphics/vtkHierarchicalDataExtractLevel.cxx
index ea2ef5c7a40cad2efb45491066320665d1eef0c3..00c883ab4237abb2b462d190ea855e202230ea9b 100644
--- a/Graphics/vtkHierarchicalDataExtractLevel.cxx
+++ b/Graphics/vtkHierarchicalDataExtractLevel.cxx
@@ -16,7 +16,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalDataExtractLevel, "1.8");
 vtkStandardNewMacro(vtkHierarchicalDataExtractLevel);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHierarchicalDataExtractLevel.h b/Graphics/vtkHierarchicalDataExtractLevel.h
index fa3598b94cc124b3b0ffe7930330e18938899f8e..31c2b8de170aabcf62a74b5efe2c62704c8fed14 100644
--- a/Graphics/vtkHierarchicalDataExtractLevel.h
+++ b/Graphics/vtkHierarchicalDataExtractLevel.h
@@ -24,7 +24,7 @@
 class VTK_GRAPHICS_EXPORT vtkHierarchicalDataExtractLevel : public vtkExtractLevel 
 {
 public:
-  vtkTypeRevisionMacro(vtkHierarchicalDataExtractLevel,vtkExtractLevel);
+  vtkTypeMacro(vtkHierarchicalDataExtractLevel,vtkExtractLevel);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkHierarchicalDataExtractLevel *New();
diff --git a/Graphics/vtkHierarchicalDataLevelFilter.cxx b/Graphics/vtkHierarchicalDataLevelFilter.cxx
index 424b845197ceaab2e90a78a3b7c75949130ae091..999b9f87ebccc77bd4f2274f7fc0b7ebf8bb9951 100644
--- a/Graphics/vtkHierarchicalDataLevelFilter.cxx
+++ b/Graphics/vtkHierarchicalDataLevelFilter.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalDataLevelFilter, "1.2");
 vtkStandardNewMacro(vtkHierarchicalDataLevelFilter);
 
 // Construct object with PointIds and CellIds on; and ids being generated
diff --git a/Graphics/vtkHierarchicalDataLevelFilter.h b/Graphics/vtkHierarchicalDataLevelFilter.h
index d95fd19fb240dc48f11fe0a1b92bb8c534597e2b..f01499770a2971117e91cd645c91087ee6df63bf 100644
--- a/Graphics/vtkHierarchicalDataLevelFilter.h
+++ b/Graphics/vtkHierarchicalDataLevelFilter.h
@@ -27,7 +27,7 @@
 class VTK_GRAPHICS_EXPORT vtkHierarchicalDataLevelFilter : public vtkLevelIdScalars 
 {
 public:
-  vtkTypeRevisionMacro(vtkHierarchicalDataLevelFilter,vtkLevelIdScalars);
+  vtkTypeMacro(vtkHierarchicalDataLevelFilter,vtkLevelIdScalars);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHierarchicalDataSetGeometryFilter.cxx b/Graphics/vtkHierarchicalDataSetGeometryFilter.cxx
index 42483e7fa0acb8f427a18afdc15adcfeb706b793..5ca9c673304078c965d0569169828f505baa0a51 100644
--- a/Graphics/vtkHierarchicalDataSetGeometryFilter.cxx
+++ b/Graphics/vtkHierarchicalDataSetGeometryFilter.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalDataSetGeometryFilter, "1.6");
 vtkStandardNewMacro(vtkHierarchicalDataSetGeometryFilter);
 //-----------------------------------------------------------------------------
 vtkHierarchicalDataSetGeometryFilter::vtkHierarchicalDataSetGeometryFilter()
diff --git a/Graphics/vtkHierarchicalDataSetGeometryFilter.h b/Graphics/vtkHierarchicalDataSetGeometryFilter.h
index 0da42ad4dcf0ea1e1c9073d7ba788827de89f69e..e8f7f005ebdc394949eb230c1e77ba7e1ab9e04a 100644
--- a/Graphics/vtkHierarchicalDataSetGeometryFilter.h
+++ b/Graphics/vtkHierarchicalDataSetGeometryFilter.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkHierarchicalDataSetGeometryFilter :
 {
 public:
   static vtkHierarchicalDataSetGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkHierarchicalDataSetGeometryFilter,
+  vtkTypeMacro(vtkHierarchicalDataSetGeometryFilter,
     vtkCompositeDataGeometryFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Graphics/vtkHull.cxx b/Graphics/vtkHull.cxx
index 880447eba85999c8cc5c5838395003adbcdb4b31..b9407b788326ecac7ed3a81d958766ed02c7b3f6 100644
--- a/Graphics/vtkHull.cxx
+++ b/Graphics/vtkHull.cxx
@@ -22,7 +22,6 @@
 #include "vtkPlanes.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkHull, "1.40");
 vtkStandardNewMacro(vtkHull);
 
 // Construct an the hull object with no planes
diff --git a/Graphics/vtkHull.h b/Graphics/vtkHull.h
index f92183dc45bc6e035e52db0b18bd274e4f2baebd..41f9cfa9934413a21d43ef6477899584aa00d849 100644
--- a/Graphics/vtkHull.h
+++ b/Graphics/vtkHull.h
@@ -49,7 +49,7 @@ class VTK_GRAPHICS_EXPORT vtkHull : public vtkPolyDataAlgorithm
 {
 public:
   static vtkHull *New();
-  vtkTypeRevisionMacro(vtkHull,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHull,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx b/Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx
index 93e7888ce9c07182fb3f5d0be3c59a66acffe631..8a2e285ae685db464a179096868cdc851e5bf151 100644
--- a/Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx
+++ b/Graphics/vtkHyperOctreeClipCutPointsGrabber.cxx
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeClipCutPointsGrabber, "1.1");
 vtkStandardNewMacro(vtkHyperOctreeClipCutPointsGrabber);
 
 class vtkHyperOctreeIdSet // Pimpl idiom
diff --git a/Graphics/vtkHyperOctreeClipCutPointsGrabber.h b/Graphics/vtkHyperOctreeClipCutPointsGrabber.h
index 5fdfc09dc258d322dae3e5b60527a153c156c616..69aa65f936c5f508c18c60c08f2dc03e7e75e027 100644
--- a/Graphics/vtkHyperOctreeClipCutPointsGrabber.h
+++ b/Graphics/vtkHyperOctreeClipCutPointsGrabber.h
@@ -34,7 +34,7 @@ class VTK_GRAPHICS_EXPORT vtkHyperOctreeClipCutPointsGrabber : public vtkHyperOc
 public:
   static vtkHyperOctreeClipCutPointsGrabber *New();
   
-  vtkTypeRevisionMacro(vtkHyperOctreeClipCutPointsGrabber,vtkHyperOctreePointsGrabber);
+  vtkTypeMacro(vtkHyperOctreeClipCutPointsGrabber,vtkHyperOctreePointsGrabber);
   
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Graphics/vtkHyperOctreeContourFilter.cxx b/Graphics/vtkHyperOctreeContourFilter.cxx
index dd9a57adf9b72778986a1baa4fe35d4cb964071f..5149b661c24ca336028eaafac0bbb130fe4b55df 100644
--- a/Graphics/vtkHyperOctreeContourFilter.cxx
+++ b/Graphics/vtkHyperOctreeContourFilter.cxx
@@ -79,7 +79,7 @@ class vtkHyperOctreeContourPointsGrabber : public vtkHyperOctreePointsGrabber
 public:
   static vtkHyperOctreeContourPointsGrabber *New();
   
-  vtkTypeRevisionMacro(vtkHyperOctreeContourPointsGrabber,vtkHyperOctreePointsGrabber);
+  vtkTypeMacro(vtkHyperOctreeContourPointsGrabber,vtkHyperOctreePointsGrabber);
   
   void PrintSelf(ostream& os, vtkIndent indent);
   
@@ -154,7 +154,6 @@ private:
   void operator=(const vtkHyperOctreeContourPointsGrabber&);    // Not implemented.
 };
   
-vtkCxxRevisionMacro(vtkHyperOctreeContourFilter, "1.6");
 vtkStandardNewMacro(vtkHyperOctreeContourFilter);
 
 //----------------------------------------------------------------------------
@@ -1288,7 +1287,6 @@ int vtkHyperOctreeContourFilter::FillInputPortInformation(int,
 }
 
 
-vtkCxxRevisionMacro(vtkHyperOctreeContourPointsGrabber, "1.6");
 vtkStandardNewMacro(vtkHyperOctreeContourPointsGrabber);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkHyperOctreeContourFilter.h b/Graphics/vtkHyperOctreeContourFilter.h
index 1c47b9406af3076ee3c2201d5d92288dc1755da7..0984074cd9ef3ba02acc6208899d93de4a22e312 100644
--- a/Graphics/vtkHyperOctreeContourFilter.h
+++ b/Graphics/vtkHyperOctreeContourFilter.h
@@ -65,7 +65,7 @@ class vtkBitArray;
 class VTK_GRAPHICS_EXPORT vtkHyperOctreeContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeContourFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeContourFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHyperOctreeCutter.cxx b/Graphics/vtkHyperOctreeCutter.cxx
index ae7c6a69dbbe8d42705912dd0d17e050e787da1e..79c3903cfa7e21587b92d799bcc4340fbde7d68e 100644
--- a/Graphics/vtkHyperOctreeCutter.cxx
+++ b/Graphics/vtkHyperOctreeCutter.cxx
@@ -44,7 +44,6 @@
 #include "vtkHyperOctreeClipCutPointsGrabber.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeCutter, "1.8");
 vtkStandardNewMacro(vtkHyperOctreeCutter);
 vtkCxxSetObjectMacro(vtkHyperOctreeCutter,CutFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkHyperOctreeCutter.h b/Graphics/vtkHyperOctreeCutter.h
index df75a53b98a6160adcbf145a254eb4c1bb5adafe..9dc3e577f65f97c759f061a5228958253379490e 100644
--- a/Graphics/vtkHyperOctreeCutter.h
+++ b/Graphics/vtkHyperOctreeCutter.h
@@ -67,7 +67,7 @@ class vtkHyperOctreeClipCutPointsGrabber;
 class VTK_GRAPHICS_EXPORT vtkHyperOctreeCutter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeCutter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeCutter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHyperOctreeDepth.cxx b/Graphics/vtkHyperOctreeDepth.cxx
index 0040c37aeffe5465b837bb59171ee7b4ba8d0043..52db525e0997049818ac370583bcacdf3bf6e0bb 100644
--- a/Graphics/vtkHyperOctreeDepth.cxx
+++ b/Graphics/vtkHyperOctreeDepth.cxx
@@ -24,7 +24,6 @@
 #include "vtkCellData.h"
 #include "vtkIntArray.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeDepth, "1.3");
 vtkStandardNewMacro(vtkHyperOctreeDepth);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHyperOctreeDepth.h b/Graphics/vtkHyperOctreeDepth.h
index 4fe897e0f5b84d68fd1fd8a1bf0c387ac7e5f9f5..3f0e77abab0d5cb63e93409b5af6989ef912b77a 100644
--- a/Graphics/vtkHyperOctreeDepth.h
+++ b/Graphics/vtkHyperOctreeDepth.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkHyperOctreeDepth : public vtkDataSetAlgorithm
 {
 public:
   static vtkHyperOctreeDepth *New();
-  vtkTypeRevisionMacro(vtkHyperOctreeDepth, vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeDepth, vtkDataSetAlgorithm);
 
 protected:
   vtkHyperOctreeDepth();
diff --git a/Graphics/vtkHyperOctreeDualGridContourFilter.cxx b/Graphics/vtkHyperOctreeDualGridContourFilter.cxx
index 0dae724d8f23310fa5815ef0219a2b7d6b58800d..59c156029ef77a1cb297e947f7ed48c37639cefe 100644
--- a/Graphics/vtkHyperOctreeDualGridContourFilter.cxx
+++ b/Graphics/vtkHyperOctreeDualGridContourFilter.cxx
@@ -73,7 +73,6 @@ public:
   vtkstd::set<vtkIdType> Set;
 };
 
-vtkCxxRevisionMacro(vtkHyperOctreeDualGridContourFilter, "1.4");
 vtkStandardNewMacro(vtkHyperOctreeDualGridContourFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHyperOctreeDualGridContourFilter.h b/Graphics/vtkHyperOctreeDualGridContourFilter.h
index a3bcea80a6a56e185ce2ece5932aa41c76192683..8b47e8ef566e754c961f18cb1e71d096ec2082ec 100644
--- a/Graphics/vtkHyperOctreeDualGridContourFilter.h
+++ b/Graphics/vtkHyperOctreeDualGridContourFilter.h
@@ -54,7 +54,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkHyperOctreeDualGridContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeDualGridContourFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeDualGridContourFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHyperOctreeFractalSource.cxx b/Graphics/vtkHyperOctreeFractalSource.cxx
index 61ebf987664f1266f36cc63d62dcb613f618c0a6..8d2b6fc3f82330b09536a440ced7ce30c1f4b1a7 100644
--- a/Graphics/vtkHyperOctreeFractalSource.cxx
+++ b/Graphics/vtkHyperOctreeFractalSource.cxx
@@ -27,7 +27,6 @@
 #include "vtkFloatArray.h"
 #include "vtkGarbageCollector.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeFractalSource, "1.6");
 vtkStandardNewMacro(vtkHyperOctreeFractalSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHyperOctreeFractalSource.h b/Graphics/vtkHyperOctreeFractalSource.h
index b87c106744e35c4eb12a8cb41676628dbce48252..a646c605a3f139b32c4fbc695b6cf8a6d35d3205 100644
--- a/Graphics/vtkHyperOctreeFractalSource.h
+++ b/Graphics/vtkHyperOctreeFractalSource.h
@@ -29,7 +29,7 @@ class vtkImplicitFunction;
 class VTK_GRAPHICS_EXPORT vtkHyperOctreeFractalSource : public vtkHyperOctreeAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeFractalSource,vtkHyperOctreeAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeFractalSource,vtkHyperOctreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   static vtkHyperOctreeFractalSource *New();
diff --git a/Graphics/vtkHyperOctreeLimiter.cxx b/Graphics/vtkHyperOctreeLimiter.cxx
index a36f3ae2479127793a376400a1223ef203a70f19..8d18fed73d0ea6da10e5c5da292f21c7e4b28e1d 100644
--- a/Graphics/vtkHyperOctreeLimiter.cxx
+++ b/Graphics/vtkHyperOctreeLimiter.cxx
@@ -29,7 +29,6 @@
 #include "vtkCellType.h"
 #include "vtkDoubleArray.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeLimiter, "1.4");
 vtkStandardNewMacro(vtkHyperOctreeLimiter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkHyperOctreeLimiter.h b/Graphics/vtkHyperOctreeLimiter.h
index 42d9e9fc680d11abc7f39eb260c0a53f17dfd502..7bdea164c2606a37f60f96e8f3f6486d0af18139 100644
--- a/Graphics/vtkHyperOctreeLimiter.h
+++ b/Graphics/vtkHyperOctreeLimiter.h
@@ -34,7 +34,7 @@ class VTK_GRAPHICS_EXPORT vtkHyperOctreeLimiter : public vtkDataSetAlgorithm
 {
 public:
   static vtkHyperOctreeLimiter *New();
-  vtkTypeRevisionMacro(vtkHyperOctreeLimiter, vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeLimiter, vtkDataSetAlgorithm);
 
   // Description:
   // Return the maximum number of levels of the hyperoctree.
diff --git a/Graphics/vtkHyperOctreeSampleFunction.cxx b/Graphics/vtkHyperOctreeSampleFunction.cxx
index 372358ff4a12778dfe92e4a615e18b81f7013ea1..f6261cf202086b82b84be89ccfc61d45ec97348f 100644
--- a/Graphics/vtkHyperOctreeSampleFunction.cxx
+++ b/Graphics/vtkHyperOctreeSampleFunction.cxx
@@ -26,7 +26,6 @@
 #include "vtkImplicitFunction.h"
 #include "vtkGarbageCollector.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeSampleFunction, "1.3");
 vtkStandardNewMacro(vtkHyperOctreeSampleFunction);
 vtkCxxSetObjectMacro(vtkHyperOctreeSampleFunction,ImplicitFunction,
                      vtkImplicitFunction);
diff --git a/Graphics/vtkHyperOctreeSampleFunction.h b/Graphics/vtkHyperOctreeSampleFunction.h
index 771a6bc64e892993082781b1ca0ee236ee9cfb39..fcda7391f759f024188d532d2756c39e841f7608 100644
--- a/Graphics/vtkHyperOctreeSampleFunction.h
+++ b/Graphics/vtkHyperOctreeSampleFunction.h
@@ -33,7 +33,7 @@ class vtkImplicitFunction;
 class VTK_GRAPHICS_EXPORT vtkHyperOctreeSampleFunction : public vtkHyperOctreeAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperOctreeSampleFunction,vtkHyperOctreeAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeSampleFunction,vtkHyperOctreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   static vtkHyperOctreeSampleFunction *New();
diff --git a/Graphics/vtkHyperOctreeSurfaceFilter.cxx b/Graphics/vtkHyperOctreeSurfaceFilter.cxx
index 9e3b5723e47cbf23692b3117bb60d55f608fa664..2d1260a39b7163eb5fbf25ba1188fc732633f5a0 100644
--- a/Graphics/vtkHyperOctreeSurfaceFilter.cxx
+++ b/Graphics/vtkHyperOctreeSurfaceFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkHyperOctreeSurfaceFilter, "1.6");
 vtkStandardNewMacro(vtkHyperOctreeSurfaceFilter);
 
 // merging: locator
diff --git a/Graphics/vtkHyperOctreeSurfaceFilter.h b/Graphics/vtkHyperOctreeSurfaceFilter.h
index 47534c6509fa224972bbf030767b72439db8aabc..9c2bf0a4f6e1a1c2aacc239e5d6d34fca0baf1cd 100644
--- a/Graphics/vtkHyperOctreeSurfaceFilter.h
+++ b/Graphics/vtkHyperOctreeSurfaceFilter.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkHyperOctreeSurfaceFilter : public vtkPolyDataAlgori
 {
 public:
   static vtkHyperOctreeSurfaceFilter *New();
-  vtkTypeRevisionMacro(vtkHyperOctreeSurfaceFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeSurfaceFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkHyperOctreeToUniformGridFilter.cxx b/Graphics/vtkHyperOctreeToUniformGridFilter.cxx
index d3458ebbeeb74cb4ed9a97d1d359143ed2f4f7ea..d023368829f215eb0401362d35bbd8df9fb6a15d 100644
--- a/Graphics/vtkHyperOctreeToUniformGridFilter.cxx
+++ b/Graphics/vtkHyperOctreeToUniformGridFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkImageData.h"
 #include "vtkStreamingDemandDrivenPipeline.h" // WHOLE_EXTENT() key
 
-vtkCxxRevisionMacro(vtkHyperOctreeToUniformGridFilter, "1.5");
 vtkStandardNewMacro(vtkHyperOctreeToUniformGridFilter);
 
 // merging: locator
diff --git a/Graphics/vtkHyperOctreeToUniformGridFilter.h b/Graphics/vtkHyperOctreeToUniformGridFilter.h
index ba6dcfc93f009f006b5849ded829e6624aca7225..011012933b53600e57d0a3c5a0bb82815541312c 100644
--- a/Graphics/vtkHyperOctreeToUniformGridFilter.h
+++ b/Graphics/vtkHyperOctreeToUniformGridFilter.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkHyperOctreeToUniformGridFilter : public vtkImageAlg
 {
 public:
   static vtkHyperOctreeToUniformGridFilter *New();
-  vtkTypeRevisionMacro(vtkHyperOctreeToUniformGridFilter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkHyperOctreeToUniformGridFilter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/Graphics/vtkHyperStreamline.cxx b/Graphics/vtkHyperStreamline.cxx
index de735e085558177529ff71587cdb88d87c3ab1e2..d1b2772660d15e84b073b3bf3b982d4073e6964d 100644
--- a/Graphics/vtkHyperStreamline.cxx
+++ b/Graphics/vtkHyperStreamline.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkHyperStreamline, "1.63");
 vtkStandardNewMacro(vtkHyperStreamline);
 
 //
diff --git a/Graphics/vtkHyperStreamline.h b/Graphics/vtkHyperStreamline.h
index ba93853f466d7fe1ba31e3f64d67cb6eda9f0058..06648cbd206e7d7a0711d7f0e9b780d0ee7ddd65 100644
--- a/Graphics/vtkHyperStreamline.h
+++ b/Graphics/vtkHyperStreamline.h
@@ -61,7 +61,7 @@ class vtkHyperArray;
 class VTK_GRAPHICS_EXPORT vtkHyperStreamline : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkHyperStreamline,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkHyperStreamline,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkIconGlyphFilter.cxx b/Graphics/vtkIconGlyphFilter.cxx
index a3a94bde6ec093f66ca1f4a464f482c9f95fdc14..bf35e2887a6dd134d0d7fa1aa74c9609338f2bb1 100644
--- a/Graphics/vtkIconGlyphFilter.cxx
+++ b/Graphics/vtkIconGlyphFilter.cxx
@@ -29,7 +29,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkIconGlyphFilter, "1.9");
 vtkStandardNewMacro(vtkIconGlyphFilter);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkIconGlyphFilter.h b/Graphics/vtkIconGlyphFilter.h
index 25be6e4eaa41d91b02423da4845835d1136dd09a..73e4ed832c76c329975d18a8acac97c6df7d2198 100644
--- a/Graphics/vtkIconGlyphFilter.h
+++ b/Graphics/vtkIconGlyphFilter.h
@@ -46,7 +46,7 @@ public:
 
   // Description
   static vtkIconGlyphFilter *New();
-  vtkTypeRevisionMacro(vtkIconGlyphFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkIconGlyphFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkIdFilter.cxx b/Graphics/vtkIdFilter.cxx
index 2a90a864003ca65ce3637341d2bcd04c648d953b..7939618fbc3e1e23501a7da6c55f787ffc44fadd 100644
--- a/Graphics/vtkIdFilter.cxx
+++ b/Graphics/vtkIdFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkIdFilter, "1.23");
 vtkStandardNewMacro(vtkIdFilter);
 
 // Construct object with PointIds and CellIds on; and ids being generated
diff --git a/Graphics/vtkIdFilter.h b/Graphics/vtkIdFilter.h
index f3b1a626a3f067d8c6a7c509785cb41eb1d656f9..0168fda4bc2d62211faecba631b932e3a490d60c 100644
--- a/Graphics/vtkIdFilter.h
+++ b/Graphics/vtkIdFilter.h
@@ -32,7 +32,7 @@
 class VTK_GRAPHICS_EXPORT vtkIdFilter : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkIdFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkIdFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkImageDataGeometryFilter.cxx b/Graphics/vtkImageDataGeometryFilter.cxx
index 5ee5a825be92f96529576840155ab7e32b91b7c5..76447472ee7bf77c523c5f551c8baf3643ba9af9 100644
--- a/Graphics/vtkImageDataGeometryFilter.cxx
+++ b/Graphics/vtkImageDataGeometryFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkImageDataGeometryFilter, "1.18");
 vtkStandardNewMacro(vtkImageDataGeometryFilter);
 
 // Construct with initial extent of all the data
diff --git a/Graphics/vtkImageDataGeometryFilter.h b/Graphics/vtkImageDataGeometryFilter.h
index bef71493c2d1532bca0b8384d791699baa66bb53..d9d3ae8ed4f8190f34fef30f5cd57133c93b0bbb 100644
--- a/Graphics/vtkImageDataGeometryFilter.h
+++ b/Graphics/vtkImageDataGeometryFilter.h
@@ -40,7 +40,7 @@
 class VTK_GRAPHICS_EXPORT vtkImageDataGeometryFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageDataGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkImageDataGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkImageMarchingCubes.cxx b/Graphics/vtkImageMarchingCubes.cxx
index 0164b898ab347d1024d8d19422b5269b5596ad43..f51a05ef9dcf3232e40d9d9b1055f8d157b0b0ed 100644
--- a/Graphics/vtkImageMarchingCubes.cxx
+++ b/Graphics/vtkImageMarchingCubes.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageMarchingCubes, "1.3");
 vtkStandardNewMacro(vtkImageMarchingCubes);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkImageMarchingCubes.h b/Graphics/vtkImageMarchingCubes.h
index 321aaab075de455fa825b66a9b4d172f4086bdb8..20f4d3dfafb9513a6eca89724df11edeb6a82e60 100644
--- a/Graphics/vtkImageMarchingCubes.h
+++ b/Graphics/vtkImageMarchingCubes.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkImageMarchingCubes : public vtkPolyDataAlgorithm
 {
 public:
   static vtkImageMarchingCubes *New();
-  vtkTypeRevisionMacro(vtkImageMarchingCubes,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkImageMarchingCubes,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkImplicitTextureCoords.cxx b/Graphics/vtkImplicitTextureCoords.cxx
index 82a9cec6ffc26119c0fe063599a1773225c240cf..116a68ac27837971ab557a5441ba72f680c17135 100644
--- a/Graphics/vtkImplicitTextureCoords.cxx
+++ b/Graphics/vtkImplicitTextureCoords.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImplicitTextureCoords, "1.49");
 vtkStandardNewMacro(vtkImplicitTextureCoords);
 vtkCxxSetObjectMacro(vtkImplicitTextureCoords,SFunction,vtkImplicitFunction);
 vtkCxxSetObjectMacro(vtkImplicitTextureCoords,RFunction,vtkImplicitFunction);
diff --git a/Graphics/vtkImplicitTextureCoords.h b/Graphics/vtkImplicitTextureCoords.h
index dbb917a057ec7f35e324c3a32bc529eb807145d8..ec899f94f6e6067ddb0446549c5941c76022f15d 100644
--- a/Graphics/vtkImplicitTextureCoords.h
+++ b/Graphics/vtkImplicitTextureCoords.h
@@ -53,7 +53,7 @@ class vtkImplicitFunction;
 class VTK_GRAPHICS_EXPORT vtkImplicitTextureCoords : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitTextureCoords,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkImplicitTextureCoords,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkInterpolateDataSetAttributes.cxx b/Graphics/vtkInterpolateDataSetAttributes.cxx
index 9fe3734913f0416f1569cdeee63b364e28a6a8e7..bb5157ec18e5514cce2b2d3df686fd5b29722aa7 100644
--- a/Graphics/vtkInterpolateDataSetAttributes.cxx
+++ b/Graphics/vtkInterpolateDataSetAttributes.cxx
@@ -28,7 +28,6 @@
 #include "vtkStructuredPoints.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkInterpolateDataSetAttributes, "1.30");
 vtkStandardNewMacro(vtkInterpolateDataSetAttributes);
 
 // Create object with no input or output.
diff --git a/Graphics/vtkInterpolateDataSetAttributes.h b/Graphics/vtkInterpolateDataSetAttributes.h
index d23fdaba63b463b7c4c2080d46ffcae464ffa374..bdcbf7d9826b65f8bf858c66fe6371f214f1e66b 100644
--- a/Graphics/vtkInterpolateDataSetAttributes.h
+++ b/Graphics/vtkInterpolateDataSetAttributes.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkInterpolateDataSetAttributes : public vtkDataSetAlg
 {
 public:
   static vtkInterpolateDataSetAttributes *New();
-  vtkTypeRevisionMacro(vtkInterpolateDataSetAttributes,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkInterpolateDataSetAttributes,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkInterpolatingSubdivisionFilter.cxx b/Graphics/vtkInterpolatingSubdivisionFilter.cxx
index 74a1ec0939d0bb027a839b3812c49574b0b8449e..4019c3f7d2577aaf548ad58efc661ce51455eb81 100644
--- a/Graphics/vtkInterpolatingSubdivisionFilter.cxx
+++ b/Graphics/vtkInterpolatingSubdivisionFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkInterpolatingSubdivisionFilter, "1.28");
 
 // Construct object with number of subdivisions set to 1.
 vtkInterpolatingSubdivisionFilter::vtkInterpolatingSubdivisionFilter()
diff --git a/Graphics/vtkInterpolatingSubdivisionFilter.h b/Graphics/vtkInterpolatingSubdivisionFilter.h
index 8e82a7ae344b18a8d51d470e861478579b28d876..e404151552cf60719d922748d1b80b6d94daa48b 100644
--- a/Graphics/vtkInterpolatingSubdivisionFilter.h
+++ b/Graphics/vtkInterpolatingSubdivisionFilter.h
@@ -40,7 +40,7 @@ class vtkPolyData;
 class VTK_GRAPHICS_EXPORT vtkInterpolatingSubdivisionFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkInterpolatingSubdivisionFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkInterpolatingSubdivisionFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkJVMManager.cxx b/Graphics/vtkJVMManager.cxx
index 8244be6bc0a726cca2cd4615519dba202f08eb8e..73c6f3df17856b477c6abf326f44b760f0e7a107 100644
--- a/Graphics/vtkJVMManager.cxx
+++ b/Graphics/vtkJVMManager.cxx
@@ -46,7 +46,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkJVMManager);
-vtkCxxRevisionMacro(vtkJVMManager, "1.5");
 
 //----------------------------------------------------------------------------
 class vtkJVMManagerInternal
diff --git a/Graphics/vtkJVMManager.h b/Graphics/vtkJVMManager.h
index b8f14a242865e73d3b677e07b17308dd9dc56b74..70fcd395c767111791d6f821ae854fa038d0b4c9 100644
--- a/Graphics/vtkJVMManager.h
+++ b/Graphics/vtkJVMManager.h
@@ -71,7 +71,7 @@ class VTK_GRAPHICS_JAVA_EXPORT vtkJVMManager : public vtkObject
 {
 public:
   static vtkJVMManager *New();
-  vtkTypeRevisionMacro(vtkJVMManager,vtkObject);
+  vtkTypeMacro(vtkJVMManager,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkJavaProgrammableFilter.cxx b/Graphics/vtkJavaProgrammableFilter.cxx
index 2c537ccde8fd1e5a44bc2b4ef4c160d1cc640f1a..6914a754d2d219e88c22a40d1009609f82dbbfa3 100644
--- a/Graphics/vtkJavaProgrammableFilter.cxx
+++ b/Graphics/vtkJavaProgrammableFilter.cxx
@@ -41,7 +41,6 @@ public:
   vtksys_stl::map<vtkStdString, vtkVariant> Parameters;
 };
 
-vtkCxxRevisionMacro(vtkJavaProgrammableFilter, "1.3");
 vtkStandardNewMacro(vtkJavaProgrammableFilter);
 //---------------------------------------------------------------------------
 vtkJavaProgrammableFilter::vtkJavaProgrammableFilter()
diff --git a/Graphics/vtkJavaProgrammableFilter.h b/Graphics/vtkJavaProgrammableFilter.h
index 795ad3957663781362f1c02e4d39403430cdb5cb..e731cf86b365a9d219d9abde30d2e91a535b8120 100644
--- a/Graphics/vtkJavaProgrammableFilter.h
+++ b/Graphics/vtkJavaProgrammableFilter.h
@@ -62,7 +62,7 @@ class VTK_GRAPHICS_JAVA_EXPORT vtkJavaProgrammableFilter : public vtkAlgorithm
 {
 public:
   static vtkJavaProgrammableFilter* New();
-  vtkTypeRevisionMacro(vtkJavaProgrammableFilter, vtkAlgorithm);
+  vtkTypeMacro(vtkJavaProgrammableFilter, vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkKdTreeSelector.cxx b/Graphics/vtkKdTreeSelector.cxx
index 154435d6ef1a5ba6a9d30937f078dbffbdc0e3b7..753729d7801242de54bb323a6839176f581caa86 100644
--- a/Graphics/vtkKdTreeSelector.cxx
+++ b/Graphics/vtkKdTreeSelector.cxx
@@ -31,7 +31,6 @@
 #include "vtkSelectionNode.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkKdTreeSelector, "1.11");
 vtkStandardNewMacro(vtkKdTreeSelector);
 
 vtkKdTreeSelector::vtkKdTreeSelector()
diff --git a/Graphics/vtkKdTreeSelector.h b/Graphics/vtkKdTreeSelector.h
index 546e8057b8d5490c53cb3dc1e70b36772c4c7719..3a73558cd3e3d2df5e9f76252313c07b0e1b12be 100644
--- a/Graphics/vtkKdTreeSelector.h
+++ b/Graphics/vtkKdTreeSelector.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkKdTreeSelector : public vtkSelectionAlgorithm
 {
 public:
   static vtkKdTreeSelector* New();
-  vtkTypeRevisionMacro(vtkKdTreeSelector, vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkKdTreeSelector, vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkLevelIdScalars.cxx b/Graphics/vtkLevelIdScalars.cxx
index 19adaaecd866dcf4e7112c3781bcfa20fd7020e8..6b56dab4fd254739588a761246cb34ea469e458e 100644
--- a/Graphics/vtkLevelIdScalars.cxx
+++ b/Graphics/vtkLevelIdScalars.cxx
@@ -24,7 +24,6 @@
 #include "vtkUnsignedCharArray.h"
 
 vtkStandardNewMacro(vtkLevelIdScalars);
-vtkCxxRevisionMacro(vtkLevelIdScalars, "1.1");
 //----------------------------------------------------------------------------
 vtkLevelIdScalars::vtkLevelIdScalars()
 {
diff --git a/Graphics/vtkLevelIdScalars.h b/Graphics/vtkLevelIdScalars.h
index 3e7fb02c59d6129860a5f67879853fff22c72007..b1d8ada6770177d866ef7324a744b8e520971b8e 100644
--- a/Graphics/vtkLevelIdScalars.h
+++ b/Graphics/vtkLevelIdScalars.h
@@ -28,7 +28,7 @@ class VTK_GRAPHICS_EXPORT vtkLevelIdScalars : public vtkHierarchicalBoxDataSetAl
 {
 public:
   static vtkLevelIdScalars* New();
-  vtkTypeRevisionMacro(vtkLevelIdScalars, vtkHierarchicalBoxDataSetAlgorithm);
+  vtkTypeMacro(vtkLevelIdScalars, vtkHierarchicalBoxDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Graphics/vtkLineSource.cxx b/Graphics/vtkLineSource.cxx
index 73702067d3378b355bb2c7dfc5151802f02ed0ce..00449ec754b95bff17f43ea7428d77d787acc42e 100644
--- a/Graphics/vtkLineSource.cxx
+++ b/Graphics/vtkLineSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 
 #include <math.h>
-vtkCxxRevisionMacro(vtkLineSource, "1.48");
 vtkStandardNewMacro(vtkLineSource);
 
 vtkLineSource::vtkLineSource(int res)
diff --git a/Graphics/vtkLineSource.h b/Graphics/vtkLineSource.h
index 0440f88ac01987d3382b5b3ec999df7f2195ac1f..1c84f589ce0ab282dac0b1bea78ac017bbe519d5 100644
--- a/Graphics/vtkLineSource.h
+++ b/Graphics/vtkLineSource.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkLineSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkLineSource *New();
-  vtkTypeRevisionMacro(vtkLineSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkLineSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkLinearExtrusionFilter.cxx b/Graphics/vtkLinearExtrusionFilter.cxx
index 1968bd3fb0b5973c3bb20c8818099508ff8e8b79..5b7675d5c951e5fb184d58157722bbecbf4a3ffc 100644
--- a/Graphics/vtkLinearExtrusionFilter.cxx
+++ b/Graphics/vtkLinearExtrusionFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkLinearExtrusionFilter, "1.63");
 vtkStandardNewMacro(vtkLinearExtrusionFilter);
 
 // Create object with normal extrusion type, capping on, scale factor=1.0,
diff --git a/Graphics/vtkLinearExtrusionFilter.h b/Graphics/vtkLinearExtrusionFilter.h
index cd327a37d21ed1ba8081bb54837a545678a338a3..8086467459964d5ecaae456d323d0547f28fb026 100644
--- a/Graphics/vtkLinearExtrusionFilter.h
+++ b/Graphics/vtkLinearExtrusionFilter.h
@@ -59,7 +59,7 @@ class vtkDataArray;
 class VTK_GRAPHICS_EXPORT vtkLinearExtrusionFilter : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkLinearExtrusionFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkLinearExtrusionFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkLinearSubdivisionFilter.cxx b/Graphics/vtkLinearSubdivisionFilter.cxx
index f8f843836a9c86bc6e38a3e7337c801dae2a3573..b5e3c2eac373d18cd960e54d51707d54ad826e62 100644
--- a/Graphics/vtkLinearSubdivisionFilter.cxx
+++ b/Graphics/vtkLinearSubdivisionFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkLinearSubdivisionFilter, "1.17");
 vtkStandardNewMacro(vtkLinearSubdivisionFilter);
 
 void vtkLinearSubdivisionFilter::GenerateSubdivisionPoints (vtkPolyData *inputDS, vtkIntArray *edgeData, vtkPoints *outputPts, vtkPointData *outputPD)
diff --git a/Graphics/vtkLinearSubdivisionFilter.h b/Graphics/vtkLinearSubdivisionFilter.h
index cac8048f3d230e8ef2761fb8c1de5ec1b4619c4a..7cf0f657b9785dbbcc27f7a35a7f8ac2ad685c67 100644
--- a/Graphics/vtkLinearSubdivisionFilter.h
+++ b/Graphics/vtkLinearSubdivisionFilter.h
@@ -41,7 +41,7 @@ public:
   // Description:
   // Construct object with NumberOfSubdivisions set to 1.
   static vtkLinearSubdivisionFilter *New();
-  vtkTypeRevisionMacro(vtkLinearSubdivisionFilter,vtkInterpolatingSubdivisionFilter);
+  vtkTypeMacro(vtkLinearSubdivisionFilter,vtkInterpolatingSubdivisionFilter);
 
 protected:
   vtkLinearSubdivisionFilter () {};
diff --git a/Graphics/vtkLinkEdgels.cxx b/Graphics/vtkLinkEdgels.cxx
index da81685997fb4bcf49122b7d4c31998183ceafe2..a0ff2756e2603961399885a9b60c1e6a5043cd93 100644
--- a/Graphics/vtkLinkEdgels.cxx
+++ b/Graphics/vtkLinkEdgels.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkLinkEdgels, "1.40");
 vtkStandardNewMacro(vtkLinkEdgels);
 
 // Construct instance of vtkLinkEdgels with GradientThreshold set to 
diff --git a/Graphics/vtkLinkEdgels.h b/Graphics/vtkLinkEdgels.h
index bde2e063833f63d09964a7d46daa47ebfbf38b20..25936e9621908aa922154c4dc569caa4928e6495 100644
--- a/Graphics/vtkLinkEdgels.h
+++ b/Graphics/vtkLinkEdgels.h
@@ -55,7 +55,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkLinkEdgels : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkLinkEdgels,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkLinkEdgels,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkLoopSubdivisionFilter.cxx b/Graphics/vtkLoopSubdivisionFilter.cxx
index 104d00743526784a436cab5d92b3960b79111df0..22f8b994b3d58fc9e55342eb7a2f403b7cb70b46 100644
--- a/Graphics/vtkLoopSubdivisionFilter.cxx
+++ b/Graphics/vtkLoopSubdivisionFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkLoopSubdivisionFilter, "1.22");
 vtkStandardNewMacro(vtkLoopSubdivisionFilter);
 
 static double LoopWeights[4] =
diff --git a/Graphics/vtkLoopSubdivisionFilter.h b/Graphics/vtkLoopSubdivisionFilter.h
index e634a4a2135af83627389825b28f0105ebe045a3..6a1b6061dedb3876e131557feafedfa87375d9b0 100644
--- a/Graphics/vtkLoopSubdivisionFilter.h
+++ b/Graphics/vtkLoopSubdivisionFilter.h
@@ -56,7 +56,7 @@ public:
   // Description:
   // Construct object with NumberOfSubdivisions set to 1.
   static vtkLoopSubdivisionFilter *New();
-  vtkTypeRevisionMacro(vtkLoopSubdivisionFilter,vtkApproximatingSubdivisionFilter);
+  vtkTypeMacro(vtkLoopSubdivisionFilter,vtkApproximatingSubdivisionFilter);
 
 protected:
   vtkLoopSubdivisionFilter () {};
diff --git a/Graphics/vtkMarchingContourFilter.cxx b/Graphics/vtkMarchingContourFilter.cxx
index 1b687c8a3f95a9e7da3ff564f8173157164248c0..359a428852fcdc14ccf2c4c55e37a24831119b7d 100644
--- a/Graphics/vtkMarchingContourFilter.cxx
+++ b/Graphics/vtkMarchingContourFilter.cxx
@@ -33,7 +33,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkMarchingContourFilter, "1.3");
 vtkStandardNewMacro(vtkMarchingContourFilter);
 
 // Construct object with initial range (0,1) and single contour value
diff --git a/Graphics/vtkMarchingContourFilter.h b/Graphics/vtkMarchingContourFilter.h
index 1657be8ef91fe21a4f696d7ec9e61807be5fba75..b850c6596e9c18f21cba140a6977f8dc7b0962b9 100644
--- a/Graphics/vtkMarchingContourFilter.h
+++ b/Graphics/vtkMarchingContourFilter.h
@@ -61,7 +61,7 @@ class vtkScalarTree;
 class VTK_GRAPHICS_EXPORT vtkMarchingContourFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMarchingContourFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMarchingContourFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMarchingCubes.cxx b/Graphics/vtkMarchingCubes.cxx
index ad2695f66c0ace3ff0e5a9d78853a1150597eed1..0adc7e312269da21a59a26fff59dd664f0b71887 100644
--- a/Graphics/vtkMarchingCubes.cxx
+++ b/Graphics/vtkMarchingCubes.cxx
@@ -37,7 +37,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkMarchingCubes, "1.7");
 vtkStandardNewMacro(vtkMarchingCubes);
 
 // Description:
diff --git a/Graphics/vtkMarchingCubes.h b/Graphics/vtkMarchingCubes.h
index 3fbb9832045f92dc24ec6100014511a7ed68ceb3..b40916a22741eb5281ce58c2e01f3bdb80af80c2 100644
--- a/Graphics/vtkMarchingCubes.h
+++ b/Graphics/vtkMarchingCubes.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkMarchingCubes : public vtkPolyDataAlgorithm
 {
 public:
   static vtkMarchingCubes *New();
-  vtkTypeRevisionMacro(vtkMarchingCubes,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMarchingCubes,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Methods to set contour values
diff --git a/Graphics/vtkMarchingSquares.cxx b/Graphics/vtkMarchingSquares.cxx
index 2955408bc12fd769a3c8c790a795da2025e7fce7..1d9f7bf10be52b338d14dbcfdc945f2342b18f80 100644
--- a/Graphics/vtkMarchingSquares.cxx
+++ b/Graphics/vtkMarchingSquares.cxx
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkMarchingSquares, "1.3");
 vtkStandardNewMacro(vtkMarchingSquares);
 
 // Description:
diff --git a/Graphics/vtkMarchingSquares.h b/Graphics/vtkMarchingSquares.h
index a75c1c810a6c152cb366f3781818cc495cb73b3b..ad3baceccd112e1d7456287b204269606743d75d 100644
--- a/Graphics/vtkMarchingSquares.h
+++ b/Graphics/vtkMarchingSquares.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkMarchingSquares : public vtkPolyDataAlgorithm
 {
 public:
   static vtkMarchingSquares *New();
-  vtkTypeRevisionMacro(vtkMarchingSquares,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMarchingSquares,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMaskFields.cxx b/Graphics/vtkMaskFields.cxx
index 319b1d36ea0e9682b58137c9ce73a0b236b71bcf..00ab2d64e6d4a25cd7498d2b2d194d8c2095df69 100644
--- a/Graphics/vtkMaskFields.cxx
+++ b/Graphics/vtkMaskFields.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkMaskFields, "1.13");
 vtkStandardNewMacro(vtkMaskFields);
 
 char vtkMaskFields::FieldLocationNames[3][12] 
diff --git a/Graphics/vtkMaskFields.h b/Graphics/vtkMaskFields.h
index 6e318a4c9e2c5117a877751551e998bd03e9bf08..fa2a2f66e8a8c4e2b30125716f81b4ed2202e77c 100644
--- a/Graphics/vtkMaskFields.h
+++ b/Graphics/vtkMaskFields.h
@@ -36,7 +36,7 @@ class vtkDataSet;
 class VTK_GRAPHICS_EXPORT vtkMaskFields : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMaskFields,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkMaskFields,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMaskPoints.cxx b/Graphics/vtkMaskPoints.cxx
index 060f31c5ecc57d35ebb23b4810495ed29339ab93..89e954876e904e5d660424cb43c17d5de9cd009c 100644
--- a/Graphics/vtkMaskPoints.cxx
+++ b/Graphics/vtkMaskPoints.cxx
@@ -24,7 +24,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkMaskPoints, "1.51");
 vtkStandardNewMacro(vtkMaskPoints);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkMaskPoints.h b/Graphics/vtkMaskPoints.h
index 3c81ad9e23d9bb8d8ea84e2f64ed7114373922de..720a5f07f93714201178fdfe8cac5fad5a22be78 100644
--- a/Graphics/vtkMaskPoints.h
+++ b/Graphics/vtkMaskPoints.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkMaskPoints : public vtkPolyDataAlgorithm
 {
 public:
   static vtkMaskPoints *New();
-  vtkTypeRevisionMacro(vtkMaskPoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMaskPoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMaskPolyData.cxx b/Graphics/vtkMaskPolyData.cxx
index b0015ba69563d65304bd5ee88fdf4b959678ce13..7903670972b3eb626207d43f8dfbd743f3f80b12 100644
--- a/Graphics/vtkMaskPolyData.cxx
+++ b/Graphics/vtkMaskPolyData.cxx
@@ -21,7 +21,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkMaskPolyData, "1.46");
 vtkStandardNewMacro(vtkMaskPolyData);
 
 vtkMaskPolyData::vtkMaskPolyData()
diff --git a/Graphics/vtkMaskPolyData.h b/Graphics/vtkMaskPolyData.h
index 3e549fd7b766b9c98ce78b1a96193a0d1e8f7175..78c72d50bda1158197ee079a934afb569f50bdf8 100644
--- a/Graphics/vtkMaskPolyData.h
+++ b/Graphics/vtkMaskPolyData.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkMaskPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkMaskPolyData *New();
-  vtkTypeRevisionMacro(vtkMaskPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMaskPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMassProperties.cxx b/Graphics/vtkMassProperties.cxx
index 7354af6768fec9c69695d4da100ccfc81c9b100a..ccee0ad07bee650e67d0c223857da34356fbde8d 100644
--- a/Graphics/vtkMassProperties.cxx
+++ b/Graphics/vtkMassProperties.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformation.h"
 #include "vtkInformationVector.h"
 
-vtkCxxRevisionMacro(vtkMassProperties, "1.30");
 vtkStandardNewMacro(vtkMassProperties);
 
 #define  VTK_CUBE_ROOT(x) \
diff --git a/Graphics/vtkMassProperties.h b/Graphics/vtkMassProperties.h
index 496c2a953bd139d0bc08708eec07df66a0983bd7..1a5e829318adc48b50b2b5ed78d01906669fd3e5 100644
--- a/Graphics/vtkMassProperties.h
+++ b/Graphics/vtkMassProperties.h
@@ -42,7 +42,7 @@ public:
   // Constructs with initial values of zero.
   static vtkMassProperties *New();
 
-  vtkTypeRevisionMacro(vtkMassProperties,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMassProperties,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMatlabEngineFilter.cxx b/Graphics/vtkMatlabEngineFilter.cxx
index 1c1d45bfe655db311712c163b7d3d26c94b5b010..e77aa87d95095cea09d40f152c39b5f72e4cc147 100644
--- a/Graphics/vtkMatlabEngineFilter.cxx
+++ b/Graphics/vtkMatlabEngineFilter.cxx
@@ -46,7 +46,6 @@
 
 #define BUFFER_SIZE 32768 
 
-vtkCxxRevisionMacro(vtkMatlabEngineFilter, "1.2");
 vtkStandardNewMacro(vtkMatlabEngineFilter);
 
 class ArrNames
diff --git a/Graphics/vtkMatlabEngineFilter.h b/Graphics/vtkMatlabEngineFilter.h
index 4117612e0702c17840a68ae2b6b08f51593ebb2e..606ba61fc42fd0fe241200f66c220c80c7781383 100644
--- a/Graphics/vtkMatlabEngineFilter.h
+++ b/Graphics/vtkMatlabEngineFilter.h
@@ -49,7 +49,7 @@ public:
 
   static vtkMatlabEngineFilter *New();
 
-  vtkTypeRevisionMacro(vtkMatlabEngineFilter, vtkDataObjectAlgorithm );
+  vtkTypeMacro(vtkMatlabEngineFilter, vtkDataObjectAlgorithm );
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMatlabEngineInterface.cxx b/Graphics/vtkMatlabEngineInterface.cxx
index 509c0b8ba7788d4fe31c94acf2d96f51c7963f6f..992404583cdd7f78a397d5d72cd2d4e35d2ab87c 100644
--- a/Graphics/vtkMatlabEngineInterface.cxx
+++ b/Graphics/vtkMatlabEngineInterface.cxx
@@ -32,7 +32,6 @@
 #include <sys/stat.h>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkMatlabEngineInterface, "1.2");
 vtkStandardNewMacro(vtkMatlabEngineInterface);
 
 class vtkMatlabEngineSingletonDestroyer;
diff --git a/Graphics/vtkMatlabEngineInterface.h b/Graphics/vtkMatlabEngineInterface.h
index 4c9061f7b24b3b176b79e0da938e9bccf8722db9..fca69eadaf6591e6d23d2ce8c779dfb52e8e4e83 100644
--- a/Graphics/vtkMatlabEngineInterface.h
+++ b/Graphics/vtkMatlabEngineInterface.h
@@ -57,7 +57,7 @@ public:
 
   static vtkMatlabEngineInterface *New();
 
-  vtkTypeRevisionMacro(vtkMatlabEngineInterface, vtkObject );
+  vtkTypeMacro(vtkMatlabEngineInterface, vtkObject );
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMatlabMexAdapter.cxx b/Graphics/vtkMatlabMexAdapter.cxx
index b5c9683603a4236802a0561e314c0d63f5da5c24..b6e8bb8e28ab1f21018872e90a63a55fc8ac2834 100644
--- a/Graphics/vtkMatlabMexAdapter.cxx
+++ b/Graphics/vtkMatlabMexAdapter.cxx
@@ -62,7 +62,6 @@
 
 #define VTK_CREATE(classname, varname) vtkSmartPointer<classname> varname = vtkSmartPointer<classname>::New()
 
-vtkCxxRevisionMacro(vtkMatlabMexAdapter, "1.4");
 
 vtkStandardNewMacro(vtkMatlabMexAdapter);
 
diff --git a/Graphics/vtkMatlabMexAdapter.h b/Graphics/vtkMatlabMexAdapter.h
index df9fc7a49bf195dfa22f5813efd23bf90d63b99b..c0aa59cbc5dba4fb4de8f8fb8b6f5d9d3f8a5856 100644
--- a/Graphics/vtkMatlabMexAdapter.h
+++ b/Graphics/vtkMatlabMexAdapter.h
@@ -68,7 +68,7 @@ class VTK_GRAPHICS_EXPORT vtkMatlabMexAdapter : public vtkObject
 
 public:
 
-  vtkTypeRevisionMacro(vtkMatlabMexAdapter, vtkObject);
+  vtkTypeMacro(vtkMatlabMexAdapter, vtkObject);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Graphics/vtkMergeCells.cxx b/Graphics/vtkMergeCells.cxx
index a4eae0d208a121a77d8436b9a3a774f8527812a8..84f3deddeae70ca23c2269d3161bdd820c1eb30d 100644
--- a/Graphics/vtkMergeCells.cxx
+++ b/Graphics/vtkMergeCells.cxx
@@ -41,7 +41,6 @@
 #include <vtkstd/map>
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkMergeCells, "1.10");
 vtkStandardNewMacro(vtkMergeCells);
 
 vtkCxxSetObjectMacro(vtkMergeCells, UnstructuredGrid, vtkUnstructuredGrid);
diff --git a/Graphics/vtkMergeCells.h b/Graphics/vtkMergeCells.h
index adcdc699496fc3aa58b66463e20f988fa4104457..e3cf10f735f36ad469136180f04c25744dca1ad5 100644
--- a/Graphics/vtkMergeCells.h
+++ b/Graphics/vtkMergeCells.h
@@ -54,7 +54,7 @@ class vtkMergeCellsSTLCloak;
 class VTK_GRAPHICS_EXPORT vtkMergeCells : public vtkObject
 { 
 public:
-  vtkTypeRevisionMacro(vtkMergeCells, vtkObject);
+  vtkTypeMacro(vtkMergeCells, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkMergeCells *New();
diff --git a/Graphics/vtkMergeDataObjectFilter.cxx b/Graphics/vtkMergeDataObjectFilter.cxx
index 53f2bf8f977f3941e246a8dd30c789a06e585345..51c6ae446299506925272bd09154f42573ba6665 100644
--- a/Graphics/vtkMergeDataObjectFilter.cxx
+++ b/Graphics/vtkMergeDataObjectFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkMergeDataObjectFilter, "1.24");
 vtkStandardNewMacro(vtkMergeDataObjectFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkMergeDataObjectFilter.h b/Graphics/vtkMergeDataObjectFilter.h
index 89e8be256d4260fca1f9f1dbe333768099815293..6d52dceddc9f7c122733a4ce45e92b4f0908b950 100644
--- a/Graphics/vtkMergeDataObjectFilter.h
+++ b/Graphics/vtkMergeDataObjectFilter.h
@@ -44,7 +44,7 @@ class VTK_GRAPHICS_EXPORT vtkMergeDataObjectFilter : public vtkDataSetAlgorithm
 {
 public:
   static vtkMergeDataObjectFilter *New();
-  vtkTypeRevisionMacro(vtkMergeDataObjectFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkMergeDataObjectFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMergeFields.cxx b/Graphics/vtkMergeFields.cxx
index 6c3d9e432db79265febde7a85be2e17101c41517..70e2b5683a162cc37aca7cde570cffe21d9265e3 100644
--- a/Graphics/vtkMergeFields.cxx
+++ b/Graphics/vtkMergeFields.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkMergeFields, "1.20");
 vtkStandardNewMacro(vtkMergeFields);
 
 char vtkMergeFields::FieldLocationNames[3][12] 
diff --git a/Graphics/vtkMergeFields.h b/Graphics/vtkMergeFields.h
index 52ebb9d4f146fa1b08ea95209cd7b30d3619fb60..32847e98dcccd8d0217dc9ffa9f664917dbb7d69 100644
--- a/Graphics/vtkMergeFields.h
+++ b/Graphics/vtkMergeFields.h
@@ -50,7 +50,7 @@ class vtkFieldData;
 class VTK_GRAPHICS_EXPORT vtkMergeFields : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMergeFields,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkMergeFields,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMergeFilter.cxx b/Graphics/vtkMergeFilter.cxx
index 9728329fccf61a5534bc175434eac4d114956bc9..c5a9773719d35cbea1753f9c860a19699b1489b8 100644
--- a/Graphics/vtkMergeFilter.cxx
+++ b/Graphics/vtkMergeFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkStructuredPoints.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkMergeFilter, "1.70");
 vtkStandardNewMacro(vtkMergeFilter);
 
 class vtkFieldNode
diff --git a/Graphics/vtkMergeFilter.h b/Graphics/vtkMergeFilter.h
index 2a1f049dacb2c2af0be9c91a146219e320015fa9..481118eee8dc6a00871c18ec5756a40c68e85dfa 100644
--- a/Graphics/vtkMergeFilter.h
+++ b/Graphics/vtkMergeFilter.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkMergeFilter : public vtkDataSetAlgorithm
 {
 public:
   static vtkMergeFilter *New();
-  vtkTypeRevisionMacro(vtkMergeFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkMergeFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMeshQuality.cxx b/Graphics/vtkMeshQuality.cxx
index d58765c9d68388a615abb5a275608e24a7b00d4f..583979b0ac7033f3cadfbdb6fbf35cde7d1a3ef8 100644
--- a/Graphics/vtkMeshQuality.cxx
+++ b/Graphics/vtkMeshQuality.cxx
@@ -38,7 +38,6 @@
 
 #include "verdict.h"
 
-vtkCxxRevisionMacro(vtkMeshQuality,"1.57");
 vtkStandardNewMacro(vtkMeshQuality);
 
 typedef double (*CellQualityType)( vtkCell*  );
diff --git a/Graphics/vtkMeshQuality.h b/Graphics/vtkMeshQuality.h
index 0b05c3a78ac6f512ba2c734ce7388dee8d98acd4..5fb8b235515f494cf2e4f715a740c649824f797a 100644
--- a/Graphics/vtkMeshQuality.h
+++ b/Graphics/vtkMeshQuality.h
@@ -101,7 +101,7 @@ class VTK_GRAPHICS_EXPORT vtkMeshQuality : public vtkDataSetAlgorithm
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkMeshQuality,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkMeshQuality,vtkDataSetAlgorithm);
   static vtkMeshQuality* New();
 
   // Description:
diff --git a/Graphics/vtkModelMetadata.cxx b/Graphics/vtkModelMetadata.cxx
index 008e81020c41d7c2d07ad29608fcd5aa18c34e13..733654b2d35cd9e39a03c7c1e834720e0e999eba 100644
--- a/Graphics/vtkModelMetadata.cxx
+++ b/Graphics/vtkModelMetadata.cxx
@@ -32,7 +32,6 @@
 #include "vtkPointData.h"
 #include <time.h>
 
-vtkCxxRevisionMacro(vtkModelMetadata, "1.7");
 vtkStandardNewMacro(vtkModelMetadata);
 
 #include <vtkstd/set>
diff --git a/Graphics/vtkModelMetadata.h b/Graphics/vtkModelMetadata.h
index ed21f46a084f783cefb36ded032fd51a07454891..df643d57ed3954cd48a3164fd45aa69c58b5fb74 100644
--- a/Graphics/vtkModelMetadata.h
+++ b/Graphics/vtkModelMetadata.h
@@ -88,7 +88,7 @@ class vtkModelMetadataSTLCloak;
 class VTK_GRAPHICS_EXPORT vtkModelMetadata : public vtkObject
 { 
 public:
-  vtkTypeRevisionMacro(vtkModelMetadata, vtkObject);
+  vtkTypeMacro(vtkModelMetadata, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkModelMetadata *New();
 
diff --git a/Graphics/vtkMultiBlockDataGroupFilter.cxx b/Graphics/vtkMultiBlockDataGroupFilter.cxx
index 4762276984504b02b9dd77ebcdf4ebed1953553f..bd042ff6c4130ff9b33e2625be827d3c583d7087 100644
--- a/Graphics/vtkMultiBlockDataGroupFilter.cxx
+++ b/Graphics/vtkMultiBlockDataGroupFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkOnePieceExtentTranslator.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkMultiBlockDataGroupFilter, "1.4");
 vtkStandardNewMacro(vtkMultiBlockDataGroupFilter);
 //-----------------------------------------------------------------------------
 vtkMultiBlockDataGroupFilter::vtkMultiBlockDataGroupFilter()
diff --git a/Graphics/vtkMultiBlockDataGroupFilter.h b/Graphics/vtkMultiBlockDataGroupFilter.h
index d2551c5fc7b2fa30234789934216b21aef78720b..3461ee6bfd922f4eef53d489c8d8729724eb29d3 100644
--- a/Graphics/vtkMultiBlockDataGroupFilter.h
+++ b/Graphics/vtkMultiBlockDataGroupFilter.h
@@ -28,7 +28,7 @@
 class VTK_GRAPHICS_EXPORT vtkMultiBlockDataGroupFilter : public vtkMultiBlockDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkMultiBlockDataGroupFilter,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkMultiBlockDataGroupFilter,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMultiBlockMergeFilter.cxx b/Graphics/vtkMultiBlockMergeFilter.cxx
index 07b9eaf0c5a5dff9d54672c8ab9987445e8740e5..231b5d26d51b0357ce53cfa560309ae268b90f78 100644
--- a/Graphics/vtkMultiBlockMergeFilter.cxx
+++ b/Graphics/vtkMultiBlockMergeFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkMultiBlockMergeFilter, "1.6");
 vtkStandardNewMacro(vtkMultiBlockMergeFilter);
 //-----------------------------------------------------------------------------
 vtkMultiBlockMergeFilter::vtkMultiBlockMergeFilter()
diff --git a/Graphics/vtkMultiBlockMergeFilter.h b/Graphics/vtkMultiBlockMergeFilter.h
index c6f6d255a99fff098c5d3212413d1e91610631cf..3034486b108376b37ae1757edd88541205a8a563 100644
--- a/Graphics/vtkMultiBlockMergeFilter.h
+++ b/Graphics/vtkMultiBlockMergeFilter.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkMultiBlockMergeFilter
 : public vtkMultiBlockDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMultiBlockMergeFilter,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkMultiBlockMergeFilter,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkMultiThreshold.cxx b/Graphics/vtkMultiThreshold.cxx
index 792090cd744f8f0444742c0f2ea83880bc0f42eb..55d7d072dd483949c6f04b6111f8c41e215fdbd8 100644
--- a/Graphics/vtkMultiThreshold.cxx
+++ b/Graphics/vtkMultiThreshold.cxx
@@ -34,7 +34,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkMultiThreshold,"1.7");
 vtkStandardNewMacro(vtkMultiThreshold);
 
 // Prevent lots of error messages on the inner loop of the filter by keeping track of how many we have:
diff --git a/Graphics/vtkMultiThreshold.h b/Graphics/vtkMultiThreshold.h
index 393f830ab83eb42b54ac66862e2c87601e729e02..6f6c453eec26f9b61084d0a287522b87b0bb7933 100644
--- a/Graphics/vtkMultiThreshold.h
+++ b/Graphics/vtkMultiThreshold.h
@@ -116,7 +116,7 @@ class vtkUnstructuredGrid;
 class VTK_GRAPHICS_EXPORT vtkMultiThreshold : public vtkMultiBlockDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMultiThreshold,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkMultiThreshold,vtkMultiBlockDataSetAlgorithm);
   static vtkMultiThreshold* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
diff --git a/Graphics/vtkOBBDicer.cxx b/Graphics/vtkOBBDicer.cxx
index 09870e92d37bc11b010bb9a42383f2b3e8e9f3b5..89df3f6833dd53c003898da34bbfc5be9927be06 100644
--- a/Graphics/vtkOBBDicer.cxx
+++ b/Graphics/vtkOBBDicer.cxx
@@ -26,7 +26,6 @@
 #include "vtkPoints.h"
 #include "vtkShortArray.h"
 
-vtkCxxRevisionMacro(vtkOBBDicer, "1.22");
 vtkStandardNewMacro(vtkOBBDicer);
 
 void vtkOBBDicer::BuildTree(vtkIdList *ptIds, vtkOBBNode *OBBptr,
diff --git a/Graphics/vtkOBBDicer.h b/Graphics/vtkOBBDicer.h
index 9661bb40863065c23ec93f9a054398838895dd8a..b0def0e6f7365524a16f54a31566c6150b0b7126 100644
--- a/Graphics/vtkOBBDicer.h
+++ b/Graphics/vtkOBBDicer.h
@@ -38,7 +38,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkOBBDicer : public vtkDicer 
 {
 public:
-  vtkTypeRevisionMacro(vtkOBBDicer,vtkDicer);
+  vtkTypeMacro(vtkOBBDicer,vtkDicer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkOBBTree.cxx b/Graphics/vtkOBBTree.cxx
index 32521ad9ddf1a8d53074a1e51f23a091e61397b2..a8fbb264a86401674f044383194c3110ee426c2c 100644
--- a/Graphics/vtkOBBTree.cxx
+++ b/Graphics/vtkOBBTree.cxx
@@ -26,7 +26,6 @@
 #include "vtkTriangle.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkOBBTree, "1.66");
 vtkStandardNewMacro(vtkOBBTree);
 
 #define vtkCELLTRIANGLES(CELLPTIDS, TYPE, IDX, PTID0, PTID1, PTID2) \
diff --git a/Graphics/vtkOBBTree.h b/Graphics/vtkOBBTree.h
index 4b8b9dd600bfe7486d66f9e2ca0c88f3fc47e2b5..67e28f6af8c67cb871db4e9dd12020a0634c0a36 100644
--- a/Graphics/vtkOBBTree.h
+++ b/Graphics/vtkOBBTree.h
@@ -76,7 +76,7 @@ public:
 class VTK_GRAPHICS_EXPORT vtkOBBTree : public vtkAbstractCellLocator
 {
 public:
-  vtkTypeRevisionMacro(vtkOBBTree,vtkAbstractCellLocator);
+  vtkTypeMacro(vtkOBBTree,vtkAbstractCellLocator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkOutlineCornerFilter.cxx b/Graphics/vtkOutlineCornerFilter.cxx
index 0a901a832967f60864c82e084a0b52ed61174d4e..671f5af7a8d3d293f1aa562e5debba039d0471ee 100644
--- a/Graphics/vtkOutlineCornerFilter.cxx
+++ b/Graphics/vtkOutlineCornerFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkOutlineCornerSource.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkOutlineCornerFilter, "1.12");
 vtkStandardNewMacro(vtkOutlineCornerFilter);
 
 vtkOutlineCornerFilter::vtkOutlineCornerFilter ()
diff --git a/Graphics/vtkOutlineCornerFilter.h b/Graphics/vtkOutlineCornerFilter.h
index ae922be3f79540823748f1d3520ef39f6b63b8b1..25cc9d6284b02280eb1a5e2b9eadecb5cafdb73e 100644
--- a/Graphics/vtkOutlineCornerFilter.h
+++ b/Graphics/vtkOutlineCornerFilter.h
@@ -27,7 +27,7 @@ class vtkOutlineCornerSource;
 class VTK_GRAPHICS_EXPORT vtkOutlineCornerFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkOutlineCornerFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkOutlineCornerFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkOutlineCornerSource.cxx b/Graphics/vtkOutlineCornerSource.cxx
index abd28f3f011511d4bc5d5ce2fddb66b5917ae07f..09508345f1136a0fd3bdf73439401a958946e9d0 100644
--- a/Graphics/vtkOutlineCornerSource.cxx
+++ b/Graphics/vtkOutlineCornerSource.cxx
@@ -21,7 +21,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkOutlineCornerSource, "1.10");
 vtkStandardNewMacro(vtkOutlineCornerSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkOutlineCornerSource.h b/Graphics/vtkOutlineCornerSource.h
index cb6c5ed7780b5b4831849ba6f671f7cebd3f02cc..6aeceaf00327a16aaa5c3f633d6eff4b717d470c 100644
--- a/Graphics/vtkOutlineCornerSource.h
+++ b/Graphics/vtkOutlineCornerSource.h
@@ -25,7 +25,7 @@
 class VTK_GRAPHICS_EXPORT vtkOutlineCornerSource : public vtkOutlineSource
 {
 public:
-  vtkTypeRevisionMacro(vtkOutlineCornerSource,vtkOutlineSource);
+  vtkTypeMacro(vtkOutlineCornerSource,vtkOutlineSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkOutlineFilter.cxx b/Graphics/vtkOutlineFilter.cxx
index e861de6b43cd05e19102bfb5ff5e3f27b13f359a..1068b4dc3195bbdfa28bf53127c6757f4fe2b77b 100644
--- a/Graphics/vtkOutlineFilter.cxx
+++ b/Graphics/vtkOutlineFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkOutlineSource.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkOutlineFilter, "1.36");
 vtkStandardNewMacro(vtkOutlineFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkOutlineFilter.h b/Graphics/vtkOutlineFilter.h
index d7a24c5867ed9819cd53e437cc761aa6188f530a..3dd12fd8d15142fed9843f7a0e3af8fad0103330 100644
--- a/Graphics/vtkOutlineFilter.h
+++ b/Graphics/vtkOutlineFilter.h
@@ -29,7 +29,7 @@ class VTK_GRAPHICS_EXPORT vtkOutlineFilter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkOutlineFilter *New();
-  vtkTypeRevisionMacro(vtkOutlineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkOutlineFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkOutlineSource.cxx b/Graphics/vtkOutlineSource.cxx
index 2b411d71145b22d39eff404b92b04b19cda6ec83..a34b8a5064881aef18b33400ce9ee7af03884409 100644
--- a/Graphics/vtkOutlineSource.cxx
+++ b/Graphics/vtkOutlineSource.cxx
@@ -21,7 +21,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkOutlineSource, "1.36");
 vtkStandardNewMacro(vtkOutlineSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkOutlineSource.h b/Graphics/vtkOutlineSource.h
index d0021fe3b940d4ea8e26c77218876b589d90bd77..c4ecb579c40d63968adc6ed4fe18a957dc20882a 100644
--- a/Graphics/vtkOutlineSource.h
+++ b/Graphics/vtkOutlineSource.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkOutlineSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkOutlineSource *New();
-  vtkTypeRevisionMacro(vtkOutlineSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkOutlineSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkParametricFunctionSource.cxx b/Graphics/vtkParametricFunctionSource.cxx
index c15f6963c0aa201b0c9a960a586073420509f4fc..1afc711e208f54c66a82695a30e3bda163b66da4 100644
--- a/Graphics/vtkParametricFunctionSource.cxx
+++ b/Graphics/vtkParametricFunctionSource.cxx
@@ -29,7 +29,6 @@
 #include <math.h>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkParametricFunctionSource, "1.16");
 vtkStandardNewMacro(vtkParametricFunctionSource);
 vtkCxxSetObjectMacro(vtkParametricFunctionSource,ParametricFunction,vtkParametricFunction);
 
diff --git a/Graphics/vtkParametricFunctionSource.h b/Graphics/vtkParametricFunctionSource.h
index 6409cc5459fa37a9e5a6154114ef008948f2c292..2a6f3990b925a35ec7011443cc71cefdc7822273 100644
--- a/Graphics/vtkParametricFunctionSource.h
+++ b/Graphics/vtkParametricFunctionSource.h
@@ -48,7 +48,7 @@ class vtkParametricFunction;
 class VTK_GRAPHICS_EXPORT vtkParametricFunctionSource : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkParametricFunctionSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkParametricFunctionSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPlaneSource.cxx b/Graphics/vtkPlaneSource.cxx
index d405bd24b3cd582a5b41f2939508a18f498660a4..61899ff70c59ae59ee301427aef2ba8f02c4a484 100644
--- a/Graphics/vtkPlaneSource.cxx
+++ b/Graphics/vtkPlaneSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkPlaneSource, "1.65");
 vtkStandardNewMacro(vtkPlaneSource);
 
 // Construct plane perpendicular to z-axis, resolution 1x1, width and height
diff --git a/Graphics/vtkPlaneSource.h b/Graphics/vtkPlaneSource.h
index 55d93e35b9cb365c963c8a14d01445d3611be3c0..5c3307a73fa56930b5e4011c3f6e315522d66e98 100644
--- a/Graphics/vtkPlaneSource.h
+++ b/Graphics/vtkPlaneSource.h
@@ -51,7 +51,7 @@ class VTK_GRAPHICS_EXPORT vtkPlaneSource : public vtkPolyDataAlgorithm
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkPlaneSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPlaneSource,vtkPolyDataAlgorithm);
 
   // Description:
   // Construct plane perpendicular to z-axis, resolution 1x1, width
diff --git a/Graphics/vtkPlatonicSolidSource.cxx b/Graphics/vtkPlatonicSolidSource.cxx
index c4c7dbf23010ff6d6b5494e757bf27c921eab66c..20b8669ab3076ee676de162a67842e5e10423ed7 100644
--- a/Graphics/vtkPlatonicSolidSource.cxx
+++ b/Graphics/vtkPlatonicSolidSource.cxx
@@ -22,7 +22,6 @@
 #include "vtkCellData.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkPlatonicSolidSource, "1.6");
 vtkStandardNewMacro(vtkPlatonicSolidSource);
 
 // The geometry and topology of each solid. Solids are centered at
diff --git a/Graphics/vtkPlatonicSolidSource.h b/Graphics/vtkPlatonicSolidSource.h
index 3a84bf177bd47aab9ff53a3f3bd22a03f4eb132e..6710d4a46d22761cebf87ce62b9ce9819d23275e 100644
--- a/Graphics/vtkPlatonicSolidSource.h
+++ b/Graphics/vtkPlatonicSolidSource.h
@@ -35,7 +35,7 @@ class VTK_GRAPHICS_EXPORT vtkPlatonicSolidSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkPlatonicSolidSource *New();
-  vtkTypeRevisionMacro(vtkPlatonicSolidSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPlatonicSolidSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPointDataToCellData.cxx b/Graphics/vtkPointDataToCellData.cxx
index 65c6176de846914f10c5248eaecd5219fbd03513..68dbf2bb5072b37294786ec843c6432352614c64 100644
--- a/Graphics/vtkPointDataToCellData.cxx
+++ b/Graphics/vtkPointDataToCellData.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkPointDataToCellData, "1.35");
 vtkStandardNewMacro(vtkPointDataToCellData);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkPointDataToCellData.h b/Graphics/vtkPointDataToCellData.h
index 44adbe355b5d65f4196ee6af629ac56630c53fc9..0efdf9e26380436f9e03f132441c7d4cc7607db7 100644
--- a/Graphics/vtkPointDataToCellData.h
+++ b/Graphics/vtkPointDataToCellData.h
@@ -39,7 +39,7 @@ class VTK_GRAPHICS_EXPORT vtkPointDataToCellData : public vtkDataSetAlgorithm
 {
 public:
   static vtkPointDataToCellData *New();
-  vtkTypeRevisionMacro(vtkPointDataToCellData,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkPointDataToCellData,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPointSource.cxx b/Graphics/vtkPointSource.cxx
index 767c1394cc66003f9f648ee04b0a7e41cfc6bbc9..2480ed01fefe1bb882e151b43505db0572311ce0 100644
--- a/Graphics/vtkPointSource.cxx
+++ b/Graphics/vtkPointSource.cxx
@@ -25,7 +25,6 @@
 #include <float.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkPointSource, "1.45");
 vtkStandardNewMacro(vtkPointSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkPointSource.h b/Graphics/vtkPointSource.h
index 80359cfb60a6a19a8c5686d6d1d580de527601a8..d28d6954697bf9064c6bb7029f9cc65bcf4a2fe7 100644
--- a/Graphics/vtkPointSource.h
+++ b/Graphics/vtkPointSource.h
@@ -32,7 +32,7 @@ class VTK_GRAPHICS_EXPORT vtkPointSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkPointSource *New();
-  vtkTypeRevisionMacro(vtkPointSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPointSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkPolyDataConnectivityFilter.cxx b/Graphics/vtkPolyDataConnectivityFilter.cxx
index 55c8db0502fcae852e2b472d6eebf78b5879c035..071cb8e27fc2534cce8dfba6c4220b2df1498a3b 100644
--- a/Graphics/vtkPolyDataConnectivityFilter.cxx
+++ b/Graphics/vtkPolyDataConnectivityFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPolyDataConnectivityFilter, "1.43");
 vtkStandardNewMacro(vtkPolyDataConnectivityFilter);
 
 // Construct with default extraction mode to extract largest regions.
diff --git a/Graphics/vtkPolyDataConnectivityFilter.h b/Graphics/vtkPolyDataConnectivityFilter.h
index f9283411d4261f4566f3aacbdf5797c49965e366..8f67fc1e2404dd9e4b11854205d5105891dfbca8 100644
--- a/Graphics/vtkPolyDataConnectivityFilter.h
+++ b/Graphics/vtkPolyDataConnectivityFilter.h
@@ -57,7 +57,7 @@ class vtkIdTypeArray;
 class VTK_GRAPHICS_EXPORT vtkPolyDataConnectivityFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataConnectivityFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPolyDataConnectivityFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPolyDataNormals.cxx b/Graphics/vtkPolyDataNormals.cxx
index 8554f5cdf66642a2d9e5ff9ec13916aae98420ee..d586543f85f20df4130c0ff3360cca18ee9e4100 100644
--- a/Graphics/vtkPolyDataNormals.cxx
+++ b/Graphics/vtkPolyDataNormals.cxx
@@ -27,7 +27,6 @@
 #include "vtkTriangleStrip.h"
 #include "vtkPriorityQueue.h"
 
-vtkCxxRevisionMacro(vtkPolyDataNormals, "1.71");
 vtkStandardNewMacro(vtkPolyDataNormals);
 
 // Construct with feature angle=30, splitting and consistency turned on, 
diff --git a/Graphics/vtkPolyDataNormals.h b/Graphics/vtkPolyDataNormals.h
index 7cf6858f924fa5ac372522e13239ebe9a9948aa8..00a8c1344e268c34911349b3e2d88450cc9aef93 100644
--- a/Graphics/vtkPolyDataNormals.h
+++ b/Graphics/vtkPolyDataNormals.h
@@ -44,7 +44,7 @@ class vtkPolyData;
 class VTK_GRAPHICS_EXPORT vtkPolyDataNormals : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataNormals,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPolyDataNormals,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPolyDataPointSampler.cxx b/Graphics/vtkPolyDataPointSampler.cxx
index cf1e9f178f0876a867fe09ecb1e75e27c8fd7bb0..d7f615d12274e9978afe72e29d3e8b844aa4d998 100644
--- a/Graphics/vtkPolyDataPointSampler.cxx
+++ b/Graphics/vtkPolyDataPointSampler.cxx
@@ -22,7 +22,6 @@
 #include "vtkEdgeTable.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkPolyDataPointSampler, "1.1");
 vtkStandardNewMacro(vtkPolyDataPointSampler);
 
 //------------------------------------------------------------------------
diff --git a/Graphics/vtkPolyDataPointSampler.h b/Graphics/vtkPolyDataPointSampler.h
index d1b6fcae8fd388cd75344342d7984531229c8573..383e0c2331e663aeed58f7c044ce3f290ac3cbd8 100644
--- a/Graphics/vtkPolyDataPointSampler.h
+++ b/Graphics/vtkPolyDataPointSampler.h
@@ -49,7 +49,7 @@ public:
 
   // Description:
   // Standard macros for type information and printing.
-  vtkTypeRevisionMacro(vtkPolyDataPointSampler,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPolyDataPointSampler,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkPolyDataStreamer.cxx b/Graphics/vtkPolyDataStreamer.cxx
index a5c003e93fa78887e7c1952d6ad5c66df0d4cd5c..740f80b3286942b33e91663440600d37816efe01 100644
--- a/Graphics/vtkPolyDataStreamer.cxx
+++ b/Graphics/vtkPolyDataStreamer.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPolyDataStreamer, "1.20");
 vtkStandardNewMacro(vtkPolyDataStreamer);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkPolyDataStreamer.h b/Graphics/vtkPolyDataStreamer.h
index e109513af5f36ba1a65402e0111087b36ae73c96..578dce6dd0ffc48ebc20f789e0eab2f1f4236006 100644
--- a/Graphics/vtkPolyDataStreamer.h
+++ b/Graphics/vtkPolyDataStreamer.h
@@ -37,7 +37,7 @@ class VTK_GRAPHICS_EXPORT vtkPolyDataStreamer : public vtkPolyDataAlgorithm
 public:
   static vtkPolyDataStreamer *New();
 
-  vtkTypeRevisionMacro(vtkPolyDataStreamer,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPolyDataStreamer,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkProbeFilter.cxx b/Graphics/vtkProbeFilter.cxx
index 8f656dfa803c27515140d33bfb7bc270271e2320..bf7f54c8ee4adc9bc524dbd7527b75ead408ffb7 100644
--- a/Graphics/vtkProbeFilter.cxx
+++ b/Graphics/vtkProbeFilter.cxx
@@ -27,7 +27,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkProbeFilter, "1.98");
 vtkStandardNewMacro(vtkProbeFilter);
 
 class vtkProbeFilter::vtkVectorOfArrays : 
diff --git a/Graphics/vtkProbeFilter.h b/Graphics/vtkProbeFilter.h
index 92eac864a119127426ab85cda580dadd4f8cff5f..2c6a892d95297f288bf5ff677c85d0a32e5d0314 100644
--- a/Graphics/vtkProbeFilter.h
+++ b/Graphics/vtkProbeFilter.h
@@ -46,7 +46,7 @@ class VTK_GRAPHICS_EXPORT vtkProbeFilter : public vtkDataSetAlgorithm
 {
 public:
   static vtkProbeFilter *New();
-  vtkTypeRevisionMacro(vtkProbeFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkProbeFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkProbeSelectedLocations.cxx b/Graphics/vtkProbeSelectedLocations.cxx
index a59b79605aa594a11b7c2fb0b38fb46a7cb764ac..f9f3e94ed7210af64c2f2314ab4eec95bf354cf2 100644
--- a/Graphics/vtkProbeSelectedLocations.cxx
+++ b/Graphics/vtkProbeSelectedLocations.cxx
@@ -26,7 +26,6 @@
 #include "vtkUnstructuredGrid.h"
 
 vtkStandardNewMacro(vtkProbeSelectedLocations);
-vtkCxxRevisionMacro(vtkProbeSelectedLocations, "1.2");
 //----------------------------------------------------------------------------
 vtkProbeSelectedLocations::vtkProbeSelectedLocations()
 {
diff --git a/Graphics/vtkProbeSelectedLocations.h b/Graphics/vtkProbeSelectedLocations.h
index a7c21669e40b7813b82d35a64105bf0023cb88f2..d5717edb8cf37d01106add3cf24187c7def6251c 100644
--- a/Graphics/vtkProbeSelectedLocations.h
+++ b/Graphics/vtkProbeSelectedLocations.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkProbeSelectedLocations : public vtkExtractSelection
 {
 public:
   static vtkProbeSelectedLocations* New();
-  vtkTypeRevisionMacro(vtkProbeSelectedLocations, vtkExtractSelectionBase);
+  vtkTypeMacro(vtkProbeSelectedLocations, vtkExtractSelectionBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Graphics/vtkProgrammableAttributeDataFilter.cxx b/Graphics/vtkProgrammableAttributeDataFilter.cxx
index ecf43373f20a5da8280a86ae1001613d26a643c2..86d4d9a81599b46fba2fae326aec334a2a83345b 100644
--- a/Graphics/vtkProgrammableAttributeDataFilter.cxx
+++ b/Graphics/vtkProgrammableAttributeDataFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkProgrammableAttributeDataFilter, "1.23");
 vtkStandardNewMacro(vtkProgrammableAttributeDataFilter);
 
 vtkProgrammableAttributeDataFilter::vtkProgrammableAttributeDataFilter()
diff --git a/Graphics/vtkProgrammableAttributeDataFilter.h b/Graphics/vtkProgrammableAttributeDataFilter.h
index 8951c6a2b9982a83f8a83b12cdcc530430a115a3..f6606966db23aa35290c50c48279a94a218f6f7b 100644
--- a/Graphics/vtkProgrammableAttributeDataFilter.h
+++ b/Graphics/vtkProgrammableAttributeDataFilter.h
@@ -79,7 +79,7 @@ class VTK_GRAPHICS_EXPORT vtkProgrammableAttributeDataFilter : public vtkDataSet
 {
 public:
   static vtkProgrammableAttributeDataFilter *New();
-  vtkTypeRevisionMacro(vtkProgrammableAttributeDataFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkProgrammableAttributeDataFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkProgrammableDataObjectSource.cxx b/Graphics/vtkProgrammableDataObjectSource.cxx
index f15d0588b081cc2a898afb5249919255ce5bd325..3e8d97f35c93e0ef34f2bc725cc553bffa79d88f 100644
--- a/Graphics/vtkProgrammableDataObjectSource.cxx
+++ b/Graphics/vtkProgrammableDataObjectSource.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkProgrammableDataObjectSource, "1.17");
 vtkStandardNewMacro(vtkProgrammableDataObjectSource);
 
 // Construct programmable filter with empty execute method.
diff --git a/Graphics/vtkProgrammableDataObjectSource.h b/Graphics/vtkProgrammableDataObjectSource.h
index 9b26e29c9a47f5d6498f27c0afdfb6f72e002414..719a33285ce70e3bb68561ec55900fbbdc83d607 100644
--- a/Graphics/vtkProgrammableDataObjectSource.h
+++ b/Graphics/vtkProgrammableDataObjectSource.h
@@ -39,7 +39,7 @@ class VTK_GRAPHICS_EXPORT vtkProgrammableDataObjectSource : public vtkDataObject
 {
 public:
   static vtkProgrammableDataObjectSource *New();
-  vtkTypeRevisionMacro(vtkProgrammableDataObjectSource,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkProgrammableDataObjectSource,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkProgrammableFilter.cxx b/Graphics/vtkProgrammableFilter.cxx
index f3b281b9e3f253a0fcf8368778259f825da06824..afa89e2b2665c2def59e777b5e4752ccb4d6cb84 100644
--- a/Graphics/vtkProgrammableFilter.cxx
+++ b/Graphics/vtkProgrammableFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkProgrammableFilter, "1.28");
 vtkStandardNewMacro(vtkProgrammableFilter);
 
 // Construct programmable filter with empty execute method.
diff --git a/Graphics/vtkProgrammableFilter.h b/Graphics/vtkProgrammableFilter.h
index 40fe26593ed6b1727d7d86688b6d31ca75291337..d23c96a62d8532acf3d0a95a49e0c7cc4eac5675 100644
--- a/Graphics/vtkProgrammableFilter.h
+++ b/Graphics/vtkProgrammableFilter.h
@@ -46,7 +46,7 @@ class VTK_GRAPHICS_EXPORT vtkProgrammableFilter : public vtkPassInputTypeAlgorit
 {
 public:
   static vtkProgrammableFilter *New();
-  vtkTypeRevisionMacro(vtkProgrammableFilter,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkProgrammableFilter,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkProgrammableGlyphFilter.cxx b/Graphics/vtkProgrammableGlyphFilter.cxx
index 8db23ccd598133aa82f564a52852a7326cc766a9..92004a27fde655bb7931aa32640d2c56f8572e0c 100644
--- a/Graphics/vtkProgrammableGlyphFilter.cxx
+++ b/Graphics/vtkProgrammableGlyphFilter.cxx
@@ -28,7 +28,6 @@
 #include "vtkPolyData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkProgrammableGlyphFilter, "1.34");
 vtkStandardNewMacro(vtkProgrammableGlyphFilter);
 
 // Construct object with scaling on, scaling mode is by scalar value, 
diff --git a/Graphics/vtkProgrammableGlyphFilter.h b/Graphics/vtkProgrammableGlyphFilter.h
index fcd890ff6673b56af6067841257e9e2bd192065c..40f8ceeaf05ac6ff2bd49a3bd76bb003d16cb816 100644
--- a/Graphics/vtkProgrammableGlyphFilter.h
+++ b/Graphics/vtkProgrammableGlyphFilter.h
@@ -67,7 +67,7 @@ class vtkPointData;
 class VTK_GRAPHICS_EXPORT vtkProgrammableGlyphFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkProgrammableGlyphFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkProgrammableGlyphFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkProgrammableSource.cxx b/Graphics/vtkProgrammableSource.cxx
index ffcc16bde530cfd66e2ce5dc39e38420660590fa..4a3d79f0b080336b7a7b14f3cb738e7029012b9e 100644
--- a/Graphics/vtkProgrammableSource.cxx
+++ b/Graphics/vtkProgrammableSource.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkProgrammableSource, "1.26");
 vtkStandardNewMacro(vtkProgrammableSource);
 
 // Construct programmable filter with empty execute method.
diff --git a/Graphics/vtkProgrammableSource.h b/Graphics/vtkProgrammableSource.h
index d4fef167016e55c9af3cf63e437e665d81d224fd..49e929360da0003f6c179abf1e54406f449e3e72 100644
--- a/Graphics/vtkProgrammableSource.h
+++ b/Graphics/vtkProgrammableSource.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkProgrammableSource : public vtkDataSetAlgorithm
 {
 public:
   static vtkProgrammableSource *New();
-  vtkTypeRevisionMacro(vtkProgrammableSource,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkProgrammableSource,vtkDataSetAlgorithm);
 
   // Description:
   // Specify the function to use to generate the source data. Note
diff --git a/Graphics/vtkProjectedTexture.cxx b/Graphics/vtkProjectedTexture.cxx
index 1ee88dfb35f40289a42b6f006ab2201216b5ccb1..dd300d690a4e8ea790ef45475502b3375dd39b00 100644
--- a/Graphics/vtkProjectedTexture.cxx
+++ b/Graphics/vtkProjectedTexture.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkProjectedTexture, "1.31");
 vtkStandardNewMacro(vtkProjectedTexture);
 
 // Description:
diff --git a/Graphics/vtkProjectedTexture.h b/Graphics/vtkProjectedTexture.h
index 32df616b92e9be21f9cdc863f237cc5f862cd1af..9e306b1e9eeb582a45d2b6569c4d5934ccd8ccc0 100644
--- a/Graphics/vtkProjectedTexture.h
+++ b/Graphics/vtkProjectedTexture.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkProjectedTexture : public vtkDataSetAlgorithm
 {
 public:
   static vtkProjectedTexture *New();
-  vtkTypeRevisionMacro(vtkProjectedTexture,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkProjectedTexture,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkQuadraturePointInterpolator.cxx b/Graphics/vtkQuadraturePointInterpolator.cxx
index b5328b3926a02492958616e9a9f95ddd297897ca..ed5c281694601b87d0b5e0bb333cd8dfcdfa9315 100644
--- a/Graphics/vtkQuadraturePointInterpolator.cxx
+++ b/Graphics/vtkQuadraturePointInterpolator.cxx
@@ -39,7 +39,6 @@ using vtksys_ios::ostringstream;
 
 #include "vtkQuadraturePointsUtilities.hxx"
 
-vtkCxxRevisionMacro(vtkQuadraturePointInterpolator, "1.10");
 vtkStandardNewMacro(vtkQuadraturePointInterpolator);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkQuadraturePointInterpolator.h b/Graphics/vtkQuadraturePointInterpolator.h
index 3e89cc6c45c27a623daffe4a1a4c24b20233a22f..5bd0690acc9ae0181cec0ca0eebddcee87c07cdb 100644
--- a/Graphics/vtkQuadraturePointInterpolator.h
+++ b/Graphics/vtkQuadraturePointInterpolator.h
@@ -39,7 +39,7 @@ class VTK_GRAPHICS_EXPORT vtkQuadraturePointInterpolator : public vtkDataSetAlgo
 {
 public:
   static vtkQuadraturePointInterpolator *New();
-  vtkTypeRevisionMacro(vtkQuadraturePointInterpolator,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkQuadraturePointInterpolator,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Graphics/vtkQuadraturePointsGenerator.cxx b/Graphics/vtkQuadraturePointsGenerator.cxx
index 87db7f76214f3f5c42d47771c48387b9c8c0b197..2701a7e344a68ca91fc70755c1af69bcdee49d25 100644
--- a/Graphics/vtkQuadraturePointsGenerator.cxx
+++ b/Graphics/vtkQuadraturePointsGenerator.cxx
@@ -42,7 +42,6 @@ using vtksys_ios::ostringstream;
 
 
 
-vtkCxxRevisionMacro(vtkQuadraturePointsGenerator, "1.16");
 vtkStandardNewMacro(vtkQuadraturePointsGenerator);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkQuadraturePointsGenerator.h b/Graphics/vtkQuadraturePointsGenerator.h
index f884595f2fbf8b65891536818258ebf507df9747..ad652015801d0cfcf8f7975652fda9f2a1c0a8a3 100644
--- a/Graphics/vtkQuadraturePointsGenerator.h
+++ b/Graphics/vtkQuadraturePointsGenerator.h
@@ -39,7 +39,7 @@ class vtkInformationVector;
 class VTK_GRAPHICS_EXPORT vtkQuadraturePointsGenerator : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkQuadraturePointsGenerator,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkQuadraturePointsGenerator,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkQuadraturePointsGenerator *New();
 
diff --git a/Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx b/Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx
index da7a5f0ac433058bb47d07bc867c547069f142b7..82a8d5b5b3122d313882a78efdfc44ab9a8f5ee7 100644
--- a/Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx
+++ b/Graphics/vtkQuadratureSchemeDictionaryGenerator.cxx
@@ -131,7 +131,6 @@ double W_QE_42_A[] = { 1.56250000000000e-01, -9.37500000000000e-02,
 }
 ;
 
-vtkCxxRevisionMacro(vtkQuadratureSchemeDictionaryGenerator, "1.7");
 vtkStandardNewMacro(vtkQuadratureSchemeDictionaryGenerator);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkQuadratureSchemeDictionaryGenerator.h b/Graphics/vtkQuadratureSchemeDictionaryGenerator.h
index 6943a9f295b7a16daeffecf3c747d6ef9b325825..dfd22dbd467d778a283a9aa0d18535d251041e00 100644
--- a/Graphics/vtkQuadratureSchemeDictionaryGenerator.h
+++ b/Graphics/vtkQuadratureSchemeDictionaryGenerator.h
@@ -38,7 +38,7 @@ class vtkInformationVector;
 class VTK_GRAPHICS_EXPORT vtkQuadratureSchemeDictionaryGenerator : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkQuadratureSchemeDictionaryGenerator,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkQuadratureSchemeDictionaryGenerator,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkQuadratureSchemeDictionaryGenerator *New();
 
diff --git a/Graphics/vtkQuadricClustering.cxx b/Graphics/vtkQuadricClustering.cxx
index e78bbb719ef00d9eea60a90a4145ea59c99454dc..8b9f0b69744c464cffd6bbcf8dc54ec0d982a4e2 100644
--- a/Graphics/vtkQuadricClustering.cxx
+++ b/Graphics/vtkQuadricClustering.cxx
@@ -28,7 +28,6 @@
 #include "vtkTriangle.h"
 #include <vtksys/hash_set.hxx> // keep track of inserted triangles
 
-vtkCxxRevisionMacro(vtkQuadricClustering, "1.90");
 vtkStandardNewMacro(vtkQuadricClustering);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkQuadricClustering.h b/Graphics/vtkQuadricClustering.h
index dc33d7fb1bb4d2af8102585d9d4d86e9e1e96f1e..c3431687cd093138fdbb10202bfa1cd949fa0e30 100644
--- a/Graphics/vtkQuadricClustering.h
+++ b/Graphics/vtkQuadricClustering.h
@@ -93,7 +93,7 @@ class VTK_GRAPHICS_EXPORT vtkQuadricClustering : public vtkPolyDataAlgorithm
 public:
   // Description:
   // Standard instantition, type and print methods.
-  vtkTypeRevisionMacro(vtkQuadricClustering, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkQuadricClustering, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkQuadricClustering *New();
 
diff --git a/Graphics/vtkQuadricDecimation.cxx b/Graphics/vtkQuadricDecimation.cxx
index 67a436c59065c7ead97466bb144e497d78d602aa..5b4fca23f91984ff2bad0252b8d409a73db82341 100644
--- a/Graphics/vtkQuadricDecimation.cxx
+++ b/Graphics/vtkQuadricDecimation.cxx
@@ -55,7 +55,6 @@
 #include "vtkPriorityQueue.h"
 #include "vtkTriangle.h"
 
-vtkCxxRevisionMacro(vtkQuadricDecimation, "1.41");
 vtkStandardNewMacro(vtkQuadricDecimation);
 
 
diff --git a/Graphics/vtkQuadricDecimation.h b/Graphics/vtkQuadricDecimation.h
index cb507afdf24f537aea615335a4fca649bca77536..df8d8b7974f23463ce86633b0f3e464666cb335f 100644
--- a/Graphics/vtkQuadricDecimation.h
+++ b/Graphics/vtkQuadricDecimation.h
@@ -64,7 +64,7 @@ class vtkDoubleArray;
 class VTK_GRAPHICS_EXPORT vtkQuadricDecimation : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkQuadricDecimation, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkQuadricDecimation, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkQuadricDecimation *New();
 
diff --git a/Graphics/vtkQuantizePolyDataPoints.cxx b/Graphics/vtkQuantizePolyDataPoints.cxx
index f5c9030842e1a386030d5ac9d0b362dba7b76adf..038cb7cc3c96a280f8413404875a1c2651c6b45b 100644
--- a/Graphics/vtkQuantizePolyDataPoints.cxx
+++ b/Graphics/vtkQuantizePolyDataPoints.cxx
@@ -16,7 +16,6 @@
 #include "vtkMergePoints.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkQuantizePolyDataPoints, "1.9");
 vtkStandardNewMacro(vtkQuantizePolyDataPoints);
 
 //--------------------------------------------------------------------------
diff --git a/Graphics/vtkQuantizePolyDataPoints.h b/Graphics/vtkQuantizePolyDataPoints.h
index a3b7d3a1ca9261f10d5abf4893d9f10245fa5bef..f114701b3329cad26a24d94f16ae06804e4489e2 100644
--- a/Graphics/vtkQuantizePolyDataPoints.h
+++ b/Graphics/vtkQuantizePolyDataPoints.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkQuantizePolyDataPoints : public vtkCleanPolyData
 {
 public:
   static vtkQuantizePolyDataPoints *New();
-  vtkTypeRevisionMacro(vtkQuantizePolyDataPoints,vtkCleanPolyData);
+  vtkTypeMacro(vtkQuantizePolyDataPoints,vtkCleanPolyData);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRAdapter.cxx b/Graphics/vtkRAdapter.cxx
index e8dda5fda8b5a9e7eb6d68d79f5e2b2f0f6abbb7..f023dc0f9cdd80cb8c1ae6eb2445bd0127500847 100644
--- a/Graphics/vtkRAdapter.cxx
+++ b/Graphics/vtkRAdapter.cxx
@@ -51,7 +51,6 @@
 #include "R_ext/Parse.h"
 #include "R_ext/Rdynload.h"
 
-vtkCxxRevisionMacro(vtkRAdapter, "1.9");
 
 vtkStandardNewMacro(vtkRAdapter);
 
diff --git a/Graphics/vtkRAdapter.h b/Graphics/vtkRAdapter.h
index a973f103176f26aa09a57fc19addfdecd1190698..83a2a833c18d8d8ce36d1f4e77e5cf12b5d2c217 100644
--- a/Graphics/vtkRAdapter.h
+++ b/Graphics/vtkRAdapter.h
@@ -63,7 +63,7 @@ class VTK_GRAPHICS_EXPORT vtkRAdapter : public vtkObject
 
 public:
 
-  vtkTypeRevisionMacro(vtkRAdapter, vtkObject);
+  vtkTypeMacro(vtkRAdapter, vtkObject);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Graphics/vtkRCalculatorFilter.cxx b/Graphics/vtkRCalculatorFilter.cxx
index 312b1611df63c1a81012e7ba1644621b79dd0d76..da9377af741b2545ce385093b6b0605289040eac 100644
--- a/Graphics/vtkRCalculatorFilter.cxx
+++ b/Graphics/vtkRCalculatorFilter.cxx
@@ -47,7 +47,6 @@
 
 #define BUFFER_SIZE 32768 
 
-vtkCxxRevisionMacro(vtkRCalculatorFilter, "1.3");
 vtkStandardNewMacro(vtkRCalculatorFilter);
 
 class ArrNames
diff --git a/Graphics/vtkRCalculatorFilter.h b/Graphics/vtkRCalculatorFilter.h
index 5a1f7e08c1c5f2def2e04c5a3c5e55bf627be6b5..08f43d42b724a608cc37fdba1268875dab7ceba8 100644
--- a/Graphics/vtkRCalculatorFilter.h
+++ b/Graphics/vtkRCalculatorFilter.h
@@ -50,7 +50,7 @@ public:
   
   static vtkRCalculatorFilter *New();
 
-  vtkTypeRevisionMacro(vtkRCalculatorFilter, vtkDataObjectAlgorithm );
+  vtkTypeMacro(vtkRCalculatorFilter, vtkDataObjectAlgorithm );
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRInterface.cxx b/Graphics/vtkRInterface.cxx
index 534c206cda24b5ec58f0b62fa00fe80c47312e85..2bd5eabc3d780debaa4d425ba6f03d3ec41a3d7b 100644
--- a/Graphics/vtkRInterface.cxx
+++ b/Graphics/vtkRInterface.cxx
@@ -32,7 +32,6 @@
 #include "vtkDataArray.h"
 #include "vtkRAdapter.h"
 
-vtkCxxRevisionMacro(vtkRInterface, "1.7");
 vtkStandardNewMacro(vtkRInterface);
 
 #include "R.h"
diff --git a/Graphics/vtkRInterface.h b/Graphics/vtkRInterface.h
index 077ca8a12d19886bb6c22418995de7d8737f66dc..e98ce921b5a16c5299fdb8cccbb29793fcd8989b 100644
--- a/Graphics/vtkRInterface.h
+++ b/Graphics/vtkRInterface.h
@@ -52,7 +52,7 @@ class VTK_GRAPHICS_EXPORT vtkRInterface : public vtkObject
 public:
 
   static vtkRInterface* New();
-  vtkTypeRevisionMacro(vtkRInterface,vtkObject);
+  vtkTypeMacro(vtkRInterface,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRRandomTableSource.cxx b/Graphics/vtkRRandomTableSource.cxx
index ca2632113bfc61cd82c26e71da932d71c6ed758d..3fd09c848fe513ceeb6fb49001b94c48c9d911b7 100644
--- a/Graphics/vtkRRandomTableSource.cxx
+++ b/Graphics/vtkRRandomTableSource.cxx
@@ -37,7 +37,6 @@
 #include "R.h"
 #include "Rmath.h"
 
-vtkCxxRevisionMacro(vtkRRandomTableSource, "1.3");
 vtkStandardNewMacro(vtkRRandomTableSource);
 
 class ColumnStatsInfo
diff --git a/Graphics/vtkRRandomTableSource.h b/Graphics/vtkRRandomTableSource.h
index 462cdbbc5a84d71f75f16a3cd8330e26e796b4c5..00ce2b4a13e0f9f060f456e44aa3b19b185e8cca 100644
--- a/Graphics/vtkRRandomTableSource.h
+++ b/Graphics/vtkRRandomTableSource.h
@@ -59,7 +59,7 @@ class VTK_GRAPHICS_EXPORT vtkRRandomTableSource : public vtkTableAlgorithm
 public:
 
   static vtkRRandomTableSource* New();
-  vtkTypeRevisionMacro(vtkRRandomTableSource,vtkTableAlgorithm);
+  vtkTypeMacro(vtkRRandomTableSource,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkRandomAttributeGenerator.cxx b/Graphics/vtkRandomAttributeGenerator.cxx
index a1e509efc7dc85493aba4e262a97f348b3bcec92..f7517eae7f9f401de1db7147c99121ef9b965533 100644
--- a/Graphics/vtkRandomAttributeGenerator.cxx
+++ b/Graphics/vtkRandomAttributeGenerator.cxx
@@ -36,7 +36,6 @@
 #include "vtkDoubleArray.h"
 #include "vtkIdTypeArray.h"
 
-vtkCxxRevisionMacro(vtkRandomAttributeGenerator, "1.3");
 vtkStandardNewMacro(vtkRandomAttributeGenerator);
 
 // ----------------------------------------------------------------------------
diff --git a/Graphics/vtkRandomAttributeGenerator.h b/Graphics/vtkRandomAttributeGenerator.h
index 59b412870970b25abef76af8e849047470f8a6bb..2456bd6fe4be37b3391c64b079a77e5e93e51420 100644
--- a/Graphics/vtkRandomAttributeGenerator.h
+++ b/Graphics/vtkRandomAttributeGenerator.h
@@ -51,7 +51,7 @@ public:
   // Create instance with minimum speed 0.0, maximum speed 1.0.
   static vtkRandomAttributeGenerator *New();
 
-  vtkTypeRevisionMacro(vtkRandomAttributeGenerator,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkRandomAttributeGenerator,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRearrangeFields.cxx b/Graphics/vtkRearrangeFields.cxx
index 7a8bbb7d931149886c25a6682738b937e9c32a05..772a01d4d61716cdf8b21fc37c5b7181b4461e1a 100644
--- a/Graphics/vtkRearrangeFields.cxx
+++ b/Graphics/vtkRearrangeFields.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkRearrangeFields, "1.21");
 vtkStandardNewMacro(vtkRearrangeFields);
 
 typedef vtkRearrangeFields::Operation Operation;
diff --git a/Graphics/vtkRearrangeFields.h b/Graphics/vtkRearrangeFields.h
index 35df694cb8432caac51290a3238999ece24b11c2..82572dbe1d14c65aa1c6575cfa295c8fb4a2356c 100644
--- a/Graphics/vtkRearrangeFields.h
+++ b/Graphics/vtkRearrangeFields.h
@@ -64,7 +64,7 @@ class vtkFieldData;
 class VTK_GRAPHICS_EXPORT vtkRearrangeFields : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkRearrangeFields,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkRearrangeFields,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRectangularButtonSource.cxx b/Graphics/vtkRectangularButtonSource.cxx
index 1fee153bbe27421cba5490a8b700973238970ef0..8b433e1e1564c0b31e7fd9f73a8b3fc5cbc89724 100644
--- a/Graphics/vtkRectangularButtonSource.cxx
+++ b/Graphics/vtkRectangularButtonSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkRectangularButtonSource, "1.4");
 vtkStandardNewMacro(vtkRectangularButtonSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkRectangularButtonSource.h b/Graphics/vtkRectangularButtonSource.h
index 529d78e6b1e1f8a412ff21d0f6bfc9f5a39e4018..c0aea3982baa1fcea9f31e9bb1d1abc2cf0f696a 100644
--- a/Graphics/vtkRectangularButtonSource.h
+++ b/Graphics/vtkRectangularButtonSource.h
@@ -52,7 +52,7 @@ class VTK_GRAPHICS_EXPORT vtkRectangularButtonSource : public vtkButtonSource
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkRectangularButtonSource,vtkButtonSource);
+  vtkTypeMacro(vtkRectangularButtonSource,vtkButtonSource);
 
   // Description:
   // Construct a circular button with depth 10% of its height.
diff --git a/Graphics/vtkRectilinearGridClip.cxx b/Graphics/vtkRectilinearGridClip.cxx
index 97486739a89e2f073cad1b032e4ceed4b4e2df30..190162d4d7b7c1b93ea1e77e6c2035b9d3c21c20 100644
--- a/Graphics/vtkRectilinearGridClip.cxx
+++ b/Graphics/vtkRectilinearGridClip.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridClip, "1.1");
 vtkStandardNewMacro(vtkRectilinearGridClip);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkRectilinearGridClip.h b/Graphics/vtkRectilinearGridClip.h
index 5ea6375354686f8d7b6692f01cd48785946db05f..550417c8bb4ad093fae292efdf55c3e040498c46 100644
--- a/Graphics/vtkRectilinearGridClip.h
+++ b/Graphics/vtkRectilinearGridClip.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkRectilinearGridClip : public vtkRectilinearGridAlgo
 {
 public:
   static vtkRectilinearGridClip *New();
-  vtkTypeRevisionMacro(vtkRectilinearGridClip,vtkRectilinearGridAlgorithm);
+  vtkTypeMacro(vtkRectilinearGridClip,vtkRectilinearGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRectilinearGridGeometryFilter.cxx b/Graphics/vtkRectilinearGridGeometryFilter.cxx
index 70db9a9a30569a3b7d1bea66382c47abd22932ae..6306062a1eebc2f9fa2e2981cf3c7060ea4a9293 100644
--- a/Graphics/vtkRectilinearGridGeometryFilter.cxx
+++ b/Graphics/vtkRectilinearGridGeometryFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkPolyData.h"
 #include "vtkRectilinearGrid.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridGeometryFilter, "1.33");
 vtkStandardNewMacro(vtkRectilinearGridGeometryFilter);
 
 // Construct with initial extent (0,100, 0,100, 0,0) (i.e., a k-plane).
diff --git a/Graphics/vtkRectilinearGridGeometryFilter.h b/Graphics/vtkRectilinearGridGeometryFilter.h
index 962abbc2b0923542d6b0708c474d2e9f08f89100..80d90330b9d5396844c1de3f931691786bbb806f 100644
--- a/Graphics/vtkRectilinearGridGeometryFilter.h
+++ b/Graphics/vtkRectilinearGridGeometryFilter.h
@@ -40,7 +40,7 @@
 class VTK_GRAPHICS_EXPORT vtkRectilinearGridGeometryFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkRectilinearGridGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRectilinearGridGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRectilinearGridToTetrahedra.cxx b/Graphics/vtkRectilinearGridToTetrahedra.cxx
index aeffd173828b7d5519c65ae9fc5e9362bcb624af..af869ec92b24ee5036d119a9cb5a737b1ecafa4f 100644
--- a/Graphics/vtkRectilinearGridToTetrahedra.cxx
+++ b/Graphics/vtkRectilinearGridToTetrahedra.cxx
@@ -28,7 +28,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridToTetrahedra, "1.15");
 vtkStandardNewMacro(vtkRectilinearGridToTetrahedra);
 
 // ways to convert to a voxel to tetrahedra.
diff --git a/Graphics/vtkRectilinearGridToTetrahedra.h b/Graphics/vtkRectilinearGridToTetrahedra.h
index 92ae81f52ffed997ed2e60766df0b426bfc61dfc..5e759c659687f65453d653c531c515def5d91fa0 100644
--- a/Graphics/vtkRectilinearGridToTetrahedra.h
+++ b/Graphics/vtkRectilinearGridToTetrahedra.h
@@ -59,7 +59,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkRectilinearGridToTetrahedra : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkRectilinearGridToTetrahedra,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkRectilinearGridToTetrahedra,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRectilinearSynchronizedTemplates.cxx b/Graphics/vtkRectilinearSynchronizedTemplates.cxx
index 7636b80a3062140b9d532fa4bc9d7a58b97ca2a1..2524c2b9f1d2be5af3bfdb08a890afb85878c654 100644
--- a/Graphics/vtkRectilinearSynchronizedTemplates.cxx
+++ b/Graphics/vtkRectilinearSynchronizedTemplates.cxx
@@ -40,7 +40,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkRectilinearSynchronizedTemplates, "1.5");
 vtkStandardNewMacro(vtkRectilinearSynchronizedTemplates);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkRectilinearSynchronizedTemplates.h b/Graphics/vtkRectilinearSynchronizedTemplates.h
index a98ec01b8c6c54f360460e6c95b2d20c87e4b468..475f49d6e16ae14255b601ab707dd0cf1d00c5ea 100644
--- a/Graphics/vtkRectilinearSynchronizedTemplates.h
+++ b/Graphics/vtkRectilinearSynchronizedTemplates.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkRectilinearSynchronizedTemplates : public vtkPolyDa
 public:
   static vtkRectilinearSynchronizedTemplates *New();
 
-  vtkTypeRevisionMacro(vtkRectilinearSynchronizedTemplates,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRectilinearSynchronizedTemplates,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkRecursiveDividingCubes.cxx b/Graphics/vtkRecursiveDividingCubes.cxx
index 2875be5687c3a896b09409ca05548888c003169e..fdccb709136ff3f1234d24c88fd40193cf7eaa1e 100644
--- a/Graphics/vtkRecursiveDividingCubes.cxx
+++ b/Graphics/vtkRecursiveDividingCubes.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkVoxel.h"
 
-vtkCxxRevisionMacro(vtkRecursiveDividingCubes, "1.43");
 vtkStandardNewMacro(vtkRecursiveDividingCubes);
 
 vtkRecursiveDividingCubes::vtkRecursiveDividingCubes()
diff --git a/Graphics/vtkRecursiveDividingCubes.h b/Graphics/vtkRecursiveDividingCubes.h
index 57f9c9c742f91237568a10d921e85b0ae6483bdd..912e8265f51b07f56d64f5425df80ccf1c2d2399 100644
--- a/Graphics/vtkRecursiveDividingCubes.h
+++ b/Graphics/vtkRecursiveDividingCubes.h
@@ -42,7 +42,7 @@ class VTK_GRAPHICS_EXPORT vtkRecursiveDividingCubes : public vtkPolyDataAlgorith
 {
 public:
   static vtkRecursiveDividingCubes *New();
-  vtkTypeRevisionMacro(vtkRecursiveDividingCubes,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRecursiveDividingCubes,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkReflectionFilter.cxx b/Graphics/vtkReflectionFilter.cxx
index 1d247488aba36b9d4c155dd732735bc939456faa..20405dcf1f80967635e39e1cc2487b6444f13165 100644
--- a/Graphics/vtkReflectionFilter.cxx
+++ b/Graphics/vtkReflectionFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkReflectionFilter, "1.20");
 vtkStandardNewMacro(vtkReflectionFilter);
 
 //---------------------------------------------------------------------------
diff --git a/Graphics/vtkReflectionFilter.h b/Graphics/vtkReflectionFilter.h
index c12cce6333a8429ded950011f186c6c06dd62e2f..a9a2cc59a551dd2f53e1e5b6db69d504d8a8634a 100644
--- a/Graphics/vtkReflectionFilter.h
+++ b/Graphics/vtkReflectionFilter.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkReflectionFilter : public vtkDataObjectAlgorithm
 public:
   static vtkReflectionFilter *New();
   
-  vtkTypeRevisionMacro(vtkReflectionFilter, vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkReflectionFilter, vtkDataObjectAlgorithm);
   void PrintSelf(ostream &os, vtkIndent indent);
   
 //BTX
diff --git a/Graphics/vtkRegularPolygonSource.cxx b/Graphics/vtkRegularPolygonSource.cxx
index ba7c0db79a5001fff8e7b1d55abddb0bbbf84ed6..47e2df060a7ace8e45d230f325171657eb10836b 100644
--- a/Graphics/vtkRegularPolygonSource.cxx
+++ b/Graphics/vtkRegularPolygonSource.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkRegularPolygonSource, "1.2");
 vtkStandardNewMacro(vtkRegularPolygonSource);
 
 vtkRegularPolygonSource::vtkRegularPolygonSource()
diff --git a/Graphics/vtkRegularPolygonSource.h b/Graphics/vtkRegularPolygonSource.h
index 7e0bd5f0fac1dc046eaec21f8f46422abe1fd7b8..d382922cfcbf9059ce74e459e32592e261fc6b2a 100644
--- a/Graphics/vtkRegularPolygonSource.h
+++ b/Graphics/vtkRegularPolygonSource.h
@@ -32,7 +32,7 @@ public:
   // Description:
   // Standard methods for instantiation, obtaining type and printing instance values.
   static vtkRegularPolygonSource *New();
-  vtkTypeRevisionMacro(vtkRegularPolygonSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRegularPolygonSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkReverseSense.cxx b/Graphics/vtkReverseSense.cxx
index 41cb1b90741defe618c760b523e4d1076ac76739..347604d8ff627264a9e8d184c71ec94b7e8cfc99 100644
--- a/Graphics/vtkReverseSense.cxx
+++ b/Graphics/vtkReverseSense.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkReverseSense, "1.33");
 vtkStandardNewMacro(vtkReverseSense);
 
 // Construct object so that behavior is to reverse cell ordering and
diff --git a/Graphics/vtkReverseSense.h b/Graphics/vtkReverseSense.h
index 75241a69b12c1dcef7bb535e46a35ec4ead8ff13..ded4858ee81d11882ca7840c8ad4a6b7a63145ad 100644
--- a/Graphics/vtkReverseSense.h
+++ b/Graphics/vtkReverseSense.h
@@ -33,7 +33,7 @@
 class VTK_GRAPHICS_EXPORT vtkReverseSense : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkReverseSense,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkReverseSense,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRibbonFilter.cxx b/Graphics/vtkRibbonFilter.cxx
index 53e17f048d8f8d3686328924803e60e2d38a26aa..166779dac2afc3ca7b1a49a91ce6145bf7667184 100644
--- a/Graphics/vtkRibbonFilter.cxx
+++ b/Graphics/vtkRibbonFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyLine.h"
 
-vtkCxxRevisionMacro(vtkRibbonFilter, "1.83");
 vtkStandardNewMacro(vtkRibbonFilter);
 
 // Construct ribbon so that width is 0.1, the width does 
diff --git a/Graphics/vtkRibbonFilter.h b/Graphics/vtkRibbonFilter.h
index 7f4a5fbbb306c7ae7e5b3716ade6d14c2a3a035e..41b57e038964900552447537d9712fb1538efdf3 100644
--- a/Graphics/vtkRibbonFilter.h
+++ b/Graphics/vtkRibbonFilter.h
@@ -50,7 +50,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkRibbonFilter : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkRibbonFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRibbonFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRotationFilter.cxx b/Graphics/vtkRotationFilter.cxx
index 349966ccd90256b52ba40e49a2ee3c8d89ba13d0..0022c086dec831b53c3d919cb9b8eef94c88b3ce 100644
--- a/Graphics/vtkRotationFilter.cxx
+++ b/Graphics/vtkRotationFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkMath.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkRotationFilter, "1.11");
 vtkStandardNewMacro(vtkRotationFilter);
 
 //---------------------------------------------------------------------------
diff --git a/Graphics/vtkRotationFilter.h b/Graphics/vtkRotationFilter.h
index ac447e6924b6f09323e12482e06f941951b02b48..7cd1a4c626c0ab0ffd73a628f0766fb3292225c0 100644
--- a/Graphics/vtkRotationFilter.h
+++ b/Graphics/vtkRotationFilter.h
@@ -32,7 +32,7 @@ class VTK_GRAPHICS_EXPORT vtkRotationFilter : public vtkUnstructuredGridAlgorith
 {
 public:
   static vtkRotationFilter *New(); 
-  vtkTypeRevisionMacro(vtkRotationFilter, vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkRotationFilter, vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream &os, vtkIndent indent);
   
 //BTX
diff --git a/Graphics/vtkRotationalExtrusionFilter.cxx b/Graphics/vtkRotationalExtrusionFilter.cxx
index e8879847a21bb2a4e1535b976a75826d894585d0..4ebef127f58c4fe3388964c8aa61446b679f1763 100644
--- a/Graphics/vtkRotationalExtrusionFilter.cxx
+++ b/Graphics/vtkRotationalExtrusionFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkCellData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkRotationalExtrusionFilter, "1.58");
 vtkStandardNewMacro(vtkRotationalExtrusionFilter);
 
 // Create object with capping on, angle of 360 degrees, resolution = 12, and
diff --git a/Graphics/vtkRotationalExtrusionFilter.h b/Graphics/vtkRotationalExtrusionFilter.h
index b5fa7fed896e8b64397a9bb8952dd03a663eca11..51b0eda74f732084971c28152cb96b6de8c5269c 100644
--- a/Graphics/vtkRotationalExtrusionFilter.h
+++ b/Graphics/vtkRotationalExtrusionFilter.h
@@ -59,7 +59,7 @@
 class VTK_GRAPHICS_EXPORT vtkRotationalExtrusionFilter : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkRotationalExtrusionFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRotationalExtrusionFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkRuledSurfaceFilter.cxx b/Graphics/vtkRuledSurfaceFilter.cxx
index 46c4697b47ba52df308d13e5204f29744f54638b..29811fced76b5817d95b8de4a063d746f4704be9 100644
--- a/Graphics/vtkRuledSurfaceFilter.cxx
+++ b/Graphics/vtkRuledSurfaceFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyLine.h"
 
-vtkCxxRevisionMacro(vtkRuledSurfaceFilter, "1.27");
 vtkStandardNewMacro(vtkRuledSurfaceFilter);
 
 vtkRuledSurfaceFilter::vtkRuledSurfaceFilter()
diff --git a/Graphics/vtkRuledSurfaceFilter.h b/Graphics/vtkRuledSurfaceFilter.h
index dbfdab059fb0b1817649339f6c969bc24e0f4c9f..ec9c95896c671fe80ffccb69a8c8b16c8d4db071 100644
--- a/Graphics/vtkRuledSurfaceFilter.h
+++ b/Graphics/vtkRuledSurfaceFilter.h
@@ -63,7 +63,7 @@ class vtkPolyData;
 class VTK_GRAPHICS_EXPORT vtkRuledSurfaceFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkRuledSurfaceFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRuledSurfaceFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSectorSource.cxx b/Graphics/vtkSectorSource.cxx
index 1c468f31d5ff2710d7c5fb0000a80ad40c581caf..984c1c6d670601c3f1974d57fafc7c87c8255d0e 100644
--- a/Graphics/vtkSectorSource.cxx
+++ b/Graphics/vtkSectorSource.cxx
@@ -27,7 +27,6 @@
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkSectorSource, "1.5");
 vtkStandardNewMacro(vtkSectorSource);
 
 vtkSectorSource::vtkSectorSource()
diff --git a/Graphics/vtkSectorSource.h b/Graphics/vtkSectorSource.h
index 46a59c9a25f0e0f992dd0742873939860c211742..bf0d65a05243d3081f1befc7e7e0162abb4e94d9 100644
--- a/Graphics/vtkSectorSource.h
+++ b/Graphics/vtkSectorSource.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkSectorSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkSectorSource *New();
-  vtkTypeRevisionMacro(vtkSectorSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSectorSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkSelectEnclosedPoints.cxx b/Graphics/vtkSelectEnclosedPoints.cxx
index 773f0f97b6c11ff747e6b6c5a0a5836f8a53ca63..0f92194a60cb439459e1af0a5db888d06eebc85b 100644
--- a/Graphics/vtkSelectEnclosedPoints.cxx
+++ b/Graphics/vtkSelectEnclosedPoints.cxx
@@ -30,7 +30,6 @@
 #include "vtkMath.h"
 #include "vtkGarbageCollector.h"
 
-vtkCxxRevisionMacro(vtkSelectEnclosedPoints, "1.2");
 vtkStandardNewMacro(vtkSelectEnclosedPoints);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSelectEnclosedPoints.h b/Graphics/vtkSelectEnclosedPoints.h
index b57bfb785ead34776b3f03f0adcd155cabbfb08a..760de3eac6d4b7048840136c5e67d4b283660e68 100644
--- a/Graphics/vtkSelectEnclosedPoints.h
+++ b/Graphics/vtkSelectEnclosedPoints.h
@@ -52,7 +52,7 @@ class VTK_GRAPHICS_EXPORT vtkSelectEnclosedPoints : public vtkDataSetAlgorithm
 public:
   // Description
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkSelectEnclosedPoints,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkSelectEnclosedPoints,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkSelectPolyData.cxx b/Graphics/vtkSelectPolyData.cxx
index 1f5c8cb470fd6ef9e8e55272190a0502733aae65..9111c3b948122c62fe1e1321abaf29137289114c 100644
--- a/Graphics/vtkSelectPolyData.cxx
+++ b/Graphics/vtkSelectPolyData.cxx
@@ -32,7 +32,6 @@
 #include "vtkTriangleFilter.h"
 #include "vtkTriangleStrip.h"
 
-vtkCxxRevisionMacro(vtkSelectPolyData, "1.36");
 vtkStandardNewMacro(vtkSelectPolyData);
 
 vtkCxxSetObjectMacro(vtkSelectPolyData,Loop,vtkPoints);
diff --git a/Graphics/vtkSelectPolyData.h b/Graphics/vtkSelectPolyData.h
index 21a338ba27e602985a61f13d758b6913c221aa62..b63622a93bbcbc299d81d52fc5c89a9184fb3f85 100644
--- a/Graphics/vtkSelectPolyData.h
+++ b/Graphics/vtkSelectPolyData.h
@@ -93,7 +93,7 @@ public:
   // is not generated, and the inside mode is the smallest region.
   static vtkSelectPolyData *New();
 
-  vtkTypeRevisionMacro(vtkSelectPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSelectPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSelectionSource.cxx b/Graphics/vtkSelectionSource.cxx
index 2f9afc9e28da286c70ae2bcffb426c741109986d..4f2fd7fd45f20efd3e9770427a2b057eb6507ae0 100644
--- a/Graphics/vtkSelectionSource.cxx
+++ b/Graphics/vtkSelectionSource.cxx
@@ -31,7 +31,6 @@
 #include "vtkstd/vector"
 #include "vtkstd/set"
 
-vtkCxxRevisionMacro(vtkSelectionSource, "1.27");
 vtkStandardNewMacro(vtkSelectionSource);
 
 class vtkSelectionSourceInternals
diff --git a/Graphics/vtkSelectionSource.h b/Graphics/vtkSelectionSource.h
index 05ab194a1fb62f87302d7530aeb5604d23647899..07956a3ec17d1a36859ed5f4ab64e1d76bf30a4d 100644
--- a/Graphics/vtkSelectionSource.h
+++ b/Graphics/vtkSelectionSource.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkSelectionSource : public vtkSelectionAlgorithm
 {
 public:
   static vtkSelectionSource *New();
-  vtkTypeRevisionMacro(vtkSelectionSource,vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkSelectionSource,vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkShrinkFilter.cxx b/Graphics/vtkShrinkFilter.cxx
index d7fe7fb083e3996e5daf3f59d0fc8e767be82a6e..ae2cf111b533cf37fa67f06b4e71763c7206315e 100644
--- a/Graphics/vtkShrinkFilter.cxx
+++ b/Graphics/vtkShrinkFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkShrinkFilter, "1.72");
 vtkStandardNewMacro(vtkShrinkFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkShrinkFilter.h b/Graphics/vtkShrinkFilter.h
index 3f2219ed9b49d65144babccfa5447be3bf372550..e52c5bfe35caf202968a1855cd4c74b2f77e6317 100644
--- a/Graphics/vtkShrinkFilter.h
+++ b/Graphics/vtkShrinkFilter.h
@@ -36,7 +36,7 @@ class VTK_GRAPHICS_EXPORT vtkShrinkFilter : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkShrinkFilter *New();
-  vtkTypeRevisionMacro(vtkShrinkFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkShrinkFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkShrinkPolyData.cxx b/Graphics/vtkShrinkPolyData.cxx
index 365c2742da64440deb6d82b737cb970c25f74bf0..389fd6e2b733090581ce7f681761bf9f7ca1625b 100644
--- a/Graphics/vtkShrinkPolyData.cxx
+++ b/Graphics/vtkShrinkPolyData.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkShrinkPolyData, "1.69");
 vtkStandardNewMacro(vtkShrinkPolyData);
 
 vtkShrinkPolyData::vtkShrinkPolyData(double sf)
diff --git a/Graphics/vtkShrinkPolyData.h b/Graphics/vtkShrinkPolyData.h
index 72ecbc80a9760cbd8396b727029667ea85eca8b2..06a660c664193888acd9478864889d4932e1accf 100644
--- a/Graphics/vtkShrinkPolyData.h
+++ b/Graphics/vtkShrinkPolyData.h
@@ -42,7 +42,7 @@ class VTK_GRAPHICS_EXPORT vtkShrinkPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkShrinkPolyData *New();
-  vtkTypeRevisionMacro(vtkShrinkPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkShrinkPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSimpleElevationFilter.cxx b/Graphics/vtkSimpleElevationFilter.cxx
index 60284dd72f27852b7b13381afb4516787d69e6cd..2d0716980c676dba6d8069dfc67d0e4da575d4d7 100644
--- a/Graphics/vtkSimpleElevationFilter.cxx
+++ b/Graphics/vtkSimpleElevationFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkSimpleElevationFilter, "1.21");
 vtkStandardNewMacro(vtkSimpleElevationFilter);
 
 // Construct object with LowPoint=(0,0,0) and HighPoint=(0,0,1). Scalar
diff --git a/Graphics/vtkSimpleElevationFilter.h b/Graphics/vtkSimpleElevationFilter.h
index 82bdb42fcfc18cdf987131f99d2c8a5e5580cd1b..0760c862e112c1682df6356f135d6a3b272e232b 100644
--- a/Graphics/vtkSimpleElevationFilter.h
+++ b/Graphics/vtkSimpleElevationFilter.h
@@ -29,7 +29,7 @@
 class VTK_GRAPHICS_EXPORT vtkSimpleElevationFilter : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkSimpleElevationFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkSimpleElevationFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSliceCubes.cxx b/Graphics/vtkSliceCubes.cxx
index b6a4d9a853b69c09f19b0bfeaa184e5109c2d74a..d8500c762230927cb86c8c6717befd7b853bdf69 100644
--- a/Graphics/vtkSliceCubes.cxx
+++ b/Graphics/vtkSliceCubes.cxx
@@ -32,7 +32,6 @@
 #include "vtkUnsignedShortArray.h"
 #include "vtkVolumeReader.h"
 
-vtkCxxRevisionMacro(vtkSliceCubes, "1.2");
 vtkStandardNewMacro(vtkSliceCubes);
 
 vtkCxxSetObjectMacro(vtkSliceCubes,Reader,vtkVolumeReader);
diff --git a/Graphics/vtkSliceCubes.h b/Graphics/vtkSliceCubes.h
index f7f5762837b30a73e12b49a1fc7a571a8512f81a..4d221ddd1da76a37be7e7cb828753065cf26c36f 100644
--- a/Graphics/vtkSliceCubes.h
+++ b/Graphics/vtkSliceCubes.h
@@ -52,7 +52,7 @@ class VTK_GRAPHICS_EXPORT vtkSliceCubes : public vtkObject
 {
 public:
   static vtkSliceCubes *New();
-  vtkTypeRevisionMacro(vtkSliceCubes,vtkObject);
+  vtkTypeMacro(vtkSliceCubes,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // methods to make it look like a filter
diff --git a/Graphics/vtkSmoothPolyDataFilter.cxx b/Graphics/vtkSmoothPolyDataFilter.cxx
index c22d1f0bc25ff32d5629df94eb8e9ea20f9d68e1..85874c92455bcb2635fe8560aa4da918c872909f 100644
--- a/Graphics/vtkSmoothPolyDataFilter.cxx
+++ b/Graphics/vtkSmoothPolyDataFilter.cxx
@@ -28,7 +28,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTriangleFilter.h"
 
-vtkCxxRevisionMacro(vtkSmoothPolyDataFilter, "1.46");
 vtkStandardNewMacro(vtkSmoothPolyDataFilter);
 
 // The following code defines a helper class for performing mesh smoothing
diff --git a/Graphics/vtkSmoothPolyDataFilter.h b/Graphics/vtkSmoothPolyDataFilter.h
index 461423c8a22db6a8885c1ccdac216bb5754cbe6c..5a7abb6c4086a55de2af332f28380c04d38d8a66 100644
--- a/Graphics/vtkSmoothPolyDataFilter.h
+++ b/Graphics/vtkSmoothPolyDataFilter.h
@@ -97,7 +97,7 @@ class vtkSmoothPoints;
 class VTK_GRAPHICS_EXPORT vtkSmoothPolyDataFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSmoothPolyDataFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSmoothPolyDataFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSortDataArray.cxx b/Graphics/vtkSortDataArray.cxx
index c3fea3eb9598d11d8d243391dadf3ca81c6b0c5b..bd89a1eb5eae90fb42145b469fa73c0d81c8df5a 100644
--- a/Graphics/vtkSortDataArray.cxx
+++ b/Graphics/vtkSortDataArray.cxx
@@ -35,7 +35,6 @@
 // -------------------------------------------------------------------------
 
 vtkStandardNewMacro(vtkSortDataArray);
-vtkCxxRevisionMacro(vtkSortDataArray,"1.4");
 
 vtkSortDataArray::vtkSortDataArray()
 {
diff --git a/Graphics/vtkSortDataArray.h b/Graphics/vtkSortDataArray.h
index 84d211157d36e483b7804217ab7cdeb89d1fd38b..2bcb84c5af09cbdf35cc683f00e7a79d5a23d0ac 100644
--- a/Graphics/vtkSortDataArray.h
+++ b/Graphics/vtkSortDataArray.h
@@ -35,7 +35,7 @@ class vtkAbstractArray;
 class VTK_GRAPHICS_EXPORT vtkSortDataArray : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSortDataArray, vtkObject);
+  vtkTypeMacro(vtkSortDataArray, vtkObject);
   static vtkSortDataArray *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Graphics/vtkSpatialRepresentationFilter.cxx b/Graphics/vtkSpatialRepresentationFilter.cxx
index 21bd7a0388bf4913a0bcc6f4c7fb3766709f06f5..1185e2f4ac6ebd4e87c90db02775f10a8c808c87 100644
--- a/Graphics/vtkSpatialRepresentationFilter.cxx
+++ b/Graphics/vtkSpatialRepresentationFilter.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkSpatialRepresentationFilter, "1.37");
 vtkStandardNewMacro(vtkSpatialRepresentationFilter);
 vtkCxxSetObjectMacro(vtkSpatialRepresentationFilter,
                      SpatialRepresentation,vtkLocator);
diff --git a/Graphics/vtkSpatialRepresentationFilter.h b/Graphics/vtkSpatialRepresentationFilter.h
index a053dfb5cc7b5a83aa707ef5812529831e036c2a..fd49833ac0a13d3dd3144f9a3790684e65e022dd 100644
--- a/Graphics/vtkSpatialRepresentationFilter.h
+++ b/Graphics/vtkSpatialRepresentationFilter.h
@@ -64,7 +64,7 @@ class VTK_GRAPHICS_EXPORT vtkSpatialRepresentationFilter : public vtkPolyDataSou
 {
 public:
   static vtkSpatialRepresentationFilter *New();
-  vtkTypeRevisionMacro(vtkSpatialRepresentationFilter,vtkPolyDataSource);
+  vtkTypeMacro(vtkSpatialRepresentationFilter,vtkPolyDataSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSpherePuzzle.cxx b/Graphics/vtkSpherePuzzle.cxx
index beb2faf055383e38862af183600049e225904ff4..37c835de735dfb673b0dd869857af02e32cb6d76 100644
--- a/Graphics/vtkSpherePuzzle.cxx
+++ b/Graphics/vtkSpherePuzzle.cxx
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSpherePuzzle, "1.20");
 vtkStandardNewMacro(vtkSpherePuzzle);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSpherePuzzle.h b/Graphics/vtkSpherePuzzle.h
index a4ee8a70f7c1e6051dcb6638509e94d6c34dcf0d..673b7a998dab977f3ffdf06977c884deb645ba9f 100644
--- a/Graphics/vtkSpherePuzzle.h
+++ b/Graphics/vtkSpherePuzzle.h
@@ -28,7 +28,7 @@ class vtkTransform;
 class VTK_GRAPHICS_EXPORT vtkSpherePuzzle : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkSpherePuzzle,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSpherePuzzle,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkSpherePuzzle *New();
diff --git a/Graphics/vtkSpherePuzzleArrows.cxx b/Graphics/vtkSpherePuzzleArrows.cxx
index 27930a8f6156f02f34be7fbab42604a5e3e7f5b2..b36329564f14808163c0ba8f5f320a2299226dfd 100644
--- a/Graphics/vtkSpherePuzzleArrows.cxx
+++ b/Graphics/vtkSpherePuzzleArrows.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSpherePuzzleArrows, "1.13");
 vtkStandardNewMacro(vtkSpherePuzzleArrows);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSpherePuzzleArrows.h b/Graphics/vtkSpherePuzzleArrows.h
index 631027618f346b4f7bac8cde352b7ddf70ffdc92..207c1a2f9e20aabaddb18e50793bc775bb31dc94 100644
--- a/Graphics/vtkSpherePuzzleArrows.h
+++ b/Graphics/vtkSpherePuzzleArrows.h
@@ -28,7 +28,7 @@ class vtkSpherePuzzle;
 class VTK_GRAPHICS_EXPORT vtkSpherePuzzleArrows : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkSpherePuzzleArrows,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSpherePuzzleArrows,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkSpherePuzzleArrows *New();
diff --git a/Graphics/vtkSphereSource.cxx b/Graphics/vtkSphereSource.cxx
index efe2bff9726d82db45601552b26958b8e2b70208..464b18edd21286c37164e6bcb30d22c5357dc971 100644
--- a/Graphics/vtkSphereSource.cxx
+++ b/Graphics/vtkSphereSource.cxx
@@ -27,7 +27,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSphereSource, "1.70");
 vtkStandardNewMacro(vtkSphereSource);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSphereSource.h b/Graphics/vtkSphereSource.h
index 4a0370347f1b7d0d3ee8d5db2b7c368d6e68b340..0407e5aca7fc44927657b58c5a43736ff7ecf819 100644
--- a/Graphics/vtkSphereSource.h
+++ b/Graphics/vtkSphereSource.h
@@ -36,7 +36,7 @@
 class VTK_GRAPHICS_EXPORT vtkSphereSource : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkSphereSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSphereSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSplineFilter.cxx b/Graphics/vtkSplineFilter.cxx
index 77b9a10aad3379f53a45af626cb5ba9f7d6f7467..5f449a919894024b3aa15dfbb7843cde254132f1 100644
--- a/Graphics/vtkSplineFilter.cxx
+++ b/Graphics/vtkSplineFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkSplineFilter, "1.22");
 vtkStandardNewMacro(vtkSplineFilter);
 vtkCxxSetObjectMacro(vtkSplineFilter,Spline,vtkSpline);
 
diff --git a/Graphics/vtkSplineFilter.h b/Graphics/vtkSplineFilter.h
index 732423015c733e336558b98805012b1ba0eeda89..61bb6435031bb1b27bd755b1dd242a73df36e67c 100644
--- a/Graphics/vtkSplineFilter.h
+++ b/Graphics/vtkSplineFilter.h
@@ -54,7 +54,7 @@ class vtkSpline;
 class VTK_GRAPHICS_EXPORT vtkSplineFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSplineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSplineFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSplitField.cxx b/Graphics/vtkSplitField.cxx
index 258afcd9bbb7c8984b08ab3f80d9d727c07def82..7bceb2615ce27034fabd921a3ad0b6e8f613b261 100644
--- a/Graphics/vtkSplitField.cxx
+++ b/Graphics/vtkSplitField.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkSplitField, "1.24");
 vtkStandardNewMacro(vtkSplitField);
 
 char vtkSplitField::FieldLocationNames[3][12] 
diff --git a/Graphics/vtkSplitField.h b/Graphics/vtkSplitField.h
index 53f3c3afb86614ae1bb3d4a7ee78f775fad57e4b..823cb80b4528a7963405b42f82d2de1d53340bba 100644
--- a/Graphics/vtkSplitField.h
+++ b/Graphics/vtkSplitField.h
@@ -60,7 +60,7 @@ class vtkFieldData;
 class VTK_GRAPHICS_EXPORT vtkSplitField : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSplitField,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkSplitField,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStreamLine.cxx b/Graphics/vtkStreamLine.cxx
index 5f38adc782a7fe034620c1f05c0f2886adb4b6ed..06d8431887cae76685c1d478c82d7b19f6f2f584 100644
--- a/Graphics/vtkStreamLine.cxx
+++ b/Graphics/vtkStreamLine.cxx
@@ -26,7 +26,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyLine.h"
 
-vtkCxxRevisionMacro(vtkStreamLine, "1.59");
 vtkStandardNewMacro(vtkStreamLine);
 
 // Construct object with step size set to 1.0.
diff --git a/Graphics/vtkStreamLine.h b/Graphics/vtkStreamLine.h
index 8b6f407e97fe5ffacd21a5b93e7f934c7c61d81e..f514e0fbf49b18494f1fdfcc26e20a9dc69b51f9 100644
--- a/Graphics/vtkStreamLine.h
+++ b/Graphics/vtkStreamLine.h
@@ -49,7 +49,7 @@
 class VTK_GRAPHICS_EXPORT vtkStreamLine : public vtkStreamer
 {
 public:
-  vtkTypeRevisionMacro(vtkStreamLine,vtkStreamer);
+  vtkTypeMacro(vtkStreamLine,vtkStreamer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStreamPoints.cxx b/Graphics/vtkStreamPoints.cxx
index 4c4c31b84519a094043c2e82d0824e186d46861c..a6976982991826c8ee20520fb03916c4f3b74adc 100644
--- a/Graphics/vtkStreamPoints.cxx
+++ b/Graphics/vtkStreamPoints.cxx
@@ -25,7 +25,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkStreamPoints, "1.42");
 vtkStandardNewMacro(vtkStreamPoints);
 
 // Construct object with time increment set to 1.0.
diff --git a/Graphics/vtkStreamPoints.h b/Graphics/vtkStreamPoints.h
index 952ddc9afcebeb7c540f5ad7367de9e97d8d7cfb..06a4b6ddaff5382557bbd1a7f01d971aff816181 100644
--- a/Graphics/vtkStreamPoints.h
+++ b/Graphics/vtkStreamPoints.h
@@ -30,7 +30,7 @@
 class VTK_GRAPHICS_EXPORT vtkStreamPoints : public vtkStreamer
 {
 public:
-  vtkTypeRevisionMacro(vtkStreamPoints,vtkStreamer);
+  vtkTypeMacro(vtkStreamPoints,vtkStreamer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStreamTracer.cxx b/Graphics/vtkStreamTracer.cxx
index d71a22c9bc218f0ff59080249fec0e715d37b5ef..839ae93f70ae82f7a964182fb9511e1dfbb819e5 100644
--- a/Graphics/vtkStreamTracer.cxx
+++ b/Graphics/vtkStreamTracer.cxx
@@ -44,7 +44,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkRungeKutta45.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkStreamTracer, "1.52");
 vtkStandardNewMacro(vtkStreamTracer);
 vtkCxxSetObjectMacro(vtkStreamTracer,Integrator,vtkInitialValueProblemSolver);
 vtkCxxSetObjectMacro(vtkStreamTracer,InterpolatorPrototype,vtkAbstractInterpolatedVelocityField);
diff --git a/Graphics/vtkStreamTracer.h b/Graphics/vtkStreamTracer.h
index e165ed198dc579cf67a1b0d99ba226db371999fb..0140beac2bbc9ddee74110e75e46a2fa51ac1351 100644
--- a/Graphics/vtkStreamTracer.h
+++ b/Graphics/vtkStreamTracer.h
@@ -93,7 +93,7 @@ class vtkAbstractInterpolatedVelocityField;
 class VTK_GRAPHICS_EXPORT vtkStreamTracer : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkStreamTracer,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkStreamTracer,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStreamer.cxx b/Graphics/vtkStreamer.cxx
index 684da263cc48b89ca7bae25e799d95e583fe0f9c..4e53adc7a9eb47e4eaf1cd75eed147246aa59af7 100644
--- a/Graphics/vtkStreamer.cxx
+++ b/Graphics/vtkStreamer.cxx
@@ -27,7 +27,6 @@
 #include "vtkPointData.h"
 #include "vtkRungeKutta2.h"
 
-vtkCxxRevisionMacro(vtkStreamer, "1.94");
 vtkCxxSetObjectMacro(vtkStreamer,Integrator,vtkInitialValueProblemSolver);
 
 #define VTK_START_FROM_POSITION 0
diff --git a/Graphics/vtkStreamer.h b/Graphics/vtkStreamer.h
index 6f2cd04056bfd3b219338e5e6c19660c8c02f580..17a6d09ed15904167751c1e70fc1bd4c44be5a6c 100644
--- a/Graphics/vtkStreamer.h
+++ b/Graphics/vtkStreamer.h
@@ -62,7 +62,7 @@ class vtkMultiThreader;
 class VTK_GRAPHICS_EXPORT vtkStreamer : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkStreamer,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkStreamer,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStreamingTessellator.cxx b/Graphics/vtkStreamingTessellator.cxx
index f469454a6036a4a354a81bf4d702b79843ef3b02..227775095cd03a6650187e4f8f1081c2580e89ad 100644
--- a/Graphics/vtkStreamingTessellator.cxx
+++ b/Graphics/vtkStreamingTessellator.cxx
@@ -77,7 +77,6 @@ static void DefaultFacet0Callback(
   (void)pd;
 }
 
-vtkCxxRevisionMacro(vtkStreamingTessellator,"1.3");
 vtkStandardNewMacro(vtkStreamingTessellator);
 
 void vtkStreamingTessellator::PrintSelf( ostream& os, vtkIndent indent )
diff --git a/Graphics/vtkStreamingTessellator.h b/Graphics/vtkStreamingTessellator.h
index 949424b4032efb38c118220024999a757ee07705..b6579b77a95d53ef93dadda1148a29ab7b135ec3 100644
--- a/Graphics/vtkStreamingTessellator.h
+++ b/Graphics/vtkStreamingTessellator.h
@@ -83,7 +83,7 @@ class vtkEdgeSubdivisionCriterion;
 class VTK_GRAPHICS_EXPORT vtkStreamingTessellator : public vtkObject
 {
   public:
-    vtkTypeRevisionMacro(vtkStreamingTessellator,vtkObject);
+    vtkTypeMacro(vtkStreamingTessellator,vtkObject);
     static vtkStreamingTessellator* New();
     virtual void PrintSelf( ostream& os, vtkIndent indent );
 
diff --git a/Graphics/vtkStreamingTessellatorGenerator.py b/Graphics/vtkStreamingTessellatorGenerator.py
index 568d19e4034a6f804398d1700e4f0824eef58984..8d001b7142c99d012ce93f9717564821e86a1329 100755
--- a/Graphics/vtkStreamingTessellatorGenerator.py
+++ b/Graphics/vtkStreamingTessellatorGenerator.py
@@ -491,7 +491,6 @@ static void DefaultFacet0Callback(
   (void)pd;
 }
 
-vtkCxxRevisionMacro(vtkStreamingTessellator,"1.3");
 vtkStandardNewMacro(vtkStreamingTessellator);
 
 void vtkStreamingTessellator::PrintSelf( ostream& os, vtkIndent indent )
diff --git a/Graphics/vtkStripper.cxx b/Graphics/vtkStripper.cxx
index 6c14b06b60944465a6ceb803c5cc86e37808eeab..03028207892715d74a307cc3e9d41ae45085b782 100644
--- a/Graphics/vtkStripper.cxx
+++ b/Graphics/vtkStripper.cxx
@@ -24,7 +24,6 @@
 #include "vtkPolyData.h"
 #include "vtkIdTypeArray.h"
 
-vtkCxxRevisionMacro(vtkStripper, "1.76");
 vtkStandardNewMacro(vtkStripper);
 
 // Construct object with MaximumLength set to 1000.
diff --git a/Graphics/vtkStripper.h b/Graphics/vtkStripper.h
index 795afb38425b827dbf221de2e799e8a13de1fce3..f587731f745774aa7ca1f0996af701ed07d02a33 100644
--- a/Graphics/vtkStripper.h
+++ b/Graphics/vtkStripper.h
@@ -56,7 +56,7 @@
 class VTK_GRAPHICS_EXPORT vtkStripper : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkStripper,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkStripper,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkStructuredGridClip.cxx b/Graphics/vtkStructuredGridClip.cxx
index 769edc76371916345b4f6dc3f4766c2bef024971..988905670ac1bace956702e30ec11f029970b26e 100644
--- a/Graphics/vtkStructuredGridClip.cxx
+++ b/Graphics/vtkStructuredGridClip.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridClip, "1.1");
 vtkStandardNewMacro(vtkStructuredGridClip);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkStructuredGridClip.h b/Graphics/vtkStructuredGridClip.h
index 6d98db95acb5afac26c3e8ab0e5a9ab378a95003..5d5d1cf37876ec53b59c73c8f6b2256486008427 100644
--- a/Graphics/vtkStructuredGridClip.h
+++ b/Graphics/vtkStructuredGridClip.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkStructuredGridClip : public vtkStructuredGridAlgori
 {
 public:
   static vtkStructuredGridClip *New();
-  vtkTypeRevisionMacro(vtkStructuredGridClip,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkStructuredGridClip,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStructuredGridGeometryFilter.cxx b/Graphics/vtkStructuredGridGeometryFilter.cxx
index 5197d85fcbd735495529bea668c92f61638b9b66..18a96d6d12263da41dd462db7f093e0d16a2fee1 100644
--- a/Graphics/vtkStructuredGridGeometryFilter.cxx
+++ b/Graphics/vtkStructuredGridGeometryFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridGeometryFilter, "1.65");
 vtkStandardNewMacro(vtkStructuredGridGeometryFilter);
 
 // Construct with initial extent of all the data
diff --git a/Graphics/vtkStructuredGridGeometryFilter.h b/Graphics/vtkStructuredGridGeometryFilter.h
index 90111d8b9e233c687a8db70fb9be1856e67cb8ab..c7b1aee3b652da2367a782a3cf4ddb6bb9d613a9 100644
--- a/Graphics/vtkStructuredGridGeometryFilter.h
+++ b/Graphics/vtkStructuredGridGeometryFilter.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkStructuredGridGeometryFilter : public vtkPolyDataAl
 {
 public:
   static vtkStructuredGridGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkStructuredGridGeometryFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkStructuredGridGeometryFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkStructuredGridOutlineFilter.cxx b/Graphics/vtkStructuredGridOutlineFilter.cxx
index 68ad0ebc44cb18e0fbec50b46845124855c37c95..5d8d47455377753c17f8b465d756ea7a27110c75 100644
--- a/Graphics/vtkStructuredGridOutlineFilter.cxx
+++ b/Graphics/vtkStructuredGridOutlineFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridOutlineFilter, "1.49");
 vtkStandardNewMacro(vtkStructuredGridOutlineFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkStructuredGridOutlineFilter.h b/Graphics/vtkStructuredGridOutlineFilter.h
index ee19ad3bfdd0692793dd613c4ddf0bddd1122333..2e382485cdae0694baf48ae9900c8ae8ae649507 100644
--- a/Graphics/vtkStructuredGridOutlineFilter.h
+++ b/Graphics/vtkStructuredGridOutlineFilter.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkStructuredGridOutlineFilter : public vtkPolyDataAlg
 {
 public:
   static vtkStructuredGridOutlineFilter *New();
-  vtkTypeRevisionMacro(vtkStructuredGridOutlineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkStructuredGridOutlineFilter,vtkPolyDataAlgorithm);
 
 protected:
   vtkStructuredGridOutlineFilter() {};
diff --git a/Graphics/vtkStructuredPointsGeometryFilter.cxx b/Graphics/vtkStructuredPointsGeometryFilter.cxx
index 5a9f6700d8c4a61c4b8cfbbf87d9cf6b72c89873..709df4ce934779f3f714da0cac4f94f1e6a2ed57 100644
--- a/Graphics/vtkStructuredPointsGeometryFilter.cxx
+++ b/Graphics/vtkStructuredPointsGeometryFilter.cxx
@@ -15,7 +15,6 @@
 #include "vtkStructuredPointsGeometryFilter.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsGeometryFilter, "1.40");
 vtkStandardNewMacro(vtkStructuredPointsGeometryFilter);
 
 vtkStructuredPointsGeometryFilter::vtkStructuredPointsGeometryFilter()
diff --git a/Graphics/vtkStructuredPointsGeometryFilter.h b/Graphics/vtkStructuredPointsGeometryFilter.h
index 6ab2083a1ad3b91353cbb461d5c820b2a6bbc1a8..60667b3ea587fd7a3ec9514fa88e5d24a6c0af33 100644
--- a/Graphics/vtkStructuredPointsGeometryFilter.h
+++ b/Graphics/vtkStructuredPointsGeometryFilter.h
@@ -25,7 +25,7 @@
 class VTK_GRAPHICS_EXPORT vtkStructuredPointsGeometryFilter : public vtkImageDataGeometryFilter
 {
 public:
-  vtkTypeRevisionMacro(vtkStructuredPointsGeometryFilter,vtkImageDataGeometryFilter);
+  vtkTypeMacro(vtkStructuredPointsGeometryFilter,vtkImageDataGeometryFilter);
   
   // Description:
   // Construct with initial extent of all the data
diff --git a/Graphics/vtkSubPixelPositionEdgels.cxx b/Graphics/vtkSubPixelPositionEdgels.cxx
index 19cbf750096a922059b5e2cf022988c429b395bd..5de13998eb85616f46770b7f507a45c9f3647d0d 100644
--- a/Graphics/vtkSubPixelPositionEdgels.cxx
+++ b/Graphics/vtkSubPixelPositionEdgels.cxx
@@ -25,7 +25,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkSubPixelPositionEdgels, "1.49");
 vtkStandardNewMacro(vtkSubPixelPositionEdgels);
 
 vtkSubPixelPositionEdgels::vtkSubPixelPositionEdgels()
diff --git a/Graphics/vtkSubPixelPositionEdgels.h b/Graphics/vtkSubPixelPositionEdgels.h
index 7828dab60d0c018728ab74c72a620cc131f6da74..baaf3a7f8388ab73e5866735b40867c2899a6cd9 100644
--- a/Graphics/vtkSubPixelPositionEdgels.h
+++ b/Graphics/vtkSubPixelPositionEdgels.h
@@ -43,7 +43,7 @@ class VTK_GRAPHICS_EXPORT vtkSubPixelPositionEdgels : public vtkPolyDataAlgorith
 {
 public:
   static vtkSubPixelPositionEdgels *New();
-  vtkTypeRevisionMacro(vtkSubPixelPositionEdgels,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSubPixelPositionEdgels,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSubdivideTetra.cxx b/Graphics/vtkSubdivideTetra.cxx
index 4daeb837fd313a103de885f45b614d28d24ac0e1..c76bbb9c17f43603c3dedd934176746f0906fb92 100644
--- a/Graphics/vtkSubdivideTetra.cxx
+++ b/Graphics/vtkSubdivideTetra.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkSubdivideTetra, "1.29");
 vtkStandardNewMacro(vtkSubdivideTetra);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSubdivideTetra.h b/Graphics/vtkSubdivideTetra.h
index 85b647e859b677c7f9bd6471c65e5311192e0696..0dcf3630d591d505ea83f0690462cde731269fa0 100644
--- a/Graphics/vtkSubdivideTetra.h
+++ b/Graphics/vtkSubdivideTetra.h
@@ -26,7 +26,7 @@ class VTK_GRAPHICS_EXPORT vtkSubdivideTetra : public vtkUnstructuredGridAlgorith
 {
 public:
   static vtkSubdivideTetra *New();
-  vtkTypeRevisionMacro(vtkSubdivideTetra,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkSubdivideTetra,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Graphics/vtkSuperquadricSource.cxx b/Graphics/vtkSuperquadricSource.cxx
index f4aab264d9558714a6faa87fe4e55dc13c7ccde8..366a04e51cca6ae8c98c100d2327d0430abd08ba 100644
--- a/Graphics/vtkSuperquadricSource.cxx
+++ b/Graphics/vtkSuperquadricSource.cxx
@@ -32,7 +32,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSuperquadricSource, "1.25");
 vtkStandardNewMacro(vtkSuperquadricSource);
 
 static void evalSuperquadric(double u, double v,
diff --git a/Graphics/vtkSuperquadricSource.h b/Graphics/vtkSuperquadricSource.h
index 6b8b94f4a5efc8fede3ea1da044f2e47fc53342e..19bc964978c7752a78ba46d787add244e4d6c379 100644
--- a/Graphics/vtkSuperquadricSource.h
+++ b/Graphics/vtkSuperquadricSource.h
@@ -60,7 +60,7 @@ public:
   // direction, a theta resolution and a phi resolutions of 16.
   static vtkSuperquadricSource *New();
 
-  vtkTypeRevisionMacro(vtkSuperquadricSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSuperquadricSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSynchronizedTemplates2D.cxx b/Graphics/vtkSynchronizedTemplates2D.cxx
index 2351cc8f7a65dbc5873cadb1289e141d1d556b55..3dbcab6eb4d1ec53f69846e98cf2f858e2b65c20 100644
--- a/Graphics/vtkSynchronizedTemplates2D.cxx
+++ b/Graphics/vtkSynchronizedTemplates2D.cxx
@@ -36,7 +36,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSynchronizedTemplates2D, "1.8");
 vtkStandardNewMacro(vtkSynchronizedTemplates2D);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSynchronizedTemplates2D.h b/Graphics/vtkSynchronizedTemplates2D.h
index 37b6d35c9cb58ec097d6b957a220f00b85e7719d..ca4c73622b633f65ad88dd98b895f2c787d3714c 100644
--- a/Graphics/vtkSynchronizedTemplates2D.h
+++ b/Graphics/vtkSynchronizedTemplates2D.h
@@ -37,7 +37,7 @@ class VTK_GRAPHICS_EXPORT vtkSynchronizedTemplates2D : public vtkPolyDataAlgorit
 {
 public:
   static vtkSynchronizedTemplates2D *New();
-  vtkTypeRevisionMacro(vtkSynchronizedTemplates2D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSynchronizedTemplates2D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkSynchronizedTemplates3D.cxx b/Graphics/vtkSynchronizedTemplates3D.cxx
index aa19c01530ecd20d16e3fcfdb61f87ca64a9e899..077783d8e1ed0081b9bb66f38a9a4191f15cddf0 100644
--- a/Graphics/vtkSynchronizedTemplates3D.cxx
+++ b/Graphics/vtkSynchronizedTemplates3D.cxx
@@ -38,7 +38,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSynchronizedTemplates3D, "1.12");
 vtkStandardNewMacro(vtkSynchronizedTemplates3D);
 
 //----------------------------------------------------------------------------
diff --git a/Graphics/vtkSynchronizedTemplates3D.h b/Graphics/vtkSynchronizedTemplates3D.h
index d5a5e755545560f2dfc574d7c00fb8118fae36ce..90234dbb6219482b5b7dccaa5183d47d4c97bc10 100644
--- a/Graphics/vtkSynchronizedTemplates3D.h
+++ b/Graphics/vtkSynchronizedTemplates3D.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkSynchronizedTemplates3D : public vtkPolyDataAlgorit
 public:
   static vtkSynchronizedTemplates3D *New();
 
-  vtkTypeRevisionMacro(vtkSynchronizedTemplates3D,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSynchronizedTemplates3D,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkSynchronizedTemplatesCutter3D.cxx b/Graphics/vtkSynchronizedTemplatesCutter3D.cxx
index 6e26ff1b8955b8a7e89d2d94a62d78844b8c14ab..c15dd0c8cefca5c131e0b3eb56353c0eb7eb93ec 100644
--- a/Graphics/vtkSynchronizedTemplatesCutter3D.cxx
+++ b/Graphics/vtkSynchronizedTemplatesCutter3D.cxx
@@ -39,7 +39,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkSynchronizedTemplatesCutter3D, "1.6");
 vtkStandardNewMacro(vtkSynchronizedTemplatesCutter3D);
 vtkCxxSetObjectMacro(vtkSynchronizedTemplatesCutter3D,CutFunction,vtkImplicitFunction);
 
diff --git a/Graphics/vtkSynchronizedTemplatesCutter3D.h b/Graphics/vtkSynchronizedTemplatesCutter3D.h
index d09a178e236cc9c71a0ad279e35706f43827690d..482daeaa1ebd0802313bc43d0bdf6ce5b1daf4ec 100644
--- a/Graphics/vtkSynchronizedTemplatesCutter3D.h
+++ b/Graphics/vtkSynchronizedTemplatesCutter3D.h
@@ -34,7 +34,7 @@ class VTK_GRAPHICS_EXPORT vtkSynchronizedTemplatesCutter3D : public vtkSynchroni
 public:
   static vtkSynchronizedTemplatesCutter3D *New();
 
-  vtkTypeRevisionMacro(vtkSynchronizedTemplatesCutter3D,vtkSynchronizedTemplates3D);
+  vtkTypeMacro(vtkSynchronizedTemplatesCutter3D,vtkSynchronizedTemplates3D);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkTableBasedClipDataSet.cxx b/Graphics/vtkTableBasedClipDataSet.cxx
index 2f4d65a852f74c87e26ebc304b59f21d4f15d184..392b1b486fc151da55e3f08d906fa736faa0a581 100644
--- a/Graphics/vtkTableBasedClipDataSet.cxx
+++ b/Graphics/vtkTableBasedClipDataSet.cxx
@@ -59,7 +59,6 @@
 
 #include "vtkTableBasedClipCases.h"
 
-vtkCxxRevisionMacro( vtkTableBasedClipDataSet, "1.10" );
 vtkStandardNewMacro( vtkTableBasedClipDataSet );
 vtkCxxSetObjectMacro( vtkTableBasedClipDataSet, ClipFunction, vtkImplicitFunction );
 
diff --git a/Graphics/vtkTableBasedClipDataSet.h b/Graphics/vtkTableBasedClipDataSet.h
index da42a10d61fdafc84c52a9ff763d3a076a79810d..094b154484ae943546fa28c366ea8f72e46460dd 100644
--- a/Graphics/vtkTableBasedClipDataSet.h
+++ b/Graphics/vtkTableBasedClipDataSet.h
@@ -100,7 +100,7 @@ class vtkIncrementalPointLocator;
 class VTK_GRAPHICS_EXPORT vtkTableBasedClipDataSet : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro( vtkTableBasedClipDataSet, vtkUnstructuredGridAlgorithm );
+  vtkTypeMacro( vtkTableBasedClipDataSet, vtkUnstructuredGridAlgorithm );
   void PrintSelf( ostream & os, vtkIndent indent );
 
   // Description:
diff --git a/Graphics/vtkTableToPolyData.cxx b/Graphics/vtkTableToPolyData.cxx
index 5d97dd77b83721b92ce38fb13e6a10ab7c6262c7..2c47bc687c15fa9a280fa82ca7e88a120ec11b18 100644
--- a/Graphics/vtkTableToPolyData.cxx
+++ b/Graphics/vtkTableToPolyData.cxx
@@ -24,7 +24,6 @@
 #include "vtkInformation.h"
 
 vtkStandardNewMacro(vtkTableToPolyData);
-vtkCxxRevisionMacro(vtkTableToPolyData, "1.5");
 //----------------------------------------------------------------------------
 vtkTableToPolyData::vtkTableToPolyData()
 {
diff --git a/Graphics/vtkTableToPolyData.h b/Graphics/vtkTableToPolyData.h
index 233cde407a0628c558c9460325397fff0cdfe142..e8efa01443fc034f43c7ff7cf8c797d440405d43 100644
--- a/Graphics/vtkTableToPolyData.h
+++ b/Graphics/vtkTableToPolyData.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkTableToPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTableToPolyData* New();
-  vtkTypeRevisionMacro(vtkTableToPolyData, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTableToPolyData, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTableToStructuredGrid.cxx b/Graphics/vtkTableToStructuredGrid.cxx
index 229c709f79e2463f44cae425f0aef7b8d70eb034..2eae03d8820afea6aeab74577b7dab2231186556 100644
--- a/Graphics/vtkTableToStructuredGrid.cxx
+++ b/Graphics/vtkTableToStructuredGrid.cxx
@@ -24,7 +24,6 @@
 #include "vtkTable.h"
 
 vtkStandardNewMacro(vtkTableToStructuredGrid);
-vtkCxxRevisionMacro(vtkTableToStructuredGrid, "1.2");
 //----------------------------------------------------------------------------
 vtkTableToStructuredGrid::vtkTableToStructuredGrid()
 {
diff --git a/Graphics/vtkTableToStructuredGrid.h b/Graphics/vtkTableToStructuredGrid.h
index 11ce21fb4d6040bb23a7de1d72750cd64e82f2ec..b2a6d70326f5dd4979f7748ae56283f8e5c718be 100644
--- a/Graphics/vtkTableToStructuredGrid.h
+++ b/Graphics/vtkTableToStructuredGrid.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkTableToStructuredGrid : public vtkStructuredGridAlg
 {
 public:
   static vtkTableToStructuredGrid* New();
-  vtkTypeRevisionMacro(vtkTableToStructuredGrid, vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkTableToStructuredGrid, vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTemporalPathLineFilter.cxx b/Graphics/vtkTemporalPathLineFilter.cxx
index 5093adae5c2321e3da5acc7f2d70b70f3e09ad05..e296abad46dcb61946818ff9fd1c7c3ecf933197 100644
--- a/Graphics/vtkTemporalPathLineFilter.cxx
+++ b/Graphics/vtkTemporalPathLineFilter.cxx
@@ -33,7 +33,6 @@
 #include <stdexcept>
 #include <cmath>
 //---------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkTemporalPathLineFilter, "1.11");
 vtkStandardNewMacro(vtkTemporalPathLineFilter);
 //----------------------------------------------------------------------------
 //
diff --git a/Graphics/vtkTemporalPathLineFilter.h b/Graphics/vtkTemporalPathLineFilter.h
index 4d22d905b1082b371613a19c064fe46b7b35e677..8d412e3366b72ca8efd3f660581580a632b08f5b 100644
--- a/Graphics/vtkTemporalPathLineFilter.h
+++ b/Graphics/vtkTemporalPathLineFilter.h
@@ -53,7 +53,7 @@ class VTK_GRAPHICS_EXPORT vtkTemporalPathLineFilter : public vtkPolyDataAlgorith
     // Description:
     // Standard Type-Macro
     static vtkTemporalPathLineFilter *New();
-    vtkTypeRevisionMacro(vtkTemporalPathLineFilter,vtkPolyDataAlgorithm);
+    vtkTypeMacro(vtkTemporalPathLineFilter,vtkPolyDataAlgorithm);
     void PrintSelf(ostream& os, vtkIndent indent);
 
     // Description:
diff --git a/Graphics/vtkTemporalStatistics.cxx b/Graphics/vtkTemporalStatistics.cxx
index caa69dd9efc3f00060e134662b3da23395d6a33e..3808c9ec385b087f83f2f0d987b8ab8a98185942 100644
--- a/Graphics/vtkTemporalStatistics.cxx
+++ b/Graphics/vtkTemporalStatistics.cxx
@@ -44,7 +44,6 @@
 #include <vtkstd/algorithm>
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkTemporalStatistics, "1.8");
 vtkStandardNewMacro(vtkTemporalStatistics);
 
 //=============================================================================
diff --git a/Graphics/vtkTemporalStatistics.h b/Graphics/vtkTemporalStatistics.h
index 0a3e23401ae4ade5d163f8d018ecbf437502d573..cfcfb06021bcbd68172e95a9b523aac09b4f8fd7 100644
--- a/Graphics/vtkTemporalStatistics.h
+++ b/Graphics/vtkTemporalStatistics.h
@@ -60,7 +60,7 @@ class vtkGraph;
 class VTK_GRAPHICS_EXPORT vtkTemporalStatistics : public vtkPassInputTypeAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkTemporalStatistics, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkTemporalStatistics, vtkPassInputTypeAlgorithm);
   static vtkTemporalStatistics *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Graphics/vtkTensorGlyph.cxx b/Graphics/vtkTensorGlyph.cxx
index 5d73b38ed4e1806059f81649107f07b5bf6d5834..d69da35f40283f4e2d0e24aaa18e0ad1d8e15815 100644
--- a/Graphics/vtkTensorGlyph.cxx
+++ b/Graphics/vtkTensorGlyph.cxx
@@ -27,7 +27,6 @@
 #include "vtkPolyData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkTensorGlyph, "1.61");
 vtkStandardNewMacro(vtkTensorGlyph);
 
 // Construct object with scaling on and scale factor 1.0. Eigenvalues are 
diff --git a/Graphics/vtkTensorGlyph.h b/Graphics/vtkTensorGlyph.h
index cd0f2f006c5adc32bf651d3e9ec0a9dbe6d9d582..65edcfe772f1e592b2627c8dfc010aec6af6fd48 100644
--- a/Graphics/vtkTensorGlyph.h
+++ b/Graphics/vtkTensorGlyph.h
@@ -81,7 +81,7 @@
 class VTK_GRAPHICS_EXPORT vtkTensorGlyph : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkTensorGlyph,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTensorGlyph,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkTessellatedBoxSource.cxx b/Graphics/vtkTessellatedBoxSource.cxx
index f632ffd5ffbb241aeb841286bebfc0daeec2090c..fb313dc750b1f1c077da2f6fd9fed6375767ba84 100644
--- a/Graphics/vtkTessellatedBoxSource.cxx
+++ b/Graphics/vtkTessellatedBoxSource.cxx
@@ -21,7 +21,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkTessellatedBoxSource, "1.2");
 vtkStandardNewMacro(vtkTessellatedBoxSource);
 
 // ----------------------------------------------------------------------------
diff --git a/Graphics/vtkTessellatedBoxSource.h b/Graphics/vtkTessellatedBoxSource.h
index bf1ef2509a6a59acc58f9ff1f91bb2f72c8501b5..00f1439d601511a2652cf74dd07a3440c997a08a 100644
--- a/Graphics/vtkTessellatedBoxSource.h
+++ b/Graphics/vtkTessellatedBoxSource.h
@@ -38,7 +38,7 @@ class VTK_GRAPHICS_EXPORT vtkTessellatedBoxSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTessellatedBoxSource *New();
-  vtkTypeRevisionMacro(vtkTessellatedBoxSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTessellatedBoxSource,vtkPolyDataAlgorithm);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkTessellatorFilter.cxx b/Graphics/vtkTessellatorFilter.cxx
index f0e7308e4c455a271de8b5d7effd7e65c5b8e327..f90eca4243a6f90c01569de9987856e275293793 100644
--- a/Graphics/vtkTessellatorFilter.cxx
+++ b/Graphics/vtkTessellatorFilter.cxx
@@ -37,7 +37,6 @@
 #include "vtkTessellatorFilter.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkTessellatorFilter, "1.4");
 vtkStandardNewMacro(vtkTessellatorFilter);
 
 // ========================================
diff --git a/Graphics/vtkTessellatorFilter.h b/Graphics/vtkTessellatorFilter.h
index f6593700d8118bf992d42c2bc7b6a89b69ccaa07..99e85188ae92ef618e4256ff87527214199f46f7 100644
--- a/Graphics/vtkTessellatorFilter.h
+++ b/Graphics/vtkTessellatorFilter.h
@@ -66,7 +66,7 @@ class vtkUnstructuredGrid;
 class VTK_GRAPHICS_EXPORT vtkTessellatorFilter : public vtkUnstructuredGridAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkTessellatorFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkTessellatorFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   static vtkTessellatorFilter* New();
diff --git a/Graphics/vtkTextSource.cxx b/Graphics/vtkTextSource.cxx
index 34bb556813eeb58b5c9af2eec9226363f217b6d3..f2464869807753cb22f447c90b2bcf1b5d38c9d6 100644
--- a/Graphics/vtkTextSource.cxx
+++ b/Graphics/vtkTextSource.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkTextSource, "1.50");
 vtkStandardNewMacro(vtkTextSource);
 
 #define vtkfont_width 9
diff --git a/Graphics/vtkTextSource.h b/Graphics/vtkTextSource.h
index d2674f1cbb16d63934c79b91184590e8548e1ad4..b0d1b3f62e0debd92aba9b9589bbf569bba2c55d 100644
--- a/Graphics/vtkTextSource.h
+++ b/Graphics/vtkTextSource.h
@@ -38,7 +38,7 @@
 class VTK_GRAPHICS_EXPORT vtkTextSource : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTextSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTextSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTextureMapToCylinder.cxx b/Graphics/vtkTextureMapToCylinder.cxx
index 33f83b026b113b44b5206b068b37245d4c3b26a7..5054e2d9fd10908f6215ca085b86f5ebd9233390 100644
--- a/Graphics/vtkTextureMapToCylinder.cxx
+++ b/Graphics/vtkTextureMapToCylinder.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkTextureMapToCylinder, "1.34");
 vtkStandardNewMacro(vtkTextureMapToCylinder);
 
 // Create object with cylinder axis parallel to z-axis (points (0,0,-0.5) 
diff --git a/Graphics/vtkTextureMapToCylinder.h b/Graphics/vtkTextureMapToCylinder.h
index d0b27781a60d9ce70f300f3353b185de027701a7..49a760ffe006a2e993062921a63aec8bc12e3e51 100644
--- a/Graphics/vtkTextureMapToCylinder.h
+++ b/Graphics/vtkTextureMapToCylinder.h
@@ -48,7 +48,7 @@
 class VTK_GRAPHICS_EXPORT vtkTextureMapToCylinder : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTextureMapToCylinder,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkTextureMapToCylinder,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTextureMapToPlane.cxx b/Graphics/vtkTextureMapToPlane.cxx
index fe78c53b93a7793eb5c633ccbe1eb5bbc6e4d268..3a8d67fdf643e4019bb2905417101c71f742189f 100644
--- a/Graphics/vtkTextureMapToPlane.cxx
+++ b/Graphics/vtkTextureMapToPlane.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkTextureMapToPlane, "1.53");
 vtkStandardNewMacro(vtkTextureMapToPlane);
 
 // Construct with s,t range=(0,1) and automatic plane generation turned on.
diff --git a/Graphics/vtkTextureMapToPlane.h b/Graphics/vtkTextureMapToPlane.h
index f8de329c415fb7b2c740fc0c5a9b14d78e5a8e53..c9697cff73403a2689470dd98e98dd346974a2b3 100644
--- a/Graphics/vtkTextureMapToPlane.h
+++ b/Graphics/vtkTextureMapToPlane.h
@@ -42,7 +42,7 @@
 class VTK_GRAPHICS_EXPORT vtkTextureMapToPlane : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTextureMapToPlane,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkTextureMapToPlane,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTextureMapToSphere.cxx b/Graphics/vtkTextureMapToSphere.cxx
index 8715de58a067b0f03e3418cb5c3059d0740b8bde..9db719ccc2df8af1c57ccb1f97e704fc8e246a72 100644
--- a/Graphics/vtkTextureMapToSphere.cxx
+++ b/Graphics/vtkTextureMapToSphere.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkTextureMapToSphere, "1.35");
 vtkStandardNewMacro(vtkTextureMapToSphere);
 
 // Create object with Center (0,0,0) and the PreventSeam ivar is set to true. The 
diff --git a/Graphics/vtkTextureMapToSphere.h b/Graphics/vtkTextureMapToSphere.h
index a56c4647e835cccd36c3f1a2da6a688bc1d0281e..f1ff8b06518dc907a6e195d6c62eaeb01dc636f0 100644
--- a/Graphics/vtkTextureMapToSphere.h
+++ b/Graphics/vtkTextureMapToSphere.h
@@ -46,7 +46,7 @@
 class VTK_GRAPHICS_EXPORT vtkTextureMapToSphere : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTextureMapToSphere,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkTextureMapToSphere,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTexturedSphereSource.cxx b/Graphics/vtkTexturedSphereSource.cxx
index d02abda883ab9928f4a052ab64f87e3607f96d64..4aa9feba16ac3054f0c20173dcd88dfb07d18d6a 100644
--- a/Graphics/vtkTexturedSphereSource.cxx
+++ b/Graphics/vtkTexturedSphereSource.cxx
@@ -24,7 +24,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkTexturedSphereSource, "1.31");
 vtkStandardNewMacro(vtkTexturedSphereSource);
 
 // Construct sphere with radius=0.5 and default resolution 8 in both Phi
diff --git a/Graphics/vtkTexturedSphereSource.h b/Graphics/vtkTexturedSphereSource.h
index 5d3c92545838ba382efa1bbb6718b1e3875e6846..760a1d99c69c70d777ca9656304d1eaa8d2e6fa7 100644
--- a/Graphics/vtkTexturedSphereSource.h
+++ b/Graphics/vtkTexturedSphereSource.h
@@ -30,7 +30,7 @@
 class VTK_GRAPHICS_EXPORT vtkTexturedSphereSource : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTexturedSphereSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTexturedSphereSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkThreshold.cxx b/Graphics/vtkThreshold.cxx
index c326769c4d99ceffa4e7acd67dd851229fee26de..88e640122d37a1ae90ee2322beb8b04a74623ba3 100644
--- a/Graphics/vtkThreshold.cxx
+++ b/Graphics/vtkThreshold.cxx
@@ -24,7 +24,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkThreshold, "1.73");
 vtkStandardNewMacro(vtkThreshold);
 
 // Construct with lower threshold=0, upper threshold=1, and threshold 
diff --git a/Graphics/vtkThreshold.h b/Graphics/vtkThreshold.h
index c8141dc9689e01ec49aae1999ee8a4e95a8ac572..cd388ce6edd25c1b9e660739a5ee4bd4b18662d6 100644
--- a/Graphics/vtkThreshold.h
+++ b/Graphics/vtkThreshold.h
@@ -51,7 +51,7 @@ class VTK_GRAPHICS_EXPORT vtkThreshold : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkThreshold *New();
-  vtkTypeRevisionMacro(vtkThreshold,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkThreshold,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkThresholdPoints.cxx b/Graphics/vtkThresholdPoints.cxx
index c62418463ba7f4605b3088323accd18aa80d0286..4779cb49df014687fe27cf9f67af22068aa19b4f 100644
--- a/Graphics/vtkThresholdPoints.cxx
+++ b/Graphics/vtkThresholdPoints.cxx
@@ -24,7 +24,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkThresholdPoints, "1.43");
 vtkStandardNewMacro(vtkThresholdPoints);
 
 // Construct with lower threshold=0, upper threshold=1, and threshold 
diff --git a/Graphics/vtkThresholdPoints.h b/Graphics/vtkThresholdPoints.h
index f87036cfcd886963e0bf9783c5a6b743c6af0fa8..74a20e57f3c5bcd53d7e64f7835298235e6c4907 100644
--- a/Graphics/vtkThresholdPoints.h
+++ b/Graphics/vtkThresholdPoints.h
@@ -30,7 +30,7 @@ class VTK_GRAPHICS_EXPORT vtkThresholdPoints : public vtkPolyDataAlgorithm
 {
 public:
   static vtkThresholdPoints *New();
-  vtkTypeRevisionMacro(vtkThresholdPoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkThresholdPoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkThresholdTextureCoords.cxx b/Graphics/vtkThresholdTextureCoords.cxx
index 27424ad65aaaa0ce59d04dcf72ee0d70c60d1a4b..548a08d056bd4c7c603a01b44476c805ab2f8349 100644
--- a/Graphics/vtkThresholdTextureCoords.cxx
+++ b/Graphics/vtkThresholdTextureCoords.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkThresholdTextureCoords, "1.40");
 vtkStandardNewMacro(vtkThresholdTextureCoords);
 
 // Construct with lower threshold=0, upper threshold=1, threshold 
diff --git a/Graphics/vtkThresholdTextureCoords.h b/Graphics/vtkThresholdTextureCoords.h
index 6c17c6da1cc764b2de671831d41500983a84c5c8..3867f13572c10cf5dc6a11b1c1a739564edee609 100644
--- a/Graphics/vtkThresholdTextureCoords.h
+++ b/Graphics/vtkThresholdTextureCoords.h
@@ -41,7 +41,7 @@ class VTK_GRAPHICS_EXPORT vtkThresholdTextureCoords : public vtkDataSetAlgorithm
 {
 public:
   static vtkThresholdTextureCoords *New();
-  vtkTypeRevisionMacro(vtkThresholdTextureCoords,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkThresholdTextureCoords,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Graphics/vtkTimeSourceExample.cxx b/Graphics/vtkTimeSourceExample.cxx
index 36848281f478b92f6a78a3ddfff585649aeb7916..c4e5c12953d0cc85b6009144e2489be5a7f93b11 100644
--- a/Graphics/vtkTimeSourceExample.cxx
+++ b/Graphics/vtkTimeSourceExample.cxx
@@ -30,7 +30,6 @@
 #include "vtkIdTypeArray.h"
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkTimeSourceExample, "1.7");
 vtkStandardNewMacro(vtkTimeSourceExample);
 
 #ifndef M_PI
diff --git a/Graphics/vtkTimeSourceExample.h b/Graphics/vtkTimeSourceExample.h
index d3346364a43f7ccca1edc0ee1ce62c4a1e01b854..772d3f0065cbed8f0c61f5865021d1f132271e33 100644
--- a/Graphics/vtkTimeSourceExample.h
+++ b/Graphics/vtkTimeSourceExample.h
@@ -31,7 +31,7 @@ class VTK_GRAPHICS_EXPORT vtkTimeSourceExample : public vtkUnstructuredGridAlgor
 {
 public:
   static vtkTimeSourceExample *New();
-  vtkTypeRevisionMacro(vtkTimeSourceExample,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkTimeSourceExample,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //Description:
diff --git a/Graphics/vtkTransformCoordinateSystems.cxx b/Graphics/vtkTransformCoordinateSystems.cxx
index d1f5c5e983de3ecf94ae4de4a9640acadcdd283a..7674352e693b9ccfc7ca6f28c5c5bbbdd6e554cc 100644
--- a/Graphics/vtkTransformCoordinateSystems.cxx
+++ b/Graphics/vtkTransformCoordinateSystems.cxx
@@ -21,7 +21,6 @@
 #include "vtkViewport.h"
 #include "vtkPointSet.h"
 
-vtkCxxRevisionMacro(vtkTransformCoordinateSystems, "1.5");
 vtkStandardNewMacro(vtkTransformCoordinateSystems);
 
 //------------------------------------------------------------------------
diff --git a/Graphics/vtkTransformCoordinateSystems.h b/Graphics/vtkTransformCoordinateSystems.h
index d1665736989a65c62ab7b1fbca9ae2c8f6cd7015..1bdc20c55db10884a12274fa954084e0b7342911 100644
--- a/Graphics/vtkTransformCoordinateSystems.h
+++ b/Graphics/vtkTransformCoordinateSystems.h
@@ -33,7 +33,7 @@ class VTK_GRAPHICS_EXPORT vtkTransformCoordinateSystems : public vtkPointSetAlgo
 public:
   // Description:
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkTransformCoordinateSystems,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkTransformCoordinateSystems,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Graphics/vtkTransformFilter.cxx b/Graphics/vtkTransformFilter.cxx
index a0b45172fc6b0acc9e32717e0f70ab8b3ed837fe..e12565e51fba628ce08b45cf20d14438885bde52 100644
--- a/Graphics/vtkTransformFilter.cxx
+++ b/Graphics/vtkTransformFilter.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkPointSet.h"
 
-vtkCxxRevisionMacro(vtkTransformFilter, "1.47");
 vtkStandardNewMacro(vtkTransformFilter);
 vtkCxxSetObjectMacro(vtkTransformFilter,Transform,vtkAbstractTransform);
 
diff --git a/Graphics/vtkTransformFilter.h b/Graphics/vtkTransformFilter.h
index 032ca75460123ccb8e3f28c1c07e73b6f2f187e9..b159805cc385e8a76899a87c1b0b8ba64b9427c5 100644
--- a/Graphics/vtkTransformFilter.h
+++ b/Graphics/vtkTransformFilter.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkTransformFilter : public vtkPointSetAlgorithm
 {
 public:
   static vtkTransformFilter *New();
-  vtkTypeRevisionMacro(vtkTransformFilter,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkTransformFilter,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTransformPolyDataFilter.cxx b/Graphics/vtkTransformPolyDataFilter.cxx
index c4bf1f74fa66a1e9108d817acdfd3f57d32a6f82..f37d4c12b0dc922331bce1482927949e1b195efc 100644
--- a/Graphics/vtkTransformPolyDataFilter.cxx
+++ b/Graphics/vtkTransformPolyDataFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkTransformPolyDataFilter, "1.35");
 vtkStandardNewMacro(vtkTransformPolyDataFilter);
 vtkCxxSetObjectMacro(vtkTransformPolyDataFilter,
                      Transform,vtkAbstractTransform);
diff --git a/Graphics/vtkTransformPolyDataFilter.h b/Graphics/vtkTransformPolyDataFilter.h
index 69df111b293ce39ffc7b91149850e2df53b65aaf..93d69c4f2604909cf2393b1f0b9d60608900f1e0 100644
--- a/Graphics/vtkTransformPolyDataFilter.h
+++ b/Graphics/vtkTransformPolyDataFilter.h
@@ -42,7 +42,7 @@ class VTK_GRAPHICS_EXPORT vtkTransformPolyDataFilter : public vtkPolyDataAlgorit
 {
 public:
   static vtkTransformPolyDataFilter *New();
-  vtkTypeRevisionMacro(vtkTransformPolyDataFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTransformPolyDataFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTransformTextureCoords.cxx b/Graphics/vtkTransformTextureCoords.cxx
index 832294afdbdf7d446415a2b6d118ede36cfc84ef..f34eec658df09a810a3edfda86701753b60da9ba 100644
--- a/Graphics/vtkTransformTextureCoords.cxx
+++ b/Graphics/vtkTransformTextureCoords.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkTransformTextureCoords, "1.37");
 vtkStandardNewMacro(vtkTransformTextureCoords);
 
 // Create instance with Origin (0.5,0.5,0.5); Position (0,0,0); and Scale
diff --git a/Graphics/vtkTransformTextureCoords.h b/Graphics/vtkTransformTextureCoords.h
index 4d90f9cec43c0894958a36421eff6843ac693569..580ae839baf30621022a2839eee7a495775729ff 100644
--- a/Graphics/vtkTransformTextureCoords.h
+++ b/Graphics/vtkTransformTextureCoords.h
@@ -37,7 +37,7 @@
 class VTK_GRAPHICS_EXPORT vtkTransformTextureCoords : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkTransformTextureCoords,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkTransformTextureCoords,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTriangleFilter.cxx b/Graphics/vtkTriangleFilter.cxx
index c22f5a9f7e892addbae60b777d8d67df8a012326..8edb109095f7bd427c9d0ec017aa1c03b03552d1 100644
--- a/Graphics/vtkTriangleFilter.cxx
+++ b/Graphics/vtkTriangleFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkPolygon.h"
 #include "vtkTriangleStrip.h"
 
-vtkCxxRevisionMacro(vtkTriangleFilter, "1.54");
 vtkStandardNewMacro(vtkTriangleFilter);
 
 int vtkTriangleFilter::RequestData(
diff --git a/Graphics/vtkTriangleFilter.h b/Graphics/vtkTriangleFilter.h
index 868102c77e2361f0f5dcfb98d9fc8b2ecc5e1924..9945061bbb42796ef4275f1ae378d662542e2502 100644
--- a/Graphics/vtkTriangleFilter.h
+++ b/Graphics/vtkTriangleFilter.h
@@ -27,7 +27,7 @@ class VTK_GRAPHICS_EXPORT vtkTriangleFilter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTriangleFilter *New();
-  vtkTypeRevisionMacro(vtkTriangleFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTriangleFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkTriangularTCoords.cxx b/Graphics/vtkTriangularTCoords.cxx
index cec8d7a46c1054510bd287abdf61f7fdf267def3..1fb3bd0e25294ac41ea819e975e18b5441e0c2a5 100644
--- a/Graphics/vtkTriangularTCoords.cxx
+++ b/Graphics/vtkTriangularTCoords.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkTriangularTCoords, "1.31");
 vtkStandardNewMacro(vtkTriangularTCoords);
 
 int vtkTriangularTCoords::RequestData(
diff --git a/Graphics/vtkTriangularTCoords.h b/Graphics/vtkTriangularTCoords.h
index b67a4cf49398f93d0fd2eca340368006b7dacc70..6b8aba8ad87c6493687a8412881817dd0db1fcc9 100644
--- a/Graphics/vtkTriangularTCoords.h
+++ b/Graphics/vtkTriangularTCoords.h
@@ -35,7 +35,7 @@ class VTK_GRAPHICS_EXPORT vtkTriangularTCoords : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTriangularTCoords *New();
-  vtkTypeRevisionMacro(vtkTriangularTCoords,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTriangularTCoords,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Graphics/vtkTubeFilter.cxx b/Graphics/vtkTubeFilter.cxx
index 712b43fc625766a371562ada3f497868039a3ef6..287c8fe13467648c2d14bd9c90e7790988063f1f 100644
--- a/Graphics/vtkTubeFilter.cxx
+++ b/Graphics/vtkTubeFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyLine.h"
 
-vtkCxxRevisionMacro(vtkTubeFilter, "1.89");
 vtkStandardNewMacro(vtkTubeFilter);
 
 // Construct object with radius 0.5, radius variation turned off, the number 
diff --git a/Graphics/vtkTubeFilter.h b/Graphics/vtkTubeFilter.h
index b2d25994e69a5ec4ab101879c4a6c35477d3bb80..baf6cccd924960085de6444a0e484181952bc078 100644
--- a/Graphics/vtkTubeFilter.h
+++ b/Graphics/vtkTubeFilter.h
@@ -72,7 +72,7 @@ class vtkPoints;
 class VTK_GRAPHICS_EXPORT vtkTubeFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkTubeFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTubeFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkUncertaintyTubeFilter.cxx b/Graphics/vtkUncertaintyTubeFilter.cxx
index 4da7f21c64c33a26aee5ca9f56bf3d82055d4204..79f77dc1c11965cf32214e730c8e40b730e9dd9f 100644
--- a/Graphics/vtkUncertaintyTubeFilter.cxx
+++ b/Graphics/vtkUncertaintyTubeFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyLine.h"
 
-vtkCxxRevisionMacro(vtkUncertaintyTubeFilter, "1.3");
 vtkStandardNewMacro(vtkUncertaintyTubeFilter);
 
 //
diff --git a/Graphics/vtkUncertaintyTubeFilter.h b/Graphics/vtkUncertaintyTubeFilter.h
index a3d72042a3cdeb617453adae52f4c841289735ac..973826f4b8a36ae5c112064734dbe81c7a64e9d1 100644
--- a/Graphics/vtkUncertaintyTubeFilter.h
+++ b/Graphics/vtkUncertaintyTubeFilter.h
@@ -41,7 +41,7 @@ class VTK_GRAPHICS_EXPORT vtkUncertaintyTubeFilter : public vtkPolyDataAlgorithm
 public:
   // Description:
   // Standard methods for printing and obtaining type information for instances of this class.
-  vtkTypeRevisionMacro(vtkUncertaintyTubeFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkUncertaintyTubeFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkUnstructuredGridGeometryFilter.cxx b/Graphics/vtkUnstructuredGridGeometryFilter.cxx
index d6ffb0a9d054f2821dc58fe44b8bf341a98a8a18..05b0227369b49c16cdfa4ebf3c2de399c80f0772 100644
--- a/Graphics/vtkUnstructuredGridGeometryFilter.cxx
+++ b/Graphics/vtkUnstructuredGridGeometryFilter.cxx
@@ -50,7 +50,6 @@
 #include <vtkstd/vector>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkUnstructuredGridGeometryFilter, "1.9");
 vtkStandardNewMacro(vtkUnstructuredGridGeometryFilter);
 
 #if 0
diff --git a/Graphics/vtkUnstructuredGridGeometryFilter.h b/Graphics/vtkUnstructuredGridGeometryFilter.h
index 66b28d8affc0bcc0de3df60ecbe23723338b7768..4f8b327a191bb1e61b4101fe0a5ed36f44e63feb 100644
--- a/Graphics/vtkUnstructuredGridGeometryFilter.h
+++ b/Graphics/vtkUnstructuredGridGeometryFilter.h
@@ -47,7 +47,7 @@ class VTK_GRAPHICS_EXPORT vtkUnstructuredGridGeometryFilter : public vtkUnstruct
 {
 public:
   static vtkUnstructuredGridGeometryFilter *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridGeometryFilter,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkUnstructuredGridGeometryFilter,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkVectorDot.cxx b/Graphics/vtkVectorDot.cxx
index 22ac8a46b650e36ef6231595bfa4f75f9212025f..7fa95e6b8b14d6349efc7c006a7da27d8c3baf51 100644
--- a/Graphics/vtkVectorDot.cxx
+++ b/Graphics/vtkVectorDot.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkVectorDot, "1.40");
 vtkStandardNewMacro(vtkVectorDot);
 
 // Construct object with scalar range is (-1,1).
diff --git a/Graphics/vtkVectorDot.h b/Graphics/vtkVectorDot.h
index d71a4611f597d90bf405f3e12b84cc81b158230f..720562451217c4e64cc50dd0bf5ec1537ecda250 100644
--- a/Graphics/vtkVectorDot.h
+++ b/Graphics/vtkVectorDot.h
@@ -28,7 +28,7 @@
 class VTK_GRAPHICS_EXPORT vtkVectorDot : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkVectorDot,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkVectorDot,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkVectorNorm.cxx b/Graphics/vtkVectorNorm.cxx
index 3be9abe7d6dc8302a29247eb9f3d36febab34ca4..ec3c6e87424a4ada5b2ac1421f79001221590208 100644
--- a/Graphics/vtkVectorNorm.cxx
+++ b/Graphics/vtkVectorNorm.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVectorNorm, "1.45");
 vtkStandardNewMacro(vtkVectorNorm);
 
 // Construct with normalize flag off.
diff --git a/Graphics/vtkVectorNorm.h b/Graphics/vtkVectorNorm.h
index 6c061a25e5cfed01151302f1df1c2737a8e96091..d55ac88e195b4d80f288e9361315b18e826076da 100644
--- a/Graphics/vtkVectorNorm.h
+++ b/Graphics/vtkVectorNorm.h
@@ -36,7 +36,7 @@
 class VTK_GRAPHICS_EXPORT vtkVectorNorm : public vtkDataSetAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkVectorNorm,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkVectorNorm,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkVertexGlyphFilter.cxx b/Graphics/vtkVertexGlyphFilter.cxx
index 30a763edc363748fc32aa5e77c28d4c09e512879..6aeeff3b846e93c487f00cf831b52acfabbbcc0f 100644
--- a/Graphics/vtkVertexGlyphFilter.cxx
+++ b/Graphics/vtkVertexGlyphFilter.cxx
@@ -31,7 +31,6 @@
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkVertexGlyphFilter, "1.2");
 vtkStandardNewMacro(vtkVertexGlyphFilter);
 
 //-----------------------------------------------------------------------------
diff --git a/Graphics/vtkVertexGlyphFilter.h b/Graphics/vtkVertexGlyphFilter.h
index 9cd0a5503053f5e4798c09f9421bc9e10bbf9838..8e2dfa6dad492cb4a9228ac67d302c340f5ed0ca 100644
--- a/Graphics/vtkVertexGlyphFilter.h
+++ b/Graphics/vtkVertexGlyphFilter.h
@@ -36,7 +36,7 @@
 class VTK_GRAPHICS_EXPORT vtkVertexGlyphFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkVertexGlyphFilter, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkVertexGlyphFilter, vtkPolyDataAlgorithm);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkVertexGlyphFilter *New();
 
diff --git a/Graphics/vtkVoxelContoursToSurfaceFilter.cxx b/Graphics/vtkVoxelContoursToSurfaceFilter.cxx
index 2a680bc9be93af83814b2c00a74503a7a313d734..7f5969a9d2a72a934173cc1503499a0a1994587e 100644
--- a/Graphics/vtkVoxelContoursToSurfaceFilter.cxx
+++ b/Graphics/vtkVoxelContoursToSurfaceFilter.cxx
@@ -24,7 +24,6 @@
 #include "vtkPolyData.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkVoxelContoursToSurfaceFilter, "1.28");
 vtkStandardNewMacro(vtkVoxelContoursToSurfaceFilter);
 
 vtkVoxelContoursToSurfaceFilter::vtkVoxelContoursToSurfaceFilter()
diff --git a/Graphics/vtkVoxelContoursToSurfaceFilter.h b/Graphics/vtkVoxelContoursToSurfaceFilter.h
index 39667f18f56a258548bcb4ad4312783f51bd9688..065268cdf1204fcc0c5316a7517fd2232c0df747 100644
--- a/Graphics/vtkVoxelContoursToSurfaceFilter.h
+++ b/Graphics/vtkVoxelContoursToSurfaceFilter.h
@@ -46,7 +46,7 @@ class VTK_GRAPHICS_EXPORT vtkVoxelContoursToSurfaceFilter : public vtkPolyDataAl
 {
 public:
   static vtkVoxelContoursToSurfaceFilter *New();
-  vtkTypeRevisionMacro(vtkVoxelContoursToSurfaceFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkVoxelContoursToSurfaceFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkWarpLens.cxx b/Graphics/vtkWarpLens.cxx
index 45a93b89ee87d39c9b449bbafe6631e0272b6d5e..284d384d3e98be2b851395676bc5ff25d76492b9 100644
--- a/Graphics/vtkWarpLens.cxx
+++ b/Graphics/vtkWarpLens.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointSet.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkWarpLens, "1.30");
 vtkStandardNewMacro(vtkWarpLens);
 
 //
diff --git a/Graphics/vtkWarpLens.h b/Graphics/vtkWarpLens.h
index e5898e10f477fe1c9f059b9f156f0e8b9e08f943..c9f4897ad0e32c5494c1957ddd7a533475e3ce2a 100644
--- a/Graphics/vtkWarpLens.h
+++ b/Graphics/vtkWarpLens.h
@@ -26,7 +26,7 @@ class VTK_GRAPHICS_EXPORT vtkWarpLens : public vtkPointSetAlgorithm
 {
 public:
   static vtkWarpLens *New();
-  vtkTypeRevisionMacro(vtkWarpLens,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkWarpLens,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkWarpScalar.cxx b/Graphics/vtkWarpScalar.cxx
index decc1f87a656bdb53a2a7fc5fef22c7d29fb7fbb..538c920eb6f193cd25cdfb2d36d5cb85d0a0c7b8 100644
--- a/Graphics/vtkWarpScalar.cxx
+++ b/Graphics/vtkWarpScalar.cxx
@@ -24,7 +24,6 @@
 #include "vtkPointSet.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkWarpScalar, "1.51");
 vtkStandardNewMacro(vtkWarpScalar);
 
 vtkWarpScalar::vtkWarpScalar()
diff --git a/Graphics/vtkWarpScalar.h b/Graphics/vtkWarpScalar.h
index ad798ab0cf2729d17b6a1a7612afee6072748012..850a7f435fd06b03ea148f3ec73107c2a7cbd2d4 100644
--- a/Graphics/vtkWarpScalar.h
+++ b/Graphics/vtkWarpScalar.h
@@ -44,7 +44,7 @@ class VTK_GRAPHICS_EXPORT vtkWarpScalar : public vtkPointSetAlgorithm
 {
 public:
   static vtkWarpScalar *New();
-  vtkTypeRevisionMacro(vtkWarpScalar,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkWarpScalar,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkWarpTo.cxx b/Graphics/vtkWarpTo.cxx
index c9c5fbe53deae7c13cea00a55301baabb3dedb13..05d9c391ad2bb005e42cc84b461ce2450d3c1f98 100644
--- a/Graphics/vtkWarpTo.cxx
+++ b/Graphics/vtkWarpTo.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointSet.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkWarpTo, "1.43");
 vtkStandardNewMacro(vtkWarpTo);
 
 vtkWarpTo::vtkWarpTo() 
diff --git a/Graphics/vtkWarpTo.h b/Graphics/vtkWarpTo.h
index bfca4a2bcff4f4e556f7e5093f69eab215b4e36c..cfb9d7c924a71b19d5dd0fb4ae88b5aed9b554e6 100644
--- a/Graphics/vtkWarpTo.h
+++ b/Graphics/vtkWarpTo.h
@@ -26,7 +26,7 @@ class VTK_GRAPHICS_EXPORT vtkWarpTo : public vtkPointSetAlgorithm
 {
 public:
   static vtkWarpTo *New();
-  vtkTypeRevisionMacro(vtkWarpTo,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkWarpTo,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkWarpVector.cxx b/Graphics/vtkWarpVector.cxx
index 58bfa85f43c6196078602eac3aa9b0f78270832d..98e58974027d7a9a5180fac3e914ba77fa9f6052 100644
--- a/Graphics/vtkWarpVector.cxx
+++ b/Graphics/vtkWarpVector.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointSet.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkWarpVector, "1.48");
 vtkStandardNewMacro(vtkWarpVector);
 
 vtkWarpVector::vtkWarpVector()
diff --git a/Graphics/vtkWarpVector.h b/Graphics/vtkWarpVector.h
index 47c34bbf4564b201e4e1c246b0a94690f32be7ae..94f8e3931aadbc1062268dba81924dec9ef140d1 100644
--- a/Graphics/vtkWarpVector.h
+++ b/Graphics/vtkWarpVector.h
@@ -29,7 +29,7 @@ class VTK_GRAPHICS_EXPORT vtkWarpVector : public vtkPointSetAlgorithm
 {
 public:
   static vtkWarpVector *New();
-  vtkTypeRevisionMacro(vtkWarpVector,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkWarpVector,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkWindowedSincPolyDataFilter.cxx b/Graphics/vtkWindowedSincPolyDataFilter.cxx
index 73842c8183bbb5a64967c5104e2a50795003ec22..27bb48dbafe9859d0f53520072fcfefdcd6de141 100644
--- a/Graphics/vtkWindowedSincPolyDataFilter.cxx
+++ b/Graphics/vtkWindowedSincPolyDataFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkTriangle.h"
 #include "vtkTriangleFilter.h"
 
-vtkCxxRevisionMacro(vtkWindowedSincPolyDataFilter, "1.42");
 vtkStandardNewMacro(vtkWindowedSincPolyDataFilter);
 
 // Construct object with number of iterations 20; passband .1;
diff --git a/Graphics/vtkWindowedSincPolyDataFilter.h b/Graphics/vtkWindowedSincPolyDataFilter.h
index b3be0a524dc241c403217d9d0cc79427d37569ca..3b399fbce1ef692b8f2c8ccc302f65bb9163741f 100644
--- a/Graphics/vtkWindowedSincPolyDataFilter.h
+++ b/Graphics/vtkWindowedSincPolyDataFilter.h
@@ -142,7 +142,7 @@
 class VTK_GRAPHICS_EXPORT vtkWindowedSincPolyDataFilter : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkWindowedSincPolyDataFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkWindowedSincPolyDataFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Graphics/vtkYoungsMaterialInterface.cxx b/Graphics/vtkYoungsMaterialInterface.cxx
index b4a348679252803e64e0ae38b6f99d315e90868b..8ae1952be6bc1be40c803a19658dad494efe48c0 100644
--- a/Graphics/vtkYoungsMaterialInterface.cxx
+++ b/Graphics/vtkYoungsMaterialInterface.cxx
@@ -128,7 +128,6 @@ public:
 };
 
 // standard constructors and factory
-vtkCxxRevisionMacro(vtkYoungsMaterialInterface, "1.17");
 vtkStandardNewMacro(vtkYoungsMaterialInterface);
 
 #ifdef DEBUG
diff --git a/Graphics/vtkYoungsMaterialInterface.h b/Graphics/vtkYoungsMaterialInterface.h
index c7c118b669438507f61e4fe5e8af0925eb9110e6..6dedbb19cb7c0ad7fe0fe055fb58ce848f54e4b6 100644
--- a/Graphics/vtkYoungsMaterialInterface.h
+++ b/Graphics/vtkYoungsMaterialInterface.h
@@ -40,7 +40,7 @@ class VTK_GRAPHICS_EXPORT vtkYoungsMaterialInterface : public vtkMultiBlockDataS
 {
 public:
   static vtkYoungsMaterialInterface* New();
-  vtkTypeRevisionMacro(vtkYoungsMaterialInterface,vtkMultiBlockDataSetAlgorithm);          
+  vtkTypeMacro(vtkYoungsMaterialInterface,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtk3DSImporter.cxx b/Hybrid/vtk3DSImporter.cxx
index 88e512fb556ca0280305e42a481da6d1395a4131..d51a7f5d48c545c734afbb455d8d12f957cfff05 100644
--- a/Hybrid/vtk3DSImporter.cxx
+++ b/Hybrid/vtk3DSImporter.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderer.h"
 #include "vtkStripper.h"
 
-vtkCxxRevisionMacro(vtk3DSImporter, "1.40");
 vtkStandardNewMacro(vtk3DSImporter);
 
 // Silent warning like
diff --git a/Hybrid/vtk3DSImporter.h b/Hybrid/vtk3DSImporter.h
index 6aeb023c78abac4fe111c13f55d1543453a8d739..cd4b500b5d1ecbe0206b7bb091c72d47824b2978 100644
--- a/Hybrid/vtk3DSImporter.h
+++ b/Hybrid/vtk3DSImporter.h
@@ -33,7 +33,7 @@ class VTK_HYBRID_EXPORT vtk3DSImporter : public vtkImporter
 public:
   static vtk3DSImporter *New();
 
-  vtkTypeRevisionMacro(vtk3DSImporter,vtkImporter);
+  vtkTypeMacro(vtk3DSImporter,vtkImporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkAnnotatedCubeActor.cxx b/Hybrid/vtkAnnotatedCubeActor.cxx
index 413a2ef06ab4388b8000f8e81dc8764d79a25f81..0a22fd7e96440b4f8c1af1540df44e5b366b682c 100644
--- a/Hybrid/vtkAnnotatedCubeActor.cxx
+++ b/Hybrid/vtkAnnotatedCubeActor.cxx
@@ -31,7 +31,6 @@
 #include "vtkTransformFilter.h"
 #include "vtkVectorText.h"
 
-vtkCxxRevisionMacro(vtkAnnotatedCubeActor, "1.6");
 vtkStandardNewMacro(vtkAnnotatedCubeActor);
 
 //-------------------------------------------------------------------------
diff --git a/Hybrid/vtkAnnotatedCubeActor.h b/Hybrid/vtkAnnotatedCubeActor.h
index ecc8c141686c925ab35749e1717662298cc632cd..736b568cccadb9bf2f8a9511cd45883342d04325 100644
--- a/Hybrid/vtkAnnotatedCubeActor.h
+++ b/Hybrid/vtkAnnotatedCubeActor.h
@@ -54,7 +54,7 @@ class VTK_HYBRID_EXPORT vtkAnnotatedCubeActor : public vtkProp3D
 {
 public:
   static vtkAnnotatedCubeActor *New();
-  vtkTypeRevisionMacro(vtkAnnotatedCubeActor,vtkProp3D);
+  vtkTypeMacro(vtkAnnotatedCubeActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkArcPlotter.cxx b/Hybrid/vtkArcPlotter.cxx
index 12dd32a72030c89046a3a189dc4af21a4742abda..6c67f8a11870fb351498eea721a4c72a613cdf05 100644
--- a/Hybrid/vtkArcPlotter.cxx
+++ b/Hybrid/vtkArcPlotter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkArcPlotter, "1.26");
 vtkStandardNewMacro(vtkArcPlotter);
 
 vtkCxxSetObjectMacro(vtkArcPlotter,Camera,vtkCamera);
diff --git a/Hybrid/vtkArcPlotter.h b/Hybrid/vtkArcPlotter.h
index ad8325914a30ec897d7925557dcf2e8e60001f01..3f57fc6ebbde6f33e63e796e62459c145348325b 100644
--- a/Hybrid/vtkArcPlotter.h
+++ b/Hybrid/vtkArcPlotter.h
@@ -60,7 +60,7 @@ public:
   // VTK_SCALARS.
   static vtkArcPlotter *New();
 
-  vtkTypeRevisionMacro(vtkArcPlotter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkArcPlotter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkAxesActor.cxx b/Hybrid/vtkAxesActor.cxx
index 3539e5af6b346449100f24237f2ec32e78d8a61a..5502205a0f1d5b6fd19027c9f2a4ed14482bde63 100644
--- a/Hybrid/vtkAxesActor.cxx
+++ b/Hybrid/vtkAxesActor.cxx
@@ -31,7 +31,6 @@
 #include "vtkTextProperty.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkAxesActor, "1.7");
 vtkStandardNewMacro(vtkAxesActor);
 
 vtkCxxSetObjectMacro( vtkAxesActor, UserDefinedTip, vtkPolyData );
diff --git a/Hybrid/vtkAxesActor.h b/Hybrid/vtkAxesActor.h
index 7e6e7ba76799636a00baf7f254c29c23c065053b..8507ea4c005a3a2739c343f064a1192ff6ab6cf1 100644
--- a/Hybrid/vtkAxesActor.h
+++ b/Hybrid/vtkAxesActor.h
@@ -62,7 +62,7 @@ class VTK_HYBRID_EXPORT vtkAxesActor : public vtkProp3D
 {
 public:
   static vtkAxesActor *New();
-  vtkTypeRevisionMacro(vtkAxesActor,vtkProp3D);
+  vtkTypeMacro(vtkAxesActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description: 
diff --git a/Hybrid/vtkAxisActor.cxx b/Hybrid/vtkAxisActor.cxx
index 9b2016bb527fce9ee5e7bdf5ba1c9fee23035c59..60c13146724419f515fbbec485d7a7557fa779fc 100644
--- a/Hybrid/vtkAxisActor.cxx
+++ b/Hybrid/vtkAxisActor.cxx
@@ -33,7 +33,6 @@
 // ****************************************************************
 
 vtkStandardNewMacro(vtkAxisActor);
-vtkCxxRevisionMacro(vtkAxisActor, "1.7");
 vtkCxxSetObjectMacro(vtkAxisActor, Camera, vtkCamera); 
 
 // ****************************************************************
diff --git a/Hybrid/vtkAxisActor.h b/Hybrid/vtkAxisActor.h
index 66afe64af19712b078fdf59edf4ffa6867d4755d..89ae4a98ee66f29deb8a09f7c551cffe8fa679bf 100644
--- a/Hybrid/vtkAxisActor.h
+++ b/Hybrid/vtkAxisActor.h
@@ -85,7 +85,7 @@ class vtkVectorText;
 class VTK_HYBRID_EXPORT vtkAxisActor : public vtkActor
 {
 public:
-  vtkTypeRevisionMacro(vtkAxisActor,vtkActor);
+  vtkTypeMacro(vtkAxisActor,vtkActor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkBarChartActor.cxx b/Hybrid/vtkBarChartActor.cxx
index 96a597ce2971626f1859ff739d9a9e547923e871..811931852e96eb76c0526295e01796fea7db18a8 100644
--- a/Hybrid/vtkBarChartActor.cxx
+++ b/Hybrid/vtkBarChartActor.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/vector>
 
 
-vtkCxxRevisionMacro(vtkBarChartActor, "1.4");
 vtkStandardNewMacro(vtkBarChartActor);
 
 vtkCxxSetObjectMacro(vtkBarChartActor,Input,vtkDataObject);
diff --git a/Hybrid/vtkBarChartActor.h b/Hybrid/vtkBarChartActor.h
index ad6a1df5c65c3d02cd1cab731cfb6ca2b9cae3ad..689355d4d6f88c894f74e10285d036764c02f0d4 100644
--- a/Hybrid/vtkBarChartActor.h
+++ b/Hybrid/vtkBarChartActor.h
@@ -48,7 +48,7 @@ class VTK_HYBRID_EXPORT vtkBarChartActor : public vtkActor2D
 public:
   // Description:
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkBarChartActor,vtkActor2D);
+  vtkTypeMacro(vtkBarChartActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkCaptionActor2D.cxx b/Hybrid/vtkCaptionActor2D.cxx
index af77e996cc2f217747bef434fd0e3c2ae413f2a1..ef299dcdd786b68aa7197e1f3eb94de2f3832e22 100644
--- a/Hybrid/vtkCaptionActor2D.cxx
+++ b/Hybrid/vtkCaptionActor2D.cxx
@@ -32,7 +32,6 @@
 #include "vtkTextProperty.h"
 #include "vtkViewport.h"
 
-vtkCxxRevisionMacro(vtkCaptionActor2D, "1.37");
 vtkStandardNewMacro(vtkCaptionActor2D);
 
 vtkCxxSetObjectMacro(vtkCaptionActor2D,LeaderGlyph,vtkPolyData);
diff --git a/Hybrid/vtkCaptionActor2D.h b/Hybrid/vtkCaptionActor2D.h
index c7b6b5dbaff73501d37353dd0f2fcc7471b88fd2..aadc8701ca1c1857b82c4dc8e40a23b31795ba06 100644
--- a/Hybrid/vtkCaptionActor2D.h
+++ b/Hybrid/vtkCaptionActor2D.h
@@ -68,7 +68,7 @@ class vtkTextProperty;
 class VTK_HYBRID_EXPORT vtkCaptionActor2D : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkCaptionActor2D,vtkActor2D);
+  vtkTypeMacro(vtkCaptionActor2D,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkCaptionActor2D *New();
diff --git a/Hybrid/vtkCornerAnnotation.cxx b/Hybrid/vtkCornerAnnotation.cxx
index d5558f02ca86c075280cbf8673cd3ce1c471c129..d3fcf23fae2e60e5f7307ce32c25d1788a09d22f 100644
--- a/Hybrid/vtkCornerAnnotation.cxx
+++ b/Hybrid/vtkCornerAnnotation.cxx
@@ -27,7 +27,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkCornerAnnotation);
-vtkCxxRevisionMacro(vtkCornerAnnotation, "1.16");
 
 vtkSetObjectImplementationMacro(vtkCornerAnnotation,ImageActor,vtkImageActor);
 vtkSetObjectImplementationMacro(vtkCornerAnnotation,WindowLevel,
diff --git a/Hybrid/vtkCornerAnnotation.h b/Hybrid/vtkCornerAnnotation.h
index abab2117b2a82e8add12d99c2914db14aec998c1..41ab4ca40f61d15ddd6f51e243ac6f182e4d1bbc 100644
--- a/Hybrid/vtkCornerAnnotation.h
+++ b/Hybrid/vtkCornerAnnotation.h
@@ -33,7 +33,7 @@ class vtkTextProperty;
 class VTK_HYBRID_EXPORT vtkCornerAnnotation : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkCornerAnnotation,vtkActor2D);
+  vtkTypeMacro(vtkCornerAnnotation,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkCubeAxesActor.cxx b/Hybrid/vtkCubeAxesActor.cxx
index 7f6a4dd147464760b1278a2b94d7e509e8dc8690..a64d6ea5585f4510f37ab4189f80d422d00ad8c6 100644
--- a/Hybrid/vtkCubeAxesActor.cxx
+++ b/Hybrid/vtkCubeAxesActor.cxx
@@ -32,7 +32,6 @@
 // *************************************************************************
 
 vtkStandardNewMacro(vtkCubeAxesActor);
-vtkCxxRevisionMacro(vtkCubeAxesActor, "1.5");
 vtkCxxSetObjectMacro(vtkCubeAxesActor, Camera,vtkCamera);
 
 // *************************************************************************
diff --git a/Hybrid/vtkCubeAxesActor.h b/Hybrid/vtkCubeAxesActor.h
index 76226ab270d803203f12117d460854771422b88c..80bd3a42ec9b667a2720e2a4d6c9fccd1d43ad8a 100644
--- a/Hybrid/vtkCubeAxesActor.h
+++ b/Hybrid/vtkCubeAxesActor.h
@@ -65,7 +65,7 @@ class vtkCamera;
 class VTK_HYBRID_EXPORT vtkCubeAxesActor : public vtkActor
 {
 public:
-  vtkTypeRevisionMacro(vtkCubeAxesActor,vtkActor);
+  vtkTypeMacro(vtkCubeAxesActor,vtkActor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkCubeAxesActor2D.cxx b/Hybrid/vtkCubeAxesActor2D.cxx
index b55893bfe8747f3d661106f818ea74286cd47406..fb6e6b4da724b37d67791338331246588f9fa7ca 100644
--- a/Hybrid/vtkCubeAxesActor2D.cxx
+++ b/Hybrid/vtkCubeAxesActor2D.cxx
@@ -22,7 +22,6 @@
 #include "vtkTextProperty.h"
 #include "vtkViewport.h"
 
-vtkCxxRevisionMacro(vtkCubeAxesActor2D, "1.57");
 vtkStandardNewMacro(vtkCubeAxesActor2D);
 
 vtkCxxSetObjectMacro(vtkCubeAxesActor2D,Input, vtkDataSet);
diff --git a/Hybrid/vtkCubeAxesActor2D.h b/Hybrid/vtkCubeAxesActor2D.h
index 5928985ca4d6cbd3d203f8e5086672339ad85112..3a4d522d732687e2d1a0cd67c94419ddca218f93 100644
--- a/Hybrid/vtkCubeAxesActor2D.h
+++ b/Hybrid/vtkCubeAxesActor2D.h
@@ -57,7 +57,7 @@ class vtkTextProperty;
 class VTK_HYBRID_EXPORT vtkCubeAxesActor2D : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkCubeAxesActor2D,vtkActor2D);
+  vtkTypeMacro(vtkCubeAxesActor2D,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkDSPFilterDefinition.cxx b/Hybrid/vtkDSPFilterDefinition.cxx
index c56fa013394c8417dfd25be5f6a4105b1da53f42..4768d48259e9b49a5c6e6a8938807cc176974b68 100644
--- a/Hybrid/vtkDSPFilterDefinition.cxx
+++ b/Hybrid/vtkDSPFilterDefinition.cxx
@@ -27,7 +27,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkDSPFilterDefinition, "1.2");
 vtkStandardNewMacro(vtkDSPFilterDefinition);
 
 class vtkDSPFilterDefinitionVectorDoubleSTLCloak
diff --git a/Hybrid/vtkDSPFilterDefinition.h b/Hybrid/vtkDSPFilterDefinition.h
index defcef850182216887e60bf78e372159bc44eef0..9d54de21cde4f8d2fc291b3edd702f69f0e89f46 100644
--- a/Hybrid/vtkDSPFilterDefinition.h
+++ b/Hybrid/vtkDSPFilterDefinition.h
@@ -36,7 +36,7 @@ class vtkDSPFilterDefinitionStringSTLCloak;
 class VTK_HYBRID_EXPORT vtkDSPFilterDefinition : public vtkObject
 {
  public:
-  vtkTypeRevisionMacro(vtkDSPFilterDefinition, vtkObject);
+  vtkTypeMacro(vtkDSPFilterDefinition, vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
   static vtkDSPFilterDefinition *New();
 
diff --git a/Hybrid/vtkDSPFilterGroup.cxx b/Hybrid/vtkDSPFilterGroup.cxx
index 162baae96e9b09e38e0fad2d7291f978ba6971bf..d78d7bbb11d80fdcda019140f97d5e175f376f37 100644
--- a/Hybrid/vtkDSPFilterGroup.cxx
+++ b/Hybrid/vtkDSPFilterGroup.cxx
@@ -36,7 +36,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkDSPFilterGroup, "1.2");
 vtkStandardNewMacro(vtkDSPFilterGroup);
 
 
diff --git a/Hybrid/vtkDSPFilterGroup.h b/Hybrid/vtkDSPFilterGroup.h
index b12653484edc32af61addae179cd3aad4c4193e3..a45a0342f566c555966f4fef905bc506eccc5923 100644
--- a/Hybrid/vtkDSPFilterGroup.h
+++ b/Hybrid/vtkDSPFilterGroup.h
@@ -41,7 +41,7 @@ class VTK_HYBRID_EXPORT vtkDSPFilterGroup : public vtkObject
 {
 public:
   static vtkDSPFilterGroup *New();
-  vtkTypeRevisionMacro(vtkDSPFilterGroup,vtkObject);
+  vtkTypeMacro(vtkDSPFilterGroup,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Hybrid/vtkDepthSortPolyData.cxx b/Hybrid/vtkDepthSortPolyData.cxx
index 14d38110b0eb47ee672f831bb9ae62d5a131f51e..1cf9c505f5f8a103364357c200806db6678d9b6b 100644
--- a/Hybrid/vtkDepthSortPolyData.cxx
+++ b/Hybrid/vtkDepthSortPolyData.cxx
@@ -27,7 +27,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedIntArray.h"
 
-vtkCxxRevisionMacro(vtkDepthSortPolyData, "1.33");
 vtkStandardNewMacro(vtkDepthSortPolyData);
 
 vtkCxxSetObjectMacro(vtkDepthSortPolyData,Camera,vtkCamera);
diff --git a/Hybrid/vtkDepthSortPolyData.h b/Hybrid/vtkDepthSortPolyData.h
index bbfc59f2b62a791c7120f9150c9b3a55ce091117..5d0dcfd2c0e86a39a2bd1237cc1f72f94a335194 100644
--- a/Hybrid/vtkDepthSortPolyData.h
+++ b/Hybrid/vtkDepthSortPolyData.h
@@ -49,7 +49,7 @@ public:
   // Instantiate object.
   static vtkDepthSortPolyData *New();
 
-  vtkTypeRevisionMacro(vtkDepthSortPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDepthSortPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkEarthSource.cxx b/Hybrid/vtkEarthSource.cxx
index cf37e5f2b372625f9aebd8b17754909479ab6aa8..c94fa3b1ddc05a314adfe0eaf4f5dbe12e504ea7 100644
--- a/Hybrid/vtkEarthSource.cxx
+++ b/Hybrid/vtkEarthSource.cxx
@@ -27,7 +27,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkEarthSource, "1.27");
 vtkStandardNewMacro(vtkEarthSource);
 
 // Description:
diff --git a/Hybrid/vtkEarthSource.h b/Hybrid/vtkEarthSource.h
index 94e44ab00ac1ae1449400a0c4b35216a07992cff..483c272863f97ea1c40372a6d4da063915e43a52 100644
--- a/Hybrid/vtkEarthSource.h
+++ b/Hybrid/vtkEarthSource.h
@@ -29,7 +29,7 @@ class VTK_HYBRID_EXPORT vtkEarthSource : public vtkPolyDataAlgorithm
 {
 public:
   static vtkEarthSource *New();
-  vtkTypeRevisionMacro(vtkEarthSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkEarthSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkExodusIICache.cxx b/Hybrid/vtkExodusIICache.cxx
index f38ce6bb8187f788f4080c317dae8312b20209aa..62d49ecfe8f3e1df845892238814ee9d220d2cc4 100644
--- a/Hybrid/vtkExodusIICache.cxx
+++ b/Hybrid/vtkExodusIICache.cxx
@@ -65,7 +65,6 @@ void printLRUBack( vtkExodusIICacheRef& cit )
 
 // ============================================================================
 
-vtkCxxRevisionMacro(vtkExodusIICache,"1.6");
 vtkStandardNewMacro(vtkExodusIICache);
 
 vtkExodusIICache::vtkExodusIICache()
diff --git a/Hybrid/vtkExodusIICache.h b/Hybrid/vtkExodusIICache.h
index 9c3ac8006c16db0030592565746ccb6fc67b2491..49b68c51876ef48a6eaadaa95123e51f8958f1c0 100644
--- a/Hybrid/vtkExodusIICache.h
+++ b/Hybrid/vtkExodusIICache.h
@@ -121,7 +121,7 @@ class VTK_HYBRID_EXPORT vtkExodusIICache : public vtkObject
 {
 public:
   static vtkExodusIICache* New();
-  vtkTypeRevisionMacro(vtkExodusIICache,vtkObject);
+  vtkTypeMacro(vtkExodusIICache,vtkObject);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   /// Empty the cache
diff --git a/Hybrid/vtkExodusIIReader.cxx b/Hybrid/vtkExodusIIReader.cxx
index 31ac0622b4a6587356a56c7f8eba4da6a3226000..ddbb28fa345b8b40a329f79631da3b87879147d3 100644
--- a/Hybrid/vtkExodusIIReader.cxx
+++ b/Hybrid/vtkExodusIIReader.cxx
@@ -326,7 +326,6 @@ void vtkExodusIIReaderPrivate::ArrayInfoType::Reset()
 }
 
 // ------------------------------------------------------- PRIVATE CLASS MEMBERS
-vtkCxxRevisionMacro(vtkExodusIIReaderPrivate,"1.89");
 vtkStandardNewMacro(vtkExodusIIReaderPrivate);
 vtkCxxSetObjectMacro(vtkExodusIIReaderPrivate, Parser, vtkExodusIIReaderParser);
 
@@ -5353,7 +5352,6 @@ vtkDataArray* vtkExodusIIReaderPrivate::FindDisplacementVectors( int timeStep )
 
 // -------------------------------------------------------- PUBLIC CLASS MEMBERS
 
-vtkCxxRevisionMacro(vtkExodusIIReader,"1.89");
 vtkStandardNewMacro(vtkExodusIIReader);
 vtkCxxSetObjectMacro(vtkExodusIIReader,Metadata,vtkExodusIIReaderPrivate);
 vtkCxxSetObjectMacro(vtkExodusIIReader,ExodusModel,vtkExodusModel);
diff --git a/Hybrid/vtkExodusIIReader.h b/Hybrid/vtkExodusIIReader.h
index 23524ae9c01b36e1ef248555ff60af22105bfecb..7954981b20d6aa335f259ff7ce2a5867effa21f2 100644
--- a/Hybrid/vtkExodusIIReader.h
+++ b/Hybrid/vtkExodusIIReader.h
@@ -52,7 +52,7 @@ class VTK_HYBRID_EXPORT vtkExodusIIReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkExodusIIReader *New();
-  vtkTypeRevisionMacro(vtkExodusIIReader,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkExodusIIReader,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkExodusIIReaderParser.cxx b/Hybrid/vtkExodusIIReaderParser.cxx
index 22bbb4a3b6b46671aa51e47c7186d53d4d5c0b7e..71086c6d1148e48223763ee83d86faf2b287ca95 100644
--- a/Hybrid/vtkExodusIIReaderParser.cxx
+++ b/Hybrid/vtkExodusIIReaderParser.cxx
@@ -23,7 +23,6 @@
 #include <cassert>
 
 vtkStandardNewMacro(vtkExodusIIReaderParser);
-vtkCxxRevisionMacro(vtkExodusIIReaderParser, "1.3");
 //-----------------------------------------------------------------------------
 vtkExodusIIReaderParser::vtkExodusIIReaderParser()
 {
diff --git a/Hybrid/vtkExodusIIReaderParser.h b/Hybrid/vtkExodusIIReaderParser.h
index 4c3d7e2f1f9d53e1b5619367b04e8bd0ea65af6b..b703c39c2798a3b1959b096c64d9804d403dce5d 100644
--- a/Hybrid/vtkExodusIIReaderParser.h
+++ b/Hybrid/vtkExodusIIReaderParser.h
@@ -37,7 +37,7 @@ class VTK_HYBRID_EXPORT vtkExodusIIReaderParser : public vtkXMLParser
 {
 public:
   static vtkExodusIIReaderParser* New();
-  vtkTypeRevisionMacro(vtkExodusIIReaderParser, vtkXMLParser);
+  vtkTypeMacro(vtkExodusIIReaderParser, vtkXMLParser);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkExodusIIReaderPrivate.h b/Hybrid/vtkExodusIIReaderPrivate.h
index ca208335148fc4ecb1313a830309549c1b9ecdf8..f43133977243a1edd2a2f53c5108b4c35e07eaa4 100644
--- a/Hybrid/vtkExodusIIReaderPrivate.h
+++ b/Hybrid/vtkExodusIIReaderPrivate.h
@@ -30,7 +30,7 @@ class vtkExodusIIReaderPrivate : public vtkObject
 public:
   static vtkExodusIIReaderPrivate* New();
   void PrintData( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkExodusIIReaderPrivate,vtkObject);
+  vtkTypeMacro(vtkExodusIIReaderPrivate,vtkObject);
   //virtual void Modified();
 
   /// Open an ExodusII file for reading. Returns 0 on success.
diff --git a/Hybrid/vtkExodusModel.cxx b/Hybrid/vtkExodusModel.cxx
index 0404eff8655d75de34bf63eedb2cb360172bb241..6a24a49641ddd21ecc218a212f3a3d3ad7d6cc39 100644
--- a/Hybrid/vtkExodusModel.cxx
+++ b/Hybrid/vtkExodusModel.cxx
@@ -33,7 +33,6 @@
 #include <ctype.h>
 
 
-vtkCxxRevisionMacro(vtkExodusModel, "1.10");
 vtkStandardNewMacro(vtkExodusModel);
 
 vtkExodusModel::vtkExodusModel()
diff --git a/Hybrid/vtkExodusModel.h b/Hybrid/vtkExodusModel.h
index 9dbf1cfffb738d7b70eb3afd0eb4e80126ed3bdb..09963bfdf2a87f75086932bd5e35a3e98148e888 100644
--- a/Hybrid/vtkExodusModel.h
+++ b/Hybrid/vtkExodusModel.h
@@ -63,7 +63,7 @@ class vtkUnstructuredGrid;
 class VTK_HYBRID_EXPORT vtkExodusModel : public vtkObject
 { 
 public:
-  vtkTypeRevisionMacro(vtkExodusModel, vtkObject);
+  vtkTypeMacro(vtkExodusModel, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   static vtkExodusModel *New();
diff --git a/Hybrid/vtkExodusReader.cxx b/Hybrid/vtkExodusReader.cxx
index d5619b3eca3cc9964b1bd69403e76de5850ac16e..b44bc61f21a1fdeeea607da26e07c81b35a161ae 100644
--- a/Hybrid/vtkExodusReader.cxx
+++ b/Hybrid/vtkExodusReader.cxx
@@ -942,7 +942,7 @@ private:
   vtkstd::map<vtkStdString,int> apbIndents;
 
 public:
-  vtkTypeRevisionMacro(vtkExodusXMLParser,vtkXMLParser);
+  vtkTypeMacro(vtkExodusXMLParser,vtkXMLParser);
 
   static vtkExodusXMLParser* New();
 
@@ -1395,7 +1395,6 @@ private:
 };
 
 
-vtkCxxRevisionMacro(vtkExodusXMLParser, "1.58");
 vtkStandardNewMacro(vtkExodusXMLParser);
 
 // This is a cruddy hack... because we need to pass a
@@ -1577,7 +1576,6 @@ void vtkExodusMetadata::Finalize()
 }
 
 
-vtkCxxRevisionMacro(vtkExodusReader, "1.58");
 vtkStandardNewMacro(vtkExodusReader);
 
 #ifdef ARRAY_TYPE_NAMES_IN_CXX_FILE
diff --git a/Hybrid/vtkExodusReader.h b/Hybrid/vtkExodusReader.h
index 66b107d83c1dd621454323e3ec841e672ca2bef6..f086fecbc6387c1f6336bb810c5f28e5d2d33e9b 100644
--- a/Hybrid/vtkExodusReader.h
+++ b/Hybrid/vtkExodusReader.h
@@ -56,7 +56,7 @@ class VTK_HYBRID_EXPORT vtkExodusReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkExodusReader *New();
-  vtkTypeRevisionMacro(vtkExodusReader,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkExodusReader,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Hybrid/vtkFacetReader.cxx b/Hybrid/vtkFacetReader.cxx
index 6dbea53e2c5b00717d5dca41721d66ede4f09757..4af88cda8b5dc36b79d0192eb44f5c4728191cbd 100644
--- a/Hybrid/vtkFacetReader.cxx
+++ b/Hybrid/vtkFacetReader.cxx
@@ -35,7 +35,6 @@
 #include <vtkstd/string>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkFacetReader, "1.6");
 vtkStandardNewMacro(vtkFacetReader);
 
 //------------------------------------------------------------------------------
diff --git a/Hybrid/vtkFacetReader.h b/Hybrid/vtkFacetReader.h
index 0c99be4600734be755141b408e35d45ac429728d..93b946c55762e91fc6fa91b84ee6c6fe0aa0b03e 100644
--- a/Hybrid/vtkFacetReader.h
+++ b/Hybrid/vtkFacetReader.h
@@ -42,7 +42,7 @@ class VTK_HYBRID_EXPORT vtkFacetReader : public vtkPolyDataAlgorithm
 {
 public:
   static vtkFacetReader *New();
-  vtkTypeRevisionMacro(vtkFacetReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkFacetReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkGreedyTerrainDecimation.cxx b/Hybrid/vtkGreedyTerrainDecimation.cxx
index 7421825d9a9d6e06ca30c1f400254253b3bcf805..a92a9a681dce4961386450a580e5cc59b0ff0498 100644
--- a/Hybrid/vtkGreedyTerrainDecimation.cxx
+++ b/Hybrid/vtkGreedyTerrainDecimation.cxx
@@ -29,7 +29,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkGreedyTerrainDecimation, "1.25");
 vtkStandardNewMacro(vtkGreedyTerrainDecimation);
 
 // Define some constants describing vertices
diff --git a/Hybrid/vtkGreedyTerrainDecimation.h b/Hybrid/vtkGreedyTerrainDecimation.h
index bc5e83b0858a7f7f0c69915395acf9f3c6912dfc..444ee85347b8f3f92db19c9d0aa093526d00b65c 100644
--- a/Hybrid/vtkGreedyTerrainDecimation.h
+++ b/Hybrid/vtkGreedyTerrainDecimation.h
@@ -84,7 +84,7 @@ class vtkGreedyTerrainDecimationPointInfoType;
 class VTK_HYBRID_EXPORT vtkGreedyTerrainDecimation : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkGreedyTerrainDecimation,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGreedyTerrainDecimation,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkGridTransform.cxx b/Hybrid/vtkGridTransform.cxx
index 671b147364841df38ba774b254762a507b142e0c..9d16abad5fa1806248b6892ff5f2a6a3f3189b4f 100644
--- a/Hybrid/vtkGridTransform.cxx
+++ b/Hybrid/vtkGridTransform.cxx
@@ -20,7 +20,6 @@
 
 #include "math.h"
 
-vtkCxxRevisionMacro(vtkGridTransform, "1.30");
 vtkStandardNewMacro(vtkGridTransform);
 
 vtkCxxSetObjectMacro(vtkGridTransform,DisplacementGrid,vtkImageData);
diff --git a/Hybrid/vtkGridTransform.h b/Hybrid/vtkGridTransform.h
index 13454f355d599b6b894f457c40bbf85e75398d4e..1d663f9587a63bd22cba5ee79fd2ead12fd95c68 100644
--- a/Hybrid/vtkGridTransform.h
+++ b/Hybrid/vtkGridTransform.h
@@ -38,7 +38,7 @@ class VTK_HYBRID_EXPORT vtkGridTransform : public vtkWarpTransform
 {
 public:
   static vtkGridTransform *New();
-  vtkTypeRevisionMacro(vtkGridTransform,vtkWarpTransform);
+  vtkTypeMacro(vtkGridTransform,vtkWarpTransform);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkImageDataLIC2D.cxx b/Hybrid/vtkImageDataLIC2D.cxx
index dc2837a3763df90ddc75b1dd8f4927d1fec3592d..f8118ec3be5fb0668bcb8b9cc1f61df5580e44af 100644
--- a/Hybrid/vtkImageDataLIC2D.cxx
+++ b/Hybrid/vtkImageDataLIC2D.cxx
@@ -38,7 +38,6 @@
   ext[0] << ", " << ext[1] << ", " << ext[2] << ", " << ext[3] << ", " << ext[4] << ", " << ext[5] 
 
 vtkStandardNewMacro(vtkImageDataLIC2D);
-vtkCxxRevisionMacro(vtkImageDataLIC2D, "1.5");
 //----------------------------------------------------------------------------
 vtkImageDataLIC2D::vtkImageDataLIC2D()
 {
diff --git a/Hybrid/vtkImageDataLIC2D.h b/Hybrid/vtkImageDataLIC2D.h
index 6d32b1dcd4ee616ee8a59ce7977004e5dc2632d8..ea007ae7a2678deffa6c7e3473d49c043b5b59a5 100644
--- a/Hybrid/vtkImageDataLIC2D.h
+++ b/Hybrid/vtkImageDataLIC2D.h
@@ -53,7 +53,7 @@ class VTK_HYBRID_EXPORT vtkImageDataLIC2D : public vtkImageAlgorithm
 {
 public:
   static vtkImageDataLIC2D* New();
-  vtkTypeRevisionMacro(vtkImageDataLIC2D, vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageDataLIC2D, vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx b/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx
index d2f06a71312dc1756585b2e38558714de3f95416..82d228155dfa03f942b85bd07eb33dced2263cf7 100644
--- a/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx
+++ b/Hybrid/vtkImageDataLIC2DExtentTranslator.cxx
@@ -18,7 +18,6 @@
 #include "vtkImageDataLIC2D.h"
 
 vtkStandardNewMacro(vtkImageDataLIC2DExtentTranslator);
-vtkCxxRevisionMacro(vtkImageDataLIC2DExtentTranslator, "1.2");
 vtkCxxSetObjectMacro(vtkImageDataLIC2DExtentTranslator, InputExtentTranslator, vtkExtentTranslator);
 //----------------------------------------------------------------------------
 vtkImageDataLIC2DExtentTranslator::vtkImageDataLIC2DExtentTranslator()
diff --git a/Hybrid/vtkImageDataLIC2DExtentTranslator.h b/Hybrid/vtkImageDataLIC2DExtentTranslator.h
index 87162a730825ff164868bed4aadbe31edad22763..0472a5b2010e3449ae1897a58e038affd8892af7 100644
--- a/Hybrid/vtkImageDataLIC2DExtentTranslator.h
+++ b/Hybrid/vtkImageDataLIC2DExtentTranslator.h
@@ -27,7 +27,7 @@ class VTK_HYBRID_EXPORT vtkImageDataLIC2DExtentTranslator : public vtkExtentTran
 {
 public:
   static vtkImageDataLIC2DExtentTranslator* New();
-  vtkTypeRevisionMacro(vtkImageDataLIC2DExtentTranslator, vtkExtentTranslator);
+  vtkTypeMacro(vtkImageDataLIC2DExtentTranslator, vtkExtentTranslator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkImageToPolyDataFilter.cxx b/Hybrid/vtkImageToPolyDataFilter.cxx
index db36824e1b7dd64c2b9d4772dc498bc88da3ecd8..536230dc42af274b68970456e8e4fa074357eb00 100644
--- a/Hybrid/vtkImageToPolyDataFilter.cxx
+++ b/Hybrid/vtkImageToPolyDataFilter.cxx
@@ -28,7 +28,6 @@
 #include "vtkScalarsToColors.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkImageToPolyDataFilter, "1.32");
 vtkStandardNewMacro(vtkImageToPolyDataFilter);
 
 vtkCxxSetObjectMacro(vtkImageToPolyDataFilter,LookupTable,vtkScalarsToColors);
diff --git a/Hybrid/vtkImageToPolyDataFilter.h b/Hybrid/vtkImageToPolyDataFilter.h
index a0a09bfe8aaca984843c2fd352a6c833f92f9880..cbb0e81cce01ad6df02bbcaad3ace2c3d42bc6a2 100644
--- a/Hybrid/vtkImageToPolyDataFilter.h
+++ b/Hybrid/vtkImageToPolyDataFilter.h
@@ -81,7 +81,7 @@ class vtkUnsignedCharArray;
 class VTK_HYBRID_EXPORT vtkImageToPolyDataFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageToPolyDataFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkImageToPolyDataFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkImplicitModeller.cxx b/Hybrid/vtkImplicitModeller.cxx
index 89c2dd897630c144d05da4f47de90d616e7933a1..10d0efd66602b81d4c272d41ae8a875ed72c1c04 100644
--- a/Hybrid/vtkImplicitModeller.cxx
+++ b/Hybrid/vtkImplicitModeller.cxx
@@ -39,7 +39,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImplicitModeller, "1.98");
 vtkStandardNewMacro(vtkImplicitModeller);
 
 struct vtkImplicitModellerAppendInfo
diff --git a/Hybrid/vtkImplicitModeller.h b/Hybrid/vtkImplicitModeller.h
index 9cae1767b20e7c2a1ff172d13293938e9387916b..653da50f4bb72b09af9066386e46f25e300e31e1 100644
--- a/Hybrid/vtkImplicitModeller.h
+++ b/Hybrid/vtkImplicitModeller.h
@@ -96,7 +96,7 @@ class vtkMultiThreader;
 class VTK_HYBRID_EXPORT vtkImplicitModeller : public vtkImageAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkImplicitModeller,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImplicitModeller,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkIterativeClosestPointTransform.cxx b/Hybrid/vtkIterativeClosestPointTransform.cxx
index f9af4405e9d128b7b82618d8bc41139885b8756e..9d8bcd86f5ec4c8d0efb1b1c71e11db2669f24ce 100644
--- a/Hybrid/vtkIterativeClosestPointTransform.cxx
+++ b/Hybrid/vtkIterativeClosestPointTransform.cxx
@@ -22,7 +22,6 @@
 #include "vtkPoints.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkIterativeClosestPointTransform, "1.14");
 vtkStandardNewMacro(vtkIterativeClosestPointTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkIterativeClosestPointTransform.h b/Hybrid/vtkIterativeClosestPointTransform.h
index 8d3ad70b3e775c0e5cc6630f30d436431f1c3c0a..f280386ddf48211034dab713d7eca3c1b30416b4 100644
--- a/Hybrid/vtkIterativeClosestPointTransform.h
+++ b/Hybrid/vtkIterativeClosestPointTransform.h
@@ -50,7 +50,7 @@ class VTK_HYBRID_EXPORT vtkIterativeClosestPointTransform : public vtkLinearTran
 {
 public:
   static vtkIterativeClosestPointTransform *New();
-  vtkTypeRevisionMacro(vtkIterativeClosestPointTransform,vtkLinearTransform);
+  vtkTypeMacro(vtkIterativeClosestPointTransform,vtkLinearTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkLSDynaReader.cxx b/Hybrid/vtkLSDynaReader.cxx
index 790749badb1bbcf91872dd426b3bd0a6e7e7b9e9..7f1e9d0261fbd16c50bc802dcb8e03c505664a35 100644
--- a/Hybrid/vtkLSDynaReader.cxx
+++ b/Hybrid/vtkLSDynaReader.cxx
@@ -110,7 +110,6 @@ typedef FILE* vtkLSDynaFile_t;
 #endif // VTK_LSDYNA_DBG_MULTIBLOCK
 
 vtkStandardNewMacro(vtkLSDynaReader);
-vtkCxxRevisionMacro(vtkLSDynaReader,"1.21");
 
 // Names of vtkDataArrays provided with grid:
 #define LS_ARRAYNAME_USERID             "UserID"
@@ -1305,7 +1304,7 @@ class vtkXMLDynaSummaryParser : public vtkXMLParser
 {
 public:
   static vtkXMLDynaSummaryParser* New();
-  vtkTypeRevisionMacro(vtkXMLDynaSummaryParser,vtkXMLParser);
+  vtkTypeMacro(vtkXMLDynaSummaryParser,vtkXMLParser);
 
   /// Must be set before calling Parse();
   vtkLSDynaReaderPrivate* P;
@@ -1482,7 +1481,6 @@ private:
 };
 
 vtkStandardNewMacro(vtkXMLDynaSummaryParser);
-vtkCxxRevisionMacro(vtkXMLDynaSummaryParser,"1.21");
 // ============================================== End of XML Summary reader class
 
 
diff --git a/Hybrid/vtkLSDynaReader.h b/Hybrid/vtkLSDynaReader.h
index c9435e9383b6b06386cd0dc4005f044c4ae46f1d..63de19b64402e99a0f6cce39599cdea87464daaf 100644
--- a/Hybrid/vtkLSDynaReader.h
+++ b/Hybrid/vtkLSDynaReader.h
@@ -155,7 +155,7 @@ class vtkUnstructuredGrid;
 class VTK_HYBRID_EXPORT vtkLSDynaReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkLSDynaReader,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkLSDynaReader,vtkMultiBlockDataSetAlgorithm);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkLSDynaReader *New();
 
diff --git a/Hybrid/vtkLandmarkTransform.cxx b/Hybrid/vtkLandmarkTransform.cxx
index 80b969f23de585975aae2dbca9cfca99c868a028..f0d982509089701f13eee5523865ba0985ba5e8e 100644
--- a/Hybrid/vtkLandmarkTransform.cxx
+++ b/Hybrid/vtkLandmarkTransform.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkLandmarkTransform, "1.24");
 vtkStandardNewMacro(vtkLandmarkTransform);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkLandmarkTransform.h b/Hybrid/vtkLandmarkTransform.h
index 0286e016557951cf3d542ac72f2b11e0ea8b0bb8..8d86fb50d015cfb2ed395e5944ceae9c1f2b5fd9 100644
--- a/Hybrid/vtkLandmarkTransform.h
+++ b/Hybrid/vtkLandmarkTransform.h
@@ -40,7 +40,7 @@ class VTK_HYBRID_EXPORT vtkLandmarkTransform : public vtkLinearTransform
 public:
   static vtkLandmarkTransform *New();
 
-  vtkTypeRevisionMacro(vtkLandmarkTransform,vtkLinearTransform);
+  vtkTypeMacro(vtkLandmarkTransform,vtkLinearTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkLegendBoxActor.cxx b/Hybrid/vtkLegendBoxActor.cxx
index 7b76daa6befc9ea192bcaef23a5e20000443afcf..6d2ba57e94396d99e59f8b6955c11a1551801114 100644
--- a/Hybrid/vtkLegendBoxActor.cxx
+++ b/Hybrid/vtkLegendBoxActor.cxx
@@ -28,7 +28,6 @@
 #include "vtkTransformPolyDataFilter.h"
 #include "vtkViewport.h"
 
-vtkCxxRevisionMacro(vtkLegendBoxActor, "1.32");
 vtkStandardNewMacro(vtkLegendBoxActor);
 
 vtkCxxSetObjectMacro(vtkLegendBoxActor,EntryTextProperty,vtkTextProperty);
diff --git a/Hybrid/vtkLegendBoxActor.h b/Hybrid/vtkLegendBoxActor.h
index 27461696de06c975f07fbcd4b6e212cc11925d44..a2396451bba77c515824646ce3ff1b893676fad6 100644
--- a/Hybrid/vtkLegendBoxActor.h
+++ b/Hybrid/vtkLegendBoxActor.h
@@ -51,7 +51,7 @@ class vtkProperty2D;
 class VTK_HYBRID_EXPORT vtkLegendBoxActor : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkLegendBoxActor,vtkActor2D);
+  vtkTypeMacro(vtkLegendBoxActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkLegendScaleActor.cxx b/Hybrid/vtkLegendScaleActor.cxx
index 9ded618efc5a62a00404094d4cdfee087bc6b026..5cfeacc1a0533d6a49fbe1225d07e3884a863499 100644
--- a/Hybrid/vtkLegendScaleActor.cxx
+++ b/Hybrid/vtkLegendScaleActor.cxx
@@ -32,7 +32,6 @@
 #include "vtkCellData.h"
 #include "vtkCoordinate.h"
 
-vtkCxxRevisionMacro(vtkLegendScaleActor, "1.3");
 vtkStandardNewMacro(vtkLegendScaleActor);
 
 
diff --git a/Hybrid/vtkLegendScaleActor.h b/Hybrid/vtkLegendScaleActor.h
index e2d7ce09d0bfb8ef6af7d5c776749792b70c2102..d94e0926399e8ff44e00a47aca80e079075502f0 100644
--- a/Hybrid/vtkLegendScaleActor.h
+++ b/Hybrid/vtkLegendScaleActor.h
@@ -55,7 +55,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkLegendScaleActor,vtkProp);
+  vtkTypeMacro(vtkLegendScaleActor,vtkProp);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Hybrid/vtkMILVideoSource.cxx b/Hybrid/vtkMILVideoSource.cxx
index 914a19ee8805a06b689edd3d0cb735bf44e727f8..333dad606d99ecfe4f2f23f43273f31bdbcb57b0 100644
--- a/Hybrid/vtkMILVideoSource.cxx
+++ b/Hybrid/vtkMILVideoSource.cxx
@@ -21,7 +21,6 @@
 #include <ctype.h>
 #include <string.h>
 
-vtkCxxRevisionMacro(vtkMILVideoSource, "1.24");
 vtkStandardNewMacro(vtkMILVideoSource);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkMILVideoSource.h b/Hybrid/vtkMILVideoSource.h
index b30f03fbe9e053b82084f1427a527f41840fcc41..a0c2e841c8f637409f36c5ce9e0860a40f22ed23 100644
--- a/Hybrid/vtkMILVideoSource.h
+++ b/Hybrid/vtkMILVideoSource.h
@@ -66,7 +66,7 @@ class VTK_HYBRID_EXPORT vtkMILVideoSource : public vtkVideoSource
 {
 public:
   static vtkMILVideoSource *New();
-  vtkTypeRevisionMacro(vtkMILVideoSource,vtkVideoSource);
+  vtkTypeMacro(vtkMILVideoSource,vtkVideoSource);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Hybrid/vtkPCAAnalysisFilter.cxx b/Hybrid/vtkPCAAnalysisFilter.cxx
index 07074da82d72a9b107565713ea8de70c7321a301..74df1bc6cb837e58fdff21dc14528213d4358bdd 100644
--- a/Hybrid/vtkPCAAnalysisFilter.cxx
+++ b/Hybrid/vtkPCAAnalysisFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include "vtkFloatArray.h"
 
-vtkCxxRevisionMacro(vtkPCAAnalysisFilter, "1.15");
 vtkStandardNewMacro(vtkPCAAnalysisFilter);
 
 //------------------------------------------------------------------------
diff --git a/Hybrid/vtkPCAAnalysisFilter.h b/Hybrid/vtkPCAAnalysisFilter.h
index 8bf0f6947e8959fe3a11bfcd17fab35d94f3048e..8333b21b268067d5c072f2fc1604fdaa33bb40d4 100644
--- a/Hybrid/vtkPCAAnalysisFilter.h
+++ b/Hybrid/vtkPCAAnalysisFilter.h
@@ -56,7 +56,7 @@ class vtkPointSet;
 class VTK_HYBRID_EXPORT vtkPCAAnalysisFilter : public vtkPointSetAlgorithm
 {
  public:
-  vtkTypeRevisionMacro(vtkPCAAnalysisFilter,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkPCAAnalysisFilter,vtkPointSetAlgorithm);
   
   // Description:
   // Prints information about the state of the filter.
diff --git a/Hybrid/vtkPExodusIIReader.cxx b/Hybrid/vtkPExodusIIReader.cxx
index 038916cf5284b8f3ebf73f4690add4ec2623b784..dfe35d46f5d72a144f1f377d5d1afd4dbe7f00da 100644
--- a/Hybrid/vtkPExodusIIReader.cxx
+++ b/Hybrid/vtkPExodusIIReader.cxx
@@ -91,7 +91,6 @@ static const int objAttribTypes[] = {
 static const int numObjAttribTypes = sizeof(objAttribTypes)/sizeof(objAttribTypes[0]);
 
 
-vtkCxxRevisionMacro(vtkPExodusIIReader, "1.36");
 vtkStandardNewMacro(vtkPExodusIIReader);
 
 class vtkPExodusIIReaderUpdateProgress : public vtkCommand
diff --git a/Hybrid/vtkPExodusIIReader.h b/Hybrid/vtkPExodusIIReader.h
index b092029a4608043ace03bfb467f9485b12a4015e..05ec6ca1ea39fe46ab1f696f0dd473ad98883502 100644
--- a/Hybrid/vtkPExodusIIReader.h
+++ b/Hybrid/vtkPExodusIIReader.h
@@ -48,7 +48,7 @@ class VTK_HYBRID_EXPORT vtkPExodusIIReader : public vtkExodusIIReader
 {
 public:
   static vtkPExodusIIReader* New();
-  vtkTypeRevisionMacro(vtkPExodusIIReader,vtkExodusIIReader);
+  vtkTypeMacro(vtkPExodusIIReader,vtkExodusIIReader);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Hybrid/vtkPExodusReader.cxx b/Hybrid/vtkPExodusReader.cxx
index a2d225423085a7e58cada65e2a06911c95bd14f1..ee3ff49c7f73ca438bafee79bd2665002dff1448 100644
--- a/Hybrid/vtkPExodusReader.cxx
+++ b/Hybrid/vtkPExodusReader.cxx
@@ -52,7 +52,6 @@
 #define DEBUG 0
 #define vtkPExodusReaderMAXPATHLEN 2048
 
-vtkCxxRevisionMacro(vtkPExodusReader, "1.15");
 vtkStandardNewMacro(vtkPExodusReader);
 
 class vtkPExodusReaderUpdateProgress : public vtkCommand
diff --git a/Hybrid/vtkPExodusReader.h b/Hybrid/vtkPExodusReader.h
index 46c4750d5cec4e6fab74c837c2b3144ac370c86e..8363ef08f029666b9379761bfdc0b011415a0bc5 100644
--- a/Hybrid/vtkPExodusReader.h
+++ b/Hybrid/vtkPExodusReader.h
@@ -47,7 +47,7 @@ class VTK_HYBRID_EXPORT vtkPExodusReader : public vtkExodusReader
 {
 public:
   static vtkPExodusReader *New();
-  vtkTypeRevisionMacro(vtkPExodusReader,vtkExodusReader);
+  vtkTypeMacro(vtkPExodusReader,vtkExodusReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkPieChartActor.cxx b/Hybrid/vtkPieChartActor.cxx
index c5ffdfc6b29faba43b5f744adf2adff57fefe4d0..5456e8932695d115c717fac3c557b3f336830396 100644
--- a/Hybrid/vtkPieChartActor.cxx
+++ b/Hybrid/vtkPieChartActor.cxx
@@ -32,7 +32,6 @@
 #include <vtkstd/string>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkPieChartActor, "1.3");
 vtkStandardNewMacro(vtkPieChartActor);
 
 vtkCxxSetObjectMacro(vtkPieChartActor,Input,vtkDataObject);
diff --git a/Hybrid/vtkPieChartActor.h b/Hybrid/vtkPieChartActor.h
index e6204803f90eaa314959a18b9868257752fbeb20..73f37c205d1c80ddd941aea3bd204712dd36dbe1 100644
--- a/Hybrid/vtkPieChartActor.h
+++ b/Hybrid/vtkPieChartActor.h
@@ -48,7 +48,7 @@ class VTK_HYBRID_EXPORT vtkPieChartActor : public vtkActor2D
 public:
   // Description:
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkPieChartActor,vtkActor2D);
+  vtkTypeMacro(vtkPieChartActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkPolyDataSilhouette.cxx b/Hybrid/vtkPolyDataSilhouette.cxx
index 67bb2a24df822b2eeb8b89ff6815d784b6b31f54..9f19f78ca45d6c68e1cb6863af7c2b0c625bec8d 100644
--- a/Hybrid/vtkPolyDataSilhouette.cxx
+++ b/Hybrid/vtkPolyDataSilhouette.cxx
@@ -38,7 +38,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkPolyDataSilhouette, "1.2");
 vtkStandardNewMacro(vtkPolyDataSilhouette);
 
 vtkCxxSetObjectMacro(vtkPolyDataSilhouette,Camera,vtkCamera);
diff --git a/Hybrid/vtkPolyDataSilhouette.h b/Hybrid/vtkPolyDataSilhouette.h
index 3199531036bb54552b92ee8837250a85bd4fea8c..c320b18c20168afe72133141b24db85bc5899cf6 100644
--- a/Hybrid/vtkPolyDataSilhouette.h
+++ b/Hybrid/vtkPolyDataSilhouette.h
@@ -54,7 +54,7 @@ public:
   // Instantiate object.
   static vtkPolyDataSilhouette *New();
 
-  vtkTypeRevisionMacro(vtkPolyDataSilhouette,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPolyDataSilhouette,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkPolyDataToImageStencil.cxx b/Hybrid/vtkPolyDataToImageStencil.cxx
index 0e4cdf6f3de0bddba14c11a4b36079c97651ce7e..ab3f5f3c21d2fdf1b5b19fade817e0c0ed5f3460 100644
--- a/Hybrid/vtkPolyDataToImageStencil.cxx
+++ b/Hybrid/vtkPolyDataToImageStencil.cxx
@@ -73,7 +73,6 @@ POSSIBILITY OF SUCH DAMAGES.
 #include <vtkstd/algorithm>
 
 
-vtkCxxRevisionMacro(vtkPolyDataToImageStencil, "1.32");
 vtkStandardNewMacro(vtkPolyDataToImageStencil);
 vtkCxxSetObjectMacro(vtkPolyDataToImageStencil, InformationInput,
                      vtkImageData);
diff --git a/Hybrid/vtkPolyDataToImageStencil.h b/Hybrid/vtkPolyDataToImageStencil.h
index 3dc44e9c37b6b7b19e7f0d05b72ad873a8ddeebc..311326db2781ca486376c77b4c0c102a90986c16 100644
--- a/Hybrid/vtkPolyDataToImageStencil.h
+++ b/Hybrid/vtkPolyDataToImageStencil.h
@@ -73,7 +73,7 @@ class VTK_HYBRID_EXPORT vtkPolyDataToImageStencil :
 {
 public:
   static vtkPolyDataToImageStencil* New();
-  vtkTypeRevisionMacro(vtkPolyDataToImageStencil, vtkImageStencilSource);
+  vtkTypeMacro(vtkPolyDataToImageStencil, vtkImageStencilSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkProcrustesAlignmentFilter.cxx b/Hybrid/vtkProcrustesAlignmentFilter.cxx
index 3f757ae648b9460af402264000d0843fdb996548..ac186cea8785abd98bd835775a81794c800aa27a 100644
--- a/Hybrid/vtkProcrustesAlignmentFilter.cxx
+++ b/Hybrid/vtkProcrustesAlignmentFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkPolyData.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkProcrustesAlignmentFilter, "1.24");
 vtkStandardNewMacro(vtkProcrustesAlignmentFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkProcrustesAlignmentFilter.h b/Hybrid/vtkProcrustesAlignmentFilter.h
index 0b8965b5009c11a1fd9a35ed01b5f0d91dec6f43..1b5e2a2a2ef7c30950514d497c2be013c731eb19 100644
--- a/Hybrid/vtkProcrustesAlignmentFilter.h
+++ b/Hybrid/vtkProcrustesAlignmentFilter.h
@@ -59,7 +59,7 @@ class vtkPoints;
 class VTK_HYBRID_EXPORT vtkProcrustesAlignmentFilter : public vtkPointSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkProcrustesAlignmentFilter,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkProcrustesAlignmentFilter,vtkPointSetAlgorithm);
 
   // Description:
   // Prints information about the state of the filter.
diff --git a/Hybrid/vtkProjectedTerrainPath.cxx b/Hybrid/vtkProjectedTerrainPath.cxx
index 3d5035725876ab3fb234786c3dde46fc3b208f4a..20e0f309f56ff77dbfeaf667145e44b968a89483 100644
--- a/Hybrid/vtkProjectedTerrainPath.cxx
+++ b/Hybrid/vtkProjectedTerrainPath.cxx
@@ -46,7 +46,6 @@ typedef vtkEdgeList::iterator EdgeListIterator;
 
 // Begin vtkProjectedTerrainPath class implementation--------------------------
 //
-vtkCxxRevisionMacro(vtkProjectedTerrainPath, "1.11");
 vtkStandardNewMacro(vtkProjectedTerrainPath);
 
 //-----------------------------------------------------------------------------
diff --git a/Hybrid/vtkProjectedTerrainPath.h b/Hybrid/vtkProjectedTerrainPath.h
index d31339eb5fac1ad0d80a485e89f0b257ee319ae0..6f9a8a71adf3df87b8ec696304d99df81a9ecc4b 100644
--- a/Hybrid/vtkProjectedTerrainPath.h
+++ b/Hybrid/vtkProjectedTerrainPath.h
@@ -75,7 +75,7 @@ class VTK_HYBRID_EXPORT vtkProjectedTerrainPath : public vtkPolyDataAlgorithm
 public:
   // Description:
   // Standard methids for printing and determining type information.
-  vtkTypeRevisionMacro(vtkProjectedTerrainPath,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkProjectedTerrainPath,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkRIBExporter.cxx b/Hybrid/vtkRIBExporter.cxx
index f5acb19b0a02eedc240ce0a52dad7ca00f115369..6226e255648af294a6bf0ef4b0a20395073e0ea8 100644
--- a/Hybrid/vtkRIBExporter.cxx
+++ b/Hybrid/vtkRIBExporter.cxx
@@ -42,7 +42,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkRIBExporter, "1.65");
 vtkStandardNewMacro(vtkRIBExporter);
 
 typedef double RtColor[3];
diff --git a/Hybrid/vtkRIBExporter.h b/Hybrid/vtkRIBExporter.h
index f66ab83ed19ebe5dfbaec7e624d24145cc73fc19..7fc2b44c79f53fe69e88184257fda2f29adea1ea 100644
--- a/Hybrid/vtkRIBExporter.h
+++ b/Hybrid/vtkRIBExporter.h
@@ -62,7 +62,7 @@ class VTK_HYBRID_EXPORT vtkRIBExporter : public vtkExporter
 {
 public:
   static vtkRIBExporter *New();
-  vtkTypeRevisionMacro(vtkRIBExporter,vtkExporter);
+  vtkTypeMacro(vtkRIBExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Hybrid/vtkRIBLight.cxx b/Hybrid/vtkRIBLight.cxx
index 99635b51bddb7f4404590ded735727c1dfef875f..99ac93518c7ff6976fb8a09e6261646952774245 100644
--- a/Hybrid/vtkRIBLight.cxx
+++ b/Hybrid/vtkRIBLight.cxx
@@ -15,7 +15,6 @@
 #include "vtkRIBLight.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkRIBLight, "1.17");
 vtkStandardNewMacro(vtkRIBLight);
 
 vtkRIBLight::vtkRIBLight ()
diff --git a/Hybrid/vtkRIBLight.h b/Hybrid/vtkRIBLight.h
index c0ac403ed37e6fa8709803e36cd74afd881a668b..b6cd433c9dbf8cb98394b728e97d118684434574 100644
--- a/Hybrid/vtkRIBLight.h
+++ b/Hybrid/vtkRIBLight.h
@@ -31,7 +31,7 @@ class VTK_HYBRID_EXPORT vtkRIBLight : public vtkLight
 {
 public:
   static vtkRIBLight *New();
-  vtkTypeRevisionMacro(vtkRIBLight,vtkLight);
+  vtkTypeMacro(vtkRIBLight,vtkLight);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkBooleanMacro(Shadows,int);
diff --git a/Hybrid/vtkRIBProperty.cxx b/Hybrid/vtkRIBProperty.cxx
index 6f338cd0a118662e7376785164147e16fce6b79a..d9840ea0f5bfa68007119faf22ce3a701694cb09 100644
--- a/Hybrid/vtkRIBProperty.cxx
+++ b/Hybrid/vtkRIBProperty.cxx
@@ -15,7 +15,6 @@
 #include "vtkRIBProperty.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkRIBProperty, "1.17");
 vtkStandardNewMacro(vtkRIBProperty);
 
 vtkRIBProperty::vtkRIBProperty ()
diff --git a/Hybrid/vtkRIBProperty.h b/Hybrid/vtkRIBProperty.h
index 4432caa0bba48f132c83c5206a3818fe4b7824d1..571b4278f849ab605ed323cbbbea5fe3aa6adabe 100644
--- a/Hybrid/vtkRIBProperty.h
+++ b/Hybrid/vtkRIBProperty.h
@@ -33,7 +33,7 @@ class VTK_HYBRID_EXPORT vtkRIBProperty : public vtkProperty
 {
 public:
   static vtkRIBProperty *New();
-  vtkTypeRevisionMacro(vtkRIBProperty,vtkProperty);
+  vtkTypeMacro(vtkRIBProperty,vtkProperty);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkRenderLargeImage.cxx b/Hybrid/vtkRenderLargeImage.cxx
index 673264a15cc74554d6ba650fedfc7bb9260e386d..2e88ac0881ef299310551a5d234257de6014ae18 100644
--- a/Hybrid/vtkRenderLargeImage.cxx
+++ b/Hybrid/vtkRenderLargeImage.cxx
@@ -29,7 +29,6 @@
 
 #include <vtkstd/vector>
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkRenderLargeImage, "1.38");
 vtkStandardNewMacro(vtkRenderLargeImage);
 
 vtkCxxSetObjectMacro(vtkRenderLargeImage,Input,vtkRenderer);
diff --git a/Hybrid/vtkRenderLargeImage.h b/Hybrid/vtkRenderLargeImage.h
index 9b0bb8ae058f2cc296992999efdd6997fd82e274..5b3563481d9c5ce9570598b33ddf22f5b622a0cc 100644
--- a/Hybrid/vtkRenderLargeImage.h
+++ b/Hybrid/vtkRenderLargeImage.h
@@ -32,7 +32,7 @@ class VTK_HYBRID_EXPORT vtkRenderLargeImage : public vtkAlgorithm
 {
 public:
   static vtkRenderLargeImage *New();
-  vtkTypeRevisionMacro(vtkRenderLargeImage,vtkAlgorithm);
+  vtkTypeMacro(vtkRenderLargeImage,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Hybrid/vtkSpiderPlotActor.cxx b/Hybrid/vtkSpiderPlotActor.cxx
index f90993f9cbb8e9fee43bd30895e51f2ee49b0eba..7ed093cbbd7fa8da9b689a192d621b8d4f32d145 100644
--- a/Hybrid/vtkSpiderPlotActor.cxx
+++ b/Hybrid/vtkSpiderPlotActor.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/vector>
 
 
-vtkCxxRevisionMacro(vtkSpiderPlotActor, "1.4");
 vtkStandardNewMacro(vtkSpiderPlotActor);
 
 vtkCxxSetObjectMacro(vtkSpiderPlotActor,Input,vtkDataObject);
diff --git a/Hybrid/vtkSpiderPlotActor.h b/Hybrid/vtkSpiderPlotActor.h
index 292882f3b6680ee31d275c78566c060258e9f1b8..b698ecbabc0e17a13a14ed045cb8df508b7dc78a 100644
--- a/Hybrid/vtkSpiderPlotActor.h
+++ b/Hybrid/vtkSpiderPlotActor.h
@@ -67,7 +67,7 @@ class VTK_HYBRID_EXPORT vtkSpiderPlotActor : public vtkActor2D
 public:
   // Description:
   // Standard methods for type information and printing.
-  vtkTypeRevisionMacro(vtkSpiderPlotActor,vtkActor2D);
+  vtkTypeMacro(vtkSpiderPlotActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkStructuredExtent.cxx b/Hybrid/vtkStructuredExtent.cxx
index b03d016866027ca8d1fd6f4cf019cf1f735f2103..30eade0e4b3979928982c63aba3b4c60fb1c75f9 100644
--- a/Hybrid/vtkStructuredExtent.cxx
+++ b/Hybrid/vtkStructuredExtent.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkStructuredExtent);
-vtkCxxRevisionMacro(vtkStructuredExtent, "1.1");
 //----------------------------------------------------------------------------
 vtkStructuredExtent::vtkStructuredExtent()
 {
diff --git a/Hybrid/vtkStructuredExtent.h b/Hybrid/vtkStructuredExtent.h
index 8ebd0ec22268f51184707cf3b6a49fdc0502f9d1..34686f2b642a0c94d6ec65badead149f288294ab 100644
--- a/Hybrid/vtkStructuredExtent.h
+++ b/Hybrid/vtkStructuredExtent.h
@@ -29,7 +29,7 @@ class VTK_HYBRID_EXPORT vtkStructuredExtent : public vtkObject
 {
 public:
   static vtkStructuredExtent* New();
-  vtkTypeRevisionMacro(vtkStructuredExtent, vtkObject);
+  vtkTypeMacro(vtkStructuredExtent, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkStructuredGridLIC2D.cxx b/Hybrid/vtkStructuredGridLIC2D.cxx
index 895ccd7aa0bed51e600db017c6276a1de1f6c973..f52591edba3c35ae3b39da258fd007e6d3b1c3c9 100644
--- a/Hybrid/vtkStructuredGridLIC2D.cxx
+++ b/Hybrid/vtkStructuredGridLIC2D.cxx
@@ -43,7 +43,6 @@ extern const char *vtkStructuredGridLIC2D_fs;
   ext[0] << ", " << ext[1] << ", " << ext[2] << ", " << ext[3] << ", " << ext[4] << ", " << ext[5] 
 
 vtkStandardNewMacro(vtkStructuredGridLIC2D);
-vtkCxxRevisionMacro(vtkStructuredGridLIC2D, "1.7");
 //----------------------------------------------------------------------------
 vtkStructuredGridLIC2D::vtkStructuredGridLIC2D()
 {
diff --git a/Hybrid/vtkStructuredGridLIC2D.h b/Hybrid/vtkStructuredGridLIC2D.h
index c0103de4b84f2cd9692c936e91173f7d114f75da..169551a608df345e557a12b35623e2aa3bb0a9bf 100644
--- a/Hybrid/vtkStructuredGridLIC2D.h
+++ b/Hybrid/vtkStructuredGridLIC2D.h
@@ -49,7 +49,7 @@ class VTK_HYBRID_EXPORT vtkStructuredGridLIC2D : public vtkStructuredGridAlgorit
 {
 public:
   static vtkStructuredGridLIC2D* New();
-  vtkTypeRevisionMacro(vtkStructuredGridLIC2D, vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkStructuredGridLIC2D, vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkTemporalDataSetCache.cxx b/Hybrid/vtkTemporalDataSetCache.cxx
index d2ef4e70ac0ed98e23f0deaebc2509a93b92b847..21b97f1e28a04c5eb9bdda14a246c05e96858c68 100644
--- a/Hybrid/vtkTemporalDataSetCache.cxx
+++ b/Hybrid/vtkTemporalDataSetCache.cxx
@@ -22,7 +22,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkTemporalDataSetCache, "1.8");
 //---------------------------------------------------------------------------
 vtkStandardNewMacro(vtkTemporalDataSetCache);
 
diff --git a/Hybrid/vtkTemporalDataSetCache.h b/Hybrid/vtkTemporalDataSetCache.h
index c5561ff2c023760dbf96f8552327f7db97a46a71..ce8f6dabdacbdde971055fe5433996f62e3d3b7b 100644
--- a/Hybrid/vtkTemporalDataSetCache.h
+++ b/Hybrid/vtkTemporalDataSetCache.h
@@ -36,7 +36,7 @@ class VTK_HYBRID_EXPORT vtkTemporalDataSetCache : public vtkTemporalDataSetAlgor
 {
 public:
   static vtkTemporalDataSetCache *New();
-  vtkTypeRevisionMacro(vtkTemporalDataSetCache, vtkTemporalDataSetAlgorithm);
+  vtkTypeMacro(vtkTemporalDataSetCache, vtkTemporalDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkTemporalInterpolator.cxx b/Hybrid/vtkTemporalInterpolator.cxx
index 8df9dceac97c7b0558af48fcf8d5380d09b55bb1..8435bf9f611bc95119c8a82f668ef5e4ae3faa32 100644
--- a/Hybrid/vtkTemporalInterpolator.cxx
+++ b/Hybrid/vtkTemporalInterpolator.cxx
@@ -31,7 +31,6 @@
 #include "vtkstd/algorithm"
 #include "vtkstd/vector"
 
-vtkCxxRevisionMacro(vtkTemporalInterpolator, "1.16");
 vtkStandardNewMacro(vtkTemporalInterpolator);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkTemporalInterpolator.h b/Hybrid/vtkTemporalInterpolator.h
index aba5182a9863b2b2973193b3b249e7f26ce2ed36..bc75b9b08d41ed7f53d3e70fdddf64504dbb7bae 100644
--- a/Hybrid/vtkTemporalInterpolator.h
+++ b/Hybrid/vtkTemporalInterpolator.h
@@ -60,7 +60,7 @@ class VTK_HYBRID_EXPORT vtkTemporalInterpolator : public vtkTemporalDataSetAlgor
 {
 public:
   static vtkTemporalInterpolator *New();
-  vtkTypeRevisionMacro(vtkTemporalInterpolator, vtkTemporalDataSetAlgorithm);
+  vtkTypeMacro(vtkTemporalInterpolator, vtkTemporalDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkTemporalShiftScale.cxx b/Hybrid/vtkTemporalShiftScale.cxx
index 943c9a0786315b85768fe8085e2509b62435c779..d38d386d3035cba87bbff9ce117c2e00744b2292 100644
--- a/Hybrid/vtkTemporalShiftScale.cxx
+++ b/Hybrid/vtkTemporalShiftScale.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTemporalShiftScale, "1.9");
 vtkStandardNewMacro(vtkTemporalShiftScale);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkTemporalShiftScale.h b/Hybrid/vtkTemporalShiftScale.h
index 48eaafcecb27ab6bf4565f8b1b26720b50744402..b47e34b1ed9788a46441934a6fca084c7e7c36bb 100644
--- a/Hybrid/vtkTemporalShiftScale.h
+++ b/Hybrid/vtkTemporalShiftScale.h
@@ -36,7 +36,7 @@ class VTK_HYBRID_EXPORT vtkTemporalShiftScale : public vtkTemporalDataSetAlgorit
 {
 public:
   static vtkTemporalShiftScale *New();
-  vtkTypeRevisionMacro(vtkTemporalShiftScale, vtkTemporalDataSetAlgorithm);
+  vtkTypeMacro(vtkTemporalShiftScale, vtkTemporalDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkTemporalSnapToTimeStep.cxx b/Hybrid/vtkTemporalSnapToTimeStep.cxx
index 2fed81c2b3fbd8a7924e15a82a055735dd69e5ba..55d8dc6e1f16ad2c9371c8d8284901c215860bba 100644
--- a/Hybrid/vtkTemporalSnapToTimeStep.cxx
+++ b/Hybrid/vtkTemporalSnapToTimeStep.cxx
@@ -21,7 +21,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkTemporalSnapToTimeStep, "1.4");
 vtkStandardNewMacro(vtkTemporalSnapToTimeStep);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkTemporalSnapToTimeStep.h b/Hybrid/vtkTemporalSnapToTimeStep.h
index 49b8aead301da3f89b9fc07d574e9a8da4d8ae04..236df503b5e5c5d059998003a7ca132b77741d88 100644
--- a/Hybrid/vtkTemporalSnapToTimeStep.h
+++ b/Hybrid/vtkTemporalSnapToTimeStep.h
@@ -39,7 +39,7 @@ class VTK_HYBRID_EXPORT vtkTemporalSnapToTimeStep : public vtkTemporalDataSetAlg
 {
 public:
   static vtkTemporalSnapToTimeStep *New();
-  vtkTypeRevisionMacro(vtkTemporalSnapToTimeStep, vtkTemporalDataSetAlgorithm);
+  vtkTypeMacro(vtkTemporalSnapToTimeStep, vtkTemporalDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Hybrid/vtkThinPlateSplineTransform.cxx b/Hybrid/vtkThinPlateSplineTransform.cxx
index 0b86800ee321e7785a00be73644e1219731776f6..61b9e5aba0a44829e3cce0b30da0c806b4000ab1 100644
--- a/Hybrid/vtkThinPlateSplineTransform.cxx
+++ b/Hybrid/vtkThinPlateSplineTransform.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkThinPlateSplineTransform, "1.34");
 vtkStandardNewMacro(vtkThinPlateSplineTransform);
 
 //------------------------------------------------------------------------
diff --git a/Hybrid/vtkThinPlateSplineTransform.h b/Hybrid/vtkThinPlateSplineTransform.h
index 977ed937e197266d3f7c45bd1f87098871a1a49c..6c5ab0a22cd668a63b77a5f6bc48a38ba409981c 100644
--- a/Hybrid/vtkThinPlateSplineTransform.h
+++ b/Hybrid/vtkThinPlateSplineTransform.h
@@ -46,7 +46,7 @@
 class VTK_HYBRID_EXPORT vtkThinPlateSplineTransform : public vtkWarpTransform
 {
 public:
-  vtkTypeRevisionMacro(vtkThinPlateSplineTransform,vtkWarpTransform);
+  vtkTypeMacro(vtkThinPlateSplineTransform,vtkWarpTransform);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkThinPlateSplineTransform *New();
 
diff --git a/Hybrid/vtkTransformToGrid.cxx b/Hybrid/vtkTransformToGrid.cxx
index 0b6031db800ef2c5b49162bf29d8957a63646759..31202e399ce1995d8c244de8212285f69ed670bc 100644
--- a/Hybrid/vtkTransformToGrid.cxx
+++ b/Hybrid/vtkTransformToGrid.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTransformToGrid, "1.21");
 vtkStandardNewMacro(vtkTransformToGrid);
 
 vtkCxxSetObjectMacro(vtkTransformToGrid,Input,vtkAbstractTransform);
diff --git a/Hybrid/vtkTransformToGrid.h b/Hybrid/vtkTransformToGrid.h
index 555bcb9dc090ee5ea7403dfab56554422b749287..dd78307f2b99deacd37c306c69b406ec428a5575 100644
--- a/Hybrid/vtkTransformToGrid.h
+++ b/Hybrid/vtkTransformToGrid.h
@@ -33,7 +33,7 @@ class VTK_HYBRID_EXPORT vtkTransformToGrid : public vtkAlgorithm
 {
 public:
   static vtkTransformToGrid *New();
-  vtkTypeRevisionMacro(vtkTransformToGrid,vtkAlgorithm);
+  vtkTypeMacro(vtkTransformToGrid,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkVRMLImporter.cxx b/Hybrid/vtkVRMLImporter.cxx
index 30077e7249a3197262121b63b77157c76e4ed3c8..8d7ce174a6480bb2b8e20be9bfb9e30a17d246fa 100644
--- a/Hybrid/vtkVRMLImporter.cxx
+++ b/Hybrid/vtkVRMLImporter.cxx
@@ -4260,7 +4260,6 @@ YY_MALLOC_DECL
 #define YY_BREAK break;
 #endif
 
-vtkCxxRevisionMacro(vtkVRMLImporter, "1.74");
 vtkStandardNewMacro(vtkVRMLImporter);
 
 vtkPoints* vtkVRMLImporter::PointsNew()
diff --git a/Hybrid/vtkVRMLImporter.h b/Hybrid/vtkVRMLImporter.h
index 194fe31f117bf0e27073725569c1234ce7950444..32e45459659fc1cbf390221b5bb31cba5db7c9e2 100644
--- a/Hybrid/vtkVRMLImporter.h
+++ b/Hybrid/vtkVRMLImporter.h
@@ -84,7 +84,7 @@ class VTK_HYBRID_EXPORT vtkVRMLImporter : public vtkImporter
 public:
   static vtkVRMLImporter *New();
 
-  vtkTypeRevisionMacro(vtkVRMLImporter,vtkImporter);
+  vtkTypeMacro(vtkVRMLImporter,vtkImporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkVectorText.cxx b/Hybrid/vtkVectorText.cxx
index 85b3cfaedf3766d40e975b7e1d46361a32311cd7..95f8b3b23f80270a62ef6a5a5149c60f24e33983 100644
--- a/Hybrid/vtkVectorText.cxx
+++ b/Hybrid/vtkVectorText.cxx
@@ -25,7 +25,6 @@
 
 #include <locale.h>
 
-vtkCxxRevisionMacro(vtkVectorText, "1.38");
 vtkStandardNewMacro(vtkVectorText);
 
 typedef struct {
diff --git a/Hybrid/vtkVectorText.h b/Hybrid/vtkVectorText.h
index 834c2637205ae4ee398eb7dc4ad394ab6328e7fa..2f7105901fa0234004b19d0e93781bae52ae0d4b 100644
--- a/Hybrid/vtkVectorText.h
+++ b/Hybrid/vtkVectorText.h
@@ -38,7 +38,7 @@ class VTK_HYBRID_EXPORT vtkVectorText : public vtkPolyDataAlgorithm
 {
 public:
   static vtkVectorText *New();
-  vtkTypeRevisionMacro(vtkVectorText,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkVectorText,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkVideoSource.cxx b/Hybrid/vtkVideoSource.cxx
index f4ba2e2d429fc5b651bbc415535882af1863b1da..112c9f68b78ffd3d73229843634cb8112c0b342a 100644
--- a/Hybrid/vtkVideoSource.cxx
+++ b/Hybrid/vtkVideoSource.cxx
@@ -69,7 +69,6 @@
 // Finally, when Execute() is reading from the FrameBuffer it must do
 // so from within a mutex lock.  Otherwise tearing artifacts might result.
 
-vtkCxxRevisionMacro(vtkVideoSource, "1.44");
 vtkStandardNewMacro(vtkVideoSource);
 
 #if ( _MSC_VER >= 1300 ) // Visual studio .NET
diff --git a/Hybrid/vtkVideoSource.h b/Hybrid/vtkVideoSource.h
index 6afefb7e7930380b30019dcba03a3ed26a137733..b2de2582ebda96f159c31a3de54c10170810e603 100644
--- a/Hybrid/vtkVideoSource.h
+++ b/Hybrid/vtkVideoSource.h
@@ -40,7 +40,7 @@ class VTK_HYBRID_EXPORT vtkVideoSource : public vtkImageAlgorithm
 {
 public:
   static vtkVideoSource *New();
-  vtkTypeRevisionMacro(vtkVideoSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkVideoSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Hybrid/vtkWeightedTransformFilter.cxx b/Hybrid/vtkWeightedTransformFilter.cxx
index adbb2f04ce38162824625b2e95661b3934cee59b..ff89661b3428a9be26ed1523468e4112d8003f7a 100644
--- a/Hybrid/vtkWeightedTransformFilter.cxx
+++ b/Hybrid/vtkWeightedTransformFilter.cxx
@@ -27,7 +27,6 @@
 #include "vtkPointSet.h"
 #include "vtkUnsignedShortArray.h"
 
-vtkCxxRevisionMacro(vtkWeightedTransformFilter, "1.21");
 vtkStandardNewMacro(vtkWeightedTransformFilter);
 
 // helper functions.  Can't easily get to these in Matrix4x4 as written.
diff --git a/Hybrid/vtkWeightedTransformFilter.h b/Hybrid/vtkWeightedTransformFilter.h
index 4931fc347eeb73b67d6f572818de72f3b8bf5e4c..f5da30f57bcd93bbad693ea21355411e79408c10 100644
--- a/Hybrid/vtkWeightedTransformFilter.h
+++ b/Hybrid/vtkWeightedTransformFilter.h
@@ -75,7 +75,7 @@ class VTK_HYBRID_EXPORT vtkWeightedTransformFilter : public vtkPointSetAlgorithm
 {
 public:
   static vtkWeightedTransformFilter *New();
-  vtkTypeRevisionMacro(vtkWeightedTransformFilter,vtkPointSetAlgorithm);
+  vtkTypeMacro(vtkWeightedTransformFilter,vtkPointSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkWin32VideoSource.cxx b/Hybrid/vtkWin32VideoSource.cxx
index ab9e06ec968fa1dac147f9e69ed22d2e18736088..61e4969d6864e9ce82803fba24acdeb054e35e13 100644
--- a/Hybrid/vtkWin32VideoSource.cxx
+++ b/Hybrid/vtkWin32VideoSource.cxx
@@ -49,7 +49,6 @@ public:
 // VFW compressed formats are listed at http://www.webartz.com/fourcc/
 #define VTK_BI_UYVY 0x59565955
 
-vtkCxxRevisionMacro(vtkWin32VideoSource, "1.31");
 vtkStandardNewMacro(vtkWin32VideoSource);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkWin32VideoSource.h b/Hybrid/vtkWin32VideoSource.h
index 6e6e94af77edaa7c1d178776dba77bb084c8f557..32dbf4a26799217f03354eae8e743d74e8be4e80 100644
--- a/Hybrid/vtkWin32VideoSource.h
+++ b/Hybrid/vtkWin32VideoSource.h
@@ -36,7 +36,7 @@ class VTK_HYBRID_EXPORT vtkWin32VideoSource : public vtkVideoSource
 {
 public:
   static vtkWin32VideoSource *New();
-  vtkTypeRevisionMacro(vtkWin32VideoSource,vtkVideoSource);
+  vtkTypeMacro(vtkWin32VideoSource,vtkVideoSource);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Hybrid/vtkX3DExporter.cxx b/Hybrid/vtkX3DExporter.cxx
index 8f1ece2a18a138e05c1239f32f8bc32cfdad935a..9ae1ad7d9b05910c15a9a49edc77c179e076f0b4 100644
--- a/Hybrid/vtkX3DExporter.cxx
+++ b/Hybrid/vtkX3DExporter.cxx
@@ -76,7 +76,6 @@ static bool vtkX3DExporterWriterRenderPoints(
   vtkX3DExporterWriter* writer);
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkX3DExporter, "1.20");
 vtkStandardNewMacro(vtkX3DExporter);
 
 //----------------------------------------------------------------------------
diff --git a/Hybrid/vtkX3DExporter.h b/Hybrid/vtkX3DExporter.h
index cab555a3e08827b347ac9fad08036c6cdd51b076..bb06d23c60483bdf0e1649fa276e77182d445fc4 100644
--- a/Hybrid/vtkX3DExporter.h
+++ b/Hybrid/vtkX3DExporter.h
@@ -39,7 +39,7 @@ class VTK_HYBRID_EXPORT vtkX3DExporter : public vtkExporter
 {
 public:
   static vtkX3DExporter *New();
-  vtkTypeRevisionMacro(vtkX3DExporter,vtkExporter);
+  vtkTypeMacro(vtkX3DExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkX3DExporterFIWriter.cxx b/Hybrid/vtkX3DExporterFIWriter.cxx
index 8fab66a3772c0a47cd383ce4ebc9ac902601c375..a5a637e3114764c776febdfbe21db1c36335c44b 100644
--- a/Hybrid/vtkX3DExporterFIWriter.cxx
+++ b/Hybrid/vtkX3DExporterFIWriter.cxx
@@ -200,7 +200,6 @@ void vtkX3DExporterFIByteWriter::PutBits(const vtkstd::string &bitstring)
 
 /* ------------------------------------------------------------------------- */
 vtkStandardNewMacro(vtkX3DExporterFIWriter);
-vtkCxxRevisionMacro(vtkX3DExporterFIWriter, "1.8");
 //----------------------------------------------------------------------------
 vtkX3DExporterFIWriter::~vtkX3DExporterFIWriter()
 {
diff --git a/Hybrid/vtkX3DExporterFIWriter.h b/Hybrid/vtkX3DExporterFIWriter.h
index ca1783c6b51436ae66c456b47b364c733ad46bc0..48ad2a0cc40bbb6398640acf2042e7f4fa4ce887 100644
--- a/Hybrid/vtkX3DExporterFIWriter.h
+++ b/Hybrid/vtkX3DExporterFIWriter.h
@@ -28,7 +28,7 @@ class VTK_HYBRID_EXPORT vtkX3DExporterFIWriter : public vtkX3DExporterWriter
 {
 public:
   static vtkX3DExporterFIWriter *New();
-  vtkTypeRevisionMacro(vtkX3DExporterFIWriter, vtkX3DExporterWriter);
+  vtkTypeMacro(vtkX3DExporterFIWriter, vtkX3DExporterWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void CloseFile();
diff --git a/Hybrid/vtkX3DExporterJavaHelper.cxx b/Hybrid/vtkX3DExporterJavaHelper.cxx
index 8fef91465ab5b87fa48cc8848780efc60978d410..5a3fce0b5c16848b5678b246b14a8557b3d169fe 100644
--- a/Hybrid/vtkX3DExporterJavaHelper.cxx
+++ b/Hybrid/vtkX3DExporterJavaHelper.cxx
@@ -19,7 +19,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkX3DExporterJavaHelper);
-vtkCxxRevisionMacro(vtkX3DExporterJavaHelper, "1.1");
 
 //----------------------------------------------------------------------------
 void vtkX3DExporterJavaHelper::SetFastInfosetJarLocation(const char* location)
diff --git a/Hybrid/vtkX3DExporterJavaHelper.h b/Hybrid/vtkX3DExporterJavaHelper.h
index 528a8a081e55fd79fc8b4bc7499a0488bdcfd96a..b972ea743361488c4720c822cc20702e4e46f043 100644
--- a/Hybrid/vtkX3DExporterJavaHelper.h
+++ b/Hybrid/vtkX3DExporterJavaHelper.h
@@ -26,7 +26,7 @@ class VTK_HYBRID_EXPORT vtkX3DExporterJavaHelper : public vtkObject
 {
 public:
   static vtkX3DExporterJavaHelper *New();
-  vtkTypeRevisionMacro(vtkX3DExporterJavaHelper,vtkObject);
+  vtkTypeMacro(vtkX3DExporterJavaHelper,vtkObject);
 
   int OpenFile(const char* fileName);
   int Write(const char* data, vtkIdType length);
diff --git a/Hybrid/vtkX3DExporterWriter.cxx b/Hybrid/vtkX3DExporterWriter.cxx
index 9859c281cd179e4eb593560e85f7e96f32b5a377..f9e99e997805d8fe2fac240caeefdb8738c4db8a 100644
--- a/Hybrid/vtkX3DExporterWriter.cxx
+++ b/Hybrid/vtkX3DExporterWriter.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkX3DExporterWriter, "1.1");
 //----------------------------------------------------------------------------
 vtkX3DExporterWriter::vtkX3DExporterWriter()
 {
diff --git a/Hybrid/vtkX3DExporterWriter.h b/Hybrid/vtkX3DExporterWriter.h
index 6336725888c2749e4b11b5e50b277a4d811b2c7f..c4954dcce2f48fd84ad4523dc4b2c1a8134d3b84 100644
--- a/Hybrid/vtkX3DExporterWriter.h
+++ b/Hybrid/vtkX3DExporterWriter.h
@@ -31,7 +31,7 @@ class vtkCellArray;
 class VTK_HYBRID_EXPORT vtkX3DExporterWriter : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkX3DExporterWriter, vtkObject);
+  vtkTypeMacro(vtkX3DExporterWriter, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Hybrid/vtkX3DExporterXMLWriter.cxx b/Hybrid/vtkX3DExporterXMLWriter.cxx
index f0fa9e7f96adad6590b541b88485fe1dbfd3d2d0..036338986e3aa68dc8f5361a816ae8a505b30492 100644
--- a/Hybrid/vtkX3DExporterXMLWriter.cxx
+++ b/Hybrid/vtkX3DExporterXMLWriter.cxx
@@ -45,7 +45,6 @@ class vtkX3DExporterXMLNodeInfoStack: public vtkX3DExporterXMLNodeInfoStackBase
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkX3DExporterXMLWriter);
-vtkCxxRevisionMacro(vtkX3DExporterXMLWriter, "1.6");
 //-----------------------------------------------------------------------------
 vtkX3DExporterXMLWriter::~vtkX3DExporterXMLWriter()
 {
diff --git a/Hybrid/vtkX3DExporterXMLWriter.h b/Hybrid/vtkX3DExporterXMLWriter.h
index d2bc972a25be35e70ccb9430f946fa8a8ced37bd..a9b52ae4a3e7b5af583cd0eb3a70ee6ff9239668 100644
--- a/Hybrid/vtkX3DExporterXMLWriter.h
+++ b/Hybrid/vtkX3DExporterXMLWriter.h
@@ -28,7 +28,7 @@ class VTK_HYBRID_EXPORT vtkX3DExporterXMLWriter : public vtkX3DExporterWriter
 
 public:
   static vtkX3DExporterXMLWriter *New();
-  vtkTypeRevisionMacro(vtkX3DExporterXMLWriter, vtkX3DExporterWriter);
+  vtkTypeMacro(vtkX3DExporterXMLWriter, vtkX3DExporterWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   virtual void CloseFile();
diff --git a/Hybrid/vtkXYPlotActor.cxx b/Hybrid/vtkXYPlotActor.cxx
index 4d29c129fc117ccff2040ec6dad2d284817fc62a..242d4107f9546858e2eed5256bff466dea3b4a9d 100644
--- a/Hybrid/vtkXYPlotActor.cxx
+++ b/Hybrid/vtkXYPlotActor.cxx
@@ -39,7 +39,6 @@
 
 #define VTK_MAX_PLOTS 50
 
-vtkCxxRevisionMacro(vtkXYPlotActor, "1.72");
 vtkStandardNewMacro(vtkXYPlotActor);
 
 vtkCxxSetObjectMacro(vtkXYPlotActor,TitleTextProperty,vtkTextProperty);
diff --git a/Hybrid/vtkXYPlotActor.h b/Hybrid/vtkXYPlotActor.h
index 8ef702cad9c031e3e82bf1b20c763a1d5040dd33..cfc1a93b8e1ca9a309001fce17a9d1ae34654678 100644
--- a/Hybrid/vtkXYPlotActor.h
+++ b/Hybrid/vtkXYPlotActor.h
@@ -108,7 +108,7 @@ class vtkTextProperty;
 class VTK_HYBRID_EXPORT vtkXYPlotActor : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkXYPlotActor,vtkActor2D);
+  vtkTypeMacro(vtkXYPlotActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkAVIWriter.cxx b/IO/vtkAVIWriter.cxx
index e3d0f48b8b667b9350d690312a3502418099e958..64969ef04b870fa138c423da08d533bbedb61780 100644
--- a/IO/vtkAVIWriter.cxx
+++ b/IO/vtkAVIWriter.cxx
@@ -42,7 +42,6 @@ public:
 
 //---------------------------------------------------------------------------
 vtkStandardNewMacro(vtkAVIWriter);
-vtkCxxRevisionMacro(vtkAVIWriter, "1.10");
 
 //---------------------------------------------------------------------------
 vtkAVIWriter::vtkAVIWriter()
diff --git a/IO/vtkAVIWriter.h b/IO/vtkAVIWriter.h
index 0cf509d09781947acb5626a5fb65ccfe65a336f9..81a30d51db69442ec36bbb1c9dbb57c3dd6f2e37 100644
--- a/IO/vtkAVIWriter.h
+++ b/IO/vtkAVIWriter.h
@@ -31,7 +31,7 @@ class VTK_IO_EXPORT vtkAVIWriter : public vtkGenericMovieWriter
 {
 public:
   static vtkAVIWriter *New();
-  vtkTypeRevisionMacro(vtkAVIWriter,vtkGenericMovieWriter);
+  vtkTypeMacro(vtkAVIWriter,vtkGenericMovieWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkAVSucdReader.cxx b/IO/vtkAVSucdReader.cxx
index 474eca91cdbc69a0dbce36c0526631bf3bbb9ab1..214dd11999ca461139f421b60a8635c96a8bec56 100644
--- a/IO/vtkAVSucdReader.cxx
+++ b/IO/vtkAVSucdReader.cxx
@@ -36,7 +36,6 @@
 #include "vtkByteSwap.h"
 #include "vtkCellArray.h"
 
-vtkCxxRevisionMacro(vtkAVSucdReader, "1.27");
 vtkStandardNewMacro(vtkAVSucdReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkAVSucdReader.h b/IO/vtkAVSucdReader.h
index aa330b3fcfdff38288b54fe8ed61c334281870af..c207067a08c06e03664115908a5c8ce2fec63dc3 100644
--- a/IO/vtkAVSucdReader.h
+++ b/IO/vtkAVSucdReader.h
@@ -44,7 +44,7 @@ class VTK_IO_EXPORT vtkAVSucdReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkAVSucdReader *New();
-  vtkTypeRevisionMacro(vtkAVSucdReader,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkAVSucdReader,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkAbstractParticleWriter.cxx b/IO/vtkAbstractParticleWriter.cxx
index 1e013a70a23a88b5acd6a9bb2c14bc0e03fea00c..c99d204ec286ca3f6b8695db8ca06da119772c2d 100644
--- a/IO/vtkAbstractParticleWriter.cxx
+++ b/IO/vtkAbstractParticleWriter.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkAbstractParticleWriter.h"
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkAbstractParticleWriter, "1.3");
 //----------------------------------------------------------------------------
 // Construct with no start and end write methods or arguments.
 vtkAbstractParticleWriter::vtkAbstractParticleWriter()
diff --git a/IO/vtkAbstractParticleWriter.h b/IO/vtkAbstractParticleWriter.h
index fc38133a7beb0771e36fd6d3099936ddb448346f..fdd91cb4910d29001622cc62f8a0ab0d3c892904 100644
--- a/IO/vtkAbstractParticleWriter.h
+++ b/IO/vtkAbstractParticleWriter.h
@@ -33,7 +33,7 @@
 class VTK_IO_EXPORT vtkAbstractParticleWriter : public vtkWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractParticleWriter,vtkWriter);
+  vtkTypeMacro(vtkAbstractParticleWriter,vtkWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkArrayReader.cxx b/IO/vtkArrayReader.cxx
index 1caf9a63f852dee24af22b284252e3ddb0cc12e7..28b90764a045089969107bc39efc24e03701cdd6 100644
--- a/IO/vtkArrayReader.cxx
+++ b/IO/vtkArrayReader.cxx
@@ -31,7 +31,6 @@
 #include <vtkstd/stdexcept>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkArrayReader, "1.4");
 vtkStandardNewMacro(vtkArrayReader);
 
 namespace {
diff --git a/IO/vtkArrayReader.h b/IO/vtkArrayReader.h
index 45b3f01024b862fb9f4703ee2a4c4c5fb0e1b584..d243b50c519174be8b41b3b69fa7db9c0225c51f 100644
--- a/IO/vtkArrayReader.h
+++ b/IO/vtkArrayReader.h
@@ -43,7 +43,7 @@ class VTK_IO_EXPORT vtkArrayReader :
 {
 public:
   static vtkArrayReader* New();
-  vtkTypeRevisionMacro(vtkArrayReader, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkArrayReader, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkArrayWriter.cxx b/IO/vtkArrayWriter.cxx
index aeaa57fe3ddc2ffc4b12307c6e6e1abe15839643..963e6e9258abe36fd0cb25f1fc0184b3a7226126 100644
--- a/IO/vtkArrayWriter.cxx
+++ b/IO/vtkArrayWriter.cxx
@@ -311,7 +311,6 @@ bool WriteDenseArrayAscii(const vtkStdString& type_name, vtkArray* array, ostrea
 
 } // End anonymous namespace
 
-vtkCxxRevisionMacro(vtkArrayWriter, "1.4");
 vtkStandardNewMacro(vtkArrayWriter);
 
 vtkArrayWriter::vtkArrayWriter()
diff --git a/IO/vtkArrayWriter.h b/IO/vtkArrayWriter.h
index ad9154a6bdb141e10bc6c9ab5f0b9ddb11597d43..ae6abcf46f629206638a000cf068c0eb16e02d8f 100644
--- a/IO/vtkArrayWriter.h
+++ b/IO/vtkArrayWriter.h
@@ -63,7 +63,7 @@ class VTK_IO_EXPORT vtkArrayWriter :
 {
 public:
   static vtkArrayWriter *New();
-  vtkTypeRevisionMacro(vtkArrayWriter, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkArrayWriter, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkBMPReader.cxx b/IO/vtkBMPReader.cxx
index f7a63ca35c4b819f8c7d08cdd7e5fa5b92f942af..9d4c3bb2f725e2bce87aa79a188454a166f3bfb1 100644
--- a/IO/vtkBMPReader.cxx
+++ b/IO/vtkBMPReader.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkBMPReader, "1.55");
 vtkStandardNewMacro(vtkBMPReader);
 
 #ifdef read
diff --git a/IO/vtkBMPReader.h b/IO/vtkBMPReader.h
index 604db73192aeb8225f0c40579b2820d13c8b6dd8..7b8e48caef50e971180212c16391488bd952939d 100644
--- a/IO/vtkBMPReader.h
+++ b/IO/vtkBMPReader.h
@@ -45,7 +45,7 @@ class VTK_IO_EXPORT vtkBMPReader : public vtkImageReader
 {
 public:
   static vtkBMPReader *New();
-  vtkTypeRevisionMacro(vtkBMPReader,vtkImageReader);
+  vtkTypeMacro(vtkBMPReader,vtkImageReader);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/IO/vtkBMPWriter.cxx b/IO/vtkBMPWriter.cxx
index d1295e14b525fb95daae312056fce28cb56a4599..fcc5d91305117d85b115c29d69f5d8b3ee82f75b 100644
--- a/IO/vtkBMPWriter.cxx
+++ b/IO/vtkBMPWriter.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkBMPWriter, "1.23");
 vtkStandardNewMacro(vtkBMPWriter);
 
 vtkBMPWriter::vtkBMPWriter()
diff --git a/IO/vtkBMPWriter.h b/IO/vtkBMPWriter.h
index 2f32c3b6122d6e888276b2c916acf6528144c9b1..74de0884bb74e6aeeecdc298be599761a7e37196 100644
--- a/IO/vtkBMPWriter.h
+++ b/IO/vtkBMPWriter.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkBMPWriter : public vtkImageWriter
 {
 public:
   static vtkBMPWriter *New();
-  vtkTypeRevisionMacro(vtkBMPWriter,vtkImageWriter);
+  vtkTypeMacro(vtkBMPWriter,vtkImageWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkBYUReader.cxx b/IO/vtkBYUReader.cxx
index 18bf673752bc026b7fc13edb269daea4bc21a846..35cbfe43cc18eea89712f5bc1587a31fa47be680 100644
--- a/IO/vtkBYUReader.cxx
+++ b/IO/vtkBYUReader.cxx
@@ -25,7 +25,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkBYUReader, "1.52");
 vtkStandardNewMacro(vtkBYUReader);
 
 vtkBYUReader::vtkBYUReader()
diff --git a/IO/vtkBYUReader.h b/IO/vtkBYUReader.h
index 69162e821ddfb3cdf5ea4c9f3a3782cebff7dc3e..f259b69041205db2cdd31a5eec6090ccb61b17f6 100644
--- a/IO/vtkBYUReader.h
+++ b/IO/vtkBYUReader.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkBYUReader : public vtkPolyDataAlgorithm
 public:
   static vtkBYUReader *New();
 
-  vtkTypeRevisionMacro(vtkBYUReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkBYUReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkBYUWriter.cxx b/IO/vtkBYUWriter.cxx
index a8e67574e7b04a137c1d4481cd36ddf8e9f12ab8..adc2804a9df401d3319643fec7eb05c155478939 100644
--- a/IO/vtkBYUWriter.cxx
+++ b/IO/vtkBYUWriter.cxx
@@ -28,7 +28,6 @@
 
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkBYUWriter, "1.59");
 vtkStandardNewMacro(vtkBYUWriter);
 
 // Create object so that it writes displacement, scalar, and texture files
diff --git a/IO/vtkBYUWriter.h b/IO/vtkBYUWriter.h
index 2dd17329463e2de0862b20c8f2913de130032ff3..9d55003e39d57a1fbb83a8d1d9bc5bd0d848a3ed 100644
--- a/IO/vtkBYUWriter.h
+++ b/IO/vtkBYUWriter.h
@@ -33,7 +33,7 @@ class VTK_IO_EXPORT vtkBYUWriter : public vtkPolyDataWriter
 public:
   static vtkBYUWriter *New();
 
-  vtkTypeRevisionMacro(vtkBYUWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkBYUWriter,vtkPolyDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkBase64InputStream.cxx b/IO/vtkBase64InputStream.cxx
index eb6ad975747c64fdbafdd59e14a57529616374c2..ebedfc90dd08a9b7264cebfa8c9c9eab9a8172b8 100644
--- a/IO/vtkBase64InputStream.cxx
+++ b/IO/vtkBase64InputStream.cxx
@@ -17,7 +17,6 @@
 #include "vtkBase64Utilities.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBase64InputStream, "1.4");
 vtkStandardNewMacro(vtkBase64InputStream);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkBase64InputStream.h b/IO/vtkBase64InputStream.h
index 184e7c7813ac80e11062763e4d3109af8969da16..e34aa9cf1b202e49c1de469b75c5e890a311cabb 100644
--- a/IO/vtkBase64InputStream.h
+++ b/IO/vtkBase64InputStream.h
@@ -25,7 +25,7 @@
 class VTK_IO_EXPORT vtkBase64InputStream : public vtkInputStream
 {
 public:
-  vtkTypeRevisionMacro(vtkBase64InputStream,vtkInputStream);
+  vtkTypeMacro(vtkBase64InputStream,vtkInputStream);
   static vtkBase64InputStream *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/IO/vtkBase64OutputStream.cxx b/IO/vtkBase64OutputStream.cxx
index 6848b2824c0e94ccbb69fb8901acde7d40d9905e..93f44ff516b6463b239faff3798bcf7ca6826472 100644
--- a/IO/vtkBase64OutputStream.cxx
+++ b/IO/vtkBase64OutputStream.cxx
@@ -17,7 +17,6 @@
 #include "vtkBase64Utilities.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBase64OutputStream, "1.4");
 vtkStandardNewMacro(vtkBase64OutputStream);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkBase64OutputStream.h b/IO/vtkBase64OutputStream.h
index b862bf65a404f5bcdcd3b2a802d18bd721583df4..276c523e96e0b8c199b995cb15f7888b65b88090 100644
--- a/IO/vtkBase64OutputStream.h
+++ b/IO/vtkBase64OutputStream.h
@@ -25,7 +25,7 @@
 class VTK_IO_EXPORT vtkBase64OutputStream : public vtkOutputStream
 {
 public:
-  vtkTypeRevisionMacro(vtkBase64OutputStream,vtkOutputStream);
+  vtkTypeMacro(vtkBase64OutputStream,vtkOutputStream);
   static vtkBase64OutputStream *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/IO/vtkBase64Utilities.cxx b/IO/vtkBase64Utilities.cxx
index 35edc0e0040dd8e8b53e8e756f05701f88b53aeb..6039ae952e319180f8b9aaee2e4200da7b9d7d2d 100644
--- a/IO/vtkBase64Utilities.cxx
+++ b/IO/vtkBase64Utilities.cxx
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkBase64Utilities, "1.3");
 vtkStandardNewMacro(vtkBase64Utilities);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkBase64Utilities.h b/IO/vtkBase64Utilities.h
index 6a8bb32614443cfc5010931025cc46272ea0c6f8..fc05e56420b664607d8518391dd61164a769c109 100644
--- a/IO/vtkBase64Utilities.h
+++ b/IO/vtkBase64Utilities.h
@@ -25,7 +25,7 @@ class VTK_IO_EXPORT vtkBase64Utilities : public vtkObject
 {
 public:
   static vtkBase64Utilities *New();
-  vtkTypeRevisionMacro(vtkBase64Utilities,vtkObject);
+  vtkTypeMacro(vtkBase64Utilities,vtkObject);
 
   // Description:  
   // Encode 3 bytes into 4 bytes
diff --git a/IO/vtkCGMWriter.cxx b/IO/vtkCGMWriter.cxx
index 4ac3a17d66905fd8b5fa43568e86f9bc5f84a6d7..3b28aeb2f4af649502f99a9b265211084eaf6651 100644
--- a/IO/vtkCGMWriter.cxx
+++ b/IO/vtkCGMWriter.cxx
@@ -24,7 +24,6 @@
 #include "vtkCellData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCGMWriter, "1.22");
 vtkStandardNewMacro(vtkCGMWriter);
 
 vtkCxxSetObjectMacro(vtkCGMWriter, Viewport, vtkViewport);
diff --git a/IO/vtkCGMWriter.h b/IO/vtkCGMWriter.h
index 1f939b28c9330a0f1d5168fbafa91deae1fd635a..91b0b4dc965f7ef15ace7577ca1d1b016dfae76b 100644
--- a/IO/vtkCGMWriter.h
+++ b/IO/vtkCGMWriter.h
@@ -52,7 +52,7 @@ public:
   // resolution is 10,000, and the color mode is set to default.
   static vtkCGMWriter *New();
 
-  vtkTypeRevisionMacro(vtkCGMWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkCGMWriter,vtkPolyDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkChacoReader.cxx b/IO/vtkChacoReader.cxx
index f46575a698ba70f5d5cde1323c0027d12d9ebe8e..b11272adbf96d92e00f5546064643dfccc1a3dbe 100644
--- a/IO/vtkChacoReader.cxx
+++ b/IO/vtkChacoReader.cxx
@@ -33,7 +33,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkChacoReader, "1.11");
 vtkStandardNewMacro(vtkChacoReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkChacoReader.h b/IO/vtkChacoReader.h
index 922fda89cd67b35455002331e9fde3b4a7d86274..0974020e52da918290a3bb1757de6ba6ed31230c 100644
--- a/IO/vtkChacoReader.h
+++ b/IO/vtkChacoReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkChacoReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkChacoReader *New();
-  vtkTypeRevisionMacro(vtkChacoReader,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkChacoReader,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDEMReader.cxx b/IO/vtkDEMReader.cxx
index 5c9aca482344d1b454c4395072ebcfe482cd9b40..963c02d65a7781781d5f53d9d739e68a8f52b2c2 100644
--- a/IO/vtkDEMReader.cxx
+++ b/IO/vtkDEMReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkDEMReader, "1.42");
 vtkStandardNewMacro(vtkDEMReader);
 
 #define VTK_SW  0
diff --git a/IO/vtkDEMReader.h b/IO/vtkDEMReader.h
index 52d935dabb40e8e7d6ecd5fa2bc21426c741ee45..b61bff81b3407d3885bef75c753fd58dd63d88c1 100644
--- a/IO/vtkDEMReader.h
+++ b/IO/vtkDEMReader.h
@@ -31,7 +31,7 @@ class VTK_IO_EXPORT vtkDEMReader : public vtkImageAlgorithm
 {
 public:
   static vtkDEMReader *New();
-  vtkTypeRevisionMacro(vtkDEMReader,vtkImageAlgorithm);
+  vtkTypeMacro(vtkDEMReader,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDICOMImageReader.cxx b/IO/vtkDICOMImageReader.cxx
index a579590eb2f0edc0b6d16148e54f50ba4102fbf8..34e5176aa407f5d7b5ecf123b49cec3d61f6fdba 100644
--- a/IO/vtkDICOMImageReader.cxx
+++ b/IO/vtkDICOMImageReader.cxx
@@ -28,7 +28,6 @@
 #include "DICOMAppHelper.h"
 #include "DICOMParser.h"
 
-vtkCxxRevisionMacro(vtkDICOMImageReader, "1.40");
 vtkStandardNewMacro(vtkDICOMImageReader);
 
 class vtkDICOMImageReaderVector : public vtkstd::vector<vtkstd::string>
diff --git a/IO/vtkDICOMImageReader.h b/IO/vtkDICOMImageReader.h
index eee7594ca3f6045f6675baa099b7a81f9296b42a..1793bcc457bd0e7e0d0c00dc3a626606b3b70329 100644
--- a/IO/vtkDICOMImageReader.h
+++ b/IO/vtkDICOMImageReader.h
@@ -48,7 +48,7 @@ class VTK_IO_EXPORT vtkDICOMImageReader : public vtkImageReader2
   // Description:
   // Static method for construction.
   static vtkDICOMImageReader *New();
-  vtkTypeRevisionMacro(vtkDICOMImageReader,vtkImageReader2);
+  vtkTypeMacro(vtkDICOMImageReader,vtkImageReader2);
 
   // Description:
   // Prints the ivars.
diff --git a/IO/vtkDataCompressor.cxx b/IO/vtkDataCompressor.cxx
index e1023d6d7d628c42a5676496505976a8ea014b7e..d0c1d3e94189dcbd0d747b41ba22c786a9406b78 100644
--- a/IO/vtkDataCompressor.cxx
+++ b/IO/vtkDataCompressor.cxx
@@ -15,7 +15,6 @@
 #include "vtkDataCompressor.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkDataCompressor, "1.2");
 
 //----------------------------------------------------------------------------
 vtkDataCompressor::vtkDataCompressor()
diff --git a/IO/vtkDataCompressor.h b/IO/vtkDataCompressor.h
index dadb0e3ccfb0b48ada6ad0e128e71fff38f948bd..39c2a2e798bc2e2e98b4cc046ea9c880c448bdad 100644
--- a/IO/vtkDataCompressor.h
+++ b/IO/vtkDataCompressor.h
@@ -29,7 +29,7 @@ class vtkUnsignedCharArray;
 class VTK_IO_EXPORT vtkDataCompressor : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkDataCompressor,vtkObject);
+  vtkTypeMacro(vtkDataCompressor,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:  
diff --git a/IO/vtkDataObjectReader.cxx b/IO/vtkDataObjectReader.cxx
index 538c641e335d4474df2cdef8fb821e92e0679ad5..91d40db87aacf6fad057ba9b1c7c9aec98f09a04 100644
--- a/IO/vtkDataObjectReader.cxx
+++ b/IO/vtkDataObjectReader.cxx
@@ -21,7 +21,6 @@
 #include "vtkFieldData.h"
 #include "vtkDataObject.h"
 
-vtkCxxRevisionMacro(vtkDataObjectReader, "1.19");
 vtkStandardNewMacro(vtkDataObjectReader);
 
 vtkDataObjectReader::vtkDataObjectReader()
diff --git a/IO/vtkDataObjectReader.h b/IO/vtkDataObjectReader.h
index f90c900224ddbc7f60d2bc70ad89a0e9c322f273..065684ce6a16aa037183ebf6033f6f5cd9c6a5dc 100644
--- a/IO/vtkDataObjectReader.h
+++ b/IO/vtkDataObjectReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkDataObjectReader : public vtkDataReader
 {
 public:
   static vtkDataObjectReader *New();
-  vtkTypeRevisionMacro(vtkDataObjectReader,vtkDataReader);
+  vtkTypeMacro(vtkDataObjectReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDataObjectWriter.cxx b/IO/vtkDataObjectWriter.cxx
index 6849db03d0633d421b2203f0c7ef1b76352dd3a7..1617af0b23bf2f4e7c774d808da083f00510b6ca 100644
--- a/IO/vtkDataObjectWriter.cxx
+++ b/IO/vtkDataObjectWriter.cxx
@@ -18,7 +18,6 @@
 #include "vtkInformation.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDataObjectWriter, "1.16");
 vtkStandardNewMacro(vtkDataObjectWriter);
 
 vtkDataObjectWriter::vtkDataObjectWriter()
diff --git a/IO/vtkDataObjectWriter.h b/IO/vtkDataObjectWriter.h
index 4b2eed461ab64cc293b59f5f84cc89677b289865..cabe863de7dcde19966bbe37d54efd3e51971f99 100644
--- a/IO/vtkDataObjectWriter.h
+++ b/IO/vtkDataObjectWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkDataObjectWriter : public vtkWriter
 {
 public:
   static vtkDataObjectWriter *New();
-  vtkTypeRevisionMacro(vtkDataObjectWriter,vtkWriter);
+  vtkTypeMacro(vtkDataObjectWriter,vtkWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDataReader.cxx b/IO/vtkDataReader.cxx
index e46d6350672ff5d390d6b0f2a3d65eb7c6f3e7ba..9017fbd647667e478db85e1bd8e5b1ef572a43d3 100644
--- a/IO/vtkDataReader.cxx
+++ b/IO/vtkDataReader.cxx
@@ -62,7 +62,6 @@
 // so it would be nice to put this in a common file.
 static int my_getline(istream& stream, vtkStdString &output, char delim='\n');
 
-vtkCxxRevisionMacro(vtkDataReader, "1.160");
 vtkStandardNewMacro(vtkDataReader);
 
 vtkCxxSetObjectMacro(vtkDataReader, InputArray, vtkCharArray);
diff --git a/IO/vtkDataReader.h b/IO/vtkDataReader.h
index 664c2f677dec9a083ae60cf2d884ef68473de5f2..a9c99451a3704612742d56ae0bd6c4e796bd7cc3 100644
--- a/IO/vtkDataReader.h
+++ b/IO/vtkDataReader.h
@@ -45,7 +45,7 @@ class VTK_IO_EXPORT vtkDataReader : public vtkAlgorithm
 {
 public:
   static vtkDataReader *New();
-  vtkTypeRevisionMacro(vtkDataReader,vtkAlgorithm);
+  vtkTypeMacro(vtkDataReader,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDataSetReader.cxx b/IO/vtkDataSetReader.cxx
index 872d86f7d275751a6f6744b0456544c48a578459..8cd20dbcd1b4bfe9f71065d8ae7ff92fcd208b28 100644
--- a/IO/vtkDataSetReader.cxx
+++ b/IO/vtkDataSetReader.cxx
@@ -29,7 +29,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkUnstructuredGridReader.h"
 
-vtkCxxRevisionMacro(vtkDataSetReader, "1.71");
 vtkStandardNewMacro(vtkDataSetReader);
 
 vtkDataSetReader::vtkDataSetReader()
diff --git a/IO/vtkDataSetReader.h b/IO/vtkDataSetReader.h
index adc0baff2db65912e07dc622a03987b67e8d6e6e..d691dd1f19168805c02337e7d13f533dfb3f2d80 100644
--- a/IO/vtkDataSetReader.h
+++ b/IO/vtkDataSetReader.h
@@ -44,7 +44,7 @@ class VTK_IO_EXPORT vtkDataSetReader : public vtkDataReader
 {
 public:
   static vtkDataSetReader *New();
-  vtkTypeRevisionMacro(vtkDataSetReader,vtkDataReader);
+  vtkTypeMacro(vtkDataSetReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDataSetWriter.cxx b/IO/vtkDataSetWriter.cxx
index 4b0c7d5d7f8e22c738821b9475f004cbeef8d41d..10e450199ce05562c013cdb3efb3ddaf38b6963c 100644
--- a/IO/vtkDataSetWriter.cxx
+++ b/IO/vtkDataSetWriter.cxx
@@ -29,7 +29,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkUnstructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkDataSetWriter, "1.42");
 vtkStandardNewMacro(vtkDataSetWriter);
 
 void vtkDataSetWriter::WriteData()
diff --git a/IO/vtkDataSetWriter.h b/IO/vtkDataSetWriter.h
index 440a553e6b813a2be86626deb84ee9b3cd86d47a..8055ea13d853fcced7fe7ffdd60d3e8c4d0abe76 100644
--- a/IO/vtkDataSetWriter.h
+++ b/IO/vtkDataSetWriter.h
@@ -27,7 +27,7 @@ class VTK_IO_EXPORT vtkDataSetWriter : public vtkDataWriter
 {
 public:
   static vtkDataSetWriter *New();
-  vtkTypeRevisionMacro(vtkDataSetWriter,vtkDataWriter);
+  vtkTypeMacro(vtkDataSetWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDataWriter.cxx b/IO/vtkDataWriter.cxx
index ca1fad2115636113918ad530af7643ed8f54886b..d810a53eb7cf3e9f0de6af7a1f3e0a6a22b5e8c3 100644
--- a/IO/vtkDataWriter.cxx
+++ b/IO/vtkDataWriter.cxx
@@ -45,7 +45,6 @@
 #include <vtksys/ios/sstream>
 
 
-vtkCxxRevisionMacro(vtkDataWriter, "1.137");
 vtkStandardNewMacro(vtkDataWriter);
 
 // this undef is required on the hp. vtkMutexLock ends up including
diff --git a/IO/vtkDataWriter.h b/IO/vtkDataWriter.h
index cb342d68762ad3c1183e063f93ef53bc297696a8..cf133012ca50c571817b38dc24d66bb335728dc5 100644
--- a/IO/vtkDataWriter.h
+++ b/IO/vtkDataWriter.h
@@ -39,7 +39,7 @@ class vtkTable;
 class VTK_IO_EXPORT vtkDataWriter : public vtkWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkDataWriter,vtkWriter);
+  vtkTypeMacro(vtkDataWriter,vtkWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkDelimitedTextWriter.cxx b/IO/vtkDelimitedTextWriter.cxx
index ade9e589a08edbc652fa769473173217b0b80a9a..d84a998c7362ec8b4d4a438d44415408d3da0839 100644
--- a/IO/vtkDelimitedTextWriter.cxx
+++ b/IO/vtkDelimitedTextWriter.cxx
@@ -34,7 +34,6 @@
 #include <vtksys/ios/sstream>
 
 vtkStandardNewMacro(vtkDelimitedTextWriter);
-vtkCxxRevisionMacro(vtkDelimitedTextWriter, "1.1");
 //-----------------------------------------------------------------------------
 vtkDelimitedTextWriter::vtkDelimitedTextWriter()
 {
diff --git a/IO/vtkDelimitedTextWriter.h b/IO/vtkDelimitedTextWriter.h
index a21b0d583090985395fdc4488a438018b606ea17..243de1cae4e6f5959e724ddd589396fbf18fb29f 100644
--- a/IO/vtkDelimitedTextWriter.h
+++ b/IO/vtkDelimitedTextWriter.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkDelimitedTextWriter : public vtkWriter
 {
 public:
   static vtkDelimitedTextWriter* New();
-  vtkTypeRevisionMacro(vtkDelimitedTextWriter, vtkWriter);
+  vtkTypeMacro(vtkDelimitedTextWriter, vtkWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkEnSight6BinaryReader.cxx b/IO/vtkEnSight6BinaryReader.cxx
index 7bdbf0dcef76f2eb37b844469bad6ecbdfa13aa3..38d070dbf33968d5e4eb7dcfe49da74f71509e5c 100644
--- a/IO/vtkEnSight6BinaryReader.cxx
+++ b/IO/vtkEnSight6BinaryReader.cxx
@@ -33,7 +33,6 @@
 #include <ctype.h>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkEnSight6BinaryReader, "1.60");
 vtkStandardNewMacro(vtkEnSight6BinaryReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkEnSight6BinaryReader.h b/IO/vtkEnSight6BinaryReader.h
index 7f2a5c733b04dff442634dd21ee99a278fa8c27b..cc322eebaf16e2ea12801bc8adb1417762bb57e7 100644
--- a/IO/vtkEnSight6BinaryReader.h
+++ b/IO/vtkEnSight6BinaryReader.h
@@ -45,7 +45,7 @@ class VTK_IO_EXPORT vtkEnSight6BinaryReader : public vtkEnSightReader
 {
 public:
   static vtkEnSight6BinaryReader *New();
-  vtkTypeRevisionMacro(vtkEnSight6BinaryReader, vtkEnSightReader);
+  vtkTypeMacro(vtkEnSight6BinaryReader, vtkEnSightReader);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/IO/vtkEnSight6Reader.cxx b/IO/vtkEnSight6Reader.cxx
index 82d450886a1cde979d36154494a78899b7359e34..765d459df0613c79611ae0369ad8caae4cad59b8 100644
--- a/IO/vtkEnSight6Reader.cxx
+++ b/IO/vtkEnSight6Reader.cxx
@@ -33,7 +33,6 @@
 #include <ctype.h>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkEnSight6Reader, "1.68");
 vtkStandardNewMacro(vtkEnSight6Reader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkEnSight6Reader.h b/IO/vtkEnSight6Reader.h
index 26151690a11644706d9af0401d6315d3b3e4c97d..0dba100ec9fa5846a573cbce245b2b596e00402e 100644
--- a/IO/vtkEnSight6Reader.h
+++ b/IO/vtkEnSight6Reader.h
@@ -45,7 +45,7 @@ class VTK_IO_EXPORT vtkEnSight6Reader : public vtkEnSightReader
 {
 public:
   static vtkEnSight6Reader *New();
-  vtkTypeRevisionMacro(vtkEnSight6Reader, vtkEnSightReader);
+  vtkTypeMacro(vtkEnSight6Reader, vtkEnSightReader);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/IO/vtkEnSightGoldBinaryReader.cxx b/IO/vtkEnSightGoldBinaryReader.cxx
index cd6e3263d61451233b8ce3e8d642f8540e450032..0238058ccd7e3d0db19d065f2a5fda6d084e8231 100644
--- a/IO/vtkEnSightGoldBinaryReader.cxx
+++ b/IO/vtkEnSightGoldBinaryReader.cxx
@@ -32,7 +32,6 @@
 #include <ctype.h>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkEnSightGoldBinaryReader, "1.83");
 vtkStandardNewMacro(vtkEnSightGoldBinaryReader);
 
 // This is half the precision of an int.
diff --git a/IO/vtkEnSightGoldBinaryReader.h b/IO/vtkEnSightGoldBinaryReader.h
index 7ea3b9ef173ca64f7a75909cd530b17bf7388283..ae398556020418b7876805bc7919c40d0b826f51 100644
--- a/IO/vtkEnSightGoldBinaryReader.h
+++ b/IO/vtkEnSightGoldBinaryReader.h
@@ -45,7 +45,7 @@ class VTK_IO_EXPORT vtkEnSightGoldBinaryReader : public vtkEnSightReader
 {
 public:
   static vtkEnSightGoldBinaryReader *New();
-  vtkTypeRevisionMacro(vtkEnSightGoldBinaryReader, vtkEnSightReader);
+  vtkTypeMacro(vtkEnSightGoldBinaryReader, vtkEnSightReader);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
  
 protected:
diff --git a/IO/vtkEnSightGoldReader.cxx b/IO/vtkEnSightGoldReader.cxx
index 1d58fd69ed6f2217b3b7f1e5db236ed5f3dd907f..84444b4c5e078c2859752e6fb12911bb46a872df 100644
--- a/IO/vtkEnSightGoldReader.cxx
+++ b/IO/vtkEnSightGoldReader.cxx
@@ -31,7 +31,6 @@
 #include <vtkstd/string>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkEnSightGoldReader, "1.67");
 vtkStandardNewMacro(vtkEnSightGoldReader);
 
 //BTX
diff --git a/IO/vtkEnSightGoldReader.h b/IO/vtkEnSightGoldReader.h
index 206d1d570653bb0342e9f66c0efda11efab0c337..ca74c80084f81a1b2d3850a64f299b3b58d2e2bf 100644
--- a/IO/vtkEnSightGoldReader.h
+++ b/IO/vtkEnSightGoldReader.h
@@ -49,7 +49,7 @@ class VTK_IO_EXPORT vtkEnSightGoldReader : public vtkEnSightReader
 {
 public:
   static vtkEnSightGoldReader *New();
-  vtkTypeRevisionMacro(vtkEnSightGoldReader, vtkEnSightReader);
+  vtkTypeMacro(vtkEnSightGoldReader, vtkEnSightReader);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/IO/vtkEnSightMasterServerReader.cxx b/IO/vtkEnSightMasterServerReader.cxx
index dd173a2170d998e68533d8dc7f2c46d01e1bcbfd..125132915a89d39eecec7ee097f5687c173ee3b6 100644
--- a/IO/vtkEnSightMasterServerReader.cxx
+++ b/IO/vtkEnSightMasterServerReader.cxx
@@ -21,7 +21,6 @@
 #include <vtkstd/string>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkEnSightMasterServerReader, "1.12");
 vtkStandardNewMacro(vtkEnSightMasterServerReader);
 
 static int vtkEnSightMasterServerReaderStartsWith(const char* str1, const char* str2)
diff --git a/IO/vtkEnSightMasterServerReader.h b/IO/vtkEnSightMasterServerReader.h
index e6ba328ca6b3d928ccdd89be49e7d6686ce7a20d..dc7e87dc9d9d3f80b2ae113bb554cb65c17f8e77 100644
--- a/IO/vtkEnSightMasterServerReader.h
+++ b/IO/vtkEnSightMasterServerReader.h
@@ -24,7 +24,7 @@ class vtkCollection;
 class VTK_IO_EXPORT vtkEnSightMasterServerReader : public vtkGenericEnSightReader
 {
 public:
-  vtkTypeRevisionMacro(vtkEnSightMasterServerReader, vtkGenericEnSightReader);
+  vtkTypeMacro(vtkEnSightMasterServerReader, vtkGenericEnSightReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkEnSightMasterServerReader* New();
diff --git a/IO/vtkEnSightReader.cxx b/IO/vtkEnSightReader.cxx
index 289884dfd66d255ad2d189d44775d863764b47e9..b96b63f3533d5b1170b70f179ea5232b41c23c19 100644
--- a/IO/vtkEnSightReader.cxx
+++ b/IO/vtkEnSightReader.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/string>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkEnSightReader, "1.88");
 
 //----------------------------------------------------------------------------
 typedef vtkstd::vector< vtkSmartPointer<vtkIdList> > vtkEnSightReaderCellIdsTypeBase;
diff --git a/IO/vtkEnSightReader.h b/IO/vtkEnSightReader.h
index b0bce9f4d6c86be2e3ac52a4f9236c55caaf501a..4b551fbc2d08e867676d0e99755b5f20b64e52a6 100644
--- a/IO/vtkEnSightReader.h
+++ b/IO/vtkEnSightReader.h
@@ -28,7 +28,7 @@ class vtkMultiBlockDataSet;
 class VTK_IO_EXPORT vtkEnSightReader : public vtkGenericEnSightReader
 {
 public:
-  vtkTypeRevisionMacro(vtkEnSightReader, vtkGenericEnSightReader);
+  vtkTypeMacro(vtkEnSightReader, vtkGenericEnSightReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/IO/vtkFFMPEGWriter.cxx b/IO/vtkFFMPEGWriter.cxx
index 0abc9cbb4974540732ec27584f954b2e381b7f44..da28a84dc5bbe94ffcc651a65d6f1acf7abd6372 100644
--- a/IO/vtkFFMPEGWriter.cxx
+++ b/IO/vtkFFMPEGWriter.cxx
@@ -404,7 +404,6 @@ void vtkFFMPEGWriterInternal::End()
 
 //---------------------------------------------------------------------------
 vtkStandardNewMacro(vtkFFMPEGWriter);
-vtkCxxRevisionMacro(vtkFFMPEGWriter, "1.11");
 
 //---------------------------------------------------------------------------
 vtkFFMPEGWriter::vtkFFMPEGWriter()
diff --git a/IO/vtkFFMPEGWriter.h b/IO/vtkFFMPEGWriter.h
index 93db6fe09654c1a18c098b5b0fe7c5ec6eaf584f..4daf7d5649810986585cf312ef9b2f875f560f7f 100644
--- a/IO/vtkFFMPEGWriter.h
+++ b/IO/vtkFFMPEGWriter.h
@@ -38,7 +38,7 @@ class VTK_IO_EXPORT vtkFFMPEGWriter : public vtkGenericMovieWriter
 {
 public:
   static vtkFFMPEGWriter *New();
-  vtkTypeRevisionMacro(vtkFFMPEGWriter,vtkGenericMovieWriter);
+  vtkTypeMacro(vtkFFMPEGWriter,vtkGenericMovieWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkFLUENTReader.cxx b/IO/vtkFLUENTReader.cxx
index c7b1638414501ba57dafc51bc692672220432d31..115d2e690a68252c94def60a6b4b27d94390bffb 100644
--- a/IO/vtkFLUENTReader.cxx
+++ b/IO/vtkFLUENTReader.cxx
@@ -58,7 +58,6 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
-vtkCxxRevisionMacro(vtkFLUENTReader, "1.27");
 vtkStandardNewMacro(vtkFLUENTReader);
 
 #define VTK_FILE_BYTE_ORDER_BIG_ENDIAN 0
diff --git a/IO/vtkFLUENTReader.h b/IO/vtkFLUENTReader.h
index aa69f133138c5e0ad4a17905f8a5511d2b85720e..a05ba4ebfa560493dd5844a2d55a19d39698151b 100644
--- a/IO/vtkFLUENTReader.h
+++ b/IO/vtkFLUENTReader.h
@@ -48,7 +48,7 @@ class VTK_IO_EXPORT vtkFLUENTReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkFLUENTReader *New();
-  vtkTypeRevisionMacro(vtkFLUENTReader,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkFLUENTReader,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkFacetWriter.cxx b/IO/vtkFacetWriter.cxx
index 46380f77993b3c0262694be314d67e0f27fd3a5b..0a3375566166b4803b8d3842b778e1bf127f317d 100644
--- a/IO/vtkFacetWriter.cxx
+++ b/IO/vtkFacetWriter.cxx
@@ -34,7 +34,6 @@
 #include <vtkstd/string>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkFacetWriter, "1.5");
 vtkStandardNewMacro(vtkFacetWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkFacetWriter.h b/IO/vtkFacetWriter.h
index 895d223012f01b0cf37cbfc0f1a15669c6ec687a..d48af5b70032b8352c103ee4d521536e58150084 100644
--- a/IO/vtkFacetWriter.h
+++ b/IO/vtkFacetWriter.h
@@ -44,7 +44,7 @@ class VTK_IO_EXPORT vtkFacetWriter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkFacetWriter *New();
-  vtkTypeRevisionMacro(vtkFacetWriter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkFacetWriter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGAMBITReader.cxx b/IO/vtkGAMBITReader.cxx
index c6ae87bb279b561b00a5e91839eb05af7eefb862..812c1fa6d40faddc219511e71208e24690b2f12f 100644
--- a/IO/vtkGAMBITReader.cxx
+++ b/IO/vtkGAMBITReader.cxx
@@ -29,7 +29,6 @@
 #include "vtkIntArray.h"
 #include "vtkCellArray.h"
 
-vtkCxxRevisionMacro(vtkGAMBITReader, "1.6");
 vtkStandardNewMacro(vtkGAMBITReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkGAMBITReader.h b/IO/vtkGAMBITReader.h
index 8855f2872ddb98d9163629635ad74369adb6b84e..780cd006d112016c5e85bfec2f1f57d11e58477e 100644
--- a/IO/vtkGAMBITReader.h
+++ b/IO/vtkGAMBITReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkGAMBITReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkGAMBITReader *New();
-  vtkTypeRevisionMacro(vtkGAMBITReader,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkGAMBITReader,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGESignaReader.cxx b/IO/vtkGESignaReader.cxx
index c619e8cd9eb9480750e7d0df816decc5e84e8e04..c6683f01422966c1a7fccf6bae317551eda91ca9 100644
--- a/IO/vtkGESignaReader.cxx
+++ b/IO/vtkGESignaReader.cxx
@@ -21,7 +21,6 @@
 #include "vtkPointData.h"
 #include "vtkMedicalImageProperties.h"
 
-vtkCxxRevisionMacro(vtkGESignaReader, "1.21");
 vtkStandardNewMacro(vtkGESignaReader);
 
 
diff --git a/IO/vtkGESignaReader.h b/IO/vtkGESignaReader.h
index 475c1221856df2f7f559ba00767382cf55365631..ab151f5be7bdfa263a521ac1f0463302dc776794 100644
--- a/IO/vtkGESignaReader.h
+++ b/IO/vtkGESignaReader.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkGESignaReader : public vtkMedicalImageReader2
 {
 public:
   static vtkGESignaReader *New();
-  vtkTypeRevisionMacro(vtkGESignaReader,vtkMedicalImageReader2);
+  vtkTypeMacro(vtkGESignaReader,vtkMedicalImageReader2);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGaussianCubeReader.cxx b/IO/vtkGaussianCubeReader.cxx
index ee66910bed26c704bc85fd1fc2d1b9109fb01ba2..249d1efb1d834a362b676324d757dd49ce68be5e 100644
--- a/IO/vtkGaussianCubeReader.cxx
+++ b/IO/vtkGaussianCubeReader.cxx
@@ -27,7 +27,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkGaussianCubeReader, "1.16");
 vtkStandardNewMacro(vtkGaussianCubeReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkGaussianCubeReader.h b/IO/vtkGaussianCubeReader.h
index ab0745b2568222c96f093a76d73cdfd0bc2df526..c88ad1cca8cbd7a3d7d2bac69560beac335c40c3 100644
--- a/IO/vtkGaussianCubeReader.h
+++ b/IO/vtkGaussianCubeReader.h
@@ -33,7 +33,7 @@ class VTK_IO_EXPORT vtkGaussianCubeReader : public vtkMoleculeReaderBase
 {
 public:
   static vtkGaussianCubeReader *New();
-  vtkTypeRevisionMacro(vtkGaussianCubeReader,vtkMoleculeReaderBase);
+  vtkTypeMacro(vtkGaussianCubeReader,vtkMoleculeReaderBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGetObjectMacro(Transform,vtkTransform);
diff --git a/IO/vtkGenericDataObjectReader.cxx b/IO/vtkGenericDataObjectReader.cxx
index 03a32a189be735e11577083dfb8bfac3d95ca5e3..0086d87683cc4e7250d6ca7a193d4c6161990064 100644
--- a/IO/vtkGenericDataObjectReader.cxx
+++ b/IO/vtkGenericDataObjectReader.cxx
@@ -37,7 +37,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkUnstructuredGridReader.h"
 
-vtkCxxRevisionMacro(vtkGenericDataObjectReader, "1.5");
 vtkStandardNewMacro(vtkGenericDataObjectReader);
 
 template<typename ReaderT, typename DataT>
diff --git a/IO/vtkGenericDataObjectReader.h b/IO/vtkGenericDataObjectReader.h
index 47aa125b4417e494068f6c2406627ac4980886a6..1c25fe85f54b5a2b035a2dfb2e131588571ed23c 100644
--- a/IO/vtkGenericDataObjectReader.h
+++ b/IO/vtkGenericDataObjectReader.h
@@ -48,7 +48,7 @@ class VTK_IO_EXPORT vtkGenericDataObjectReader : public vtkDataReader
 {
 public:
   static vtkGenericDataObjectReader *New();
-  vtkTypeRevisionMacro(vtkGenericDataObjectReader,vtkDataReader);
+  vtkTypeMacro(vtkGenericDataObjectReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGenericDataObjectWriter.cxx b/IO/vtkGenericDataObjectWriter.cxx
index 74e2a5b966801f2ae5b12a317f69f7525b154512..aa7e4c4f2d1f8a4e4ccc4f2c8f84a71ba4316a63 100644
--- a/IO/vtkGenericDataObjectWriter.cxx
+++ b/IO/vtkGenericDataObjectWriter.cxx
@@ -36,7 +36,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkUnstructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkGenericDataObjectWriter, "1.4");
 vtkStandardNewMacro(vtkGenericDataObjectWriter);
 
 template<typename WriterT, typename DataT>
diff --git a/IO/vtkGenericDataObjectWriter.h b/IO/vtkGenericDataObjectWriter.h
index e1789e1ce09e57e7b18d0fb61a4c013f3be187f4..e4f31721ee8d1dc5374e3d910950d3eb8596aa60 100644
--- a/IO/vtkGenericDataObjectWriter.h
+++ b/IO/vtkGenericDataObjectWriter.h
@@ -26,7 +26,7 @@ class VTK_IO_EXPORT vtkGenericDataObjectWriter : public vtkDataWriter
 {
 public:
   static vtkGenericDataObjectWriter *New();
-  vtkTypeRevisionMacro(vtkGenericDataObjectWriter,vtkDataWriter);
+  vtkTypeMacro(vtkGenericDataObjectWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkGenericEnSightReader.cxx b/IO/vtkGenericEnSightReader.cxx
index 935e21c549f64c06235ea1c5ede6a01b8876e75c..841856973412cc75f35d898fa2525c807f552762 100644
--- a/IO/vtkGenericEnSightReader.cxx
+++ b/IO/vtkGenericEnSightReader.cxx
@@ -33,7 +33,6 @@
 #include <assert.h>
 #include <ctype.h> /* isspace */
 
-vtkCxxRevisionMacro(vtkGenericEnSightReader, "1.88");
 vtkStandardNewMacro(vtkGenericEnSightReader);
 
 vtkCxxSetObjectMacro(vtkGenericEnSightReader,TimeSets, 
diff --git a/IO/vtkGenericEnSightReader.h b/IO/vtkGenericEnSightReader.h
index c04c744be78d06a3babf5baf187ab5d16000889c..c6b489e0c9dc4af61bcd919c4a6a467bd449b324 100644
--- a/IO/vtkGenericEnSightReader.h
+++ b/IO/vtkGenericEnSightReader.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkGenericEnSightReader : public vtkMultiBlockDataSetAlgorit
 {
 public:
   static vtkGenericEnSightReader *New();
-  vtkTypeRevisionMacro(vtkGenericEnSightReader, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkGenericEnSightReader, vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGenericMovieWriter.cxx b/IO/vtkGenericMovieWriter.cxx
index e7c6ac06e0deb864e79441d495a06bdb3a8d4bf9..ed3a12d7561d5992e5c6b410effdc362335d55c6 100644
--- a/IO/vtkGenericMovieWriter.cxx
+++ b/IO/vtkGenericMovieWriter.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkErrorCode.h"
 
-vtkCxxRevisionMacro(vtkGenericMovieWriter, "1.3");
 
 //---------------------------------------------------------------------------
 vtkGenericMovieWriter::vtkGenericMovieWriter()
diff --git a/IO/vtkGenericMovieWriter.h b/IO/vtkGenericMovieWriter.h
index b72c6fc8cf04c77e3d9b994bcb798bb38d11b935..5c2a957c294ceab10eb8da9c1cf0a07267979dc6 100644
--- a/IO/vtkGenericMovieWriter.h
+++ b/IO/vtkGenericMovieWriter.h
@@ -32,7 +32,7 @@ class vtkImageData;
 class VTK_IO_EXPORT vtkGenericMovieWriter : public vtkProcessObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGenericMovieWriter,vtkProcessObject);
+  vtkTypeMacro(vtkGenericMovieWriter,vtkProcessObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkGlobFileNames.cxx b/IO/vtkGlobFileNames.cxx
index 553d635b08d47621cc8b1391ac2820096ab32ef4..74427bdcb7efb4d0048bcbd811a5eee5351e8d7e 100644
--- a/IO/vtkGlobFileNames.cxx
+++ b/IO/vtkGlobFileNames.cxx
@@ -23,7 +23,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkGlobFileNames, "1.4");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/IO/vtkGlobFileNames.h b/IO/vtkGlobFileNames.h
index 3f3cb3a770f48212c474fb108da56c6a47bee448..53764a21c149430a887d26d769add1280ebcf93a 100644
--- a/IO/vtkGlobFileNames.h
+++ b/IO/vtkGlobFileNames.h
@@ -42,7 +42,7 @@ class VTK_IO_EXPORT vtkGlobFileNames : public vtkObject
 public:
   // Description:
   // Return the class name as a string.
-  vtkTypeRevisionMacro(vtkGlobFileNames,vtkObject);
+  vtkTypeMacro(vtkGlobFileNames,vtkObject);
 
   // Description:
   // Create a new vtkGlobFileNames object.
diff --git a/IO/vtkGraphReader.cxx b/IO/vtkGraphReader.cxx
index c15dffaaaf11d086d34f8b0e10df2a01c869c8b0..7bc92b13dd37349e1794d6b56db9c75938a2ae2a 100644
--- a/IO/vtkGraphReader.cxx
+++ b/IO/vtkGraphReader.cxx
@@ -26,7 +26,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkGraphReader, "1.4");
 vtkStandardNewMacro(vtkGraphReader);
 
 #ifdef read
diff --git a/IO/vtkGraphReader.h b/IO/vtkGraphReader.h
index 8cded6c4b580d3ec28e27bf4f6e19a153c9c32fe..ea12c25a45f35dd1e872daa67e8438b10851f650 100644
--- a/IO/vtkGraphReader.h
+++ b/IO/vtkGraphReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkGraphReader : public vtkDataReader
 {
 public:
   static vtkGraphReader *New();
-  vtkTypeRevisionMacro(vtkGraphReader,vtkDataReader);
+  vtkTypeMacro(vtkGraphReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkGraphWriter.cxx b/IO/vtkGraphWriter.cxx
index 6c0c01452af01ae79709cb9100042d00ff2d19fa..a66a614120a6a70101a1886fb5023f8b8d3f987f 100644
--- a/IO/vtkGraphWriter.cxx
+++ b/IO/vtkGraphWriter.cxx
@@ -28,7 +28,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkGraphWriter, "1.6");
 vtkStandardNewMacro(vtkGraphWriter);
 
 void vtkGraphWriter::WriteData()
diff --git a/IO/vtkGraphWriter.h b/IO/vtkGraphWriter.h
index a4d6d78d4be1ea0849160fb0e1db4cd0a0c8c5a3..b8535a0953a0fb8318ab5e10ae5b9f7e3abe582b 100644
--- a/IO/vtkGraphWriter.h
+++ b/IO/vtkGraphWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkGraphWriter : public vtkDataWriter
 {
 public:
   static vtkGraphWriter *New();
-  vtkTypeRevisionMacro(vtkGraphWriter,vtkDataWriter);
+  vtkTypeMacro(vtkGraphWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkIVWriter.cxx b/IO/vtkIVWriter.cxx
index 1ed89eb882dc09571de1aa9517085eb05c2c9f21..814647c6cb9baf7d8eeccbdfe143eafbf97ce26e 100644
--- a/IO/vtkIVWriter.cxx
+++ b/IO/vtkIVWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkIVWriter, "1.34");
 vtkStandardNewMacro(vtkIVWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkIVWriter.h b/IO/vtkIVWriter.h
index 2df21ec065b41b58b1541a4b19ac57eec0d483d0..776df9a8114757f64c2fcd8642712b804780b445 100644
--- a/IO/vtkIVWriter.h
+++ b/IO/vtkIVWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkIVWriter : public vtkPolyDataWriter
 {
 public:
   static vtkIVWriter *New();
-  vtkTypeRevisionMacro(vtkIVWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkIVWriter,vtkPolyDataWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkImageReader.cxx b/IO/vtkImageReader.cxx
index b5255ca648415c603d5409b1aeb2e5efe030f4f7..2072d3bf258e032f5a166347ea1420bc5f7b82fe 100644
--- a/IO/vtkImageReader.cxx
+++ b/IO/vtkImageReader.cxx
@@ -24,7 +24,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkImageReader, "1.123");
 vtkStandardNewMacro(vtkImageReader);
 
 vtkCxxSetObjectMacro(vtkImageReader,Transform,vtkTransform);
diff --git a/IO/vtkImageReader.h b/IO/vtkImageReader.h
index df63af5c1820936ccfe9b4a6cf7ae684b18ed75f..9f788ec3d81ef8a6f8bc2ac38fffc08b3ae737cd 100644
--- a/IO/vtkImageReader.h
+++ b/IO/vtkImageReader.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkImageReader : public vtkImageReader2
 {
 public:
   static vtkImageReader *New();
-  vtkTypeRevisionMacro(vtkImageReader,vtkImageReader2);
+  vtkTypeMacro(vtkImageReader,vtkImageReader2);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/IO/vtkImageReader2.cxx b/IO/vtkImageReader2.cxx
index b53f4c4a28ed619a2b32aea2562a316fe4365823..aacdb8ad6142c2cae0fce1ae572255a112bfe71d 100644
--- a/IO/vtkImageReader2.cxx
+++ b/IO/vtkImageReader2.cxx
@@ -26,7 +26,6 @@
 
 #include <sys/stat.h>
 
-vtkCxxRevisionMacro(vtkImageReader2, "1.43");
 vtkStandardNewMacro(vtkImageReader2);
 
 #ifdef read
diff --git a/IO/vtkImageReader2.h b/IO/vtkImageReader2.h
index 11099f287f45c99b69b5d16a8d1d388007b30662..357a0216df7cc7938445422cba78de231bcea40b 100644
--- a/IO/vtkImageReader2.h
+++ b/IO/vtkImageReader2.h
@@ -37,7 +37,7 @@ class VTK_IO_EXPORT vtkImageReader2 : public vtkImageAlgorithm
 {
 public:
   static vtkImageReader2 *New();
-  vtkTypeRevisionMacro(vtkImageReader2,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageReader2,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/IO/vtkImageReader2Collection.cxx b/IO/vtkImageReader2Collection.cxx
index e4f1a722bd0f31ed50fd5e6f76b7fe2f26536651..4f1ed975acd800b62924d6bfe4b933556656c02c 100644
--- a/IO/vtkImageReader2Collection.cxx
+++ b/IO/vtkImageReader2Collection.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkImageReader2.h"
 
-vtkCxxRevisionMacro(vtkImageReader2Collection, "1.8");
 vtkStandardNewMacro(vtkImageReader2Collection);
 
 void vtkImageReader2Collection::AddItem(vtkImageReader2 *f) 
diff --git a/IO/vtkImageReader2Collection.h b/IO/vtkImageReader2Collection.h
index 904364192d8aa25dbc0753e8890b50196366ff5e..d3db4563b00d3044df812228f6eac3bb262c0783 100644
--- a/IO/vtkImageReader2Collection.h
+++ b/IO/vtkImageReader2Collection.h
@@ -29,7 +29,7 @@ class vtkImageReader2;
 class VTK_IO_EXPORT vtkImageReader2Collection : public vtkCollection
 {
 public:
-  vtkTypeRevisionMacro(vtkImageReader2Collection,vtkCollection);
+  vtkTypeMacro(vtkImageReader2Collection,vtkCollection);
   static vtkImageReader2Collection *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/IO/vtkImageReader2Factory.cxx b/IO/vtkImageReader2Factory.cxx
index aa69a7d8e23867d80978077a57df85792ae27928..778d6fbd1e96587d56d96e9b031524fe796c3c08 100644
--- a/IO/vtkImageReader2Factory.cxx
+++ b/IO/vtkImageReader2Factory.cxx
@@ -36,7 +36,6 @@
 // until after the AvailableReaders singleton has been destroyed.
 #include "vtkFilteringInformationKeyManager.h"
 
-vtkCxxRevisionMacro(vtkImageReader2Factory, "1.23");
 vtkStandardNewMacro(vtkImageReader2Factory);
 
 class vtkImageReader2FactoryCleanup
diff --git a/IO/vtkImageReader2Factory.h b/IO/vtkImageReader2Factory.h
index 6c1aed053c1764247eb848162377fd52c61b56cd..a96eb5e99b57bec331a5529f998d92e8ad5bb82e 100644
--- a/IO/vtkImageReader2Factory.h
+++ b/IO/vtkImageReader2Factory.h
@@ -43,7 +43,7 @@ class VTK_IO_EXPORT vtkImageReader2Factory : public vtkObject
 {
 public:
   static vtkImageReader2Factory *New();
-  vtkTypeRevisionMacro(vtkImageReader2Factory,vtkObject);
+  vtkTypeMacro(vtkImageReader2Factory,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);   
   
   //Description: register a reader with the available readers.   
diff --git a/IO/vtkImageWriter.cxx b/IO/vtkImageWriter.cxx
index 65186d9a856a7af06f7ce5bef4d1f94306a4e7d5..181de527b3bfff9d645c8854bfa54aa67d6216a6 100644
--- a/IO/vtkImageWriter.cxx
+++ b/IO/vtkImageWriter.cxx
@@ -25,7 +25,6 @@
 
 #include <vtksys/SystemTools.hxx>
 
-vtkCxxRevisionMacro(vtkImageWriter, "1.61");
 vtkStandardNewMacro(vtkImageWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkImageWriter.h b/IO/vtkImageWriter.h
index 91e0cad8e6e3b71d3699e793cd92e487692e50bb..cd4fd2f77ab23c2918bebd0d779e1e1708b47d47 100644
--- a/IO/vtkImageWriter.h
+++ b/IO/vtkImageWriter.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkImageWriter : public vtkImageAlgorithm
 {
 public:
   static vtkImageWriter *New();
-  vtkTypeRevisionMacro(vtkImageWriter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageWriter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkInputStream.cxx b/IO/vtkInputStream.cxx
index e9bcfc47a280f82fc77db3d39e5453b2e37979ab..19387d97172d1d1dd13f819c0f7789a2cff1fb44 100644
--- a/IO/vtkInputStream.cxx
+++ b/IO/vtkInputStream.cxx
@@ -15,7 +15,6 @@
 #include "vtkInputStream.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkInputStream, "1.2");
 vtkStandardNewMacro(vtkInputStream);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkInputStream.h b/IO/vtkInputStream.h
index 546125cce23a39be053376ffdec7aa2c6f052eed..b9177caf4b9053f8d1adc3723a4006bd056f3f12 100644
--- a/IO/vtkInputStream.h
+++ b/IO/vtkInputStream.h
@@ -29,7 +29,7 @@
 class VTK_IO_EXPORT vtkInputStream : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkInputStream,vtkObject);
+  vtkTypeMacro(vtkInputStream,vtkObject);
   static vtkInputStream *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/IO/vtkJPEGReader.cxx b/IO/vtkJPEGReader.cxx
index 5bdac80c1ac0cbd44d76904d4f3d5c2d885219ba..2532cba39fe5da5de5cf40750e034da8aab3b3b9 100644
--- a/IO/vtkJPEGReader.cxx
+++ b/IO/vtkJPEGReader.cxx
@@ -31,7 +31,6 @@ extern "C" {
 }
 
 
-vtkCxxRevisionMacro(vtkJPEGReader, "1.26");
 vtkStandardNewMacro(vtkJPEGReader);
 
 
diff --git a/IO/vtkJPEGReader.h b/IO/vtkJPEGReader.h
index 95cba2a3dc9fd3b6f1b273329410a952ab4819c3..1c24767b8287be829d31b472c182b304293e9e45 100644
--- a/IO/vtkJPEGReader.h
+++ b/IO/vtkJPEGReader.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkJPEGReader : public vtkImageReader2
 {
 public:
   static vtkJPEGReader *New();
-  vtkTypeRevisionMacro(vtkJPEGReader,vtkImageReader2);
+  vtkTypeMacro(vtkJPEGReader,vtkImageReader2);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkJPEGWriter.cxx b/IO/vtkJPEGWriter.cxx
index 22bf22ab13a30a9ed8270d8b78962cdc4d38fe68..04fd1d9510edfed70f0f6f0f389adff61f0373ee 100644
--- a/IO/vtkJPEGWriter.cxx
+++ b/IO/vtkJPEGWriter.cxx
@@ -30,7 +30,6 @@ extern "C" {
 #include <setjmp.h>
 }
 
-vtkCxxRevisionMacro(vtkJPEGWriter, "1.31");
 vtkStandardNewMacro(vtkJPEGWriter);
 
 vtkCxxSetObjectMacro(vtkJPEGWriter,Result,vtkUnsignedCharArray);
diff --git a/IO/vtkJPEGWriter.h b/IO/vtkJPEGWriter.h
index 89b844536d55e92b7186d05975d61f730ba9f77e..f8376376669c175cab819d43aab49a3ddfa21cfc 100644
--- a/IO/vtkJPEGWriter.h
+++ b/IO/vtkJPEGWriter.h
@@ -33,7 +33,7 @@ class VTK_IO_EXPORT vtkJPEGWriter : public vtkImageWriter
 {
 public:
   static vtkJPEGWriter *New();
-  vtkTypeRevisionMacro(vtkJPEGWriter,vtkImageWriter);
+  vtkTypeMacro(vtkJPEGWriter,vtkImageWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkJavaScriptDataWriter.cxx b/IO/vtkJavaScriptDataWriter.cxx
index c8eba0b353cac8e4f63da9fe1bd9c6bc14956a70..87f3ff14c2c83b3420f03f36e59da7fe6e701ff8 100644
--- a/IO/vtkJavaScriptDataWriter.cxx
+++ b/IO/vtkJavaScriptDataWriter.cxx
@@ -35,7 +35,6 @@
 #include <vtksys/ios/sstream>
 
 vtkStandardNewMacro(vtkJavaScriptDataWriter);
-vtkCxxRevisionMacro(vtkJavaScriptDataWriter, "1.5");
 //-----------------------------------------------------------------------------
 vtkJavaScriptDataWriter::vtkJavaScriptDataWriter()
 {
diff --git a/IO/vtkJavaScriptDataWriter.h b/IO/vtkJavaScriptDataWriter.h
index 8e2c5807bc71ecda15b4030a17d76e7f5b2dd0b1..cb814a450a18c15591a0538ef179917ee203783d 100644
--- a/IO/vtkJavaScriptDataWriter.h
+++ b/IO/vtkJavaScriptDataWriter.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkJavaScriptDataWriter : public vtkWriter
 {
 public:
   static vtkJavaScriptDataWriter* New();
-  vtkTypeRevisionMacro(vtkJavaScriptDataWriter, vtkWriter);
+  vtkTypeMacro(vtkJavaScriptDataWriter, vtkWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMCubesReader.cxx b/IO/vtkMCubesReader.cxx
index 935f1fc65b5a8e72f0103b3f7fdf85908b4c731a..ebc2b298b4f19b558db6cb35be23051c9b858081 100644
--- a/IO/vtkMCubesReader.cxx
+++ b/IO/vtkMCubesReader.cxx
@@ -28,7 +28,6 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-vtkCxxRevisionMacro(vtkMCubesReader, "1.67");
 vtkStandardNewMacro(vtkMCubesReader);
 
 // Construct object with FlipNormals turned off and Normals set to true.
diff --git a/IO/vtkMCubesReader.h b/IO/vtkMCubesReader.h
index 84421ebe197468082cf4384fd8a0bafc67a21b48..0f25f6cf24cd01d45c41a5f7e1dc43121d78d931 100644
--- a/IO/vtkMCubesReader.h
+++ b/IO/vtkMCubesReader.h
@@ -57,7 +57,7 @@ class vtkIncrementalPointLocator;
 class VTK_IO_EXPORT vtkMCubesReader : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkMCubesReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMCubesReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMCubesWriter.cxx b/IO/vtkMCubesWriter.cxx
index 30f617f779e277e032bd34b93ddbce1a81f5f335..a1b26baa5a1b9c6cb4704915a29ef6763bd0e0a0 100644
--- a/IO/vtkMCubesWriter.cxx
+++ b/IO/vtkMCubesWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkMCubesWriter, "1.36");
 vtkStandardNewMacro(vtkMCubesWriter);
 
 // Create object.
diff --git a/IO/vtkMCubesWriter.h b/IO/vtkMCubesWriter.h
index 83f29b0e28fd4102c0174226e9f20b91f7cde179..7540997c2cd739d75a067b264ee5525add59f9a3 100644
--- a/IO/vtkMCubesWriter.h
+++ b/IO/vtkMCubesWriter.h
@@ -37,7 +37,7 @@ class VTK_IO_EXPORT vtkMCubesWriter : public vtkPolyDataWriter
 {
 public:
   static vtkMCubesWriter *New();
-  vtkTypeRevisionMacro(vtkMCubesWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkMCubesWriter,vtkPolyDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMFIXReader.cxx b/IO/vtkMFIXReader.cxx
index 11010f0ae8572e8457238309772315a1878441e1..22ff2e1393bf687fbb2346e5c697bcdbedc366d0 100644
--- a/IO/vtkMFIXReader.cxx
+++ b/IO/vtkMFIXReader.cxx
@@ -38,7 +38,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStringArray.h"
 
-vtkCxxRevisionMacro(vtkMFIXReader, "1.7");
 vtkStandardNewMacro(vtkMFIXReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkMFIXReader.h b/IO/vtkMFIXReader.h
index ff242be536fdbcf408d6acfed737815b20672cad..fe49ea0a57b38fe1a519b2ce91c98f8396ec6f31 100644
--- a/IO/vtkMFIXReader.h
+++ b/IO/vtkMFIXReader.h
@@ -50,7 +50,7 @@ class VTK_IO_EXPORT vtkMFIXReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkMFIXReader *New();
-  vtkTypeRevisionMacro(vtkMFIXReader,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkMFIXReader,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMINCImageAttributes.cxx b/IO/vtkMINCImageAttributes.cxx
index fd7d00c138f4b8c5b3518ce7c7b7ed7d1c5688cd..a135e09bf8c4da5c4c3b0681cdb11b267c4f7062 100644
--- a/IO/vtkMINCImageAttributes.cxx
+++ b/IO/vtkMINCImageAttributes.cxx
@@ -122,7 +122,6 @@ private:
 };
 
 //--------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMINCImageAttributes, "1.10");
 vtkStandardNewMacro(vtkMINCImageAttributes);
 
 vtkCxxSetObjectMacro(vtkMINCImageAttributes,ImageMin,vtkDoubleArray);
diff --git a/IO/vtkMINCImageAttributes.h b/IO/vtkMINCImageAttributes.h
index 7e91f7ab21960b25b50cede3fd9acc6230650f15..cfd3d9598cc7a5ccf2c2da5e3e2e2255bc817f1e 100644
--- a/IO/vtkMINCImageAttributes.h
+++ b/IO/vtkMINCImageAttributes.h
@@ -79,7 +79,7 @@ class vtkMINCImageAttributeMap;
 class VTK_IO_EXPORT vtkMINCImageAttributes : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkMINCImageAttributes,vtkObject);
+  vtkTypeMacro(vtkMINCImageAttributes,vtkObject);
 
   static vtkMINCImageAttributes *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/IO/vtkMINCImageReader.cxx b/IO/vtkMINCImageReader.cxx
index fcbf3be07cec1a22d25bc8c81e22631425b0edf0..44962fe43969724d6e2c8efd0fee9bc8d21d44ba 100644
--- a/IO/vtkMINCImageReader.cxx
+++ b/IO/vtkMINCImageReader.cxx
@@ -78,7 +78,6 @@ POSSIBILITY OF SUCH DAMAGES.
 #define VTK_MINC_MAX_DIMS 8
 
 //--------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMINCImageReader, "1.17");
 vtkStandardNewMacro(vtkMINCImageReader);
 
 //-------------------------------------------------------------------------
diff --git a/IO/vtkMINCImageReader.h b/IO/vtkMINCImageReader.h
index bad02b9b81c5b45e887bf3555e53b39bd6670e86..5c8c80e943b78ecece139247c171a96994cb7bc4 100644
--- a/IO/vtkMINCImageReader.h
+++ b/IO/vtkMINCImageReader.h
@@ -81,7 +81,7 @@ class vtkMINCImageAttributes;
 class VTK_IO_EXPORT vtkMINCImageReader : public vtkImageReader2
 {
 public:
-  vtkTypeRevisionMacro(vtkMINCImageReader,vtkImageReader2);
+  vtkTypeMacro(vtkMINCImageReader,vtkImageReader2);
 
   static vtkMINCImageReader *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/IO/vtkMINCImageWriter.cxx b/IO/vtkMINCImageWriter.cxx
index 4d636005024eb2a219b91c426c9fe6426e9dd237..9000137dec29e43e86a89f579e08232e3e2373c0 100644
--- a/IO/vtkMINCImageWriter.cxx
+++ b/IO/vtkMINCImageWriter.cxx
@@ -90,7 +90,6 @@ POSSIBILITY OF SUCH DAMAGES.
 #define VTK_MINC_MAX_DIMS 8
 
 //--------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMINCImageWriter, "1.16");
 vtkStandardNewMacro(vtkMINCImageWriter);
 
 vtkCxxSetObjectMacro(vtkMINCImageWriter,DirectionCosines,vtkMatrix4x4);
diff --git a/IO/vtkMINCImageWriter.h b/IO/vtkMINCImageWriter.h
index 0a64ad652d5eda5e45c29c4601c208d8e193234a..d767a49e282863e69d432231a3e00b84362068e6 100644
--- a/IO/vtkMINCImageWriter.h
+++ b/IO/vtkMINCImageWriter.h
@@ -78,7 +78,7 @@ class vtkMINCImageAttributes;
 class VTK_IO_EXPORT vtkMINCImageWriter : public vtkImageWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkMINCImageWriter,vtkImageWriter);
+  vtkTypeMacro(vtkMINCImageWriter,vtkImageWriter);
 
   static vtkMINCImageWriter *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/IO/vtkMPEG2Writer.cxx b/IO/vtkMPEG2Writer.cxx
index 4624751ec6d25d67e24c2b2a7f4d9d71b970abc5..ff6bd274727eef85a236d15159a174f16bca8cea 100644
--- a/IO/vtkMPEG2Writer.cxx
+++ b/IO/vtkMPEG2Writer.cxx
@@ -178,7 +178,6 @@ int vtkMPEG2WriterInternal::RemoveImage(const char* fname)
 
 //---------------------------------------------------------------------------
 vtkStandardNewMacro(vtkMPEG2Writer);
-vtkCxxRevisionMacro(vtkMPEG2Writer, "1.7");
 
 //---------------------------------------------------------------------------
 vtkMPEG2Writer::vtkMPEG2Writer()
diff --git a/IO/vtkMPEG2Writer.h b/IO/vtkMPEG2Writer.h
index 6c0cb5049964f6e28be74f10052d254237c846d1..bf4353899ae7aa702046d47bf52456e97454c688 100644
--- a/IO/vtkMPEG2Writer.h
+++ b/IO/vtkMPEG2Writer.h
@@ -51,7 +51,7 @@ class VTK_IO_EXPORT vtkMPEG2Writer : public vtkGenericMovieWriter
 {
 public:
   static vtkMPEG2Writer *New();
-  vtkTypeRevisionMacro(vtkMPEG2Writer,vtkGenericMovieWriter);
+  vtkTypeMacro(vtkMPEG2Writer,vtkGenericMovieWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMaterialLibrary.cxx b/IO/vtkMaterialLibrary.cxx
index 3a5ae49148edf96e335f99e484b1f58ddf422946..cc29aa18fdc5031a2de900e8bbe375cadbd0ae26 100644
--- a/IO/vtkMaterialLibrary.cxx
+++ b/IO/vtkMaterialLibrary.cxx
@@ -24,7 +24,6 @@
 #endif
 
 vtkStandardNewMacro(vtkMaterialLibrary);
-vtkCxxRevisionMacro(vtkMaterialLibrary, "1.4");
 //-----------------------------------------------------------------------------
 vtkMaterialLibrary::vtkMaterialLibrary()
 {
diff --git a/IO/vtkMaterialLibrary.h b/IO/vtkMaterialLibrary.h
index e5569a3f9bfa4314135d30d0422ff4d5fa97ee2f..fbb291beff1b31c19b3bc50ebdb3d60365e4917c 100644
--- a/IO/vtkMaterialLibrary.h
+++ b/IO/vtkMaterialLibrary.h
@@ -27,7 +27,7 @@ class VTK_IO_EXPORT vtkMaterialLibrary : public vtkObject
 {
 public:
   static vtkMaterialLibrary* New();
-  vtkTypeRevisionMacro(vtkMaterialLibrary, vtkObject);
+  vtkTypeMacro(vtkMaterialLibrary, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMedicalImageProperties.cxx b/IO/vtkMedicalImageProperties.cxx
index 9b05d6b72af56171db0a3fbc2c47d9b06c71d993..baee394cf7121f740e36ac42f2fe0a4244c7ee71 100644
--- a/IO/vtkMedicalImageProperties.cxx
+++ b/IO/vtkMedicalImageProperties.cxx
@@ -24,7 +24,6 @@
 #include <assert.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMedicalImageProperties, "1.21");
 vtkStandardNewMacro(vtkMedicalImageProperties);
 
 static const char *vtkMedicalImagePropertiesOrientationString[] = {
diff --git a/IO/vtkMedicalImageProperties.h b/IO/vtkMedicalImageProperties.h
index cd0f6c89e3106354e0ddc0872d2d57a50c01338f..b78109e18ba0dd460e65055734f1180dd2a473dd 100644
--- a/IO/vtkMedicalImageProperties.h
+++ b/IO/vtkMedicalImageProperties.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkMedicalImageProperties : public vtkObject
 {
 public:
   static vtkMedicalImageProperties *New();
-  vtkTypeRevisionMacro(vtkMedicalImageProperties,vtkObject);
+  vtkTypeMacro(vtkMedicalImageProperties,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMedicalImageReader2.cxx b/IO/vtkMedicalImageReader2.cxx
index e94b87ce54689c7f949853db9205dc4b9d572618..493a63e1ba2ec513f87657f33a302534195406fc 100644
--- a/IO/vtkMedicalImageReader2.cxx
+++ b/IO/vtkMedicalImageReader2.cxx
@@ -18,7 +18,6 @@
 #include "vtkMedicalImageProperties.h"
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMedicalImageReader2, "1.7");
 vtkStandardNewMacro(vtkMedicalImageReader2);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkMedicalImageReader2.h b/IO/vtkMedicalImageReader2.h
index 1f14670f7d0f05519f41664aa6c8c157c581ac66..8377d7f9a89e13764a5beea19bce790f0800d5f9 100644
--- a/IO/vtkMedicalImageReader2.h
+++ b/IO/vtkMedicalImageReader2.h
@@ -31,7 +31,7 @@ class VTK_IO_EXPORT vtkMedicalImageReader2 : public vtkImageReader2
 {
 public:
   static vtkMedicalImageReader2 *New();
-  vtkTypeRevisionMacro(vtkMedicalImageReader2,vtkImageReader2);
+  vtkTypeMacro(vtkMedicalImageReader2,vtkImageReader2);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/IO/vtkMetaImageReader.cxx b/IO/vtkMetaImageReader.cxx
index 3a2e252d90db0751b70cf1a0da23c9bef2d08c00..9c89fd0089ec5d969b0e7a77c15d3551a5cae00e 100644
--- a/IO/vtkMetaImageReader.cxx
+++ b/IO/vtkMetaImageReader.cxx
@@ -38,7 +38,6 @@
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMetaImageReader, "1.31");
 vtkStandardNewMacro(vtkMetaImageReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkMetaImageReader.h b/IO/vtkMetaImageReader.h
index 2581651a5fae95590c46c8039f0e50fc700b0676..82a5af32a2d2188dd758c2d154081e382d64b790 100644
--- a/IO/vtkMetaImageReader.h
+++ b/IO/vtkMetaImageReader.h
@@ -68,7 +68,7 @@ namespace vtkmetaio { class MetaImage; } // forward declaration
 class VTK_IO_EXPORT vtkMetaImageReader : public vtkImageReader2
 {
 public:
-  vtkTypeRevisionMacro(vtkMetaImageReader,vtkImageReader2);
+  vtkTypeMacro(vtkMetaImageReader,vtkImageReader2);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMetaImageWriter.cxx b/IO/vtkMetaImageWriter.cxx
index 8b9863d802e35e4517fe0ee77b525ff9de787762..94e79d8c8dd8dbf243365b85e0bd70bdf2c10cde 100644
--- a/IO/vtkMetaImageWriter.cxx
+++ b/IO/vtkMetaImageWriter.cxx
@@ -39,7 +39,6 @@
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkMetaImageWriter, "1.17");
 vtkStandardNewMacro(vtkMetaImageWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkMetaImageWriter.h b/IO/vtkMetaImageWriter.h
index f1a2b9ca34a791290766eb5ea326f84c5e970af0..c3604160abecbb937ae5dc4faf3bbde6c9dd2d6d 100644
--- a/IO/vtkMetaImageWriter.h
+++ b/IO/vtkMetaImageWriter.h
@@ -69,7 +69,7 @@ namespace vtkmetaio { class MetaImage; } // forward declaration
 class VTK_IO_EXPORT vtkMetaImageWriter : public vtkImageWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkMetaImageWriter,vtkImageWriter);
+  vtkTypeMacro(vtkMetaImageWriter,vtkImageWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMoleculeReaderBase.cxx b/IO/vtkMoleculeReaderBase.cxx
index f2195de0e850f723a7229a23d7a1e05dc56699db..8d34b06e927f1a05d90bccb8e6be884aaa5333c5 100644
--- a/IO/vtkMoleculeReaderBase.cxx
+++ b/IO/vtkMoleculeReaderBase.cxx
@@ -27,7 +27,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkMoleculeReaderBase, "1.17");
 
 static double vtkMoleculeReaderBaseCovRadius[103] = {
 0.32 , 1.6 , 0.68 , 0.352 , 0.832 , 0.72 ,
diff --git a/IO/vtkMoleculeReaderBase.h b/IO/vtkMoleculeReaderBase.h
index bb7f28eb0be921a7cff4e375b9da818daf9908fb..9a849c75415ee5246bcc75e38b415d160a4a6c13 100644
--- a/IO/vtkMoleculeReaderBase.h
+++ b/IO/vtkMoleculeReaderBase.h
@@ -35,7 +35,7 @@ class vtkPoints;
 class VTK_IO_EXPORT vtkMoleculeReaderBase : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkMoleculeReaderBase,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkMoleculeReaderBase,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkSetStringMacro(FileName);
diff --git a/IO/vtkMultiBlockPLOT3DReader.cxx b/IO/vtkMultiBlockPLOT3DReader.cxx
index 9a0cb126f6cac4f088ab4dfb3789af139b553fa7..dd9186baf29bc9b48bde208653957ff0da6eb31d 100644
--- a/IO/vtkMultiBlockPLOT3DReader.cxx
+++ b/IO/vtkMultiBlockPLOT3DReader.cxx
@@ -32,7 +32,6 @@
 #include "vtkSmartPointer.h"
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkMultiBlockPLOT3DReader, "1.12");
 vtkStandardNewMacro(vtkMultiBlockPLOT3DReader);
 
 #define VTK_RHOINF 1.0
diff --git a/IO/vtkMultiBlockPLOT3DReader.h b/IO/vtkMultiBlockPLOT3DReader.h
index 132dff45c828bccc5018f838036280b629479a76..1211cc71bb420c3c4ac73eb75f91207ed1259927 100644
--- a/IO/vtkMultiBlockPLOT3DReader.h
+++ b/IO/vtkMultiBlockPLOT3DReader.h
@@ -85,7 +85,7 @@ class VTK_IO_EXPORT vtkMultiBlockPLOT3DReader : public vtkMultiBlockDataSetAlgor
 {
 public:
   static vtkMultiBlockPLOT3DReader *New();
-  vtkTypeRevisionMacro(vtkMultiBlockPLOT3DReader,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkMultiBlockPLOT3DReader,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkMySQLDatabase.cxx b/IO/vtkMySQLDatabase.cxx
index 69a9451b1b4fdfebd6c9506b3d2960dd6c44d8e1..520380e4bb9f8aa65b1a87cdb38ed5ad39f15995 100644
--- a/IO/vtkMySQLDatabase.cxx
+++ b/IO/vtkMySQLDatabase.cxx
@@ -33,7 +33,6 @@
 
 #define VTK_MYSQL_DEFAULT_PORT 3306
  
-vtkCxxRevisionMacro(vtkMySQLDatabase, "1.37");
 vtkStandardNewMacro(vtkMySQLDatabase);
 
 
diff --git a/IO/vtkMySQLDatabase.h b/IO/vtkMySQLDatabase.h
index ae2b5eb0df07d2cf1b6f924ad77d683b3c74c83c..2ac023fc2414543cb83679cfc9481e1824d7d557 100644
--- a/IO/vtkMySQLDatabase.h
+++ b/IO/vtkMySQLDatabase.h
@@ -47,7 +47,7 @@ class VTK_IO_EXPORT vtkMySQLDatabase : public vtkSQLDatabase
 //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkMySQLDatabase, vtkSQLDatabase);
+  vtkTypeMacro(vtkMySQLDatabase, vtkSQLDatabase);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkMySQLDatabase *New();
 
diff --git a/IO/vtkMySQLQuery.cxx b/IO/vtkMySQLQuery.cxx
index 67e903a14cc6cc9b48f1551e3cdea5639315c6db..5ec8003df0eefcd9c0067afcceea7f31cc123f10 100644
--- a/IO/vtkMySQLQuery.cxx
+++ b/IO/vtkMySQLQuery.cxx
@@ -482,7 +482,6 @@ bool vtkMySQLQueryInternals::ValidPreparedStatementSQL(const char *query)
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkMySQLQuery, "1.13");
 vtkStandardNewMacro(vtkMySQLQuery);
 
 // ----------------------------------------------------------------------
diff --git a/IO/vtkMySQLQuery.h b/IO/vtkMySQLQuery.h
index 8ce78d01fde814fdff5cf2f71b4ad6c3b79ca26c..1ae2676ace157e3cbfca11f73f002ef4ee8de8f2 100644
--- a/IO/vtkMySQLQuery.h
+++ b/IO/vtkMySQLQuery.h
@@ -47,7 +47,7 @@ class VTK_IO_EXPORT vtkMySQLQuery : public vtkSQLQuery
 //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkMySQLQuery, vtkSQLQuery);
+  vtkTypeMacro(vtkMySQLQuery, vtkSQLQuery);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkMySQLQuery *New();
 
diff --git a/IO/vtkNetCDFCFReader.cxx b/IO/vtkNetCDFCFReader.cxx
index 1c5ea5de43942976d084352d2c822be60d5e2fd5..93f89e3f350a7b94a62a0fee7a33d658905844ee 100644
--- a/IO/vtkNetCDFCFReader.cxx
+++ b/IO/vtkNetCDFCFReader.cxx
@@ -527,7 +527,6 @@ public:
 };
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkNetCDFCFReader, "1.4");
 vtkStandardNewMacro(vtkNetCDFCFReader);
 
 //-----------------------------------------------------------------------------
diff --git a/IO/vtkNetCDFCFReader.h b/IO/vtkNetCDFCFReader.h
index 23b7159a80682e73dd29fa432817286abd9f628e..39cc6cb59808d0fc75e419d6f345bed7718ec567 100644
--- a/IO/vtkNetCDFCFReader.h
+++ b/IO/vtkNetCDFCFReader.h
@@ -40,7 +40,7 @@ class vtkStructuredGrid;
 class VTK_IO_EXPORT vtkNetCDFCFReader : public vtkNetCDFReader
 {
 public:
-  vtkTypeRevisionMacro(vtkNetCDFCFReader, vtkNetCDFReader);
+  vtkTypeMacro(vtkNetCDFCFReader, vtkNetCDFReader);
   static vtkNetCDFCFReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/IO/vtkNetCDFPOPReader.cxx b/IO/vtkNetCDFPOPReader.cxx
index 696eb3f3446dd3caa7f06ad761f4438e04b9c911..2e38e4b54b0a69aab99749fb38c029b408b1779c 100644
--- a/IO/vtkNetCDFPOPReader.cxx
+++ b/IO/vtkNetCDFPOPReader.cxx
@@ -33,7 +33,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkMultiThreader.h"
-vtkCxxRevisionMacro(vtkNetCDFPOPReader, "1.7");
 vtkStandardNewMacro(vtkNetCDFPOPReader);
 
 //============================================================================
diff --git a/IO/vtkNetCDFPOPReader.h b/IO/vtkNetCDFPOPReader.h
index d10dc7f66286c78108aac1ce467cb02092da4716..753cf4fd62c2359d30b2ac784f284d6416d5da6a 100644
--- a/IO/vtkNetCDFPOPReader.h
+++ b/IO/vtkNetCDFPOPReader.h
@@ -31,7 +31,7 @@ class vtkCallbackCommand;
 class VTK_IO_EXPORT vtkNetCDFPOPReader : public vtkRectilinearGridAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkNetCDFPOPReader,vtkRectilinearGridAlgorithm);
+  vtkTypeMacro(vtkNetCDFPOPReader,vtkRectilinearGridAlgorithm);
   static vtkNetCDFPOPReader *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/IO/vtkNetCDFReader.cxx b/IO/vtkNetCDFReader.cxx
index 80a8962029391c9e77d1229c10e4fd6303770cd1..250b59b2baa38783fe1414b445e3fcbd169dcb8e 100644
--- a/IO/vtkNetCDFReader.cxx
+++ b/IO/vtkNetCDFReader.cxx
@@ -78,7 +78,6 @@ static int NetCDFTypeToVTKType(nc_type type)
 }
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkNetCDFReader, "1.8");
 vtkStandardNewMacro(vtkNetCDFReader);
 
 //-----------------------------------------------------------------------------
diff --git a/IO/vtkNetCDFReader.h b/IO/vtkNetCDFReader.h
index 1277681cadc80fae6f0224654aa2775bab59c9bf..f77f806aeb29905442106691c0d023bb8da69a3b 100644
--- a/IO/vtkNetCDFReader.h
+++ b/IO/vtkNetCDFReader.h
@@ -47,7 +47,7 @@ class vtkStringArray;
 class VTK_IO_EXPORT vtkNetCDFReader : public vtkDataObjectAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkNetCDFReader, vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkNetCDFReader, vtkDataObjectAlgorithm);
   static vtkNetCDFReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/IO/vtkOBJReader.cxx b/IO/vtkOBJReader.cxx
index 1f4ab830fe4816d7fda30d2fab5d6758d17e5d87..c6cdb19a8e61f783c1df72f63677f94732292550 100644
--- a/IO/vtkOBJReader.cxx
+++ b/IO/vtkOBJReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkOBJReader, "1.29");
 vtkStandardNewMacro(vtkOBJReader);
 
 // Description:
diff --git a/IO/vtkOBJReader.h b/IO/vtkOBJReader.h
index c86f08b583bc9e3630e7af84190f0ac03306de26..124d870926599051506c3cf347c01c0aa5bc2735 100644
--- a/IO/vtkOBJReader.h
+++ b/IO/vtkOBJReader.h
@@ -28,7 +28,7 @@ class VTK_IO_EXPORT vtkOBJReader : public vtkPolyDataAlgorithm
 {
 public:
   static vtkOBJReader *New();
-  vtkTypeRevisionMacro(vtkOBJReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkOBJReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkODBCDatabase.cxx b/IO/vtkODBCDatabase.cxx
index 170950f09a45b4d2aacfd24a1435748f55f75e9d..a0d907fe04e2beeeda33a7423e09c3d33d84486d 100644
--- a/IO/vtkODBCDatabase.cxx
+++ b/IO/vtkODBCDatabase.cxx
@@ -49,7 +49,6 @@
 
 
 // ----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkODBCDatabase, "1.9");
 vtkStandardNewMacro(vtkODBCDatabase);
 // ----------------------------------------------------------------------------
 
diff --git a/IO/vtkODBCDatabase.h b/IO/vtkODBCDatabase.h
index 0cf3abf532844471b04c71498f5ae9355f0820dd..eb38c752b4183dc24333c76f7048d28be82b33b4 100644
--- a/IO/vtkODBCDatabase.h
+++ b/IO/vtkODBCDatabase.h
@@ -80,7 +80,7 @@ class VTK_IO_EXPORT vtkODBCDatabase : public vtkSQLDatabase
 //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkODBCDatabase, vtkSQLDatabase);
+  vtkTypeMacro(vtkODBCDatabase, vtkSQLDatabase);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkODBCDatabase *New();
 
diff --git a/IO/vtkODBCQuery.cxx b/IO/vtkODBCQuery.cxx
index 6d930c738bf4a1b4b7cf01f7c4ba8b484a1900a5..8426c331a275853ffb9b1b5d307e5fa415c0ee15 100644
--- a/IO/vtkODBCQuery.cxx
+++ b/IO/vtkODBCQuery.cxx
@@ -45,7 +45,6 @@
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkODBCQuery, "1.4");
 vtkStandardNewMacro(vtkODBCQuery);
 
 static vtkStdString GetErrorMessage(SQLSMALLINT handleType, SQLHANDLE handle, int *code=0);
diff --git a/IO/vtkODBCQuery.h b/IO/vtkODBCQuery.h
index aca93722619f989b16eb60c244c5d26596b0e367..3191035e7067e6a5b15428381725d3e7ebdff817 100644
--- a/IO/vtkODBCQuery.h
+++ b/IO/vtkODBCQuery.h
@@ -48,7 +48,7 @@ class VTK_IO_EXPORT vtkODBCQuery : public vtkSQLQuery
 //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkODBCQuery, vtkSQLQuery);
+  vtkTypeMacro(vtkODBCQuery, vtkSQLQuery);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkODBCQuery *New();
 
diff --git a/IO/vtkOggTheoraWriter.cxx b/IO/vtkOggTheoraWriter.cxx
index 201f42702797a798c60d316dd336505d07249980..436eae1aff397a28f64d784bba077d687d494096 100644
--- a/IO/vtkOggTheoraWriter.cxx
+++ b/IO/vtkOggTheoraWriter.cxx
@@ -475,7 +475,6 @@ void vtkOggTheoraWriterInternal::RGB2YCbCr(vtkImageData *id,
 
 //---------------------------------------------------------------------------
 vtkStandardNewMacro(vtkOggTheoraWriter);
-vtkCxxRevisionMacro(vtkOggTheoraWriter, "1.2");
 
 //---------------------------------------------------------------------------
 vtkOggTheoraWriter::vtkOggTheoraWriter()
diff --git a/IO/vtkOggTheoraWriter.h b/IO/vtkOggTheoraWriter.h
index 959fd05a0305e3814cc701d224cec17773eecd31..a798d540411ddbfc45d01315a53ed3f8d1b1cd5d 100644
--- a/IO/vtkOggTheoraWriter.h
+++ b/IO/vtkOggTheoraWriter.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkOggTheoraWriter : public vtkGenericMovieWriter
 {
 public:
   static vtkOggTheoraWriter *New();
-  vtkTypeRevisionMacro(vtkOggTheoraWriter,vtkGenericMovieWriter);
+  vtkTypeMacro(vtkOggTheoraWriter,vtkGenericMovieWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkOpenFOAMReader.cxx b/IO/vtkOpenFOAMReader.cxx
index 2b3a0d1c0cf7abe8debc31d9e8c8c76199a9d734..d52212189d7f698f483a706b5308b5fce373df2d 100644
--- a/IO/vtkOpenFOAMReader.cxx
+++ b/IO/vtkOpenFOAMReader.cxx
@@ -108,7 +108,6 @@ uLong ZEXPORT crc32(uLong, const Bytef *, uInt)
 { return 0; }
 #endif
 
-vtkCxxRevisionMacro(vtkOpenFOAMReader, "1.22");
 vtkStandardNewMacro(vtkOpenFOAMReader);
 
 // forward declarations
@@ -152,7 +151,7 @@ class VTK_IO_EXPORT vtkOpenFOAMReaderPrivate : public vtkObject
 {
 public:
   static vtkOpenFOAMReaderPrivate *New();
-  vtkTypeRevisionMacro(vtkOpenFOAMReaderPrivate, vtkObject);
+  vtkTypeMacro(vtkOpenFOAMReaderPrivate, vtkObject);
 
   vtkDoubleArray *GetTimeValues()
     {return this->TimeValues;}
@@ -340,7 +339,6 @@ private:
       const vtkFoamIntVectorVector *, vtkPoints *);
 };
 
-vtkCxxRevisionMacro(vtkOpenFOAMReaderPrivate, "1.22");
 vtkStandardNewMacro(vtkOpenFOAMReaderPrivate);
 
 //-----------------------------------------------------------------------------
diff --git a/IO/vtkOpenFOAMReader.h b/IO/vtkOpenFOAMReader.h
index efabbbed1e92c99a0cc201d6d1a2d4588cd6c157..36c928ac33971212292ad48af159ec2043616c77 100644
--- a/IO/vtkOpenFOAMReader.h
+++ b/IO/vtkOpenFOAMReader.h
@@ -53,7 +53,7 @@ class VTK_IO_EXPORT vtkOpenFOAMReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkOpenFOAMReader *New();
-  vtkTypeRevisionMacro(vtkOpenFOAMReader, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkOpenFOAMReader, vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream &, vtkIndent);
 
   // Description:
diff --git a/IO/vtkOutputStream.cxx b/IO/vtkOutputStream.cxx
index ad523f0d8104627109e50530e7e0b8736a09171f..9487ec1fb6e55b30601da70507764d6b06f18041 100644
--- a/IO/vtkOutputStream.cxx
+++ b/IO/vtkOutputStream.cxx
@@ -15,7 +15,6 @@
 #include "vtkOutputStream.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkOutputStream, "1.2");
 vtkStandardNewMacro(vtkOutputStream);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkOutputStream.h b/IO/vtkOutputStream.h
index 5bf599c5c8f144304c6da398a1b997372125cd25..d75454d659ddb776b2c1921f909fb9f30ac90f93 100644
--- a/IO/vtkOutputStream.h
+++ b/IO/vtkOutputStream.h
@@ -29,7 +29,7 @@
 class VTK_IO_EXPORT vtkOutputStream : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkOutputStream,vtkObject);
+  vtkTypeMacro(vtkOutputStream,vtkObject);
   static vtkOutputStream *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/IO/vtkPDBReader.cxx b/IO/vtkPDBReader.cxx
index 669f393cf386ec5cbba7dfbc91c69f9239e91e3a..dcd72058800ed078318f1db0e3b0a7ce96d3f0b3 100644
--- a/IO/vtkPDBReader.cxx
+++ b/IO/vtkPDBReader.cxx
@@ -19,7 +19,6 @@
 #include "vtkPoints.h"
 #include "vtkIdTypeArray.h"
 
-vtkCxxRevisionMacro(vtkPDBReader, "1.5");
 vtkStandardNewMacro(vtkPDBReader);
 
 vtkPDBReader::vtkPDBReader()
diff --git a/IO/vtkPDBReader.h b/IO/vtkPDBReader.h
index 5e3fbba8ad984d6782f7f540de22053653e6070a..b6c38793f87e2becdde6cf29342bdf07f1f76b83 100644
--- a/IO/vtkPDBReader.h
+++ b/IO/vtkPDBReader.h
@@ -29,7 +29,7 @@
 class VTK_IO_EXPORT vtkPDBReader : public vtkMoleculeReaderBase
 {
 public:
-  vtkTypeRevisionMacro(vtkPDBReader,vtkMoleculeReaderBase);
+  vtkTypeMacro(vtkPDBReader,vtkMoleculeReaderBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkPDBReader *New();
diff --git a/IO/vtkPLOT3DReader.cxx b/IO/vtkPLOT3DReader.cxx
index f4522f05258eacce553d993f2e9168560070e1e2..882aebacef22db27b6307f1e026b1fe04e8e6549 100644
--- a/IO/vtkPLOT3DReader.cxx
+++ b/IO/vtkPLOT3DReader.cxx
@@ -25,7 +25,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtkDataArrayCollection.h"
 
-vtkCxxRevisionMacro(vtkPLOT3DReader, "1.89");
 vtkStandardNewMacro(vtkPLOT3DReader);
 
 #define VTK_RHOINF 1.0
diff --git a/IO/vtkPLOT3DReader.h b/IO/vtkPLOT3DReader.h
index 2eb92a41711408f5eaa5a82d70901e2f27cb6af7..ffd310802f81f14b326672c4fe001fa912a46929 100644
--- a/IO/vtkPLOT3DReader.h
+++ b/IO/vtkPLOT3DReader.h
@@ -84,7 +84,7 @@ class VTK_IO_EXPORT vtkPLOT3DReader : public vtkStructuredGridSource
 {
 public:
   static vtkPLOT3DReader *New();
-  vtkTypeRevisionMacro(vtkPLOT3DReader,vtkStructuredGridSource);
+  vtkTypeMacro(vtkPLOT3DReader,vtkStructuredGridSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPLYReader.cxx b/IO/vtkPLYReader.cxx
index 8f29396bfaa1044f701eea26034b8bf90927a74a..15747951ea7c15a270ea92b938ba81f37f2188c1 100644
--- a/IO/vtkPLYReader.cxx
+++ b/IO/vtkPLYReader.cxx
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include <stddef.h>
 
-vtkCxxRevisionMacro(vtkPLYReader, "1.21");
 vtkStandardNewMacro(vtkPLYReader);
 
 
diff --git a/IO/vtkPLYReader.h b/IO/vtkPLYReader.h
index 945477a4650cbeaa86c1f95bd402efb12001cb0b..86534560e7742eb960a435fa81d311201ff5262b 100644
--- a/IO/vtkPLYReader.h
+++ b/IO/vtkPLYReader.h
@@ -35,7 +35,7 @@
 class VTK_IO_EXPORT vtkPLYReader : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkPLYReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPLYReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPLYWriter.cxx b/IO/vtkPLYWriter.cxx
index 2ec6e5e0d9dac305474100d5e3eb82a3d922bb00..66d1b542ba5ede4812b74d2a4ababdd75582f27f 100644
--- a/IO/vtkPLYWriter.cxx
+++ b/IO/vtkPLYWriter.cxx
@@ -24,7 +24,6 @@
 
 #include <stddef.h>
 
-vtkCxxRevisionMacro(vtkPLYWriter, "1.22");
 vtkStandardNewMacro(vtkPLYWriter);
 
 vtkCxxSetObjectMacro(vtkPLYWriter,LookupTable,vtkScalarsToColors);
diff --git a/IO/vtkPLYWriter.h b/IO/vtkPLYWriter.h
index b69c5a412df3be30980cf718f4d5e662db208d41..c77e109c77ca46f39394cf8299fdb2f452299053 100644
--- a/IO/vtkPLYWriter.h
+++ b/IO/vtkPLYWriter.h
@@ -51,7 +51,7 @@ class VTK_IO_EXPORT vtkPLYWriter : public vtkPolyDataWriter
 {
 public:
   static vtkPLYWriter *New();
-  vtkTypeRevisionMacro(vtkPLYWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkPLYWriter,vtkPolyDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPNGReader.cxx b/IO/vtkPNGReader.cxx
index 9ef592c226a90e82143b37a156dff0db1a744655..513dc6c2370897dd20607c498750e3c67f9da5bf 100644
--- a/IO/vtkPNGReader.cxx
+++ b/IO/vtkPNGReader.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointData.h"
 #include "vtk_png.h"
 
-vtkCxxRevisionMacro(vtkPNGReader, "1.27");
 vtkStandardNewMacro(vtkPNGReader);
 
 #ifdef _MSC_VER
diff --git a/IO/vtkPNGReader.h b/IO/vtkPNGReader.h
index 1d05c4b49989ea5f507b7fa254b01f34d5fad7e6..6066997653771750eae6cdbe54f29673cfed7ba5 100644
--- a/IO/vtkPNGReader.h
+++ b/IO/vtkPNGReader.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkPNGReader : public vtkImageReader2
 {
 public:
   static vtkPNGReader *New();
-  vtkTypeRevisionMacro(vtkPNGReader,vtkImageReader2);
+  vtkTypeMacro(vtkPNGReader,vtkImageReader2);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPNGWriter.cxx b/IO/vtkPNGWriter.cxx
index 66901b7feff545b7a36939093c16e5c5ae22ed54..e6e625167b45cc7cdebd61708cd860937f943580 100644
--- a/IO/vtkPNGWriter.cxx
+++ b/IO/vtkPNGWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtk_png.h"
 
-vtkCxxRevisionMacro(vtkPNGWriter, "1.28");
 vtkStandardNewMacro(vtkPNGWriter);
 
 vtkCxxSetObjectMacro(vtkPNGWriter,Result,vtkUnsignedCharArray);
diff --git a/IO/vtkPNGWriter.h b/IO/vtkPNGWriter.h
index cd8a0f4a3551825c85f3caf60da91f529b1b9474..02ac6c10b1a07f60ff46ff30f4ba703df7d4f28e 100644
--- a/IO/vtkPNGWriter.h
+++ b/IO/vtkPNGWriter.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkPNGWriter : public vtkImageWriter
 {
 public:
   static vtkPNGWriter *New();
-  vtkTypeRevisionMacro(vtkPNGWriter,vtkImageWriter);
+  vtkTypeMacro(vtkPNGWriter,vtkImageWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPNMReader.cxx b/IO/vtkPNMReader.cxx
index 8ca2a4b54bb0a20e615e2b0fc4599beb195bd45d..7da4177cd88cd45e5d18c4cf893db483c56c0261 100644
--- a/IO/vtkPNMReader.cxx
+++ b/IO/vtkPNMReader.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPNMReader, "1.32");
 vtkStandardNewMacro(vtkPNMReader);
 
 char vtkPNMReaderGetChar(FILE *fp)
diff --git a/IO/vtkPNMReader.h b/IO/vtkPNMReader.h
index f51cf1df5b9d0373229676ad16a7b96408eb3797..c4b7dedd30ac185551b8881384a771ee24a2c68f 100644
--- a/IO/vtkPNMReader.h
+++ b/IO/vtkPNMReader.h
@@ -39,7 +39,7 @@ class VTK_IO_EXPORT vtkPNMReader : public vtkImageReader
 {
 public:
   static vtkPNMReader *New();
-  vtkTypeRevisionMacro(vtkPNMReader,vtkImageReader);
+  vtkTypeMacro(vtkPNMReader,vtkImageReader);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   int CanReadFile(const char* fname); 
diff --git a/IO/vtkPNMWriter.cxx b/IO/vtkPNMWriter.cxx
index b978b37f880c014ae2dd9c4c295dc4021b678c22..488bec836583bc41b73e2aa1dd60b7b2409cf59a 100644
--- a/IO/vtkPNMWriter.cxx
+++ b/IO/vtkPNMWriter.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkPNMWriter, "1.23");
 vtkStandardNewMacro(vtkPNMWriter);
 
 #ifdef write
diff --git a/IO/vtkPNMWriter.h b/IO/vtkPNMWriter.h
index 1309acca29f7b4b4a4d7c33b7bc287f15c50b41b..3fb86398b3344a4987802c2f3bce9dec9fb79202 100644
--- a/IO/vtkPNMWriter.h
+++ b/IO/vtkPNMWriter.h
@@ -27,7 +27,7 @@ class VTK_IO_EXPORT vtkPNMWriter : public vtkImageWriter
 {
 public:
   static vtkPNMWriter *New();
-  vtkTypeRevisionMacro(vtkPNMWriter,vtkImageWriter);
+  vtkTypeMacro(vtkPNMWriter,vtkImageWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkParticleReader.cxx b/IO/vtkParticleReader.cxx
index e6bc5e88f65dbc51685932fd661db9f15986a73a..a329f44e2791bcb26ae56a329b02065cda51ec80 100644
--- a/IO/vtkParticleReader.cxx
+++ b/IO/vtkParticleReader.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/string>
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkParticleReader, "1.30");
 vtkStandardNewMacro(vtkParticleReader);
 
 namespace {
diff --git a/IO/vtkParticleReader.h b/IO/vtkParticleReader.h
index cb233182982e8a632861d3d16792b2951b829a1b..25a2f57bf8fee99e2c3d22980ea344e8d6ab74c2 100644
--- a/IO/vtkParticleReader.h
+++ b/IO/vtkParticleReader.h
@@ -41,7 +41,7 @@ class VTK_IO_EXPORT vtkParticleReader : public vtkPolyDataAlgorithm
 {
 public:
   static vtkParticleReader *New();
-  vtkTypeRevisionMacro(vtkParticleReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkParticleReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/IO/vtkPolyDataReader.cxx b/IO/vtkPolyDataReader.cxx
index 9bd6074e06b5e479e4d2f1c9537a25363bbb0076..40426058e36295203a855799e5a1e7f4326627ca 100644
--- a/IO/vtkPolyDataReader.cxx
+++ b/IO/vtkPolyDataReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPolyDataReader, "1.29");
 vtkStandardNewMacro(vtkPolyDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkPolyDataReader.h b/IO/vtkPolyDataReader.h
index 9e04108b103dc4070b9f6d5fe50e761d47df39b9..5e718a335d7b2ff3829a92e7004256c4f09129aa 100644
--- a/IO/vtkPolyDataReader.h
+++ b/IO/vtkPolyDataReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkPolyDataReader : public vtkDataReader
 {
 public:
   static vtkPolyDataReader *New();
-  vtkTypeRevisionMacro(vtkPolyDataReader,vtkDataReader);
+  vtkTypeMacro(vtkPolyDataReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPolyDataWriter.cxx b/IO/vtkPolyDataWriter.cxx
index 5256a762a6b50bc93bcd611b43aeb6d66b38a64c..9a91bada18ef1f2eec3278a1bf756bfcecf6c472 100644
--- a/IO/vtkPolyDataWriter.cxx
+++ b/IO/vtkPolyDataWriter.cxx
@@ -24,7 +24,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkPolyDataWriter, "1.27");
 vtkStandardNewMacro(vtkPolyDataWriter);
 
 void vtkPolyDataWriter::WriteData()
diff --git a/IO/vtkPolyDataWriter.h b/IO/vtkPolyDataWriter.h
index 50ee0002bc7d5877d1ec0698a57670b270f21f14..ef49c907442de84d1d9319f280d219c413acb18f 100644
--- a/IO/vtkPolyDataWriter.h
+++ b/IO/vtkPolyDataWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkPolyDataWriter : public vtkDataWriter
 {
 public:
   static vtkPolyDataWriter *New();
-  vtkTypeRevisionMacro(vtkPolyDataWriter,vtkDataWriter);
+  vtkTypeMacro(vtkPolyDataWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkPostScriptWriter.cxx b/IO/vtkPostScriptWriter.cxx
index cf7523973a28b27b4cc40a31226d99e41599a822..221a3258e0ef5c0fe4b65a27ab9de52eea3e7280 100644
--- a/IO/vtkPostScriptWriter.cxx
+++ b/IO/vtkPostScriptWriter.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkPostScriptWriter, "1.21");
 vtkStandardNewMacro(vtkPostScriptWriter);
 
 #define VTK_MARGIN 0.95
diff --git a/IO/vtkPostScriptWriter.h b/IO/vtkPostScriptWriter.h
index 1461499a3f886c0b1447d5ab27d2c11f3699fa57..706d3825490423158bba3909f753d332a3032091 100644
--- a/IO/vtkPostScriptWriter.h
+++ b/IO/vtkPostScriptWriter.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkPostScriptWriter : public vtkImageWriter
 {
 public:
   static vtkPostScriptWriter *New();
-  vtkTypeRevisionMacro(vtkPostScriptWriter,vtkImageWriter);
+  vtkTypeMacro(vtkPostScriptWriter,vtkImageWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkPostgreSQLDatabase.cxx b/IO/vtkPostgreSQLDatabase.cxx
index cd77670c3d8c09387a1dea27657e0f68cf232bdd..09b06b1f6edbac72ebc963c65c7b512a6d0ebf5f 100644
--- a/IO/vtkPostgreSQLDatabase.cxx
+++ b/IO/vtkPostgreSQLDatabase.cxx
@@ -37,7 +37,6 @@
 #include <assert.h>
 
 vtkStandardNewMacro(vtkPostgreSQLDatabase);
-vtkCxxRevisionMacro(vtkPostgreSQLDatabase, "1.34");
 
 // ----------------------------------------------------------------------
 vtkPostgreSQLDatabase::vtkPostgreSQLDatabase()
diff --git a/IO/vtkPostgreSQLDatabase.h b/IO/vtkPostgreSQLDatabase.h
index fd3ce218f0149a3e599336ce37d9c46750976a55..d6d1691de935358ea4f713341124123308be4116 100644
--- a/IO/vtkPostgreSQLDatabase.h
+++ b/IO/vtkPostgreSQLDatabase.h
@@ -58,7 +58,7 @@ class VTK_IO_EXPORT vtkPostgreSQLDatabase : public vtkSQLDatabase
   //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkPostgreSQLDatabase, vtkSQLDatabase);
+  vtkTypeMacro(vtkPostgreSQLDatabase, vtkSQLDatabase);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkPostgreSQLDatabase *New();
 
diff --git a/IO/vtkPostgreSQLQuery.cxx b/IO/vtkPostgreSQLQuery.cxx
index f4e41d47d03242e02cfb1ebc1d791a27ab43b41d..3d911ef000d066870b4211ac343316d0e15fa552 100644
--- a/IO/vtkPostgreSQLQuery.cxx
+++ b/IO/vtkPostgreSQLQuery.cxx
@@ -67,7 +67,6 @@ void ConvertFromNetworkOrder(T &target, const char *rawBytes)
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkPostgreSQLQuery, "1.12");
 vtkStandardNewMacro(vtkPostgreSQLQuery);
 
 // ----------------------------------------------------------------------
diff --git a/IO/vtkPostgreSQLQuery.h b/IO/vtkPostgreSQLQuery.h
index cf3e81d549455c765cc44f6036747fa03621b6ca..84eff4c8c539cd02e92a64527f4896b8d05ed341 100644
--- a/IO/vtkPostgreSQLQuery.h
+++ b/IO/vtkPostgreSQLQuery.h
@@ -48,7 +48,7 @@ class VTK_IO_EXPORT vtkPostgreSQLQuery : public vtkSQLQuery
 public:
   static vtkPostgreSQLQuery* New();
   void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkPostgreSQLQuery, vtkSQLQuery);
+  vtkTypeMacro(vtkPostgreSQLQuery, vtkSQLQuery);
 
   // Description:
   // Execute the query.  This must be performed
diff --git a/IO/vtkRTXMLPolyDataReader.cxx b/IO/vtkRTXMLPolyDataReader.cxx
index e095928592d97d00df44a2f53f3177785bcde2a6..f2212d6e6a09e396a9308c562c9280183eca529b 100644
--- a/IO/vtkRTXMLPolyDataReader.cxx
+++ b/IO/vtkRTXMLPolyDataReader.cxx
@@ -18,7 +18,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkRTXMLPolyDataReader, "1.5");
 vtkStandardNewMacro(vtkRTXMLPolyDataReader);
 
 class vtkRTXMLPolyDataReaderInternals
diff --git a/IO/vtkRTXMLPolyDataReader.h b/IO/vtkRTXMLPolyDataReader.h
index 3c4a4f31446ac28fac3bd96c0936a43c750b6bf7..dcc386220efdde540fefc5ed921068a021a60624 100644
--- a/IO/vtkRTXMLPolyDataReader.h
+++ b/IO/vtkRTXMLPolyDataReader.h
@@ -28,7 +28,7 @@ class vtkRTXMLPolyDataReaderInternals;
 class VTK_IO_EXPORT vtkRTXMLPolyDataReader : public vtkXMLPolyDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkRTXMLPolyDataReader,vtkXMLPolyDataReader);
+  vtkTypeMacro(vtkRTXMLPolyDataReader,vtkXMLPolyDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkRTXMLPolyDataReader* New();
 
diff --git a/IO/vtkRectilinearGridReader.cxx b/IO/vtkRectilinearGridReader.cxx
index ddb09687255ad761b60b46665c761bcf8166800c..8c349abc21d10401b12ab800de702ad93e6169eb 100644
--- a/IO/vtkRectilinearGridReader.cxx
+++ b/IO/vtkRectilinearGridReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridReader, "1.33");
 vtkStandardNewMacro(vtkRectilinearGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkRectilinearGridReader.h b/IO/vtkRectilinearGridReader.h
index 0eea94fa22908e195b39be9d78b8c7f9ed2c4cd1..d66acf89340d30eef1ddcd1d795774c349206062 100644
--- a/IO/vtkRectilinearGridReader.h
+++ b/IO/vtkRectilinearGridReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkRectilinearGridReader : public vtkDataReader
 {
 public:
   static vtkRectilinearGridReader *New();
-  vtkTypeRevisionMacro(vtkRectilinearGridReader,vtkDataReader);
+  vtkTypeMacro(vtkRectilinearGridReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkRectilinearGridWriter.cxx b/IO/vtkRectilinearGridWriter.cxx
index 6490d8700d8d3d267b55848c6ad81ffdba1c2ae7..a6be0d2aa0401da8793661ed75fb0cecf4a608f5 100644
--- a/IO/vtkRectilinearGridWriter.cxx
+++ b/IO/vtkRectilinearGridWriter.cxx
@@ -24,7 +24,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkRectilinearGridWriter, "1.26");
 vtkStandardNewMacro(vtkRectilinearGridWriter);
 
 void vtkRectilinearGridWriter::WriteData()
diff --git a/IO/vtkRectilinearGridWriter.h b/IO/vtkRectilinearGridWriter.h
index 5c7a4417ba6ef1e7c45c6523f0e89b6b835625f2..a057182d5d09829f08cbb93d30c85308253a0568 100644
--- a/IO/vtkRectilinearGridWriter.h
+++ b/IO/vtkRectilinearGridWriter.h
@@ -31,7 +31,7 @@ class VTK_IO_EXPORT vtkRectilinearGridWriter : public vtkDataWriter
 {
 public:
   static vtkRectilinearGridWriter *New();
-  vtkTypeRevisionMacro(vtkRectilinearGridWriter,vtkDataWriter);
+  vtkTypeMacro(vtkRectilinearGridWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
                                
   // Description:
diff --git a/IO/vtkRowQuery.cxx b/IO/vtkRowQuery.cxx
index 8143cdfb414cb7b22151e3333234e2d60a840e46..218452e7300c8c6e71f420b9bd79892c88d921f7 100644
--- a/IO/vtkRowQuery.cxx
+++ b/IO/vtkRowQuery.cxx
@@ -26,7 +26,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkRowQuery, "1.7");
 
 vtkRowQuery::vtkRowQuery()
 {
diff --git a/IO/vtkRowQuery.h b/IO/vtkRowQuery.h
index ac260f71b28a60e1f4dbef673d1eccbf00db0649..4de331fee14e0ff62399933a092b9e326dff05b7 100644
--- a/IO/vtkRowQuery.h
+++ b/IO/vtkRowQuery.h
@@ -58,7 +58,7 @@ class vtkVariantArray;
 class VTK_IO_EXPORT vtkRowQuery : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkRowQuery, vtkObject);
+  vtkTypeMacro(vtkRowQuery, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkRowQueryToTable.cxx b/IO/vtkRowQueryToTable.cxx
index 23ca85cf98dc26c5833302a2306f086c292e307c..0fdbbd34bd0f2bfc806561d2462faa72bad5512e 100644
--- a/IO/vtkRowQueryToTable.cxx
+++ b/IO/vtkRowQueryToTable.cxx
@@ -31,7 +31,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkRowQueryToTable, "1.7");
 vtkStandardNewMacro(vtkRowQueryToTable);
 
 vtkRowQueryToTable::vtkRowQueryToTable()
diff --git a/IO/vtkRowQueryToTable.h b/IO/vtkRowQueryToTable.h
index e8ef1750caccaf6e5983067479fd349c12f7f021..eb3971d7c744ebaaa77a98f76fc52a27804fce4f 100644
--- a/IO/vtkRowQueryToTable.h
+++ b/IO/vtkRowQueryToTable.h
@@ -43,7 +43,7 @@ class VTK_IO_EXPORT vtkRowQueryToTable : public vtkTableAlgorithm
 {
 public:
   static vtkRowQueryToTable* New();
-  vtkTypeRevisionMacro(vtkRowQueryToTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkRowQueryToTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSESAMEReader.cxx b/IO/vtkSESAMEReader.cxx
index dc8ced39e26a9fdd323434a675f1b97fd9bcce18..04c0f265ef89c6dc0c8d08690cb1961c6bd03a6f 100644
--- a/IO/vtkSESAMEReader.cxx
+++ b/IO/vtkSESAMEReader.cxx
@@ -17,7 +17,6 @@
 #include <vtkstd/string>
 
 vtkStandardNewMacro(vtkSESAMEReader);
-vtkCxxRevisionMacro(vtkSESAMEReader, "1.9");
 
 static const int SESAME_NUM_CHARS = 512;
 static const char* TableLineFormat = "%2i%6i%6i";
diff --git a/IO/vtkSESAMEReader.h b/IO/vtkSESAMEReader.h
index 68bc7893f03bd42fd73221157a8292c3d4c034fb..ede3ce41098f250a281dafd5b710ee9b54acf042 100644
--- a/IO/vtkSESAMEReader.h
+++ b/IO/vtkSESAMEReader.h
@@ -33,7 +33,7 @@ class VTK_IO_EXPORT vtkSESAMEReader : public vtkRectilinearGridSource
 {
 public:
   static vtkSESAMEReader *New();
-  vtkTypeRevisionMacro(vtkSESAMEReader, vtkRectilinearGridSource);
+  vtkTypeMacro(vtkSESAMEReader, vtkRectilinearGridSource);
   
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/IO/vtkSLACParticleReader.cxx b/IO/vtkSLACParticleReader.cxx
index 793cae14d56b709a64ce144fee059c97c99d16af..c7b085a5d1875cd7e169467de81aee5ef6baae46 100644
--- a/IO/vtkSLACParticleReader.cxx
+++ b/IO/vtkSLACParticleReader.cxx
@@ -160,7 +160,6 @@ private:
 };
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkSLACParticleReader, "1.3");
 vtkStandardNewMacro(vtkSLACParticleReader);
 
 //-----------------------------------------------------------------------------
diff --git a/IO/vtkSLACParticleReader.h b/IO/vtkSLACParticleReader.h
index 44e52242c62a3784099eda10b17fc0960add6b95..a23e1b91880e2d18a312f4ec362c43d34d8f5858 100644
--- a/IO/vtkSLACParticleReader.h
+++ b/IO/vtkSLACParticleReader.h
@@ -46,7 +46,7 @@ class vtkInformationObjectBaseKey;
 class VTK_IO_EXPORT vtkSLACParticleReader : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSLACParticleReader, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSLACParticleReader, vtkPolyDataAlgorithm);
   static vtkSLACParticleReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/IO/vtkSLACReader.cxx b/IO/vtkSLACReader.cxx
index 68ec74649948337a3f778c302a53756b741f7bb5..8c3e99103ddc270ef29023bbdf051f2cff795636 100644
--- a/IO/vtkSLACReader.cxx
+++ b/IO/vtkSLACReader.cxx
@@ -421,7 +421,6 @@ bool vtkSLACReader::MidpointIdMap::GetNextMidpoint(EdgeEndpoints &edge,
 }
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkSLACReader, "1.18");
 vtkStandardNewMacro(vtkSLACReader);
 
 vtkInformationKeyMacro(vtkSLACReader, IS_INTERNAL_VOLUME, Integer);
diff --git a/IO/vtkSLACReader.h b/IO/vtkSLACReader.h
index 6bedbaa0fc884faeab45ea2168dd46dbfbce8988..a607f96aa92d4a63aa12ffc8a3ea7429a48a2189 100644
--- a/IO/vtkSLACReader.h
+++ b/IO/vtkSLACReader.h
@@ -45,7 +45,7 @@ class vtkInformationObjectBaseKey;
 class VTK_IO_EXPORT vtkSLACReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSLACReader, vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkSLACReader, vtkMultiBlockDataSetAlgorithm);
   static vtkSLACReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/IO/vtkSLCReader.cxx b/IO/vtkSLCReader.cxx
index d13189d1d959f141d50b42da2dac98b91fcd4bcd..bf2ac3ab4f0ad35aac05bc1178f695ad8700307f 100644
--- a/IO/vtkSLCReader.cxx
+++ b/IO/vtkSLCReader.cxx
@@ -21,7 +21,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkSLCReader, "1.54");
 vtkStandardNewMacro(vtkSLCReader);
 
 // Constructor for a vtkSLCReader.
diff --git a/IO/vtkSLCReader.h b/IO/vtkSLCReader.h
index e474b8cf7631b078b09a232169b5a6c611303f31..de032cc543446e17cb360383512c31c2686c6d52 100644
--- a/IO/vtkSLCReader.h
+++ b/IO/vtkSLCReader.h
@@ -28,7 +28,7 @@ class VTK_IO_EXPORT vtkSLCReader : public vtkImageReader2
 {
 public:
   static vtkSLCReader *New();
-  vtkTypeRevisionMacro(vtkSLCReader,vtkImageReader2);
+  vtkTypeMacro(vtkSLCReader,vtkImageReader2);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSQLDatabase.cxx b/IO/vtkSQLDatabase.cxx
index 9360e23c90bbd6dc1c48ca46f917da99f6fc7121..d87735dee7451c2b96dc8051fd67d2e44d70a18f 100644
--- a/IO/vtkSQLDatabase.cxx
+++ b/IO/vtkSQLDatabase.cxx
@@ -82,7 +82,6 @@ public:
 // Used to clean up the Callbacks 
 static vtkSQLDatabaseCleanup vtkCleanupSQLDatabaseGlobal;
 
-vtkCxxRevisionMacro(vtkSQLDatabase, "1.50");
 vtkInformationKeyMacro(vtkSQLDatabase, DATABASE, ObjectBase);
 
 // ----------------------------------------------------------------------
diff --git a/IO/vtkSQLDatabase.h b/IO/vtkSQLDatabase.h
index 23399b1c992bd84e7b238f71da3dab0e8a05434a..9ab83056c69b126095d5b99e9a341129c3d4c8e5 100644
--- a/IO/vtkSQLDatabase.h
+++ b/IO/vtkSQLDatabase.h
@@ -80,7 +80,7 @@ class vtkStringArray;
 class VTK_IO_EXPORT vtkSQLDatabase : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkSQLDatabase, vtkObject);
+  vtkTypeMacro(vtkSQLDatabase, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSQLDatabaseSchema.cxx b/IO/vtkSQLDatabaseSchema.cxx
index 40a40f85e7faf95112747f69f5106aeab4cae711..93822f75e31f9e98ee53a0dfb5e89c3d28454172 100644
--- a/IO/vtkSQLDatabaseSchema.cxx
+++ b/IO/vtkSQLDatabaseSchema.cxx
@@ -29,7 +29,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtkstd/vector>
 
 // ----------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkSQLDatabaseSchema, "1.23");
 vtkStandardNewMacro(vtkSQLDatabaseSchema);
 
 // ----------------------------------------------------------------------
diff --git a/IO/vtkSQLDatabaseSchema.h b/IO/vtkSQLDatabaseSchema.h
index ed1fb389e5b11b30780849779810fc8d4c14ce0f..1fc3a3a7630a7c2f92ac8de87787e6f4d1971e69 100644
--- a/IO/vtkSQLDatabaseSchema.h
+++ b/IO/vtkSQLDatabaseSchema.h
@@ -49,7 +49,7 @@ class vtkSQLDatabaseSchemaInternals;
 class VTK_IO_EXPORT vtkSQLDatabaseSchema : public vtkObject
 {
  public:
-  vtkTypeRevisionMacro(vtkSQLDatabaseSchema, vtkObject);
+  vtkTypeMacro(vtkSQLDatabaseSchema, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkSQLDatabaseSchema *New();
 
diff --git a/IO/vtkSQLQuery.cxx b/IO/vtkSQLQuery.cxx
index 8aab7e5761fff4cdf737f217c59ee6e67a20f3e1..ee40444754b6564c037935a3d21259389be89f16 100644
--- a/IO/vtkSQLQuery.cxx
+++ b/IO/vtkSQLQuery.cxx
@@ -25,7 +25,6 @@
 
 #include "vtksys/SystemTools.hxx"
 
-vtkCxxRevisionMacro(vtkSQLQuery, "1.11");
 
 vtkSQLQuery::vtkSQLQuery()
 {
diff --git a/IO/vtkSQLQuery.h b/IO/vtkSQLQuery.h
index 8127068d3adb23cf9f1457bdd896ba3e3be0c12a..e5734ddbf47db3585509bc12808a8c5434f0036d 100644
--- a/IO/vtkSQLQuery.h
+++ b/IO/vtkSQLQuery.h
@@ -64,7 +64,7 @@ class vtkVariantArray;
 class VTK_IO_EXPORT vtkSQLQuery : public vtkRowQuery
 {
 public:
-  vtkTypeRevisionMacro(vtkSQLQuery, vtkRowQuery);
+  vtkTypeMacro(vtkSQLQuery, vtkRowQuery);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSQLiteDatabase.cxx b/IO/vtkSQLiteDatabase.cxx
index c1f13945ac80fe176dc87cf29582c0251fd44690..336bcd3e9e07bf652114a2592ea2fc48e7426c7c 100644
--- a/IO/vtkSQLiteDatabase.cxx
+++ b/IO/vtkSQLiteDatabase.cxx
@@ -32,7 +32,6 @@
 #include <vtksqlite/vtk_sqlite3.h>
 
 vtkStandardNewMacro(vtkSQLiteDatabase);
-vtkCxxRevisionMacro(vtkSQLiteDatabase, "1.24");
 
 // ----------------------------------------------------------------------
 vtkSQLiteDatabase::vtkSQLiteDatabase()
diff --git a/IO/vtkSQLiteDatabase.h b/IO/vtkSQLiteDatabase.h
index 4b2e1e9aa6afe2ee1b8b8e10f63d9b4fcc9c1460..f8660f9440ffe8af86e1ea9feecaaa2da960d62f 100644
--- a/IO/vtkSQLiteDatabase.h
+++ b/IO/vtkSQLiteDatabase.h
@@ -57,7 +57,7 @@ class VTK_IO_EXPORT vtkSQLiteDatabase : public vtkSQLDatabase
   //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkSQLiteDatabase, vtkSQLDatabase);
+  vtkTypeMacro(vtkSQLiteDatabase, vtkSQLDatabase);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkSQLiteDatabase *New();
 
diff --git a/IO/vtkSQLiteQuery.cxx b/IO/vtkSQLiteQuery.cxx
index a88fe4c181a594ddca0c96282b11b973a5cade0d..45b26e1bf3c709d6f9ae74910bbd39208a141896 100644
--- a/IO/vtkSQLiteQuery.cxx
+++ b/IO/vtkSQLiteQuery.cxx
@@ -36,7 +36,6 @@
 #define COMMIT_TRANSACTION "COMMIT"
 #define ROLLBACK_TRANSACTION "ROLLBACK"
 
-vtkCxxRevisionMacro(vtkSQLiteQuery, "1.20");
 vtkStandardNewMacro(vtkSQLiteQuery);
 
 // ----------------------------------------------------------------------
diff --git a/IO/vtkSQLiteQuery.h b/IO/vtkSQLiteQuery.h
index b7fb8bfef7839dbe2be51855f46bbdca3aa1ce5e..bd2624262b7c8b3e62769eacfb2b07952c242c4a 100644
--- a/IO/vtkSQLiteQuery.h
+++ b/IO/vtkSQLiteQuery.h
@@ -55,7 +55,7 @@ class VTK_IO_EXPORT vtkSQLiteQuery : public vtkSQLQuery
   //ETX
 
 public:
-  vtkTypeRevisionMacro(vtkSQLiteQuery, vtkSQLQuery);
+  vtkTypeMacro(vtkSQLiteQuery, vtkSQLQuery);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkSQLiteQuery *New();
 
diff --git a/IO/vtkSTLReader.cxx b/IO/vtkSTLReader.cxx
index a43ebcc4c2eb22d0a59a14e7c777b6df9f6532ba..138d4cc49128fba0a347a94c0d6bca3a4cb3a783 100644
--- a/IO/vtkSTLReader.cxx
+++ b/IO/vtkSTLReader.cxx
@@ -30,7 +30,6 @@
 #include <ctype.h>
 #include <vtksys/SystemTools.hxx>
 
-vtkCxxRevisionMacro(vtkSTLReader, "1.80");
 vtkStandardNewMacro(vtkSTLReader);
 
 #define VTK_ASCII 0
diff --git a/IO/vtkSTLReader.h b/IO/vtkSTLReader.h
index 0858cc08a8771adbb67c82c44fa67ed945cd4745..1a7652c9776d638bb44e446f584de0ee068199b6 100644
--- a/IO/vtkSTLReader.h
+++ b/IO/vtkSTLReader.h
@@ -42,7 +42,7 @@ class vtkPoints;
 class VTK_IO_EXPORT vtkSTLReader : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkSTLReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSTLReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSTLWriter.cxx b/IO/vtkSTLWriter.cxx
index 28d114ac61cbd8f274ae10f4175fb6bcbfe608ed..af80751e01e01a9ec30b7c9ec99b71e8a5bbde62 100644
--- a/IO/vtkSTLWriter.cxx
+++ b/IO/vtkSTLWriter.cxx
@@ -27,7 +27,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkSTLWriter, "1.57");
 vtkStandardNewMacro(vtkSTLWriter);
 
 vtkSTLWriter::vtkSTLWriter()
diff --git a/IO/vtkSTLWriter.h b/IO/vtkSTLWriter.h
index 7b7164d4402e4b8eb0dfd7b89cc1fac4ea9cd076..0abf7129da050ad48110e0a037f967220c67528a 100644
--- a/IO/vtkSTLWriter.h
+++ b/IO/vtkSTLWriter.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkSTLWriter : public vtkPolyDataWriter
 {
 public:
   static vtkSTLWriter *New();
-  vtkTypeRevisionMacro(vtkSTLWriter,vtkPolyDataWriter);
+  vtkTypeMacro(vtkSTLWriter,vtkPolyDataWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkShaderCodeLibrary.cxx b/IO/vtkShaderCodeLibrary.cxx
index defedb895a31e0c49ffb08dd4566f409e74adb7b..a14a4151978a330d17e4851d093b10586c0eaa19 100644
--- a/IO/vtkShaderCodeLibrary.cxx
+++ b/IO/vtkShaderCodeLibrary.cxx
@@ -55,7 +55,6 @@ vtkShaderCodeLibrary::vtkInternalCleanup::~vtkInternalCleanup()
 
 
 vtkStandardNewMacro(vtkShaderCodeLibrary);
-vtkCxxRevisionMacro(vtkShaderCodeLibrary, "1.4");
 //-----------------------------------------------------------------------------
 vtkShaderCodeLibrary::vtkShaderCodeLibrary()
 {
diff --git a/IO/vtkShaderCodeLibrary.h b/IO/vtkShaderCodeLibrary.h
index 724f870a767a23fe4b71f4a5430da470bbfa3604..09988c492bd5a91947dfb60521272020062ad7af 100644
--- a/IO/vtkShaderCodeLibrary.h
+++ b/IO/vtkShaderCodeLibrary.h
@@ -28,7 +28,7 @@ class VTK_IO_EXPORT vtkShaderCodeLibrary : public vtkObject
 {
 public:
   static vtkShaderCodeLibrary* New();
-  vtkTypeRevisionMacro(vtkShaderCodeLibrary, vtkObject);
+  vtkTypeMacro(vtkShaderCodeLibrary, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSimplePointsReader.cxx b/IO/vtkSimplePointsReader.cxx
index a86a8a82c51cf13a2f2811785d20e38e338770e6..3b5abe69f797156b368232a9673af2b8a969584b 100644
--- a/IO/vtkSimplePointsReader.cxx
+++ b/IO/vtkSimplePointsReader.cxx
@@ -20,7 +20,6 @@
 #include "vtkPolyData.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkSimplePointsReader, "1.1");
 vtkStandardNewMacro(vtkSimplePointsReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkSimplePointsReader.h b/IO/vtkSimplePointsReader.h
index 5621b0444b1a4238d6d118c7d21d99a10c50d91b..6db451539e2b58a89e33e7954be772704ff27eef 100644
--- a/IO/vtkSimplePointsReader.h
+++ b/IO/vtkSimplePointsReader.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkSimplePointsReader : public vtkPolyDataAlgorithm
 {
 public:
   static vtkSimplePointsReader* New();
-  vtkTypeRevisionMacro(vtkSimplePointsReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSimplePointsReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkSortFileNames.cxx b/IO/vtkSortFileNames.cxx
index c8904e429857d19ca7460715902d4d8026a350a3..e8821fc803d057ebea792dfd19aa1429a6093b9a 100644
--- a/IO/vtkSortFileNames.cxx
+++ b/IO/vtkSortFileNames.cxx
@@ -27,7 +27,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkSortFileNames, "1.7");
 vtkStandardNewMacro(vtkSortFileNames);
 
 // a container for holding string arrays
diff --git a/IO/vtkSortFileNames.h b/IO/vtkSortFileNames.h
index b896bbcbc96669a9562756777ce95bfd9f550fab..b52ec8719b950faa87f3329885db2675319674ce 100644
--- a/IO/vtkSortFileNames.h
+++ b/IO/vtkSortFileNames.h
@@ -41,7 +41,7 @@ class VTK_IO_EXPORT vtkSortFileNames : public vtkObject
 {
 public:
   
-  vtkTypeRevisionMacro(vtkSortFileNames,vtkObject);
+  vtkTypeMacro(vtkSortFileNames,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);   
   static vtkSortFileNames *New();
 
diff --git a/IO/vtkStructuredGridReader.cxx b/IO/vtkStructuredGridReader.cxx
index 8d06283d68d09e531e77bb80646ea3b3a35d5667..501844352ff1c00ea372012eaef9b621acf3283a 100644
--- a/IO/vtkStructuredGridReader.cxx
+++ b/IO/vtkStructuredGridReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkStructuredGridReader, "1.60");
 vtkStandardNewMacro(vtkStructuredGridReader);
 
 vtkStructuredGridReader::vtkStructuredGridReader()
diff --git a/IO/vtkStructuredGridReader.h b/IO/vtkStructuredGridReader.h
index 79f6a47b06225baa1aba532976b4d5a4386fa9bc..8f4e088ebd14e75c4c57e0dd11690b1d9a44356f 100644
--- a/IO/vtkStructuredGridReader.h
+++ b/IO/vtkStructuredGridReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkStructuredGridReader : public vtkDataReader
 {
 public:
   static vtkStructuredGridReader *New();
-  vtkTypeRevisionMacro(vtkStructuredGridReader,vtkDataReader);
+  vtkTypeMacro(vtkStructuredGridReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkStructuredGridWriter.cxx b/IO/vtkStructuredGridWriter.cxx
index ab954b00a382f482db0859fb2b8ff9c24a0c312a..29b963966b73e1a634e27e0707ae26e2fb2c92e7 100644
--- a/IO/vtkStructuredGridWriter.cxx
+++ b/IO/vtkStructuredGridWriter.cxx
@@ -25,7 +25,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkStructuredGridWriter, "1.40");
 vtkStandardNewMacro(vtkStructuredGridWriter);
 
 void vtkStructuredGridWriter::WriteData()
diff --git a/IO/vtkStructuredGridWriter.h b/IO/vtkStructuredGridWriter.h
index 9edae6cf4a49adaaee7966b9da0d715e7e52228c..e952ea16e33e0dde5b7455ecfb07943edbe8b4b9 100644
--- a/IO/vtkStructuredGridWriter.h
+++ b/IO/vtkStructuredGridWriter.h
@@ -31,7 +31,7 @@ class VTK_IO_EXPORT vtkStructuredGridWriter : public vtkDataWriter
 {
 public:
   static vtkStructuredGridWriter *New();
-  vtkTypeRevisionMacro(vtkStructuredGridWriter,vtkDataWriter);
+  vtkTypeMacro(vtkStructuredGridWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkStructuredPointsReader.cxx b/IO/vtkStructuredPointsReader.cxx
index 6bcfa5be3af3b927b5cfc51095f9a7aa6db15e3c..19e721cd5ba217734326d03f1ba44ce4d978fb47 100644
--- a/IO/vtkStructuredPointsReader.cxx
+++ b/IO/vtkStructuredPointsReader.cxx
@@ -24,7 +24,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStructuredPoints.h"
 
-vtkCxxRevisionMacro(vtkStructuredPointsReader, "1.64");
 vtkStandardNewMacro(vtkStructuredPointsReader);
 
 vtkStructuredPointsReader::vtkStructuredPointsReader()
diff --git a/IO/vtkStructuredPointsReader.h b/IO/vtkStructuredPointsReader.h
index 420cf67634261906cf1e755231f3971bd15aef2a..9b6c26969d6f194791ba9f14383ab7e84d68194f 100644
--- a/IO/vtkStructuredPointsReader.h
+++ b/IO/vtkStructuredPointsReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkStructuredPointsReader : public vtkDataReader
 {
 public:
   static vtkStructuredPointsReader *New();
-  vtkTypeRevisionMacro(vtkStructuredPointsReader,vtkDataReader);
+  vtkTypeMacro(vtkStructuredPointsReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkStructuredPointsWriter.cxx b/IO/vtkStructuredPointsWriter.cxx
index 0fefe464e6dd6ce2f4147e437d6b02b0fa41df5b..56868765523ffdb4e0c63e3f4428f795c5138532 100644
--- a/IO/vtkStructuredPointsWriter.cxx
+++ b/IO/vtkStructuredPointsWriter.cxx
@@ -25,7 +25,6 @@
 #endif
 
 
-vtkCxxRevisionMacro(vtkStructuredPointsWriter, "1.42");
 vtkStandardNewMacro(vtkStructuredPointsWriter);
 
 void vtkStructuredPointsWriter::WriteData()
diff --git a/IO/vtkStructuredPointsWriter.h b/IO/vtkStructuredPointsWriter.h
index 10397d351d91e873519631e7f6fcb9088958d987..4af40b15b57c7c557a20dd263463798b5bf165be 100644
--- a/IO/vtkStructuredPointsWriter.h
+++ b/IO/vtkStructuredPointsWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkStructuredPointsWriter : public vtkDataWriter
 {
 public:
   static vtkStructuredPointsWriter *New();
-  vtkTypeRevisionMacro(vtkStructuredPointsWriter,vtkDataWriter);
+  vtkTypeMacro(vtkStructuredPointsWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkTIFFReader.cxx b/IO/vtkTIFFReader.cxx
index 709ee8a102e34f835a005093fee3efd9819d25c6..1869bff5fc3587ea80b1b0778dd7b16205a0c5e8 100644
--- a/IO/vtkTIFFReader.cxx
+++ b/IO/vtkTIFFReader.cxx
@@ -31,7 +31,6 @@ extern "C" {
 
 //-------------------------------------------------------------------------
 vtkStandardNewMacro(vtkTIFFReader);
-vtkCxxRevisionMacro(vtkTIFFReader, "1.53");
 
 class vtkTIFFReaderInternal
 {
diff --git a/IO/vtkTIFFReader.h b/IO/vtkTIFFReader.h
index 703574e4245fae22a630389cb30d5712a81b808d..38916910b052958b48a8a1a073582167f8107429 100644
--- a/IO/vtkTIFFReader.h
+++ b/IO/vtkTIFFReader.h
@@ -33,7 +33,7 @@ class VTK_IO_EXPORT vtkTIFFReader : public vtkImageReader2
 {
 public:
   static vtkTIFFReader *New();
-  vtkTypeRevisionMacro(vtkTIFFReader,vtkImageReader2);
+  vtkTypeMacro(vtkTIFFReader,vtkImageReader2);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkTIFFWriter.cxx b/IO/vtkTIFFWriter.cxx
index ddcadf0c9e10dffd5508b1e8e4a613ce3041e0b5..901e25f87938694fa4834fb0a96bbdb4d163bc44 100644
--- a/IO/vtkTIFFWriter.cxx
+++ b/IO/vtkTIFFWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkPointData.h"
 #include "vtk_tiff.h"
 
-vtkCxxRevisionMacro(vtkTIFFWriter, "1.44");
 vtkStandardNewMacro(vtkTIFFWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkTIFFWriter.h b/IO/vtkTIFFWriter.h
index 924478eaff9cfbd7e738c8497682c306f30febb3..de091509aa21e0249d715da257a7911d65284f01 100644
--- a/IO/vtkTIFFWriter.h
+++ b/IO/vtkTIFFWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkTIFFWriter : public vtkImageWriter
 {
 public:
   static vtkTIFFWriter *New();
-  vtkTypeRevisionMacro(vtkTIFFWriter,vtkImageWriter);
+  vtkTypeMacro(vtkTIFFWriter,vtkImageWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/IO/vtkTableReader.cxx b/IO/vtkTableReader.cxx
index 8a0dbb458fa457dc4d056b5753a4dc2b6906bec0..a9d51adcf9f2e7e30fce6014de9a7e57722073d2 100644
--- a/IO/vtkTableReader.cxx
+++ b/IO/vtkTableReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkTableReader, "1.2");
 vtkStandardNewMacro(vtkTableReader);
 
 #ifdef read
diff --git a/IO/vtkTableReader.h b/IO/vtkTableReader.h
index 13323f6690580e66c07d9f6bad61b8a7ee5f1580..ed26cd21ad4d280bc938b5f5bb87918dc32b6b3b 100644
--- a/IO/vtkTableReader.h
+++ b/IO/vtkTableReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkTableReader : public vtkDataReader
 {
 public:
   static vtkTableReader *New();
-  vtkTypeRevisionMacro(vtkTableReader,vtkDataReader);
+  vtkTypeMacro(vtkTableReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkTableWriter.cxx b/IO/vtkTableWriter.cxx
index b686ebc61f1c9a7caee020bf7f5da937cf2b9324..8b60c417a43152d25672a6de58d8cc32d12c509e 100644
--- a/IO/vtkTableWriter.cxx
+++ b/IO/vtkTableWriter.cxx
@@ -26,7 +26,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkTableWriter, "1.2");
 vtkStandardNewMacro(vtkTableWriter);
 
 void vtkTableWriter::WriteData()
diff --git a/IO/vtkTableWriter.h b/IO/vtkTableWriter.h
index 0276d9231d9510c08fed000f700c626f5ab7ca55..036d3affcb9703f99e10e2301d4fca52f4e1fc7e 100644
--- a/IO/vtkTableWriter.h
+++ b/IO/vtkTableWriter.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkTableWriter : public vtkDataWriter
 {
 public:
   static vtkTableWriter *New();
-  vtkTypeRevisionMacro(vtkTableWriter,vtkDataWriter);
+  vtkTypeMacro(vtkTableWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkTecplotReader.cxx b/IO/vtkTecplotReader.cxx
index 56987b1e818da644b28883c397c3cff68191347a..1f4d4590d9ed42d07868c67d40bf2d1f07451b6b 100644
--- a/IO/vtkTecplotReader.cxx
+++ b/IO/vtkTecplotReader.cxx
@@ -49,7 +49,6 @@
 
 #include <ctype.h> // for isspace(), isalnum()
 
-vtkCxxRevisionMacro( vtkTecplotReader, "1.16" );
 vtkStandardNewMacro( vtkTecplotReader );
 
 // ============================================================================
diff --git a/IO/vtkTecplotReader.h b/IO/vtkTecplotReader.h
index d88b4a056dbdb169c8087bf6c3875e3527c2ab1b..8f68db1c3493b0439e5daf8ab7bddbe50e48d216 100644
--- a/IO/vtkTecplotReader.h
+++ b/IO/vtkTecplotReader.h
@@ -93,7 +93,7 @@ class VTK_IO_EXPORT vtkTecplotReader : public vtkMultiBlockDataSetAlgorithm
 {
 public:
   static vtkTecplotReader * New();
-  vtkTypeRevisionMacro( vtkTecplotReader, vtkMultiBlockDataSetAlgorithm );
+  vtkTypeMacro( vtkTecplotReader, vtkMultiBlockDataSetAlgorithm );
   void  PrintSelf( ostream & os, vtkIndent indent );
   
   // Description:
diff --git a/IO/vtkTreeReader.cxx b/IO/vtkTreeReader.cxx
index 08147646874933b5ebb13a5d0615eba5a76db725..900fb52e7a1517eb332f889671b909ca96b08760 100644
--- a/IO/vtkTreeReader.cxx
+++ b/IO/vtkTreeReader.cxx
@@ -25,7 +25,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTreeReader, "1.3");
 vtkStandardNewMacro(vtkTreeReader);
 
 #ifdef read
diff --git a/IO/vtkTreeReader.h b/IO/vtkTreeReader.h
index 8c977b8ac79f94d53e30657f1da8fe668e6acad3..9e9a8142ee6090cca46461ac3095249cfd491ab7 100644
--- a/IO/vtkTreeReader.h
+++ b/IO/vtkTreeReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkTreeReader : public vtkDataReader
 {
 public:
   static vtkTreeReader *New();
-  vtkTypeRevisionMacro(vtkTreeReader,vtkDataReader);
+  vtkTypeMacro(vtkTreeReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkTreeWriter.cxx b/IO/vtkTreeWriter.cxx
index 1227e5bdb0e0a87dc9fa7f3170266b88c0fca762..797598c4e7ebc5e9879cb13a6052ea9790983b45 100644
--- a/IO/vtkTreeWriter.cxx
+++ b/IO/vtkTreeWriter.cxx
@@ -26,7 +26,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkTreeWriter, "1.4");
 vtkStandardNewMacro(vtkTreeWriter);
 
 void vtkTreeWriter::WriteEdges(ostream& Stream, vtkTree* Tree, vtkIdType Vertex)
diff --git a/IO/vtkTreeWriter.h b/IO/vtkTreeWriter.h
index 0959b76b7d4f898d0e06aef20125c76a5f3b042d..3e991da31329b6cc36902be1c0b5254607532f0c 100644
--- a/IO/vtkTreeWriter.h
+++ b/IO/vtkTreeWriter.h
@@ -30,7 +30,7 @@ class VTK_IO_EXPORT vtkTreeWriter : public vtkDataWriter
 {
 public:
   static vtkTreeWriter *New();
-  vtkTypeRevisionMacro(vtkTreeWriter,vtkDataWriter);
+  vtkTypeMacro(vtkTreeWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkUGFacetReader.cxx b/IO/vtkUGFacetReader.cxx
index 8e48aac736aacc7be260026a0bea5c185809d816..e86426a9c0c90c9458ecaae8ee0be63ae8a77682 100644
--- a/IO/vtkUGFacetReader.cxx
+++ b/IO/vtkUGFacetReader.cxx
@@ -26,7 +26,6 @@
 #include "vtkShortArray.h"
 #include "vtkIncrementalPointLocator.h"
 
-vtkCxxRevisionMacro(vtkUGFacetReader, "1.48");
 vtkStandardNewMacro(vtkUGFacetReader);
 
 // Construct object to extract all parts, and with point merging
diff --git a/IO/vtkUGFacetReader.h b/IO/vtkUGFacetReader.h
index f44abfd0d96b56f0c1a04b82d2d259782b3b7066..d907577f635af3d0835955ee757da9d526b9a4f1 100644
--- a/IO/vtkUGFacetReader.h
+++ b/IO/vtkUGFacetReader.h
@@ -29,7 +29,7 @@ class vtkShortArray;
 class VTK_IO_EXPORT vtkUGFacetReader : public vtkPolyDataAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkUGFacetReader,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkUGFacetReader,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkUnstructuredGridReader.cxx b/IO/vtkUnstructuredGridReader.cxx
index c951d9d16b7a4b8c8728dda46300d372567b613e..2926f19489b04f7842e40e43fc245318a918fd68 100644
--- a/IO/vtkUnstructuredGridReader.cxx
+++ b/IO/vtkUnstructuredGridReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridReader, "1.71");
 vtkStandardNewMacro(vtkUnstructuredGridReader);
 
 #ifdef read
diff --git a/IO/vtkUnstructuredGridReader.h b/IO/vtkUnstructuredGridReader.h
index dddba05484033af1a64d60027d4bfd75c6dd3b13..5745198f370f2fe32faed787c8c7b1cd4bc3d193 100644
--- a/IO/vtkUnstructuredGridReader.h
+++ b/IO/vtkUnstructuredGridReader.h
@@ -36,7 +36,7 @@ class VTK_IO_EXPORT vtkUnstructuredGridReader : public vtkDataReader
 {
 public:
   static vtkUnstructuredGridReader *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridReader,vtkDataReader);
+  vtkTypeMacro(vtkUnstructuredGridReader,vtkDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkUnstructuredGridWriter.cxx b/IO/vtkUnstructuredGridWriter.cxx
index 5e298afa9715d0b04bc054ccb0b0a3ef65b162c4..02ed4ff8314e1a1809acb16784dd3d03e89705be 100644
--- a/IO/vtkUnstructuredGridWriter.cxx
+++ b/IO/vtkUnstructuredGridWriter.cxx
@@ -26,7 +26,6 @@
 # include <io.h> /* unlink */
 #endif
 
-vtkCxxRevisionMacro(vtkUnstructuredGridWriter, "1.43");
 vtkStandardNewMacro(vtkUnstructuredGridWriter);
 
 void vtkUnstructuredGridWriter::WriteData()
diff --git a/IO/vtkUnstructuredGridWriter.h b/IO/vtkUnstructuredGridWriter.h
index efe2f009597e5ebd945a74be8ff40465adc9c54b..6a8dab9507a988e4f61a51e3c4cfc1e457801a59 100644
--- a/IO/vtkUnstructuredGridWriter.h
+++ b/IO/vtkUnstructuredGridWriter.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkUnstructuredGridWriter : public vtkDataWriter
 {
 public:
   static vtkUnstructuredGridWriter *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridWriter,vtkDataWriter);
+  vtkTypeMacro(vtkUnstructuredGridWriter,vtkDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkVolume16Reader.cxx b/IO/vtkVolume16Reader.cxx
index 95701073fac6a5d96da8fd449588196fde8b586d..48240bbd66b15818e69bf130bbf25fb478bb27bd 100644
--- a/IO/vtkVolume16Reader.cxx
+++ b/IO/vtkVolume16Reader.cxx
@@ -23,7 +23,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedShortArray.h"
 
-vtkCxxRevisionMacro(vtkVolume16Reader, "1.57");
 vtkStandardNewMacro(vtkVolume16Reader);
 
 vtkCxxSetObjectMacro(vtkVolume16Reader,Transform,vtkTransform);
diff --git a/IO/vtkVolume16Reader.h b/IO/vtkVolume16Reader.h
index 1d6c3ca9c0b49710fd45cc3811f5120ecf959f6c..6780332e3bf786860ca3ebc8c3f04a886460fa29 100644
--- a/IO/vtkVolume16Reader.h
+++ b/IO/vtkVolume16Reader.h
@@ -57,7 +57,7 @@ class vtkUnsignedShortArray;
 class VTK_IO_EXPORT vtkVolume16Reader : public vtkVolumeReader
 {
 public:
-  vtkTypeRevisionMacro(vtkVolume16Reader,vtkVolumeReader);
+  vtkTypeMacro(vtkVolume16Reader,vtkVolumeReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkVolumeReader.cxx b/IO/vtkVolumeReader.cxx
index 0ac23ff679500972350ba6307b31ff67cd3ec1d7..46f8c2f2ba06dc202575335c93d458b21a02b21b 100644
--- a/IO/vtkVolumeReader.cxx
+++ b/IO/vtkVolumeReader.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkVolumeReader.h"
 
-vtkCxxRevisionMacro(vtkVolumeReader, "1.22");
 
 // Construct object with NULL file prefix; file pattern "%s.%d"; image range 
 // set to (1,1); 
diff --git a/IO/vtkVolumeReader.h b/IO/vtkVolumeReader.h
index 276f6eb0c3fb85ce195c3fed1b23ffc9137c1fed..8e37d8400796ffec45cb5b4ffa98dc681789161b 100644
--- a/IO/vtkVolumeReader.h
+++ b/IO/vtkVolumeReader.h
@@ -47,7 +47,7 @@
 class VTK_IO_EXPORT vtkVolumeReader : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeReader,vtkImageAlgorithm);
+  vtkTypeMacro(vtkVolumeReader,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkWriter.cxx b/IO/vtkWriter.cxx
index 7600a6733afa53373597cf1a704d90463bc7fd16..57b00153b85c15e224528de219e3092e6058d7b4 100644
--- a/IO/vtkWriter.cxx
+++ b/IO/vtkWriter.cxx
@@ -23,7 +23,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkWriter, "1.46");
 
 namespace 
 {
diff --git a/IO/vtkWriter.h b/IO/vtkWriter.h
index 8f31165f41f4307dd4329950eb32b98669a14a44..a86b75054cf3ed13db968278602199f3a3aca403 100644
--- a/IO/vtkWriter.h
+++ b/IO/vtkWriter.h
@@ -38,7 +38,7 @@ class vtkDataObject;
 class VTK_IO_EXPORT vtkWriter : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkWriter,vtkAlgorithm);
+  vtkTypeMacro(vtkWriter,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLCompositeDataReader.cxx b/IO/vtkXMLCompositeDataReader.cxx
index 7cc6455aee6b852e860a28f0f90cd61859628ec0..b19b88d4e7db0dd7fae8ae4d0f6607c9ef4d74b4 100644
--- a/IO/vtkXMLCompositeDataReader.cxx
+++ b/IO/vtkXMLCompositeDataReader.cxx
@@ -40,7 +40,6 @@
 #include <vtkstd/vector>
 #include <vtksys/SystemTools.hxx>
 
-vtkCxxRevisionMacro(vtkXMLCompositeDataReader, "1.5");
 
 struct vtkXMLCompositeDataReaderEntry
 {
diff --git a/IO/vtkXMLCompositeDataReader.h b/IO/vtkXMLCompositeDataReader.h
index 401a01dc4fea876057ed9d150e5a77a27e552b1f..6e9c26409b1ed80076de8992ab40219cd9396f59 100644
--- a/IO/vtkXMLCompositeDataReader.h
+++ b/IO/vtkXMLCompositeDataReader.h
@@ -36,7 +36,7 @@ struct vtkXMLCompositeDataReaderInternals;
 class VTK_IO_EXPORT vtkXMLCompositeDataReader : public vtkXMLReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLCompositeDataReader,vtkXMLReader);
+  vtkTypeMacro(vtkXMLCompositeDataReader,vtkXMLReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLCompositeDataWriter.cxx b/IO/vtkXMLCompositeDataWriter.cxx
index d863a21fff6cb23f7fd8d9a8750c1a65cc0af875..b363f4ce1016a3d9f0774ca0fe67753598f4289c 100644
--- a/IO/vtkXMLCompositeDataWriter.cxx
+++ b/IO/vtkXMLCompositeDataWriter.cxx
@@ -53,7 +53,6 @@
 #include <vtkstd/vector>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkXMLCompositeDataWriter, "1.9");
 
 class vtkXMLCompositeDataWriterInternals
 {
diff --git a/IO/vtkXMLCompositeDataWriter.h b/IO/vtkXMLCompositeDataWriter.h
index 3385de4b34def4c86510f7e13f3e60ba9a11bfbd..a2f348aebd2c20d3fd5b8b43237410f939194c87 100644
--- a/IO/vtkXMLCompositeDataWriter.h
+++ b/IO/vtkXMLCompositeDataWriter.h
@@ -34,7 +34,7 @@ class vtkXMLCompositeDataWriterInternals;
 class VTK_IO_EXPORT vtkXMLCompositeDataWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLCompositeDataWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLCompositeDataWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);  
   
   // Description:
diff --git a/IO/vtkXMLDataParser.cxx b/IO/vtkXMLDataParser.cxx
index e546e0473f1575dc5139996d78ae374c4add4c59..f7405f9af7c7f2f64b1ec0e99e1a64b7ec5ff804 100644
--- a/IO/vtkXMLDataParser.cxx
+++ b/IO/vtkXMLDataParser.cxx
@@ -27,7 +27,6 @@
 #include "vtkXMLUtilities.h"
 
 
-vtkCxxRevisionMacro(vtkXMLDataParser, "1.39");
 vtkStandardNewMacro(vtkXMLDataParser);
 vtkCxxSetObjectMacro(vtkXMLDataParser, Compressor, vtkDataCompressor);
 
diff --git a/IO/vtkXMLDataParser.h b/IO/vtkXMLDataParser.h
index 17863e3850b9d12733060eefad70494ac14cb7dd..bc9a2dd7e4b82602d1f3cc94dd619827627d868a 100644
--- a/IO/vtkXMLDataParser.h
+++ b/IO/vtkXMLDataParser.h
@@ -35,7 +35,7 @@ class vtkDataCompressor;
 class VTK_IO_EXPORT vtkXMLDataParser : public vtkXMLParser
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLDataParser,vtkXMLParser);
+  vtkTypeMacro(vtkXMLDataParser,vtkXMLParser);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLDataParser* New();
 
diff --git a/IO/vtkXMLDataReader.cxx b/IO/vtkXMLDataReader.cxx
index b6961ea00f75da6584179dd6dc7e332dcc2b2ca5..5b02fe477c570a172b3bf4a197226dd5052a359f 100644
--- a/IO/vtkXMLDataReader.cxx
+++ b/IO/vtkXMLDataReader.cxx
@@ -29,7 +29,6 @@
 
 #include "assert.h"
 
-vtkCxxRevisionMacro(vtkXMLDataReader, "1.40");
 
 //----------------------------------------------------------------------------
 vtkXMLDataReader::vtkXMLDataReader()
diff --git a/IO/vtkXMLDataReader.h b/IO/vtkXMLDataReader.h
index 9fa544bb20d7e4890b13a563c6cf8db3ebde1dbd..46e4a4f1d098e2287c10f6b4d2e8e63f18dd087d 100644
--- a/IO/vtkXMLDataReader.h
+++ b/IO/vtkXMLDataReader.h
@@ -29,7 +29,7 @@
 class VTK_IO_EXPORT vtkXMLDataReader : public vtkXMLReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLDataReader,vtkXMLReader);
+  vtkTypeMacro(vtkXMLDataReader,vtkXMLReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLDataSetWriter.cxx b/IO/vtkXMLDataSetWriter.cxx
index 3ddb7f8ac101117413752e4c4e2dcdd0aa5ecc76..37a3ae8033cb07647f7beee9d43b4727490c199b 100644
--- a/IO/vtkXMLDataSetWriter.cxx
+++ b/IO/vtkXMLDataSetWriter.cxx
@@ -31,7 +31,6 @@
 #include "vtkXMLStructuredGridWriter.h"
 #include "vtkXMLUnstructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLDataSetWriter, "1.12");
 vtkStandardNewMacro(vtkXMLDataSetWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLDataSetWriter.h b/IO/vtkXMLDataSetWriter.h
index 1d02ad1b06b96cabf99ee75a12ad771ed1dc02df..4e7af7932d08a915e63bad3fea0354ef8fa39109 100644
--- a/IO/vtkXMLDataSetWriter.h
+++ b/IO/vtkXMLDataSetWriter.h
@@ -33,7 +33,7 @@ class vtkCallbackCommand;
 class VTK_IO_EXPORT vtkXMLDataSetWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLDataSetWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLDataSetWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLDataSetWriter* New();
   
diff --git a/IO/vtkXMLFileReadTester.cxx b/IO/vtkXMLFileReadTester.cxx
index 48dbd031e18b5260587593ab092a52ed47135f6f..0b3965905b1d7d4e37a86683575a5e67071a8728 100644
--- a/IO/vtkXMLFileReadTester.cxx
+++ b/IO/vtkXMLFileReadTester.cxx
@@ -15,7 +15,6 @@
 #include "vtkXMLFileReadTester.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkXMLFileReadTester, "1.3");
 vtkStandardNewMacro(vtkXMLFileReadTester);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLFileReadTester.h b/IO/vtkXMLFileReadTester.h
index 0f85509f2eabd9e4a065874b158823878c6aa39e..6225554d3e62b6d59bc588c0d673e3080661d017 100644
--- a/IO/vtkXMLFileReadTester.h
+++ b/IO/vtkXMLFileReadTester.h
@@ -26,7 +26,7 @@
 class VTK_IO_EXPORT vtkXMLFileReadTester: public vtkXMLParser
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLFileReadTester,vtkXMLParser);
+  vtkTypeMacro(vtkXMLFileReadTester,vtkXMLParser);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkXMLFileReadTester* New();
   
diff --git a/IO/vtkXMLHierarchicalBoxDataReader.cxx b/IO/vtkXMLHierarchicalBoxDataReader.cxx
index 8ad589c3663940b47f185901caaf62873c874a54..fc843daa29caf8e264c71fb5cab53f4e0e910665 100644
--- a/IO/vtkXMLHierarchicalBoxDataReader.cxx
+++ b/IO/vtkXMLHierarchicalBoxDataReader.cxx
@@ -26,7 +26,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkXMLHierarchicalBoxDataReader, "1.11");
 vtkStandardNewMacro(vtkXMLHierarchicalBoxDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLHierarchicalBoxDataReader.h b/IO/vtkXMLHierarchicalBoxDataReader.h
index 095a265490d6079bc9027cd31cb7e64ec8317b88..6d3401b96b74fc42f72b35adc327066409239142 100644
--- a/IO/vtkXMLHierarchicalBoxDataReader.h
+++ b/IO/vtkXMLHierarchicalBoxDataReader.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkXMLHierarchicalBoxDataReader : public vtkXMLCompositeData
 {
 public:
   static vtkXMLHierarchicalBoxDataReader* New();
-  vtkTypeRevisionMacro(vtkXMLHierarchicalBoxDataReader,vtkXMLCompositeDataReader);
+  vtkTypeMacro(vtkXMLHierarchicalBoxDataReader,vtkXMLCompositeDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkXMLHierarchicalBoxDataWriter.cxx b/IO/vtkXMLHierarchicalBoxDataWriter.cxx
index 6b119015228dab11a0f8454d2dda02dbb4ad8921..1dece3941ddc0239857dd3555066ac6f8a6d0a83 100644
--- a/IO/vtkXMLHierarchicalBoxDataWriter.cxx
+++ b/IO/vtkXMLHierarchicalBoxDataWriter.cxx
@@ -27,7 +27,6 @@
 #include "assert.h"
 
 vtkStandardNewMacro(vtkXMLHierarchicalBoxDataWriter);
-vtkCxxRevisionMacro(vtkXMLHierarchicalBoxDataWriter, "1.8");
 //----------------------------------------------------------------------------
 vtkXMLHierarchicalBoxDataWriter::vtkXMLHierarchicalBoxDataWriter()
 {
diff --git a/IO/vtkXMLHierarchicalBoxDataWriter.h b/IO/vtkXMLHierarchicalBoxDataWriter.h
index 2aacf70c9b22afbaeea2b4a9f497c8560d2cfc5d..7fef103e232165ec5abd7bf0259a4472077d38e6 100644
--- a/IO/vtkXMLHierarchicalBoxDataWriter.h
+++ b/IO/vtkXMLHierarchicalBoxDataWriter.h
@@ -27,7 +27,7 @@ class VTK_IO_EXPORT vtkXMLHierarchicalBoxDataWriter : public vtkXMLCompositeData
 {
 public:
   static vtkXMLHierarchicalBoxDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLHierarchicalBoxDataWriter, vtkXMLCompositeDataWriter);
+  vtkTypeMacro(vtkXMLHierarchicalBoxDataWriter, vtkXMLCompositeDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLHierarchicalDataReader.cxx b/IO/vtkXMLHierarchicalDataReader.cxx
index 81af1d97b8225433011ce0f771243d104194b5ef..21aabc8ae56972ca7c6b629538e33db616b01860 100644
--- a/IO/vtkXMLHierarchicalDataReader.cxx
+++ b/IO/vtkXMLHierarchicalDataReader.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkXMLHierarchicalDataReader);
-vtkCxxRevisionMacro(vtkXMLHierarchicalDataReader, "1.6");
 //----------------------------------------------------------------------------
 vtkXMLHierarchicalDataReader::vtkXMLHierarchicalDataReader()
 {
diff --git a/IO/vtkXMLHierarchicalDataReader.h b/IO/vtkXMLHierarchicalDataReader.h
index 55b3be5d091385d70a91a89a9ca513ed99191101..48bdc4f7c0ead8ffe89cfaf11297fa04e493b231 100644
--- a/IO/vtkXMLHierarchicalDataReader.h
+++ b/IO/vtkXMLHierarchicalDataReader.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLHierarchicalDataReader : public vtkXMLMultiGroupDataRe
 {
 public:
   static vtkXMLHierarchicalDataReader* New();
-  vtkTypeRevisionMacro(vtkXMLHierarchicalDataReader,vtkXMLMultiGroupDataReader);
+  vtkTypeMacro(vtkXMLHierarchicalDataReader,vtkXMLMultiGroupDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkXMLHyperOctreeReader.cxx b/IO/vtkXMLHyperOctreeReader.cxx
index 72574aaa6ab8c41ce1f660692a0788bc210a36ef..d8cbe0fe456e381ba022a6b9af433d940fab1409 100644
--- a/IO/vtkXMLHyperOctreeReader.cxx
+++ b/IO/vtkXMLHyperOctreeReader.cxx
@@ -30,7 +30,6 @@
 #include "vtkIntArray.h"
 #include "vtkFieldData.h"
 
-vtkCxxRevisionMacro(vtkXMLHyperOctreeReader, "1.6");
 vtkStandardNewMacro(vtkXMLHyperOctreeReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLHyperOctreeReader.h b/IO/vtkXMLHyperOctreeReader.h
index 66c881438d3100f6ccbc97506c8212878ba2333e..b3f6366a1db43466f3a34035cb08ed1d9ac5d77b 100644
--- a/IO/vtkXMLHyperOctreeReader.h
+++ b/IO/vtkXMLHyperOctreeReader.h
@@ -35,7 +35,7 @@ class vtkIntArray;
 class VTK_IO_EXPORT vtkXMLHyperOctreeReader : public vtkXMLDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLHyperOctreeReader,vtkXMLDataReader);
+  vtkTypeMacro(vtkXMLHyperOctreeReader,vtkXMLDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLHyperOctreeReader *New();
   
diff --git a/IO/vtkXMLHyperOctreeWriter.cxx b/IO/vtkXMLHyperOctreeWriter.cxx
index 33ec6afaf6ba38e1ae5c116b0fa060e62f8abf56..b0e4a15066421514c40bdfcd2ba725778e979196 100644
--- a/IO/vtkXMLHyperOctreeWriter.cxx
+++ b/IO/vtkXMLHyperOctreeWriter.cxx
@@ -33,7 +33,6 @@
 #undef  vtkOffsetsManager_DoNotInclude
 
 
-vtkCxxRevisionMacro(vtkXMLHyperOctreeWriter, "1.6");
 vtkStandardNewMacro(vtkXMLHyperOctreeWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLHyperOctreeWriter.h b/IO/vtkXMLHyperOctreeWriter.h
index d4e920d33e62f5546a2796b4eed6079c346dbed1..683807d19076dda529ddcadb67346f3289a5ee7d 100644
--- a/IO/vtkXMLHyperOctreeWriter.h
+++ b/IO/vtkXMLHyperOctreeWriter.h
@@ -35,7 +35,7 @@ class vtkIntArray;
 class VTK_IO_EXPORT vtkXMLHyperOctreeWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLHyperOctreeWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLHyperOctreeWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLHyperOctreeWriter* New();
   
diff --git a/IO/vtkXMLImageDataReader.cxx b/IO/vtkXMLImageDataReader.cxx
index 08ee063a6ae404a396546f3b49006024b41d2379..f8b3c710f7b85ecd5150bc0ce7108304f2dc96a2 100644
--- a/IO/vtkXMLImageDataReader.cxx
+++ b/IO/vtkXMLImageDataReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkInformationVector.h"
 
-vtkCxxRevisionMacro(vtkXMLImageDataReader, "1.14");
 vtkStandardNewMacro(vtkXMLImageDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLImageDataReader.h b/IO/vtkXMLImageDataReader.h
index dc0cd8c38c8f5b52ad737543330e17122680b679..71f4425459346765c80d0d3e7e93e52e3d355b34 100644
--- a/IO/vtkXMLImageDataReader.h
+++ b/IO/vtkXMLImageDataReader.h
@@ -33,7 +33,7 @@ class vtkImageData;
 class VTK_IO_EXPORT vtkXMLImageDataReader : public vtkXMLStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLImageDataReader,vtkXMLStructuredDataReader);
+  vtkTypeMacro(vtkXMLImageDataReader,vtkXMLStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLImageDataReader *New();
   
diff --git a/IO/vtkXMLImageDataWriter.cxx b/IO/vtkXMLImageDataWriter.cxx
index 0d4b46f895df21388636f3860e5abeb0cf016861..42757c79a4d1d8c33cd27fa2c154e5d5f9a28dfe 100644
--- a/IO/vtkXMLImageDataWriter.cxx
+++ b/IO/vtkXMLImageDataWriter.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkXMLImageDataWriter, "1.7");
 vtkStandardNewMacro(vtkXMLImageDataWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLImageDataWriter.h b/IO/vtkXMLImageDataWriter.h
index a7fe06512d16db6cb836c0b7de481192283e8c50..a2bf6a0976b5f63c7ea77957460a1281571c817a 100644
--- a/IO/vtkXMLImageDataWriter.h
+++ b/IO/vtkXMLImageDataWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLImageDataWriter : public vtkXMLStructuredDataWriter
 {
 public:
   static vtkXMLImageDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLImageDataWriter,vtkXMLStructuredDataWriter);
+  vtkTypeMacro(vtkXMLImageDataWriter,vtkXMLStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/IO/vtkXMLMaterial.cxx b/IO/vtkXMLMaterial.cxx
index 223395e788ec505b89445abcc14092e79a9a15be..bbee281cf37be9c70b20a74630c9e1f8eae765ec 100644
--- a/IO/vtkXMLMaterial.cxx
+++ b/IO/vtkXMLMaterial.cxx
@@ -44,7 +44,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkXMLMaterial);
-vtkCxxRevisionMacro(vtkXMLMaterial, "1.8");
 //-----------------------------------------------------------------------------
 vtkXMLMaterial::vtkXMLMaterial()
 {
diff --git a/IO/vtkXMLMaterial.h b/IO/vtkXMLMaterial.h
index 42c33b39e847704cbee4eea36c489af7dd0a8a0e..cc2bd77ce3c69e9ac3936f41705aacc07e814268 100644
--- a/IO/vtkXMLMaterial.h
+++ b/IO/vtkXMLMaterial.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLMaterial : public vtkObject
 {
 public:
   static vtkXMLMaterial* New();
-  vtkTypeRevisionMacro(vtkXMLMaterial, vtkObject);
+  vtkTypeMacro(vtkXMLMaterial, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLMaterialParser.cxx b/IO/vtkXMLMaterialParser.cxx
index c24bcd8731d1eea7d9960044955c0ece1fb5c281..49c870d536d589f8f7f84806934e3cd146010ae6 100644
--- a/IO/vtkXMLMaterialParser.cxx
+++ b/IO/vtkXMLMaterialParser.cxx
@@ -44,7 +44,6 @@ public:
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkXMLMaterialParser);
-vtkCxxRevisionMacro(vtkXMLMaterialParser, "1.5" );
 vtkCxxSetObjectMacro(vtkXMLMaterialParser, Material, vtkXMLMaterial);
 
 //-----------------------------------------------------------------------------
diff --git a/IO/vtkXMLMaterialParser.h b/IO/vtkXMLMaterialParser.h
index 7994c252cff72b924fef190bf4b3168de542d264..9aec74f7a87b40d6e24ee9ac06c067bb4f0ec873 100644
--- a/IO/vtkXMLMaterialParser.h
+++ b/IO/vtkXMLMaterialParser.h
@@ -77,7 +77,7 @@ class VTK_IO_EXPORT vtkXMLMaterialParser : public vtkXMLParser
 {
 public:
   static vtkXMLMaterialParser *New();
-  vtkTypeRevisionMacro(vtkXMLMaterialParser,vtkXMLParser);
+  vtkTypeMacro(vtkXMLMaterialParser,vtkXMLParser);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLMaterialReader.cxx b/IO/vtkXMLMaterialReader.cxx
index a1fab3544bc9f3008a65c8132ff2c6038511384e..d161a886e65fd862cc9c2ba269e0d5a018a61c8b 100644
--- a/IO/vtkXMLMaterialReader.cxx
+++ b/IO/vtkXMLMaterialReader.cxx
@@ -19,7 +19,6 @@
 #include "vtkXMLMaterial.h"
 #include "vtkXMLMaterialParser.h"
 
-vtkCxxRevisionMacro(vtkXMLMaterialReader, "1.2");
 vtkStandardNewMacro( vtkXMLMaterialReader );
 //-----------------------------------------------------------------------------
 vtkXMLMaterialReader::vtkXMLMaterialReader()
diff --git a/IO/vtkXMLMaterialReader.h b/IO/vtkXMLMaterialReader.h
index 65e7a5ba5d0d498be867aea2adbf787e8c3a0bf6..949df5a5a923880e31cf49a4f9d6dac9471a4066 100644
--- a/IO/vtkXMLMaterialReader.h
+++ b/IO/vtkXMLMaterialReader.h
@@ -50,7 +50,7 @@ class vtkXMLMaterialParser;
 class VTK_IO_EXPORT vtkXMLMaterialReader : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLMaterialReader,vtkObject);
+  vtkTypeMacro(vtkXMLMaterialReader,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLMaterialReader* New();
 
diff --git a/IO/vtkXMLMultiBlockDataReader.cxx b/IO/vtkXMLMultiBlockDataReader.cxx
index b0d60afd3a064ab1d6af28f58a6114863cc90ee1..66e6ff4ea052910bfd91a176bae2710fd592e78d 100644
--- a/IO/vtkXMLMultiBlockDataReader.cxx
+++ b/IO/vtkXMLMultiBlockDataReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkXMLDataElement.h"
 
-vtkCxxRevisionMacro(vtkXMLMultiBlockDataReader, "1.6");
 vtkStandardNewMacro(vtkXMLMultiBlockDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLMultiBlockDataReader.h b/IO/vtkXMLMultiBlockDataReader.h
index 6c316bf342b91431160672d23da95b69bc1afc40..4614ddf04390bc24d14afcd2ae06f543851bed06 100644
--- a/IO/vtkXMLMultiBlockDataReader.h
+++ b/IO/vtkXMLMultiBlockDataReader.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLMultiBlockDataReader : public vtkXMLCompositeDataReade
 {
 public:
   static vtkXMLMultiBlockDataReader* New();
-  vtkTypeRevisionMacro(vtkXMLMultiBlockDataReader,vtkXMLCompositeDataReader);
+  vtkTypeMacro(vtkXMLMultiBlockDataReader,vtkXMLCompositeDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkXMLMultiBlockDataWriter.cxx b/IO/vtkXMLMultiBlockDataWriter.cxx
index 482795fe295e6788f8b243f2c75af48353f7455e..e9f8fa79887310dcbd10a4aec2c1951e05964a32 100644
--- a/IO/vtkXMLMultiBlockDataWriter.cxx
+++ b/IO/vtkXMLMultiBlockDataWriter.cxx
@@ -22,7 +22,6 @@
 #include "vtkXMLDataElement.h"
 
 vtkStandardNewMacro(vtkXMLMultiBlockDataWriter);
-vtkCxxRevisionMacro(vtkXMLMultiBlockDataWriter, "1.5");
 //----------------------------------------------------------------------------
 vtkXMLMultiBlockDataWriter::vtkXMLMultiBlockDataWriter()
 {
diff --git a/IO/vtkXMLMultiBlockDataWriter.h b/IO/vtkXMLMultiBlockDataWriter.h
index 87dd850d1c5987e930d06fdd3a6b31d3f6bae85e..0cabe9660ec8ae4fbb5f3feb56b86ab89dddf2b2 100644
--- a/IO/vtkXMLMultiBlockDataWriter.h
+++ b/IO/vtkXMLMultiBlockDataWriter.h
@@ -25,7 +25,7 @@ class VTK_IO_EXPORT vtkXMLMultiBlockDataWriter : public vtkXMLCompositeDataWrite
 {
 public:
   static vtkXMLMultiBlockDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLMultiBlockDataWriter, vtkXMLCompositeDataWriter);
+  vtkTypeMacro(vtkXMLMultiBlockDataWriter, vtkXMLCompositeDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLMultiGroupDataReader.cxx b/IO/vtkXMLMultiGroupDataReader.cxx
index d64922b4cbb7ac6b247c519e169cf8e538a26224..69f9812e5fc4cc2cc96bece60d6feee437ae268d 100644
--- a/IO/vtkXMLMultiGroupDataReader.cxx
+++ b/IO/vtkXMLMultiGroupDataReader.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 vtkStandardNewMacro(vtkXMLMultiGroupDataReader);
-vtkCxxRevisionMacro(vtkXMLMultiGroupDataReader, "1.5");
 //----------------------------------------------------------------------------
 vtkXMLMultiGroupDataReader::vtkXMLMultiGroupDataReader()
 {
diff --git a/IO/vtkXMLMultiGroupDataReader.h b/IO/vtkXMLMultiGroupDataReader.h
index 5c7fddf55248b5844c011d0114c75857fef19455..1bc42a956122209d8aeddc382df4742d9637f6d4 100644
--- a/IO/vtkXMLMultiGroupDataReader.h
+++ b/IO/vtkXMLMultiGroupDataReader.h
@@ -26,7 +26,7 @@ class VTK_IO_EXPORT vtkXMLMultiGroupDataReader : public vtkXMLMultiBlockDataRead
 {
 public:
   static vtkXMLMultiGroupDataReader* New();
-  vtkTypeRevisionMacro(vtkXMLMultiGroupDataReader,vtkXMLMultiBlockDataReader);
+  vtkTypeMacro(vtkXMLMultiGroupDataReader,vtkXMLMultiBlockDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/IO/vtkXMLPDataReader.cxx b/IO/vtkXMLPDataReader.cxx
index b04daac191f5b19e7273b68e6f296f287c38cbf5..d09e48c288ddf8799c04a2d5b88d86692584e5bf 100644
--- a/IO/vtkXMLPDataReader.cxx
+++ b/IO/vtkXMLPDataReader.cxx
@@ -28,7 +28,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkXMLPDataReader, "1.22");
 
 //----------------------------------------------------------------------------
 vtkXMLPDataReader::vtkXMLPDataReader()
diff --git a/IO/vtkXMLPDataReader.h b/IO/vtkXMLPDataReader.h
index 8c37f873aeacfb4ca5cae6a4e2a383d13aecf94c..daa24f013a458820b98c37a2340d741a7367ff97 100644
--- a/IO/vtkXMLPDataReader.h
+++ b/IO/vtkXMLPDataReader.h
@@ -33,7 +33,7 @@ class vtkXMLDataReader;
 class VTK_IO_EXPORT vtkXMLPDataReader : public vtkXMLReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPDataReader,vtkXMLReader);
+  vtkTypeMacro(vtkXMLPDataReader,vtkXMLReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLPDataSetWriter.cxx b/IO/vtkXMLPDataSetWriter.cxx
index 1f70b042436bdfaf556b4887bc89483d242914be..a219dbab4ebf9cd7c34024dd353b70151710fc33 100644
--- a/IO/vtkXMLPDataSetWriter.cxx
+++ b/IO/vtkXMLPDataSetWriter.cxx
@@ -29,7 +29,6 @@
 #include "vtkXMLPStructuredGridWriter.h"
 #include "vtkXMLPUnstructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPDataSetWriter, "1.11");
 vtkStandardNewMacro(vtkXMLPDataSetWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPDataSetWriter.h b/IO/vtkXMLPDataSetWriter.h
index d5e3b7dd16419d442869f8104efb1bf9e1f9605b..d02eb972825401116452638f113325ca8d684ec4 100644
--- a/IO/vtkXMLPDataSetWriter.h
+++ b/IO/vtkXMLPDataSetWriter.h
@@ -31,7 +31,7 @@
 class VTK_IO_EXPORT vtkXMLPDataSetWriter : public vtkXMLPDataWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPDataSetWriter,vtkXMLPDataWriter);
+  vtkTypeMacro(vtkXMLPDataSetWriter,vtkXMLPDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLPDataSetWriter* New();
   
diff --git a/IO/vtkXMLPDataWriter.cxx b/IO/vtkXMLPDataWriter.cxx
index 103cb2b59af5db9240a86180c0a16a2a5e8d44a5..1db07fa23b4808476b5cb7bc5e0b665f9d66c757 100644
--- a/IO/vtkXMLPDataWriter.cxx
+++ b/IO/vtkXMLPDataWriter.cxx
@@ -20,7 +20,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkXMLPDataWriter, "1.17");
 
 //----------------------------------------------------------------------------
 vtkXMLPDataWriter::vtkXMLPDataWriter()
diff --git a/IO/vtkXMLPDataWriter.h b/IO/vtkXMLPDataWriter.h
index 748f71f2b6dcd949655636112ebd229c2700b5d3..fc310dbf9e6f38ee0aeb3ffead02b59c915147ef 100644
--- a/IO/vtkXMLPDataWriter.h
+++ b/IO/vtkXMLPDataWriter.h
@@ -29,7 +29,7 @@ class vtkCallbackCommand;
 class VTK_IO_EXPORT vtkXMLPDataWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPDataWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLPDataWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLPImageDataReader.cxx b/IO/vtkXMLPImageDataReader.cxx
index 3e7170fb0fa4d9511ae0576e735cd9ebf7eb8845..eb5516400f15c390c6407913c5a9f2e67e747e99 100644
--- a/IO/vtkXMLPImageDataReader.cxx
+++ b/IO/vtkXMLPImageDataReader.cxx
@@ -23,7 +23,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPImageDataReader, "1.12");
 vtkStandardNewMacro(vtkXMLPImageDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPImageDataReader.h b/IO/vtkXMLPImageDataReader.h
index 9133cc829e01ea0d68b5a6d1b1e0a926f6d2a2cc..1ee3707dfbfeb0b7feda9aba4d329d7a0e4d4300 100644
--- a/IO/vtkXMLPImageDataReader.h
+++ b/IO/vtkXMLPImageDataReader.h
@@ -33,7 +33,7 @@ class vtkImageData;
 class VTK_IO_EXPORT vtkXMLPImageDataReader : public vtkXMLPStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPImageDataReader,vtkXMLPStructuredDataReader);
+  vtkTypeMacro(vtkXMLPImageDataReader,vtkXMLPStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLPImageDataReader *New();
   
diff --git a/IO/vtkXMLPImageDataWriter.cxx b/IO/vtkXMLPImageDataWriter.cxx
index 5aabf8989016ded2057811b27001e1cbc1558690..cc423f31d2eb5b58434061669a5a051be08f8f3e 100644
--- a/IO/vtkXMLPImageDataWriter.cxx
+++ b/IO/vtkXMLPImageDataWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkXMLImageDataWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPImageDataWriter, "1.8");
 vtkStandardNewMacro(vtkXMLPImageDataWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPImageDataWriter.h b/IO/vtkXMLPImageDataWriter.h
index e6cf0bd335a7e765014eb304cd01686c7101d1b9..53940121b10f98a460c5ccc2848456c26498ecb8 100644
--- a/IO/vtkXMLPImageDataWriter.h
+++ b/IO/vtkXMLPImageDataWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLPImageDataWriter : public vtkXMLPStructuredDataWriter
 {
 public:
   static vtkXMLPImageDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPImageDataWriter,vtkXMLPStructuredDataWriter);
+  vtkTypeMacro(vtkXMLPImageDataWriter,vtkXMLPStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/IO/vtkXMLPPolyDataReader.cxx b/IO/vtkXMLPPolyDataReader.cxx
index 0838cbc8ed6db9410ff78d112cd83cb4b0dbd9b1..4ed850392b65e038e52a954dad13c68a75bf9486 100644
--- a/IO/vtkXMLPPolyDataReader.cxx
+++ b/IO/vtkXMLPPolyDataReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPPolyDataReader, "1.8");
 vtkStandardNewMacro(vtkXMLPPolyDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPPolyDataReader.h b/IO/vtkXMLPPolyDataReader.h
index 0838b74e4b6c02e13200337986e5220d4c0d6ae3..41659c7f933718de8764f1a20e36f1fb0a238150 100644
--- a/IO/vtkXMLPPolyDataReader.h
+++ b/IO/vtkXMLPPolyDataReader.h
@@ -33,7 +33,7 @@ class vtkPolyData;
 class VTK_IO_EXPORT vtkXMLPPolyDataReader : public vtkXMLPUnstructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPPolyDataReader,vtkXMLPUnstructuredDataReader);
+  vtkTypeMacro(vtkXMLPPolyDataReader,vtkXMLPUnstructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkXMLPPolyDataReader *New();
   
diff --git a/IO/vtkXMLPPolyDataWriter.cxx b/IO/vtkXMLPPolyDataWriter.cxx
index 1bff61640cf8f57f02c382449b049be9a1a3c132..cbce8247405a10476e1e4bd16f90436212b118cc 100644
--- a/IO/vtkXMLPPolyDataWriter.cxx
+++ b/IO/vtkXMLPPolyDataWriter.cxx
@@ -19,7 +19,6 @@
 #include "vtkPolyData.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkXMLPPolyDataWriter, "1.7");
 vtkStandardNewMacro(vtkXMLPPolyDataWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPPolyDataWriter.h b/IO/vtkXMLPPolyDataWriter.h
index fab1c8809fcec98e9cd3d277c7d799c2e42ae661..e2f30bdef8b6d456a3149d22231da5fd946bf8d5 100644
--- a/IO/vtkXMLPPolyDataWriter.h
+++ b/IO/vtkXMLPPolyDataWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLPPolyDataWriter : public vtkXMLPUnstructuredDataWriter
 {
 public:
   static vtkXMLPPolyDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPPolyDataWriter,vtkXMLPUnstructuredDataWriter);
+  vtkTypeMacro(vtkXMLPPolyDataWriter,vtkXMLPUnstructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/IO/vtkXMLPRectilinearGridReader.cxx b/IO/vtkXMLPRectilinearGridReader.cxx
index f631780b4d66df78fad70f2bd60c6d67e498cc64..06df421ad74127da3e79a2625078a3cc67921f70 100644
--- a/IO/vtkXMLPRectilinearGridReader.cxx
+++ b/IO/vtkXMLPRectilinearGridReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPRectilinearGridReader, "1.13");
 vtkStandardNewMacro(vtkXMLPRectilinearGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPRectilinearGridReader.h b/IO/vtkXMLPRectilinearGridReader.h
index 0787e0fba5c0f6ef16785426261fc7ced04884c2..39be84c8318036eb5cc35e50812004a73b481b61 100644
--- a/IO/vtkXMLPRectilinearGridReader.h
+++ b/IO/vtkXMLPRectilinearGridReader.h
@@ -33,7 +33,7 @@ class vtkRectilinearGrid;
 class VTK_IO_EXPORT vtkXMLPRectilinearGridReader : public vtkXMLPStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPRectilinearGridReader,vtkXMLPStructuredDataReader);
+  vtkTypeMacro(vtkXMLPRectilinearGridReader,vtkXMLPStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLPRectilinearGridReader *New();
   
diff --git a/IO/vtkXMLPRectilinearGridWriter.cxx b/IO/vtkXMLPRectilinearGridWriter.cxx
index 8104dd5e00b40844a38d7db1485618a43e9aae4f..145d1045a657c06e8400aa4606c03691bcdd0b36 100644
--- a/IO/vtkXMLPRectilinearGridWriter.cxx
+++ b/IO/vtkXMLPRectilinearGridWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkXMLRectilinearGridWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPRectilinearGridWriter, "1.8");
 vtkStandardNewMacro(vtkXMLPRectilinearGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPRectilinearGridWriter.h b/IO/vtkXMLPRectilinearGridWriter.h
index 96775744ed16763788510e019275811fc38e02ea..8e1994ab15ec217e118b6ec48e58e35928443763 100644
--- a/IO/vtkXMLPRectilinearGridWriter.h
+++ b/IO/vtkXMLPRectilinearGridWriter.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkXMLPRectilinearGridWriter : public vtkXMLPStructuredDataW
 {
 public:
   static vtkXMLPRectilinearGridWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPRectilinearGridWriter,vtkXMLPStructuredDataWriter);
+  vtkTypeMacro(vtkXMLPRectilinearGridWriter,vtkXMLPStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/IO/vtkXMLPStructuredDataReader.cxx b/IO/vtkXMLPStructuredDataReader.cxx
index 56a8817477b8324fbe4e6573e5758e3d68565c72..f59d4a93e6391ebf1688421b9b4f6b173614bd93 100644
--- a/IO/vtkXMLPStructuredDataReader.cxx
+++ b/IO/vtkXMLPStructuredDataReader.cxx
@@ -26,7 +26,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkXMLPStructuredDataReader, "1.28");
 
 //----------------------------------------------------------------------------
 vtkXMLPStructuredDataReader::vtkXMLPStructuredDataReader()
diff --git a/IO/vtkXMLPStructuredDataReader.h b/IO/vtkXMLPStructuredDataReader.h
index d35c1b20881583a418b770fd20e6e80cc331daff..f553198114838645a94504cdfa509cc2afc5edec 100644
--- a/IO/vtkXMLPStructuredDataReader.h
+++ b/IO/vtkXMLPStructuredDataReader.h
@@ -34,7 +34,7 @@ class vtkXMLStructuredDataReader;
 class VTK_IO_EXPORT vtkXMLPStructuredDataReader : public vtkXMLPDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPStructuredDataReader,vtkXMLPDataReader);
+  vtkTypeMacro(vtkXMLPStructuredDataReader,vtkXMLPDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLPStructuredDataWriter.cxx b/IO/vtkXMLPStructuredDataWriter.cxx
index 4abdf085ee9d2ab6f766d530fa4d5d8d0fa95440..a5c0a8da5b21bb250b3bfe5ea3b9714ee4a17b7b 100644
--- a/IO/vtkXMLPStructuredDataWriter.cxx
+++ b/IO/vtkXMLPStructuredDataWriter.cxx
@@ -18,7 +18,6 @@
 #include "vtkErrorCode.h"
 #include "vtkDataSet.h"
 
-vtkCxxRevisionMacro(vtkXMLPStructuredDataWriter, "1.5");
 vtkCxxSetObjectMacro(vtkXMLPStructuredDataWriter, ExtentTranslator,
                      vtkExtentTranslator);
 
diff --git a/IO/vtkXMLPStructuredDataWriter.h b/IO/vtkXMLPStructuredDataWriter.h
index f3d9fcbc1ae8df20da8418aee1042fc3194a9c56..166af8906a2e1b653049c18d6d70ba1ffb38dde3 100644
--- a/IO/vtkXMLPStructuredDataWriter.h
+++ b/IO/vtkXMLPStructuredDataWriter.h
@@ -28,7 +28,7 @@ class vtkExtentTranslator;
 class VTK_IO_EXPORT vtkXMLPStructuredDataWriter : public vtkXMLPDataWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPStructuredDataWriter,vtkXMLPDataWriter);
+  vtkTypeMacro(vtkXMLPStructuredDataWriter,vtkXMLPDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLPStructuredGridReader.cxx b/IO/vtkXMLPStructuredGridReader.cxx
index 7c30f7c2e8fc5d3c6fe2f86b41deefa18e153b4d..e13150109846cf7dbc3500291aa9bb285c940b14 100644
--- a/IO/vtkXMLPStructuredGridReader.cxx
+++ b/IO/vtkXMLPStructuredGridReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPStructuredGridReader, "1.12");
 vtkStandardNewMacro(vtkXMLPStructuredGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPStructuredGridReader.h b/IO/vtkXMLPStructuredGridReader.h
index c2931dd7e4c6530a2949d656ce0f0110ab2a60d9..4c147fc048ba148a2b82e7f14bbcaadc4c8047ff 100644
--- a/IO/vtkXMLPStructuredGridReader.h
+++ b/IO/vtkXMLPStructuredGridReader.h
@@ -33,7 +33,7 @@ class vtkStructuredGrid;
 class VTK_IO_EXPORT vtkXMLPStructuredGridReader : public vtkXMLPStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPStructuredGridReader,vtkXMLPStructuredDataReader);
+  vtkTypeMacro(vtkXMLPStructuredGridReader,vtkXMLPStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLPStructuredGridReader *New();
   
diff --git a/IO/vtkXMLPStructuredGridWriter.cxx b/IO/vtkXMLPStructuredGridWriter.cxx
index 869438543297ea3b72f117b415fa13c18ffed226..5363bddcdd4f295ce58009c2409c5a27c7f8176b 100644
--- a/IO/vtkXMLPStructuredGridWriter.cxx
+++ b/IO/vtkXMLPStructuredGridWriter.cxx
@@ -20,7 +20,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkXMLStructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPStructuredGridWriter, "1.8");
 vtkStandardNewMacro(vtkXMLPStructuredGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPStructuredGridWriter.h b/IO/vtkXMLPStructuredGridWriter.h
index 0bae1437cf99dfe168fce85956aed9bf749b0a33..3efb891014a5bab570f6ca0687e7a94fb744b017 100644
--- a/IO/vtkXMLPStructuredGridWriter.h
+++ b/IO/vtkXMLPStructuredGridWriter.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkXMLPStructuredGridWriter : public vtkXMLPStructuredDataWr
 {
 public:
   static vtkXMLPStructuredGridWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPStructuredGridWriter,vtkXMLPStructuredDataWriter);
+  vtkTypeMacro(vtkXMLPStructuredGridWriter,vtkXMLPStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/IO/vtkXMLPUnstructuredDataReader.cxx b/IO/vtkXMLPUnstructuredDataReader.cxx
index 6328f7d5b60cd8fe56a2338ff778eb353683712f..b28e84c2f28534d3fae78f3c6aa9227b423bcad4 100644
--- a/IO/vtkXMLPUnstructuredDataReader.cxx
+++ b/IO/vtkXMLPUnstructuredDataReader.cxx
@@ -20,7 +20,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPUnstructuredDataReader, "1.22");
 
 //----------------------------------------------------------------------------
 vtkXMLPUnstructuredDataReader::vtkXMLPUnstructuredDataReader()
diff --git a/IO/vtkXMLPUnstructuredDataReader.h b/IO/vtkXMLPUnstructuredDataReader.h
index 87f5cfb7e420b371fd96e56cb0097a400ea484b0..c2116966509b072690888a30d146c9503f018e13 100644
--- a/IO/vtkXMLPUnstructuredDataReader.h
+++ b/IO/vtkXMLPUnstructuredDataReader.h
@@ -32,7 +32,7 @@ class vtkXMLUnstructuredDataReader;
 class VTK_IO_EXPORT vtkXMLPUnstructuredDataReader : public vtkXMLPDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPUnstructuredDataReader,vtkXMLPDataReader);
+  vtkTypeMacro(vtkXMLPUnstructuredDataReader,vtkXMLPDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // For the specified port, copy the information this reader sets up in
diff --git a/IO/vtkXMLPUnstructuredDataWriter.cxx b/IO/vtkXMLPUnstructuredDataWriter.cxx
index c0b3018c8b55c7a6c69c83c757b0df78f8af77ee..e94c71a9f6d51adc6b0bb7fd3b3a5ed296969d68 100644
--- a/IO/vtkXMLPUnstructuredDataWriter.cxx
+++ b/IO/vtkXMLPUnstructuredDataWriter.cxx
@@ -21,7 +21,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkXMLUnstructuredDataWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPUnstructuredDataWriter, "1.8");
 
 //----------------------------------------------------------------------------
 vtkXMLPUnstructuredDataWriter::vtkXMLPUnstructuredDataWriter()
diff --git a/IO/vtkXMLPUnstructuredDataWriter.h b/IO/vtkXMLPUnstructuredDataWriter.h
index a0834d0c21396b7c396c52087f2e4a9e5e8d1992..8bb96aa34ec08fc2e64372f3cd292e7a8cd023d6 100644
--- a/IO/vtkXMLPUnstructuredDataWriter.h
+++ b/IO/vtkXMLPUnstructuredDataWriter.h
@@ -29,7 +29,7 @@ class vtkXMLUnstructuredDataWriter;
 class VTK_IO_EXPORT vtkXMLPUnstructuredDataWriter : public vtkXMLPDataWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPUnstructuredDataWriter,vtkXMLPDataWriter);
+  vtkTypeMacro(vtkXMLPUnstructuredDataWriter,vtkXMLPDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);  
 
   // See the vtkAlgorithm for a desciption of what these do
diff --git a/IO/vtkXMLPUnstructuredGridReader.cxx b/IO/vtkXMLPUnstructuredGridReader.cxx
index 3fcae083af339cf48cafeb8ea2bc573efdd349eb..8e7fdbfa2bee17cba2641413f63c743a38ace7ad 100644
--- a/IO/vtkXMLPUnstructuredGridReader.cxx
+++ b/IO/vtkXMLPUnstructuredGridReader.cxx
@@ -24,7 +24,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLPUnstructuredGridReader, "1.10");
 vtkStandardNewMacro(vtkXMLPUnstructuredGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPUnstructuredGridReader.h b/IO/vtkXMLPUnstructuredGridReader.h
index 7572d2d010e8d24c3dfb622f72d63aedc5522ee4..5d3a3261f7c87e1eaea2719198a920b33a290601 100644
--- a/IO/vtkXMLPUnstructuredGridReader.h
+++ b/IO/vtkXMLPUnstructuredGridReader.h
@@ -33,7 +33,7 @@ class vtkUnstructuredGrid;
 class VTK_IO_EXPORT vtkXMLPUnstructuredGridReader : public vtkXMLPUnstructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPUnstructuredGridReader,vtkXMLPUnstructuredDataReader);
+  vtkTypeMacro(vtkXMLPUnstructuredGridReader,vtkXMLPUnstructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkXMLPUnstructuredGridReader *New();
   
diff --git a/IO/vtkXMLPUnstructuredGridWriter.cxx b/IO/vtkXMLPUnstructuredGridWriter.cxx
index 80be948a5d284b7d32bd9463d5b5be8c30af2168..dc22a47e98090e587ee3434dc37b9df3e5b94471 100644
--- a/IO/vtkXMLPUnstructuredGridWriter.cxx
+++ b/IO/vtkXMLPUnstructuredGridWriter.cxx
@@ -19,7 +19,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkXMLUnstructuredGridWriter.h"
 
-vtkCxxRevisionMacro(vtkXMLPUnstructuredGridWriter, "1.7");
 vtkStandardNewMacro(vtkXMLPUnstructuredGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPUnstructuredGridWriter.h b/IO/vtkXMLPUnstructuredGridWriter.h
index 314991747e7947e4ca72c4e229d87ba0032a490b..79ddfd3ac1180174fd53d7a474e67467b7ca4a8b 100644
--- a/IO/vtkXMLPUnstructuredGridWriter.h
+++ b/IO/vtkXMLPUnstructuredGridWriter.h
@@ -35,7 +35,7 @@ class VTK_IO_EXPORT vtkXMLPUnstructuredGridWriter : public vtkXMLPUnstructuredDa
 {
 public:
   static vtkXMLPUnstructuredGridWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPUnstructuredGridWriter,vtkXMLPUnstructuredDataWriter);
+  vtkTypeMacro(vtkXMLPUnstructuredGridWriter,vtkXMLPUnstructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/IO/vtkXMLParser.cxx b/IO/vtkXMLParser.cxx
index 279e37a2e243bd1beab35e5891fbe792cbd89f6d..1dbc93f85da1d72e21d9a1b3235e783cb32c3a38 100644
--- a/IO/vtkXMLParser.cxx
+++ b/IO/vtkXMLParser.cxx
@@ -33,7 +33,6 @@
 #include <ctype.h>
 #include <sys/stat.h>
 
-vtkCxxRevisionMacro(vtkXMLParser, "1.30");
 vtkStandardNewMacro(vtkXMLParser);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLParser.h b/IO/vtkXMLParser.h
index 13e11f2dfc997bb27f8753f138de2886269d443e..a7bf9f08181e3de10e5a299638e689bb6d7df927 100644
--- a/IO/vtkXMLParser.h
+++ b/IO/vtkXMLParser.h
@@ -36,7 +36,7 @@ extern "C"
 class VTK_IO_EXPORT vtkXMLParser : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLParser,vtkObject);
+  vtkTypeMacro(vtkXMLParser,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkXMLParser* New();
diff --git a/IO/vtkXMLPolyDataReader.cxx b/IO/vtkXMLPolyDataReader.cxx
index 08df92988f4218d221ff21d97322f0c8511ac713..20c8dc4b43382dcba9f485fba9796f89c96d0ed1 100644
--- a/IO/vtkXMLPolyDataReader.cxx
+++ b/IO/vtkXMLPolyDataReader.cxx
@@ -24,7 +24,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkXMLPolyDataReader, "1.12");
 vtkStandardNewMacro(vtkXMLPolyDataReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPolyDataReader.h b/IO/vtkXMLPolyDataReader.h
index ab7f1a5f669fc95a619abf88ae042e4880145762..215813bdccbbf3cf6722084ff18c283929f7782b 100644
--- a/IO/vtkXMLPolyDataReader.h
+++ b/IO/vtkXMLPolyDataReader.h
@@ -33,7 +33,7 @@ class vtkPolyData;
 class VTK_IO_EXPORT vtkXMLPolyDataReader : public vtkXMLUnstructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPolyDataReader,vtkXMLUnstructuredDataReader);
+  vtkTypeMacro(vtkXMLPolyDataReader,vtkXMLUnstructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkXMLPolyDataReader *New();
   
diff --git a/IO/vtkXMLPolyDataWriter.cxx b/IO/vtkXMLPolyDataWriter.cxx
index 9698c5adeb9ad796ed31913c2a008d3385b12fcc..c4a32e1c26830580347fcad6709287a3a49ea6c4 100644
--- a/IO/vtkXMLPolyDataWriter.cxx
+++ b/IO/vtkXMLPolyDataWriter.cxx
@@ -27,7 +27,6 @@
 #include "vtkOffsetsManagerArray.h"
 #undef  vtkOffsetsManager_DoNotInclude
 
-vtkCxxRevisionMacro(vtkXMLPolyDataWriter, "1.11");
 vtkStandardNewMacro(vtkXMLPolyDataWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLPolyDataWriter.h b/IO/vtkXMLPolyDataWriter.h
index bd0fb3e000787005a6457039c3a62d4b1aa7c1d5..29d3a939114651647495c28da57c9a43fc45000d 100644
--- a/IO/vtkXMLPolyDataWriter.h
+++ b/IO/vtkXMLPolyDataWriter.h
@@ -34,7 +34,7 @@ class vtkPolyData;
 class VTK_IO_EXPORT vtkXMLPolyDataWriter : public vtkXMLUnstructuredDataWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLPolyDataWriter,vtkXMLUnstructuredDataWriter);
+  vtkTypeMacro(vtkXMLPolyDataWriter,vtkXMLUnstructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLPolyDataWriter* New();
 
diff --git a/IO/vtkXMLReader.cxx b/IO/vtkXMLReader.cxx
index 8769e0a10208e2a6e5214cec70b199d1bb4df518..699c4da66af20a453c4c84103cfe7e5cff21f16a 100644
--- a/IO/vtkXMLReader.cxx
+++ b/IO/vtkXMLReader.cxx
@@ -36,7 +36,6 @@
 #include <assert.h>
 #include <locale> // C++ locale
 
-vtkCxxRevisionMacro(vtkXMLReader, "1.60");
 //-----------------------------------------------------------------------------
 static void ReadStringVersion(const char* version, int& major, int& minor)
 {
diff --git a/IO/vtkXMLReader.h b/IO/vtkXMLReader.h
index c910902eec5cd49dbe251bfa2a7536d706177ee3..bb0a5d56ce5c39bbe3f029f2b9ccdf6fb25ad645 100644
--- a/IO/vtkXMLReader.h
+++ b/IO/vtkXMLReader.h
@@ -36,7 +36,7 @@ class vtkInformation;
 class VTK_IO_EXPORT vtkXMLReader : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLReader,vtkAlgorithm);
+  vtkTypeMacro(vtkXMLReader,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLRectilinearGridReader.cxx b/IO/vtkXMLRectilinearGridReader.cxx
index 81ed05cfde9dc183f3bc4778406315ac04d302da..5f1bb92ca21cc711b1b6acc54db1f204d425fff6 100644
--- a/IO/vtkXMLRectilinearGridReader.cxx
+++ b/IO/vtkXMLRectilinearGridReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLRectilinearGridReader, "1.14");
 vtkStandardNewMacro(vtkXMLRectilinearGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLRectilinearGridReader.h b/IO/vtkXMLRectilinearGridReader.h
index d55fe8cb435ff2cbca88adcab71454e428a54cea..f17565d7f9aa7299d0ef859c134c92706bf70073 100644
--- a/IO/vtkXMLRectilinearGridReader.h
+++ b/IO/vtkXMLRectilinearGridReader.h
@@ -33,7 +33,7 @@ class vtkRectilinearGrid;
 class VTK_IO_EXPORT vtkXMLRectilinearGridReader : public vtkXMLStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLRectilinearGridReader,vtkXMLStructuredDataReader);
+  vtkTypeMacro(vtkXMLRectilinearGridReader,vtkXMLStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLRectilinearGridReader *New();
   
diff --git a/IO/vtkXMLRectilinearGridWriter.cxx b/IO/vtkXMLRectilinearGridWriter.cxx
index 82ebc6497e7ff9ee6eb308c104dfef089acb9282..2ce87d378add90e56358ec9c597d826bc9bdaee3 100644
--- a/IO/vtkXMLRectilinearGridWriter.cxx
+++ b/IO/vtkXMLRectilinearGridWriter.cxx
@@ -26,7 +26,6 @@
 #include "vtkOffsetsManagerArray.h"
 #undef  vtkOffsetsManager_DoNotInclude
 
-vtkCxxRevisionMacro(vtkXMLRectilinearGridWriter, "1.13");
 vtkStandardNewMacro(vtkXMLRectilinearGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLRectilinearGridWriter.h b/IO/vtkXMLRectilinearGridWriter.h
index 1caaf3cff0ca01aa0d4f59a1c7f52b6865cd6847..7bcc3c374c367d658cdbf4e08fc1011ba2fac1d6 100644
--- a/IO/vtkXMLRectilinearGridWriter.h
+++ b/IO/vtkXMLRectilinearGridWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLRectilinearGridWriter : public vtkXMLStructuredDataWri
 {
 public:
   static vtkXMLRectilinearGridWriter* New();
-  vtkTypeRevisionMacro(vtkXMLRectilinearGridWriter,vtkXMLStructuredDataWriter);
+  vtkTypeMacro(vtkXMLRectilinearGridWriter,vtkXMLStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/IO/vtkXMLShader.cxx b/IO/vtkXMLShader.cxx
index 4190416dd3643c5b6a1448ab34c4192402107073..9fcefbb2ee4dd4715d4c15c4a10657f17054c9fd 100644
--- a/IO/vtkXMLShader.cxx
+++ b/IO/vtkXMLShader.cxx
@@ -23,7 +23,6 @@
 #include <assert.h>
 
 vtkStandardNewMacro(vtkXMLShader);
-vtkCxxRevisionMacro(vtkXMLShader, "1.10");
 vtkCxxSetObjectMacro(vtkXMLShader, SourceLibraryElement, vtkXMLDataElement);
 //-----------------------------------------------------------------------------
 vtkXMLShader::vtkXMLShader()
diff --git a/IO/vtkXMLShader.h b/IO/vtkXMLShader.h
index 6acf35e3ce206c9c2c3cdf8790dfef623f48b723..6a4388ac13738dd9500ea04b7cb42fea9d993f40 100644
--- a/IO/vtkXMLShader.h
+++ b/IO/vtkXMLShader.h
@@ -32,7 +32,7 @@ class VTK_IO_EXPORT vtkXMLShader : public vtkObject
 {
 public:
   static vtkXMLShader* New();
-  vtkTypeRevisionMacro(vtkXMLShader, vtkObject);
+  vtkTypeMacro(vtkXMLShader, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/IO/vtkXMLStructuredDataReader.cxx b/IO/vtkXMLStructuredDataReader.cxx
index 9193019b09874b291edf1d4473d09c90ece8f211..47348e84038c3e67f0bb1e0cc7a064bf11113ae6 100644
--- a/IO/vtkXMLStructuredDataReader.cxx
+++ b/IO/vtkXMLStructuredDataReader.cxx
@@ -22,7 +22,6 @@
 #include "vtkXMLDataElement.h"
 #include "vtkXMLDataParser.h"
 
-vtkCxxRevisionMacro(vtkXMLStructuredDataReader, "1.29");
 
 //----------------------------------------------------------------------------
 vtkXMLStructuredDataReader::vtkXMLStructuredDataReader()
diff --git a/IO/vtkXMLStructuredDataReader.h b/IO/vtkXMLStructuredDataReader.h
index 11725f0d523c6a753c211e619600e60da21ef6f1..518c48ea0b3e5f0b0605a24ffccab83017a40bef 100644
--- a/IO/vtkXMLStructuredDataReader.h
+++ b/IO/vtkXMLStructuredDataReader.h
@@ -30,7 +30,7 @@
 class VTK_IO_EXPORT vtkXMLStructuredDataReader : public vtkXMLDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLStructuredDataReader,vtkXMLDataReader);
+  vtkTypeMacro(vtkXMLStructuredDataReader,vtkXMLDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   
   // Description:
diff --git a/IO/vtkXMLStructuredDataWriter.cxx b/IO/vtkXMLStructuredDataWriter.cxx
index d55a07698b8b71299fc584a409eff9cb00a2bdbe..92c068024cb5765055e650908d0f050ebc086507 100644
--- a/IO/vtkXMLStructuredDataWriter.cxx
+++ b/IO/vtkXMLStructuredDataWriter.cxx
@@ -30,7 +30,6 @@
 #include "vtkOffsetsManagerArray.h"
 #undef  vtkOffsetsManager_DoNotInclude
 
-vtkCxxRevisionMacro(vtkXMLStructuredDataWriter, "1.24");
 vtkCxxSetObjectMacro(vtkXMLStructuredDataWriter, ExtentTranslator,
                      vtkExtentTranslator);
 
diff --git a/IO/vtkXMLStructuredDataWriter.h b/IO/vtkXMLStructuredDataWriter.h
index a6e925e5c6805c41d827973ff94b260e1c51aa3e..a5a436f35756a6cb93177906b468182cfcb3aa4c 100644
--- a/IO/vtkXMLStructuredDataWriter.h
+++ b/IO/vtkXMLStructuredDataWriter.h
@@ -30,7 +30,7 @@ class vtkInformationVector;
 class VTK_IO_EXPORT vtkXMLStructuredDataWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLStructuredDataWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLStructuredDataWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLStructuredGridReader.cxx b/IO/vtkXMLStructuredGridReader.cxx
index 1d83dfcb6e872d84d55e07dce8879c9abfb70ba9..da5b7a7843b9f304767a69dcdf480ad5c59b4829 100644
--- a/IO/vtkXMLStructuredGridReader.cxx
+++ b/IO/vtkXMLStructuredGridReader.cxx
@@ -21,7 +21,6 @@
 #include "vtkInformation.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkXMLStructuredGridReader, "1.13");
 vtkStandardNewMacro(vtkXMLStructuredGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLStructuredGridReader.h b/IO/vtkXMLStructuredGridReader.h
index 4b42a092c0e7a17b8b0b4fb6c6b0e2af2bfe38a1..56ec91b52ac2f2b779ea49933c3513c0d65cb230 100644
--- a/IO/vtkXMLStructuredGridReader.h
+++ b/IO/vtkXMLStructuredGridReader.h
@@ -33,7 +33,7 @@ class vtkStructuredGrid;
 class VTK_IO_EXPORT vtkXMLStructuredGridReader : public vtkXMLStructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLStructuredGridReader,vtkXMLStructuredDataReader);
+  vtkTypeMacro(vtkXMLStructuredGridReader,vtkXMLStructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLStructuredGridReader *New();
   
diff --git a/IO/vtkXMLStructuredGridWriter.cxx b/IO/vtkXMLStructuredGridWriter.cxx
index bbbd0e82e109a0a22c0b83555792d87d4b4219b2..ed69355cdeeb7f68704b80794d93e07165cade80 100644
--- a/IO/vtkXMLStructuredGridWriter.cxx
+++ b/IO/vtkXMLStructuredGridWriter.cxx
@@ -25,7 +25,6 @@
 #include "vtkOffsetsManagerArray.h"
 #undef  vtkOffsetsManager_DoNotInclude
 
-vtkCxxRevisionMacro(vtkXMLStructuredGridWriter, "1.11");
 vtkStandardNewMacro(vtkXMLStructuredGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLStructuredGridWriter.h b/IO/vtkXMLStructuredGridWriter.h
index 50891e0f4b105cc7dedd293a02739e4d2856ead8..d3738f17e8365195da4596f06662d9da9c4f3ef2 100644
--- a/IO/vtkXMLStructuredGridWriter.h
+++ b/IO/vtkXMLStructuredGridWriter.h
@@ -34,7 +34,7 @@ class VTK_IO_EXPORT vtkXMLStructuredGridWriter : public vtkXMLStructuredDataWrit
 {
 public:
   static vtkXMLStructuredGridWriter* New();
-  vtkTypeRevisionMacro(vtkXMLStructuredGridWriter,vtkXMLStructuredDataWriter);
+  vtkTypeMacro(vtkXMLStructuredGridWriter,vtkXMLStructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/IO/vtkXMLUnstructuredDataReader.cxx b/IO/vtkXMLUnstructuredDataReader.cxx
index 3ca6864d07e92bf6bb5c5b8dda9b1a3be598daf7..137e05a3be79a0d8f678eace905cf873aa53e420 100644
--- a/IO/vtkXMLUnstructuredDataReader.cxx
+++ b/IO/vtkXMLUnstructuredDataReader.cxx
@@ -25,7 +25,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkXMLUnstructuredDataReader, "1.31");
 
 //----------------------------------------------------------------------------
 vtkXMLUnstructuredDataReader::vtkXMLUnstructuredDataReader()
diff --git a/IO/vtkXMLUnstructuredDataReader.h b/IO/vtkXMLUnstructuredDataReader.h
index 5e588f5dee4cadd3e254934ef49c239671b689c2..ca1631e3492e57d7981c0c18ac143b9b1a734c75 100644
--- a/IO/vtkXMLUnstructuredDataReader.h
+++ b/IO/vtkXMLUnstructuredDataReader.h
@@ -33,7 +33,7 @@ class vtkUnsignedCharArray;
 class VTK_IO_EXPORT vtkXMLUnstructuredDataReader : public vtkXMLDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLUnstructuredDataReader,vtkXMLDataReader);
+  vtkTypeMacro(vtkXMLUnstructuredDataReader,vtkXMLDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   
   // Description:
diff --git a/IO/vtkXMLUnstructuredDataWriter.cxx b/IO/vtkXMLUnstructuredDataWriter.cxx
index 557b5c5f5cd870145884822efbd3d210b077c678..f924c04370e9a4ffd2074c50dcb088a0d89977da 100644
--- a/IO/vtkXMLUnstructuredDataWriter.cxx
+++ b/IO/vtkXMLUnstructuredDataWriter.cxx
@@ -35,7 +35,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkXMLUnstructuredDataWriter, "1.24");
 
 //----------------------------------------------------------------------------
 vtkXMLUnstructuredDataWriter::vtkXMLUnstructuredDataWriter()
diff --git a/IO/vtkXMLUnstructuredDataWriter.h b/IO/vtkXMLUnstructuredDataWriter.h
index 9f4070c1a3130e66fda9f25cc09b735a6e61c85e..26b124a22bf2ca0d4930b37b74f79862959b482c 100644
--- a/IO/vtkXMLUnstructuredDataWriter.h
+++ b/IO/vtkXMLUnstructuredDataWriter.h
@@ -30,7 +30,7 @@ class vtkIdTypeArray;
 class VTK_IO_EXPORT vtkXMLUnstructuredDataWriter : public vtkXMLWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLUnstructuredDataWriter,vtkXMLWriter);
+  vtkTypeMacro(vtkXMLUnstructuredDataWriter,vtkXMLWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/IO/vtkXMLUnstructuredGridReader.cxx b/IO/vtkXMLUnstructuredGridReader.cxx
index c76e09e6210e6bc2ec82cb156151a311dfc7907e..de4f28660a7f74a2169c0220cb09a416bb7b8719 100644
--- a/IO/vtkXMLUnstructuredGridReader.cxx
+++ b/IO/vtkXMLUnstructuredGridReader.cxx
@@ -25,7 +25,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkXMLUnstructuredGridReader, "1.16");
 vtkStandardNewMacro(vtkXMLUnstructuredGridReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLUnstructuredGridReader.h b/IO/vtkXMLUnstructuredGridReader.h
index f5bae8192607249dc6db9321d9795c773317b8ca..3ff2df7bdae252ed215a18c7e34c3b0665cad136 100644
--- a/IO/vtkXMLUnstructuredGridReader.h
+++ b/IO/vtkXMLUnstructuredGridReader.h
@@ -33,7 +33,7 @@ class vtkUnstructuredGrid;
 class VTK_IO_EXPORT vtkXMLUnstructuredGridReader : public vtkXMLUnstructuredDataReader
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLUnstructuredGridReader,vtkXMLUnstructuredDataReader);
+  vtkTypeMacro(vtkXMLUnstructuredGridReader,vtkXMLUnstructuredDataReader);
   void PrintSelf(ostream& os, vtkIndent indent);  
   static vtkXMLUnstructuredGridReader *New();
   
diff --git a/IO/vtkXMLUnstructuredGridWriter.cxx b/IO/vtkXMLUnstructuredGridWriter.cxx
index b96170912c01352f092fa74f9aeef007256de581..f2f51e2beb759cb27baa3dd8a4619a2521ceea53 100644
--- a/IO/vtkXMLUnstructuredGridWriter.cxx
+++ b/IO/vtkXMLUnstructuredGridWriter.cxx
@@ -28,7 +28,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkXMLUnstructuredGridWriter, "1.14");
 vtkStandardNewMacro(vtkXMLUnstructuredGridWriter);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXMLUnstructuredGridWriter.h b/IO/vtkXMLUnstructuredGridWriter.h
index 9467fd208792e61682de1c7c46c54ca3b00713c4..a5e44f991b3a47734ba0fb31f644522a99d43c15 100644
--- a/IO/vtkXMLUnstructuredGridWriter.h
+++ b/IO/vtkXMLUnstructuredGridWriter.h
@@ -35,7 +35,7 @@ class vtkUnstructuredGrid;
 class VTK_IO_EXPORT vtkXMLUnstructuredGridWriter : public vtkXMLUnstructuredDataWriter
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLUnstructuredGridWriter,vtkXMLUnstructuredDataWriter);
+  vtkTypeMacro(vtkXMLUnstructuredGridWriter,vtkXMLUnstructuredDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkXMLUnstructuredGridWriter* New();
 
diff --git a/IO/vtkXMLUtilities.cxx b/IO/vtkXMLUtilities.cxx
index b018c7ed8e31ae1af09810d0fffb4e5f34141203..db279551d104549c35c442f5ca10b3682223d501 100644
--- a/IO/vtkXMLUtilities.cxx
+++ b/IO/vtkXMLUtilities.cxx
@@ -31,7 +31,6 @@
 typedef vtkstd::vector<vtkXMLDataElement*> vtkXMLUtilitiesDataElementContainer;
 
 vtkStandardNewMacro(vtkXMLUtilities);
-vtkCxxRevisionMacro(vtkXMLUtilities, "1.10");
 
 #define  VTK_XML_UTILITIES_FACTORED_POOL_NAME "FactoredPool"
 #define  VTK_XML_UTILITIES_FACTORED_NAME      "Factored"
diff --git a/IO/vtkXMLUtilities.h b/IO/vtkXMLUtilities.h
index 3a06fbbbb4cad545042d27b4c781f7f98f7bbfe1..2fd07ad46198faf8dd788e3910b7a30fddf13b02 100644
--- a/IO/vtkXMLUtilities.h
+++ b/IO/vtkXMLUtilities.h
@@ -29,7 +29,7 @@ class VTK_IO_EXPORT vtkXMLUtilities : public vtkObject
 {
 public:
   static vtkXMLUtilities* New();
-  vtkTypeRevisionMacro(vtkXMLUtilities, vtkObject);
+  vtkTypeMacro(vtkXMLUtilities, vtkObject);
 
   // Description:
   // Encode a string from one format to another 
diff --git a/IO/vtkXMLWriter.cxx b/IO/vtkXMLWriter.cxx
index 543d25a4268a8f6bf2318798ce8b3309ed675909..ae47c6c95fcad1b5d48dd4786d74bd8a1b05ad53 100644
--- a/IO/vtkXMLWriter.cxx
+++ b/IO/vtkXMLWriter.cxx
@@ -214,7 +214,6 @@ int vtkXMLWriterWriteBinaryDataBlocks(vtkXMLWriter* writer,
 }
 //*****************************************************************************
 
-vtkCxxRevisionMacro(vtkXMLWriter, "1.81");
 vtkCxxSetObjectMacro(vtkXMLWriter, Compressor, vtkDataCompressor);
 //----------------------------------------------------------------------------
 vtkXMLWriter::vtkXMLWriter()
diff --git a/IO/vtkXMLWriter.h b/IO/vtkXMLWriter.h
index 7927367df3980b97e9e6a340b15dc33a15ef0106..ab5ffa78052d346cd8a41b5002e35d58545c8fc0 100644
--- a/IO/vtkXMLWriter.h
+++ b/IO/vtkXMLWriter.h
@@ -48,7 +48,7 @@ class OffsetsManagerArray; // array of OffsetsManagerGroup
 class VTK_IO_EXPORT vtkXMLWriter : public vtkAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkXMLWriter,vtkAlgorithm);
+  vtkTypeMacro(vtkXMLWriter,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
  
   //BTX
diff --git a/IO/vtkXYZMolReader.cxx b/IO/vtkXYZMolReader.cxx
index 2737237a6497517d1f869539b634a9372e12dae9..19d2577fb621236f68d172d8ba8b2cb5cd280460 100644
--- a/IO/vtkXYZMolReader.cxx
+++ b/IO/vtkXYZMolReader.cxx
@@ -23,7 +23,6 @@
 #include <sys/stat.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkXYZMolReader, "1.8");
 vtkStandardNewMacro(vtkXYZMolReader);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkXYZMolReader.h b/IO/vtkXYZMolReader.h
index fd718d720d8163605f453b243bfde49601afea1d..2242f78f8886759258497276499f4dff74e4d47d 100644
--- a/IO/vtkXYZMolReader.h
+++ b/IO/vtkXYZMolReader.h
@@ -29,7 +29,7 @@
 class VTK_IO_EXPORT vtkXYZMolReader : public vtkMoleculeReaderBase
 {
 public:
-  vtkTypeRevisionMacro(vtkXYZMolReader,vtkMoleculeReaderBase);
+  vtkTypeMacro(vtkXYZMolReader,vtkMoleculeReaderBase);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkXYZMolReader *New();
diff --git a/IO/vtkZLibDataCompressor.cxx b/IO/vtkZLibDataCompressor.cxx
index 0b8bf110ac2e883eb1854567e943b0eee4d6cbb6..1837080e16be0504fc5bbbb9e148470c32395cc0 100644
--- a/IO/vtkZLibDataCompressor.cxx
+++ b/IO/vtkZLibDataCompressor.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtk_zlib.h"
 
-vtkCxxRevisionMacro(vtkZLibDataCompressor, "1.6");
 vtkStandardNewMacro(vtkZLibDataCompressor);
 
 //----------------------------------------------------------------------------
diff --git a/IO/vtkZLibDataCompressor.h b/IO/vtkZLibDataCompressor.h
index edff8d6cb4db94dda15ad4c6aa3396c7835a2d86..a07ce6dc11a549b83d6b6adbc3fa2dac0a7f1f3e 100644
--- a/IO/vtkZLibDataCompressor.h
+++ b/IO/vtkZLibDataCompressor.h
@@ -25,7 +25,7 @@
 class VTK_IO_EXPORT vtkZLibDataCompressor : public vtkDataCompressor
 {
 public:
-  vtkTypeRevisionMacro(vtkZLibDataCompressor,vtkDataCompressor);
+  vtkTypeMacro(vtkZLibDataCompressor,vtkDataCompressor);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkZLibDataCompressor* New();  
   
diff --git a/Imaging/vtkBooleanTexture.cxx b/Imaging/vtkBooleanTexture.cxx
index 6a54f0074010c2c6e6faa4e918c750dbe60cb8df..9589c37dae05c3f84e51c1775e5b9116d1175ab8 100644
--- a/Imaging/vtkBooleanTexture.cxx
+++ b/Imaging/vtkBooleanTexture.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkBooleanTexture, "1.45");
 vtkStandardNewMacro(vtkBooleanTexture);
 
 vtkBooleanTexture::vtkBooleanTexture()
diff --git a/Imaging/vtkBooleanTexture.h b/Imaging/vtkBooleanTexture.h
index c018bf54016eb44df2dcbbdc5c43d9c5e763b297..3ba866e9e819456485b7cd074284a9467ad5c7a1 100644
--- a/Imaging/vtkBooleanTexture.h
+++ b/Imaging/vtkBooleanTexture.h
@@ -48,7 +48,7 @@ class VTK_IMAGING_EXPORT vtkBooleanTexture : public vtkImageAlgorithm
 public:
   static vtkBooleanTexture *New();
 
-  vtkTypeRevisionMacro(vtkBooleanTexture,vtkImageAlgorithm);
+  vtkTypeMacro(vtkBooleanTexture,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkExtractVOI.cxx b/Imaging/vtkExtractVOI.cxx
index c2f1917734e9d297cf315d6f539b4e10173f5260..ae43a60bbe5a5984bd9c7194b6b0f2ec4c9a610e 100644
--- a/Imaging/vtkExtractVOI.cxx
+++ b/Imaging/vtkExtractVOI.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkExtractVOI, "1.48");
 vtkStandardNewMacro(vtkExtractVOI);
 
 // Construct object to extract all of the input data.
diff --git a/Imaging/vtkExtractVOI.h b/Imaging/vtkExtractVOI.h
index 725a51a1d61145175946f93ab2976e740b7148c1..f1d81f5359e581361240f96ff9914fe97f46507c 100644
--- a/Imaging/vtkExtractVOI.h
+++ b/Imaging/vtkExtractVOI.h
@@ -41,7 +41,7 @@
 class VTK_IMAGING_EXPORT vtkExtractVOI : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractVOI,vtkImageAlgorithm);
+  vtkTypeMacro(vtkExtractVOI,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkFastSplatter.cxx b/Imaging/vtkFastSplatter.cxx
index a8534d050009f5774fb7276d0b81917b9c7ab6ef..83497ded3a1cdfbebf08a7da30f304857945fd44 100644
--- a/Imaging/vtkFastSplatter.cxx
+++ b/Imaging/vtkFastSplatter.cxx
@@ -41,7 +41,6 @@
 #define MAX(x, y)       ((x) > (y) ? (x) : (y))
 #endif
 
-vtkCxxRevisionMacro(vtkFastSplatter, "1.5");
 vtkStandardNewMacro(vtkFastSplatter);
 
 //-----------------------------------------------------------------------------
diff --git a/Imaging/vtkFastSplatter.h b/Imaging/vtkFastSplatter.h
index 0b3027df138e87c8effcd4ad62739f5d8fffe5ff..8bb9aa11e32739d68a102a7c5ce9a3d2a5f7b70b 100644
--- a/Imaging/vtkFastSplatter.h
+++ b/Imaging/vtkFastSplatter.h
@@ -47,7 +47,7 @@
 class VTK_IMAGING_EXPORT vtkFastSplatter : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkFastSplatter, vtkImageAlgorithm);
+  vtkTypeMacro(vtkFastSplatter, vtkImageAlgorithm);
   static vtkFastSplatter *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Imaging/vtkGaussianSplatter.cxx b/Imaging/vtkGaussianSplatter.cxx
index 0273f162fbfac591307ee6a2685fa301d57be2d1..4370677249f2aee300db039422700639dcdc9493 100644
--- a/Imaging/vtkGaussianSplatter.cxx
+++ b/Imaging/vtkGaussianSplatter.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkGaussianSplatter, "1.64");
 vtkStandardNewMacro(vtkGaussianSplatter);
 
 // Construct object with dimensions=(50,50,50); automatic computation of 
diff --git a/Imaging/vtkGaussianSplatter.h b/Imaging/vtkGaussianSplatter.h
index 3ab35f36966af39003eaa9493a205d675d83a46a..d17a30b8f281cbe4ad6126565c75092fccad4f32 100644
--- a/Imaging/vtkGaussianSplatter.h
+++ b/Imaging/vtkGaussianSplatter.h
@@ -75,7 +75,7 @@ class vtkDoubleArray;
 class VTK_IMAGING_EXPORT vtkGaussianSplatter : public vtkImageAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkGaussianSplatter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkGaussianSplatter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageAccumulate.cxx b/Imaging/vtkImageAccumulate.cxx
index 8846053450e1ea8e9fce5b3eca43e133fdf9c1a4..5b95805f8ee1287efb0061983c7fb845260c4487 100644
--- a/Imaging/vtkImageAccumulate.cxx
+++ b/Imaging/vtkImageAccumulate.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageAccumulate, "1.74");
 vtkStandardNewMacro(vtkImageAccumulate);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageAccumulate.h b/Imaging/vtkImageAccumulate.h
index 3e77d3215d8e1248117e72f268dc7b7ced8dc18f..1f0fc495320f1d4ab2199ff9849b9506c0208b72 100644
--- a/Imaging/vtkImageAccumulate.h
+++ b/Imaging/vtkImageAccumulate.h
@@ -44,7 +44,7 @@ class VTK_IMAGING_EXPORT vtkImageAccumulate : public vtkImageAlgorithm
 {
 public:
   static vtkImageAccumulate *New();
-  vtkTypeRevisionMacro(vtkImageAccumulate,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageAccumulate,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageAnisotropicDiffusion2D.cxx b/Imaging/vtkImageAnisotropicDiffusion2D.cxx
index be2b20ea6684ad07ac342c2b7c998efc01470e61..0783adc4024cc2d537456e4629e67e57cbe75cfb 100644
--- a/Imaging/vtkImageAnisotropicDiffusion2D.cxx
+++ b/Imaging/vtkImageAnisotropicDiffusion2D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageAnisotropicDiffusion2D, "1.49");
 vtkStandardNewMacro(vtkImageAnisotropicDiffusion2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageAnisotropicDiffusion2D.h b/Imaging/vtkImageAnisotropicDiffusion2D.h
index c16ba8a9a7c4916742c7c1995466e1d63055a45c..f3daf5dac94cb4d8303c90473a4f42513907d156 100644
--- a/Imaging/vtkImageAnisotropicDiffusion2D.h
+++ b/Imaging/vtkImageAnisotropicDiffusion2D.h
@@ -43,7 +43,7 @@ class VTK_IMAGING_EXPORT vtkImageAnisotropicDiffusion2D : public vtkImageSpatial
 {
 public:
   static vtkImageAnisotropicDiffusion2D *New();
-  vtkTypeRevisionMacro(vtkImageAnisotropicDiffusion2D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageAnisotropicDiffusion2D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageAnisotropicDiffusion3D.cxx b/Imaging/vtkImageAnisotropicDiffusion3D.cxx
index 9ca3d4b0e84bf1b35a519e21068bffff64de7278..8b81dcaa3e2d041d5cb74e5748d6664e729df0ce 100644
--- a/Imaging/vtkImageAnisotropicDiffusion3D.cxx
+++ b/Imaging/vtkImageAnisotropicDiffusion3D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageAnisotropicDiffusion3D, "1.44");
 vtkStandardNewMacro(vtkImageAnisotropicDiffusion3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageAnisotropicDiffusion3D.h b/Imaging/vtkImageAnisotropicDiffusion3D.h
index d0b0c904774ccd913b65f01b9c87a76c65bde6c8..3f5ce3a1d2afa0f0c7db27b7079d864e2ceedecb 100644
--- a/Imaging/vtkImageAnisotropicDiffusion3D.h
+++ b/Imaging/vtkImageAnisotropicDiffusion3D.h
@@ -45,7 +45,7 @@ class VTK_IMAGING_EXPORT vtkImageAnisotropicDiffusion3D : public vtkImageSpatial
 {
 public:
   static vtkImageAnisotropicDiffusion3D *New();
-  vtkTypeRevisionMacro(vtkImageAnisotropicDiffusion3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageAnisotropicDiffusion3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   
diff --git a/Imaging/vtkImageAppend.cxx b/Imaging/vtkImageAppend.cxx
index 97cde343af4ad4f49f8dabf62faa7db01010f468..1b2f9e145a9dcd95a2edaeda472126537902527e 100644
--- a/Imaging/vtkImageAppend.cxx
+++ b/Imaging/vtkImageAppend.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageAppend, "1.35");
 vtkStandardNewMacro(vtkImageAppend);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageAppend.h b/Imaging/vtkImageAppend.h
index 262cd3f05297211c8b3d2ba80402829be4f6808f..04d9e3e3263b2ea36465447da04efb59d29d0400 100644
--- a/Imaging/vtkImageAppend.h
+++ b/Imaging/vtkImageAppend.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageAppend : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageAppend *New();
-  vtkTypeRevisionMacro(vtkImageAppend,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageAppend,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageAppendComponents.cxx b/Imaging/vtkImageAppendComponents.cxx
index e24018dc5149f2fa26648903f363ed67b7c5c03c..700efff556dc440175703ab543ccd3d5cf20a7fe 100644
--- a/Imaging/vtkImageAppendComponents.cxx
+++ b/Imaging/vtkImageAppendComponents.cxx
@@ -23,7 +23,6 @@
 #include "vtkDataSetAttributes.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageAppendComponents, "1.33");
 vtkStandardNewMacro(vtkImageAppendComponents);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageAppendComponents.h b/Imaging/vtkImageAppendComponents.h
index 2a25dbe5f6f3c00ea6702ad8b01ad42b5dfc384a..8c7e7ce7c75bc55758f89294771fc9c86f7a2b6f 100644
--- a/Imaging/vtkImageAppendComponents.h
+++ b/Imaging/vtkImageAppendComponents.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageAppendComponents : public vtkThreadedImageAlgor
 {
 public:
   static vtkImageAppendComponents *New();
-  vtkTypeRevisionMacro(vtkImageAppendComponents,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageAppendComponents,vtkThreadedImageAlgorithm);
 
   // Description:
   // Replace one of the input connections with a new input.  You can
diff --git a/Imaging/vtkImageBlend.cxx b/Imaging/vtkImageBlend.cxx
index f38b5fd8dae5607a77de9e39da850d456e0221ba..ffed657a6aea52fe7bab04b5aeb32050c19e73bc 100644
--- a/Imaging/vtkImageBlend.cxx
+++ b/Imaging/vtkImageBlend.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageBlend, "1.49");
 vtkStandardNewMacro(vtkImageBlend);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageBlend.h b/Imaging/vtkImageBlend.h
index 7f9fbb6f4563e89af1c44d9c49706a3ddb4e3d96..f009a5779e3c87c901d27e2bd27d4daa0aaf5808 100644
--- a/Imaging/vtkImageBlend.h
+++ b/Imaging/vtkImageBlend.h
@@ -83,7 +83,7 @@ class VTK_IMAGING_EXPORT vtkImageBlend : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageBlend *New();
-  vtkTypeRevisionMacro(vtkImageBlend,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageBlend,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageButterworthHighPass.cxx b/Imaging/vtkImageButterworthHighPass.cxx
index b1dd31d542ff9396fabdb7d4d3b81b2fdf429ff0..5d19c4f62544ba86e1dd444568d768b1586daf4a 100644
--- a/Imaging/vtkImageButterworthHighPass.cxx
+++ b/Imaging/vtkImageButterworthHighPass.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageButterworthHighPass, "1.28");
 vtkStandardNewMacro(vtkImageButterworthHighPass);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageButterworthHighPass.h b/Imaging/vtkImageButterworthHighPass.h
index f9553f3627d129c2eae6fcea1aba079f8d889d55..b87b08cce0227da6e2d9c7be72e91b23d020a7f6 100644
--- a/Imaging/vtkImageButterworthHighPass.h
+++ b/Imaging/vtkImageButterworthHighPass.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageButterworthHighPass : public vtkThreadedImageAl
 {
 public:
   static vtkImageButterworthHighPass *New();
-  vtkTypeRevisionMacro(vtkImageButterworthHighPass,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageButterworthHighPass,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageButterworthLowPass.cxx b/Imaging/vtkImageButterworthLowPass.cxx
index f14186106ebfe3d7f0674819459fbf553e0480c7..aaa2f74c5cafea3993a0cdf895e458a0dbd1eeed 100644
--- a/Imaging/vtkImageButterworthLowPass.cxx
+++ b/Imaging/vtkImageButterworthLowPass.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageButterworthLowPass, "1.29");
 vtkStandardNewMacro(vtkImageButterworthLowPass);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageButterworthLowPass.h b/Imaging/vtkImageButterworthLowPass.h
index 10f426e84b2e557213d2a95a65b0c8414b0f5b1e..51b6dd10f1f4e18a8d6f566ca9157d8fd689353f 100644
--- a/Imaging/vtkImageButterworthLowPass.h
+++ b/Imaging/vtkImageButterworthLowPass.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageButterworthLowPass : public vtkThreadedImageAlg
 {
 public:
   static vtkImageButterworthLowPass *New();
-  vtkTypeRevisionMacro(vtkImageButterworthLowPass,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageButterworthLowPass,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCacheFilter.cxx b/Imaging/vtkImageCacheFilter.cxx
index 0bd2e36f875ea6e25277969cb4396395d7799950..f46ef31bd27e064add23f05eb4bcfc15da769935 100644
--- a/Imaging/vtkImageCacheFilter.cxx
+++ b/Imaging/vtkImageCacheFilter.cxx
@@ -19,7 +19,6 @@
 #include "vtkPointData.h"
 #include "vtkCachedStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageCacheFilter, "1.26");
 vtkStandardNewMacro(vtkImageCacheFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCacheFilter.h b/Imaging/vtkImageCacheFilter.h
index ec8abbd16d1dd905d4914f3c2434da854fe75636..1ed53f94560907098ccf5ddb6cd605df2f645606 100644
--- a/Imaging/vtkImageCacheFilter.h
+++ b/Imaging/vtkImageCacheFilter.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageCacheFilter : public vtkImageAlgorithm
 {
 public:
   static vtkImageCacheFilter *New();
-  vtkTypeRevisionMacro(vtkImageCacheFilter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageCacheFilter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCanvasSource2D.cxx b/Imaging/vtkImageCanvasSource2D.cxx
index 848b7e382dba3c87302d389c9d2ac4ace0987ad4..73c2ace49e95135f3e8f112520c68bda915ec824 100644
--- a/Imaging/vtkImageCanvasSource2D.cxx
+++ b/Imaging/vtkImageCanvasSource2D.cxx
@@ -41,7 +41,6 @@ public:
 
 
 
-vtkCxxRevisionMacro(vtkImageCanvasSource2D, "1.48");
 vtkStandardNewMacro(vtkImageCanvasSource2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCanvasSource2D.h b/Imaging/vtkImageCanvasSource2D.h
index 853d258d64fb5769fa348b95134240492885afc1..f77539783fdf518d1feb5f1c6c3b7fad10914b2e 100644
--- a/Imaging/vtkImageCanvasSource2D.h
+++ b/Imaging/vtkImageCanvasSource2D.h
@@ -31,7 +31,7 @@ public:
   // Construct an instance of vtkImageCanvasSource2D with no data.
   static vtkImageCanvasSource2D *New();
 
-  vtkTypeRevisionMacro(vtkImageCanvasSource2D,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageCanvasSource2D,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCast.cxx b/Imaging/vtkImageCast.cxx
index 67970d41e345a3a98b0f3a31c485eb4897de9b25..78c20aa2669a30a7feee28a683974adc2dca2182 100644
--- a/Imaging/vtkImageCast.cxx
+++ b/Imaging/vtkImageCast.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageCast, "1.52");
 vtkStandardNewMacro(vtkImageCast);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCast.h b/Imaging/vtkImageCast.h
index 130f03b8e3777def37ed47ccd7c562a7d8534da4..fd380e7b529a8ff8be3307f19615aaa54bcb140b 100644
--- a/Imaging/vtkImageCast.h
+++ b/Imaging/vtkImageCast.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageCast : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageCast *New();
-  vtkTypeRevisionMacro(vtkImageCast,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageCast,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageChangeInformation.cxx b/Imaging/vtkImageChangeInformation.cxx
index d17a7738711244bd32a0f4b4b0ea5c6138301990..1abdd239adcb2402ad5bc574a5387fc1fe20d35b 100644
--- a/Imaging/vtkImageChangeInformation.cxx
+++ b/Imaging/vtkImageChangeInformation.cxx
@@ -21,7 +21,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageChangeInformation, "1.23");
 vtkStandardNewMacro(vtkImageChangeInformation);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageChangeInformation.h b/Imaging/vtkImageChangeInformation.h
index aa7a4ca5d2edb6289eec745b88196ff983d68621..d1d4e67c5c4653a239d84c2d7b27a9e9c59c204a 100644
--- a/Imaging/vtkImageChangeInformation.h
+++ b/Imaging/vtkImageChangeInformation.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageChangeInformation : public vtkImageAlgorithm
 {
 public:
   static vtkImageChangeInformation *New();
-  vtkTypeRevisionMacro(vtkImageChangeInformation, vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageChangeInformation, vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCheckerboard.cxx b/Imaging/vtkImageCheckerboard.cxx
index 01f085ba064bf138e735af64c6f0978267961cb7..4fdce16db09b49635d76081db35307a78b0b97e4 100644
--- a/Imaging/vtkImageCheckerboard.cxx
+++ b/Imaging/vtkImageCheckerboard.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageCheckerboard, "1.15");
 vtkStandardNewMacro(vtkImageCheckerboard);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCheckerboard.h b/Imaging/vtkImageCheckerboard.h
index 6174c157d24fb1a391ac61cae3b62f0e87cdfdbb..e0826c280e96db51b3c263e0f99e2d2fc667af54 100644
--- a/Imaging/vtkImageCheckerboard.h
+++ b/Imaging/vtkImageCheckerboard.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageCheckerboard : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageCheckerboard *New();
-  vtkTypeRevisionMacro(vtkImageCheckerboard,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageCheckerboard,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCityBlockDistance.cxx b/Imaging/vtkImageCityBlockDistance.cxx
index 5e1e4b8166c45fb26c82d8a326664a4e129293a7..50094bf3e1373ab9d2490a5333d7870027122a66 100644
--- a/Imaging/vtkImageCityBlockDistance.cxx
+++ b/Imaging/vtkImageCityBlockDistance.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageCityBlockDistance, "1.30");
 vtkStandardNewMacro(vtkImageCityBlockDistance);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCityBlockDistance.h b/Imaging/vtkImageCityBlockDistance.h
index 9fa09be099c29bf2a92ff459441113dd6e666c24..9060cffdb54b1e8f02e4403a3f69c8098cd41385 100644
--- a/Imaging/vtkImageCityBlockDistance.h
+++ b/Imaging/vtkImageCityBlockDistance.h
@@ -36,7 +36,7 @@ class VTK_IMAGING_EXPORT vtkImageCityBlockDistance : public vtkImageDecomposeFil
 {
 public:
   static vtkImageCityBlockDistance *New();
-  vtkTypeRevisionMacro(vtkImageCityBlockDistance,vtkImageDecomposeFilter);
+  vtkTypeMacro(vtkImageCityBlockDistance,vtkImageDecomposeFilter);
   
 protected:
   vtkImageCityBlockDistance();
diff --git a/Imaging/vtkImageClip.cxx b/Imaging/vtkImageClip.cxx
index fb293b5eba42672cb1d6fbdade317771b5f2e116..9d6bc7091f46633bff2fbf73930b4b30440be6d9 100644
--- a/Imaging/vtkImageClip.cxx
+++ b/Imaging/vtkImageClip.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageClip, "1.56");
 vtkStandardNewMacro(vtkImageClip);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageClip.h b/Imaging/vtkImageClip.h
index 077da697381c90274ad5810bbfc03365e3ac90c5..bdd815d33fa702bfbfa823738c999be9119e8342 100644
--- a/Imaging/vtkImageClip.h
+++ b/Imaging/vtkImageClip.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageClip : public vtkImageAlgorithm
 {
 public:
   static vtkImageClip *New();
-  vtkTypeRevisionMacro(vtkImageClip,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageClip,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageConnector.cxx b/Imaging/vtkImageConnector.cxx
index a8fd130c94a22e1555f1373489328a80f59e86f5..893383e0950fa34322c2da8bcbfe9b99c2cbfa01 100644
--- a/Imaging/vtkImageConnector.cxx
+++ b/Imaging/vtkImageConnector.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageConnector, "1.21");
 vtkStandardNewMacro(vtkImageConnector);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageConnector.h b/Imaging/vtkImageConnector.h
index b30d83cd458935bce14f16f65452dc935e19ff9d..283da256c10c3c29179ca37078a9a7a191ef4ea4 100644
--- a/Imaging/vtkImageConnector.h
+++ b/Imaging/vtkImageConnector.h
@@ -53,7 +53,7 @@ class VTK_IMAGING_EXPORT vtkImageConnector : public vtkObject
 public:
   static vtkImageConnector *New();
 
-  vtkTypeRevisionMacro(vtkImageConnector,vtkObject);
+  vtkTypeMacro(vtkImageConnector,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Imaging/vtkImageConstantPad.cxx b/Imaging/vtkImageConstantPad.cxx
index 5a217644865231ddbf8cff7a580d3ad58bfbc273..bda9868e6534769a95ce943fd05a65b1f07acef8 100644
--- a/Imaging/vtkImageConstantPad.cxx
+++ b/Imaging/vtkImageConstantPad.cxx
@@ -20,7 +20,6 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageConstantPad, "1.39");
 vtkStandardNewMacro(vtkImageConstantPad);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageConstantPad.h b/Imaging/vtkImageConstantPad.h
index 4dec081a6e63d49904e84bcdea481a2d251f8ba9..f0751c6efc55ef8d73592b12392fd6eea8f5e8e4 100644
--- a/Imaging/vtkImageConstantPad.h
+++ b/Imaging/vtkImageConstantPad.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageConstantPad : public vtkImagePadFilter
 {
 public:
   static vtkImageConstantPad *New();
-  vtkTypeRevisionMacro(vtkImageConstantPad,vtkImagePadFilter);
+  vtkTypeMacro(vtkImageConstantPad,vtkImagePadFilter);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageContinuousDilate3D.cxx b/Imaging/vtkImageContinuousDilate3D.cxx
index a2e2b2f9d4e4445ae773d325ce8f29ee76208a31..365549fd36966289443442bd39d42904d2c24de3 100644
--- a/Imaging/vtkImageContinuousDilate3D.cxx
+++ b/Imaging/vtkImageContinuousDilate3D.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageContinuousDilate3D, "1.35");
 vtkStandardNewMacro(vtkImageContinuousDilate3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageContinuousDilate3D.h b/Imaging/vtkImageContinuousDilate3D.h
index 139a6a575e7abfef2edd653401fa2a7f82e95876..a0e9cd2ae0d2d243771a77015b5de6042bb1957d 100644
--- a/Imaging/vtkImageContinuousDilate3D.h
+++ b/Imaging/vtkImageContinuousDilate3D.h
@@ -35,7 +35,7 @@ public:
   // Construct an instance of vtkImageContinuousDilate3D filter.
   // By default zero values are dilated.
   static vtkImageContinuousDilate3D *New();
-  vtkTypeRevisionMacro(vtkImageContinuousDilate3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageContinuousDilate3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageContinuousErode3D.cxx b/Imaging/vtkImageContinuousErode3D.cxx
index b6dd38e34454be4f013b3c98cceefde3ff18f402..b849508507497e821acc401012ebc41abd4e9048 100644
--- a/Imaging/vtkImageContinuousErode3D.cxx
+++ b/Imaging/vtkImageContinuousErode3D.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageContinuousErode3D, "1.35");
 vtkStandardNewMacro(vtkImageContinuousErode3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageContinuousErode3D.h b/Imaging/vtkImageContinuousErode3D.h
index 5123941247fb305578bff987745e4251933280ca..2cd1867cd1b446cc780707ba217a0315c7dfdb70 100644
--- a/Imaging/vtkImageContinuousErode3D.h
+++ b/Imaging/vtkImageContinuousErode3D.h
@@ -34,7 +34,7 @@ public:
   // Construct an instance of vtkImageContinuousErode3D filter.
   // By default zero values are eroded.
   static vtkImageContinuousErode3D *New();
-  vtkTypeRevisionMacro(vtkImageContinuousErode3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageContinuousErode3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageConvolve.cxx b/Imaging/vtkImageConvolve.cxx
index d619fcc13f46fe35424d86d0cca5be9eb010ab22..5fe17d64600efc040a68abed60fa954468aa74e9 100644
--- a/Imaging/vtkImageConvolve.cxx
+++ b/Imaging/vtkImageConvolve.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageConvolve, "1.19");
 vtkStandardNewMacro(vtkImageConvolve);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageConvolve.h b/Imaging/vtkImageConvolve.h
index 1441035a124addd907f5f031f97bf2c6723a3293..75e05d9551fc05f98d11b39bebff2ee8154d713a 100644
--- a/Imaging/vtkImageConvolve.h
+++ b/Imaging/vtkImageConvolve.h
@@ -29,7 +29,7 @@ public:
   // Description:
   // Construct an instance of vtkImageConvolve filter.
   static vtkImageConvolve *New();
-  vtkTypeRevisionMacro(vtkImageConvolve,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageConvolve,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageCorrelation.cxx b/Imaging/vtkImageCorrelation.cxx
index c54eb4c78a0de847265b8bc59f47d48b6d23ac08..9bb98b48e707fb96f9802a62ecb77248d0b3df7f 100644
--- a/Imaging/vtkImageCorrelation.cxx
+++ b/Imaging/vtkImageCorrelation.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageCorrelation, "1.35");
 vtkStandardNewMacro(vtkImageCorrelation);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCorrelation.h b/Imaging/vtkImageCorrelation.h
index 02fce9cd6e8d9db78f202f0d0f6927444f6315a0..403f03a543c7b7a655bf7303db0cbe97d085e438 100644
--- a/Imaging/vtkImageCorrelation.h
+++ b/Imaging/vtkImageCorrelation.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageCorrelation : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageCorrelation *New();
-  vtkTypeRevisionMacro(vtkImageCorrelation,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageCorrelation,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageCursor3D.cxx b/Imaging/vtkImageCursor3D.cxx
index 0020bd777aea24c895940ff2b19cc94353b38786..b5f72264fffee91cd919893d64efe2fa25cdee46 100644
--- a/Imaging/vtkImageCursor3D.cxx
+++ b/Imaging/vtkImageCursor3D.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageCursor3D, "1.23");
 vtkStandardNewMacro(vtkImageCursor3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageCursor3D.h b/Imaging/vtkImageCursor3D.h
index a08d7ee2ea784d35b07ca238f7e9b860b078d526..ef2d626a7a61db0e87410ad930760e5bac521256 100644
--- a/Imaging/vtkImageCursor3D.h
+++ b/Imaging/vtkImageCursor3D.h
@@ -25,7 +25,7 @@ class VTK_IMAGING_EXPORT vtkImageCursor3D : public vtkImageInPlaceFilter
 {
 public:
   static vtkImageCursor3D *New();
-  vtkTypeRevisionMacro(vtkImageCursor3D,vtkImageInPlaceFilter);
+  vtkTypeMacro(vtkImageCursor3D,vtkImageInPlaceFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Imaging/vtkImageDataStreamer.cxx b/Imaging/vtkImageDataStreamer.cxx
index 30679269f858f7b1627d020245758612f445c7f0..112cc1e25b2c9af17730c6e18c0837733f628e2a 100644
--- a/Imaging/vtkImageDataStreamer.cxx
+++ b/Imaging/vtkImageDataStreamer.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageDataStreamer, "1.37");
 vtkStandardNewMacro(vtkImageDataStreamer);
 vtkCxxSetObjectMacro(vtkImageDataStreamer,ExtentTranslator,vtkExtentTranslator);
 
diff --git a/Imaging/vtkImageDataStreamer.h b/Imaging/vtkImageDataStreamer.h
index c066bfe350027dbe8f3c1544cee1bfd68078541d..6d24212303f21dc0df7507a901f8654e3702efc7 100644
--- a/Imaging/vtkImageDataStreamer.h
+++ b/Imaging/vtkImageDataStreamer.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageDataStreamer : public vtkImageAlgorithm
 {
 public:
   static vtkImageDataStreamer *New();
-  vtkTypeRevisionMacro(vtkImageDataStreamer,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageDataStreamer,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageDecomposeFilter.cxx b/Imaging/vtkImageDecomposeFilter.cxx
index 3f71ce447cba1e83e53338750ee5c49281469d84..f000598411c4650efbdc3277a95b1f9c8cc9f592 100644
--- a/Imaging/vtkImageDecomposeFilter.cxx
+++ b/Imaging/vtkImageDecomposeFilter.cxx
@@ -16,7 +16,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageDecomposeFilter, "1.20");
 
 //----------------------------------------------------------------------------
 // Construct an instance of vtkImageDecomposeFilter fitler.
diff --git a/Imaging/vtkImageDecomposeFilter.h b/Imaging/vtkImageDecomposeFilter.h
index c1037be5a0f69ac2a3ea141c5c03fbbfa60ee6e3..d2c013d206e7cff4f5bff3b91875561125074957 100644
--- a/Imaging/vtkImageDecomposeFilter.h
+++ b/Imaging/vtkImageDecomposeFilter.h
@@ -32,7 +32,7 @@ public:
   // Description:
   // Construct an instance of vtkImageDecomposeFilter filter with default
   // dimensionality 3.
-  vtkTypeRevisionMacro(vtkImageDecomposeFilter,vtkImageIterateFilter);
+  vtkTypeMacro(vtkImageDecomposeFilter,vtkImageIterateFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageDifference.cxx b/Imaging/vtkImageDifference.cxx
index 114e79529f390108598a86579bdf26cda80ab885..949da4b6775d24c53e5ed3ac6d3c4dc2673b1314 100644
--- a/Imaging/vtkImageDifference.cxx
+++ b/Imaging/vtkImageDifference.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageDifference, "1.40");
 vtkStandardNewMacro(vtkImageDifference);
 
 // Construct object to extract all of the input data.
diff --git a/Imaging/vtkImageDifference.h b/Imaging/vtkImageDifference.h
index f7862a3f990ec5f35a450acb7e0d41231a5d9b61..87a0caaf61ceba82138607c8aa236216289f488f 100644
--- a/Imaging/vtkImageDifference.h
+++ b/Imaging/vtkImageDifference.h
@@ -40,7 +40,7 @@ class VTK_IMAGING_EXPORT vtkImageDifference : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageDifference *New();
-  vtkTypeRevisionMacro(vtkImageDifference,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageDifference,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageDilateErode3D.cxx b/Imaging/vtkImageDilateErode3D.cxx
index 7bf7834231cfaff6868c0572914e52f2d28a284d..2cadecb51379fd3d64853f3fc587f7c326540a2f 100644
--- a/Imaging/vtkImageDilateErode3D.cxx
+++ b/Imaging/vtkImageDilateErode3D.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageDilateErode3D, "1.47");
 vtkStandardNewMacro(vtkImageDilateErode3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageDilateErode3D.h b/Imaging/vtkImageDilateErode3D.h
index 263cc4f59d5d6ee9e891b6068a72c28a986d4d11..e4da125363afbc0098d16ba8c366744b578f1c0e 100644
--- a/Imaging/vtkImageDilateErode3D.h
+++ b/Imaging/vtkImageDilateErode3D.h
@@ -36,7 +36,7 @@ public:
   // Construct an instance of vtkImageDilateErode3D filter.
   // By default zero values are dilated.
   static vtkImageDilateErode3D *New();
-  vtkTypeRevisionMacro(vtkImageDilateErode3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageDilateErode3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageDivergence.cxx b/Imaging/vtkImageDivergence.cxx
index 9779ea79e10bcb98db52219d7c175604a42ee976..bf1266ce563212a101cf19f532f8500693b7533c 100644
--- a/Imaging/vtkImageDivergence.cxx
+++ b/Imaging/vtkImageDivergence.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageDivergence, "1.36");
 vtkStandardNewMacro(vtkImageDivergence);
 
 vtkImageDivergence::vtkImageDivergence()
diff --git a/Imaging/vtkImageDivergence.h b/Imaging/vtkImageDivergence.h
index 7673da02191eeb6b3e652bdf1775919f31ab140a..7ff6a023c39346384f060a8bdd907a0e5796c197 100644
--- a/Imaging/vtkImageDivergence.h
+++ b/Imaging/vtkImageDivergence.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageDivergence : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageDivergence *New();
-  vtkTypeRevisionMacro(vtkImageDivergence,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageDivergence,vtkThreadedImageAlgorithm);
 
 protected:
   vtkImageDivergence();
diff --git a/Imaging/vtkImageDotProduct.cxx b/Imaging/vtkImageDotProduct.cxx
index e1da2bec1d7810e3e37b5f1cddc6d29711a1edee..e05771ea199465b5efbdd5c33208f2374d5547ee 100644
--- a/Imaging/vtkImageDotProduct.cxx
+++ b/Imaging/vtkImageDotProduct.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageDotProduct, "1.34");
 vtkStandardNewMacro(vtkImageDotProduct);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageDotProduct.h b/Imaging/vtkImageDotProduct.h
index fb4b472da44ea41e6108ce8390d51ce23f94481c..3b9fdba3a0e956b9ba429979fe3543cace41f353 100644
--- a/Imaging/vtkImageDotProduct.h
+++ b/Imaging/vtkImageDotProduct.h
@@ -28,7 +28,7 @@ class VTK_IMAGING_EXPORT vtkImageDotProduct : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageDotProduct *New();
-  vtkTypeRevisionMacro(vtkImageDotProduct,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageDotProduct,vtkThreadedImageAlgorithm);
 
   // Description:
   // Set the two inputs to this filter
diff --git a/Imaging/vtkImageEllipsoidSource.cxx b/Imaging/vtkImageEllipsoidSource.cxx
index e034257e64cb7170f789406d653697988bec852e..03a72fdf4e06e0403a4e51f917aaf3f85d1a0bce 100644
--- a/Imaging/vtkImageEllipsoidSource.cxx
+++ b/Imaging/vtkImageEllipsoidSource.cxx
@@ -20,7 +20,6 @@
 
 #include "vtkImageData.h"
 
-vtkCxxRevisionMacro(vtkImageEllipsoidSource, "1.36");
 vtkStandardNewMacro(vtkImageEllipsoidSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageEllipsoidSource.h b/Imaging/vtkImageEllipsoidSource.h
index 3a521ab2d39ded3ebbc961e45ad0cc623477bf47..e90a80df5878a96b6565991694fa449a68331a6e 100644
--- a/Imaging/vtkImageEllipsoidSource.h
+++ b/Imaging/vtkImageEllipsoidSource.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageEllipsoidSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageEllipsoidSource *New();
-  vtkTypeRevisionMacro(vtkImageEllipsoidSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageEllipsoidSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
   
   // Description:
diff --git a/Imaging/vtkImageEuclideanDistance.cxx b/Imaging/vtkImageEuclideanDistance.cxx
index f9f56bf731052e6ead4bd89b93231e02767d287e..bced81e1efcbe0433485a6778ddd2c924b30f904 100644
--- a/Imaging/vtkImageEuclideanDistance.cxx
+++ b/Imaging/vtkImageEuclideanDistance.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageEuclideanDistance, "1.25");
 vtkStandardNewMacro(vtkImageEuclideanDistance);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageEuclideanDistance.h b/Imaging/vtkImageEuclideanDistance.h
index 7fb23638a51268b221127b65c0f4672dec51200c..793decc2810a190255a790f061ec4ba856341a8c 100644
--- a/Imaging/vtkImageEuclideanDistance.h
+++ b/Imaging/vtkImageEuclideanDistance.h
@@ -52,7 +52,7 @@ class VTK_IMAGING_EXPORT vtkImageEuclideanDistance : public vtkImageDecomposeFil
 {
 public:
   static vtkImageEuclideanDistance *New();
-  vtkTypeRevisionMacro(vtkImageEuclideanDistance,vtkImageDecomposeFilter);
+  vtkTypeMacro(vtkImageEuclideanDistance,vtkImageDecomposeFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageEuclideanToPolar.cxx b/Imaging/vtkImageEuclideanToPolar.cxx
index ae66827c7985409ace101a6550ccbbc0755df28e..7b117fa5adf16c97c14a559d90ec8611646b71fd 100644
--- a/Imaging/vtkImageEuclideanToPolar.cxx
+++ b/Imaging/vtkImageEuclideanToPolar.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageEuclideanToPolar, "1.29");
 vtkStandardNewMacro(vtkImageEuclideanToPolar);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageEuclideanToPolar.h b/Imaging/vtkImageEuclideanToPolar.h
index 3d7e1b69eac3b6d271e0245065489bbe7660cebb..1c1b4d3cfe4399610d7ca07ea5cd53da37f7a4f3 100644
--- a/Imaging/vtkImageEuclideanToPolar.h
+++ b/Imaging/vtkImageEuclideanToPolar.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageEuclideanToPolar : public vtkThreadedImageAlgor
 {
 public:
   static vtkImageEuclideanToPolar *New();
-  vtkTypeRevisionMacro(vtkImageEuclideanToPolar,
+  vtkTypeMacro(vtkImageEuclideanToPolar,
                        vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageExport.cxx b/Imaging/vtkImageExport.cxx
index 6ea96ad124307c3e8a18d29e52b121dac9b4d669..5df396a8e9cfa3d2a378f014664115390c3782e0 100644
--- a/Imaging/vtkImageExport.cxx
+++ b/Imaging/vtkImageExport.cxx
@@ -21,7 +21,6 @@
 #include <ctype.h>
 #include <string.h>
 
-vtkCxxRevisionMacro(vtkImageExport, "1.34");
 vtkStandardNewMacro(vtkImageExport);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageExport.h b/Imaging/vtkImageExport.h
index c40c051d0de76ec617095695d39488f7fd814973..96ac39f43254895f0cd2fad854d794e3979e0a1a 100644
--- a/Imaging/vtkImageExport.h
+++ b/Imaging/vtkImageExport.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageExport : public vtkImageAlgorithm
 {
 public:
   static vtkImageExport *New();
-  vtkTypeRevisionMacro(vtkImageExport,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageExport,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageExtractComponents.cxx b/Imaging/vtkImageExtractComponents.cxx
index c0c73563fe9a25cff0069a77f26b653b01cb3def..182e674c8809ea6ed04ef0cc1f3a4dcc8af36369 100644
--- a/Imaging/vtkImageExtractComponents.cxx
+++ b/Imaging/vtkImageExtractComponents.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageExtractComponents, "1.37");
 vtkStandardNewMacro(vtkImageExtractComponents);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageExtractComponents.h b/Imaging/vtkImageExtractComponents.h
index 2aff3c8bf0604d881ec4e115a6a0406f3d20f6b8..9dc4a65c25f42c9465d0c1a31fe6c671df7f73e8 100644
--- a/Imaging/vtkImageExtractComponents.h
+++ b/Imaging/vtkImageExtractComponents.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageExtractComponents : public vtkThreadedImageAlgo
 {
 public:
   static vtkImageExtractComponents *New();
-  vtkTypeRevisionMacro(vtkImageExtractComponents,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageExtractComponents,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageFFT.cxx b/Imaging/vtkImageFFT.cxx
index 3edb05d427051ce1d3ee01cee7a676569a30e6ea..693d7f6eb982c9ebb700d8d2ca6c902e91d139dc 100644
--- a/Imaging/vtkImageFFT.cxx
+++ b/Imaging/vtkImageFFT.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageFFT, "1.43");
 vtkStandardNewMacro(vtkImageFFT);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageFFT.h b/Imaging/vtkImageFFT.h
index bdd9caf014ee8d7d8e0a2a6835ac174004141696..fc39dd7a601c6f725475e0f3bd7058eb38c523e9 100644
--- a/Imaging/vtkImageFFT.h
+++ b/Imaging/vtkImageFFT.h
@@ -34,7 +34,7 @@ class VTK_IMAGING_EXPORT vtkImageFFT : public vtkImageFourierFilter
 {
 public:
   static vtkImageFFT *New();
-  vtkTypeRevisionMacro(vtkImageFFT,vtkImageFourierFilter);
+  vtkTypeMacro(vtkImageFFT,vtkImageFourierFilter);
 
 
   // Description:
diff --git a/Imaging/vtkImageFlip.cxx b/Imaging/vtkImageFlip.cxx
index d5c6c5d2ba17f59281d0a7918dee194916b5ad23..e00e7e0b20a5c86331e15324bce9397769cc139f 100644
--- a/Imaging/vtkImageFlip.cxx
+++ b/Imaging/vtkImageFlip.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkDataSetAttributes.h"
 
-vtkCxxRevisionMacro(vtkImageFlip, "1.40");
 vtkStandardNewMacro(vtkImageFlip);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageFlip.h b/Imaging/vtkImageFlip.h
index 9c94643c2f11e578f320c305954255a3a233c1a2..35f27431f37d98fbf443d0aeeddbce2b346678c0 100644
--- a/Imaging/vtkImageFlip.h
+++ b/Imaging/vtkImageFlip.h
@@ -28,7 +28,7 @@ class VTK_IMAGING_EXPORT vtkImageFlip : public vtkImageReslice
 public:
   static vtkImageFlip *New();
 
-  vtkTypeRevisionMacro(vtkImageFlip,vtkImageReslice);
+  vtkTypeMacro(vtkImageFlip,vtkImageReslice);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageFourierCenter.cxx b/Imaging/vtkImageFourierCenter.cxx
index 8297399af746bef0f0e08e881126804d7bf8c390..d7f3f4b454f4fe6942b6cebcadbfdf3718e1ce19 100644
--- a/Imaging/vtkImageFourierCenter.cxx
+++ b/Imaging/vtkImageFourierCenter.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageFourierCenter, "1.22");
 vtkStandardNewMacro(vtkImageFourierCenter);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageFourierCenter.h b/Imaging/vtkImageFourierCenter.h
index bb64e9611bacfa4e1d6c765a5734444310d791fb..64a3bd8e18d7bf5bb57ea2b6cea4dc5e0182e3d8 100644
--- a/Imaging/vtkImageFourierCenter.h
+++ b/Imaging/vtkImageFourierCenter.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageFourierCenter : public vtkImageDecomposeFilter
 {
 public:
   static vtkImageFourierCenter *New();
-  vtkTypeRevisionMacro(vtkImageFourierCenter,vtkImageDecomposeFilter);
+  vtkTypeMacro(vtkImageFourierCenter,vtkImageDecomposeFilter);
 
 protected:
   vtkImageFourierCenter();
diff --git a/Imaging/vtkImageFourierFilter.cxx b/Imaging/vtkImageFourierFilter.cxx
index f7985c2743572114a9e2d0789e2a53e48c17590d..26a78f214ad860aaebf62b24121ba631f4a06241 100644
--- a/Imaging/vtkImageFourierFilter.cxx
+++ b/Imaging/vtkImageFourierFilter.cxx
@@ -16,7 +16,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageFourierFilter, "1.19");
 
 
 /*=========================================================================
diff --git a/Imaging/vtkImageFourierFilter.h b/Imaging/vtkImageFourierFilter.h
index 8fe4a1595ed8bd67caa5cad13f2971dc7f121c13..62cafd8f5742cdca2e4598812fab4542d4935ff2 100644
--- a/Imaging/vtkImageFourierFilter.h
+++ b/Imaging/vtkImageFourierFilter.h
@@ -86,7 +86,7 @@ typedef struct{
 class VTK_IMAGING_EXPORT vtkImageFourierFilter : public vtkImageDecomposeFilter
 {
 public:
-  vtkTypeRevisionMacro(vtkImageFourierFilter,vtkImageDecomposeFilter);
+  vtkTypeMacro(vtkImageFourierFilter,vtkImageDecomposeFilter);
   
   
   // public for templated functions of this object
diff --git a/Imaging/vtkImageGaussianSmooth.cxx b/Imaging/vtkImageGaussianSmooth.cxx
index bc107aef0f6b8bd9c9007206b01dc1b3bb1b55c9..5b3e52d86a5132bf212a0785df00ae1aa9bd0424 100644
--- a/Imaging/vtkImageGaussianSmooth.cxx
+++ b/Imaging/vtkImageGaussianSmooth.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageGaussianSmooth, "1.47");
 vtkStandardNewMacro(vtkImageGaussianSmooth);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageGaussianSmooth.h b/Imaging/vtkImageGaussianSmooth.h
index 1d045eac99dc875049f5dadf96837f2888555cf2..8185f1746bea3ecc6912574df17ca17ac3f0d405 100644
--- a/Imaging/vtkImageGaussianSmooth.h
+++ b/Imaging/vtkImageGaussianSmooth.h
@@ -26,7 +26,7 @@
 class VTK_IMAGING_EXPORT vtkImageGaussianSmooth : public vtkThreadedImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageGaussianSmooth,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageGaussianSmooth,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageGaussianSource.cxx b/Imaging/vtkImageGaussianSource.cxx
index 38bd23235a9323a5833c79c95914a28ad9f4ea15..fc442a67f85a248ef1f83d48be1886b300f7628a 100644
--- a/Imaging/vtkImageGaussianSource.cxx
+++ b/Imaging/vtkImageGaussianSource.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageGaussianSource, "1.34");
 vtkStandardNewMacro(vtkImageGaussianSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageGaussianSource.h b/Imaging/vtkImageGaussianSource.h
index aefc5880d6a0c61e2eaf2dcde994289da669f7b8..13fe90f1f4ecd1122557c113fbb036e8756412c5 100644
--- a/Imaging/vtkImageGaussianSource.h
+++ b/Imaging/vtkImageGaussianSource.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageGaussianSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageGaussianSource *New();
-  vtkTypeRevisionMacro(vtkImageGaussianSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageGaussianSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageGradient.cxx b/Imaging/vtkImageGradient.cxx
index 2a650f316e84cdd454d2874256912167b5f9f7a5..cd189557f5944f076e005b4f1156b5eec8a85d77 100644
--- a/Imaging/vtkImageGradient.cxx
+++ b/Imaging/vtkImageGradient.cxx
@@ -25,7 +25,6 @@
 #include <math.h>
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkImageGradient, "1.57");
 vtkStandardNewMacro(vtkImageGradient);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageGradient.h b/Imaging/vtkImageGradient.h
index 6d469ea64d4667a57cf49dc78dce22f5efdb47f8..143c2d83d3e21014ec56c079e2bb5873b30b5e1c 100644
--- a/Imaging/vtkImageGradient.h
+++ b/Imaging/vtkImageGradient.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageGradient : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageGradient *New();
-  vtkTypeRevisionMacro(vtkImageGradient,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageGradient,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageGradientMagnitude.cxx b/Imaging/vtkImageGradientMagnitude.cxx
index f4ebfd636d6ec4f431645e416844de5eee0c0eef..41bee0fbeb5a15ea1a578c1f79a559ac6793432b 100644
--- a/Imaging/vtkImageGradientMagnitude.cxx
+++ b/Imaging/vtkImageGradientMagnitude.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageGradientMagnitude, "1.45");
 vtkStandardNewMacro(vtkImageGradientMagnitude);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageGradientMagnitude.h b/Imaging/vtkImageGradientMagnitude.h
index 910032e250639690263390137177193c027c0616..121e95927d7d9f46e99e8a03698a9720a4674f03 100644
--- a/Imaging/vtkImageGradientMagnitude.h
+++ b/Imaging/vtkImageGradientMagnitude.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageGradientMagnitude : public vtkThreadedImageAlgo
 {
 public:
   static vtkImageGradientMagnitude *New();
-  vtkTypeRevisionMacro(vtkImageGradientMagnitude,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageGradientMagnitude,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageGridSource.cxx b/Imaging/vtkImageGridSource.cxx
index 6f96fd03526be88406376137c74fcde564a7c429..83738ba305c45ab26d42181b8435ed5d2d87c295 100644
--- a/Imaging/vtkImageGridSource.cxx
+++ b/Imaging/vtkImageGridSource.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageGridSource, "1.18");
 vtkStandardNewMacro(vtkImageGridSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageGridSource.h b/Imaging/vtkImageGridSource.h
index e65bfd4d56a198fad3cd753576b6eb77ec2c026a..ddead063ae8a9f4fbcc0036838883618744386fd 100644
--- a/Imaging/vtkImageGridSource.h
+++ b/Imaging/vtkImageGridSource.h
@@ -26,7 +26,7 @@ class VTK_IMAGING_EXPORT vtkImageGridSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageGridSource *New();
-  vtkTypeRevisionMacro(vtkImageGridSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageGridSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageHSIToRGB.cxx b/Imaging/vtkImageHSIToRGB.cxx
index 86d0cea3b1c1dd31e7391ea3933d815be352613c..b54f5883444b626afd4fc594ffb9aafdb572ce97 100644
--- a/Imaging/vtkImageHSIToRGB.cxx
+++ b/Imaging/vtkImageHSIToRGB.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageHSIToRGB, "1.6");
 vtkStandardNewMacro(vtkImageHSIToRGB);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageHSIToRGB.h b/Imaging/vtkImageHSIToRGB.h
index 3a86d4897282f36a1306d1a15136b234356bf9fb..3323dca00d9db87d5f35533e70099e24de8b01c4 100644
--- a/Imaging/vtkImageHSIToRGB.h
+++ b/Imaging/vtkImageHSIToRGB.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageHSIToRGB : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageHSIToRGB *New();
-  vtkTypeRevisionMacro(vtkImageHSIToRGB,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageHSIToRGB,vtkThreadedImageAlgorithm);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageHSVToRGB.cxx b/Imaging/vtkImageHSVToRGB.cxx
index 425538e4a73c7aafb6a1adca68c55f7bb281eb16..ff86fb0ebec30ac845e0614a64e8773f6fc34277 100644
--- a/Imaging/vtkImageHSVToRGB.cxx
+++ b/Imaging/vtkImageHSVToRGB.cxx
@@ -19,7 +19,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageHSVToRGB, "1.32");
 vtkStandardNewMacro(vtkImageHSVToRGB);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageHSVToRGB.h b/Imaging/vtkImageHSVToRGB.h
index 87045242f5df7d7c07a0599d9e78b479a3af305c..55a5d99551f29020bcefa523cabc37a90b45f7be 100644
--- a/Imaging/vtkImageHSVToRGB.h
+++ b/Imaging/vtkImageHSVToRGB.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageHSVToRGB : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageHSVToRGB *New();
-  vtkTypeRevisionMacro(vtkImageHSVToRGB,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageHSVToRGB,vtkThreadedImageAlgorithm);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageHybridMedian2D.cxx b/Imaging/vtkImageHybridMedian2D.cxx
index 737afca5f0a47188d936bfad8366db234630d066..d772898585e1a2df8b1df21f77ad02adce89d50a 100644
--- a/Imaging/vtkImageHybridMedian2D.cxx
+++ b/Imaging/vtkImageHybridMedian2D.cxx
@@ -23,7 +23,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/numeric>
 
-vtkCxxRevisionMacro(vtkImageHybridMedian2D, "1.29");
 vtkStandardNewMacro(vtkImageHybridMedian2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageHybridMedian2D.h b/Imaging/vtkImageHybridMedian2D.h
index acbb1c59a9f56e0aa708a978eafd992b8f51b76f..bbfc39ae3c7ac9ba2503f141014139f216d7720c 100644
--- a/Imaging/vtkImageHybridMedian2D.h
+++ b/Imaging/vtkImageHybridMedian2D.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageHybridMedian2D : public vtkImageSpatialAlgorith
 {
 public:
   static vtkImageHybridMedian2D *New();
-  vtkTypeRevisionMacro(vtkImageHybridMedian2D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageHybridMedian2D,vtkImageSpatialAlgorithm);
 
 protected:
   vtkImageHybridMedian2D();
diff --git a/Imaging/vtkImageIdealHighPass.cxx b/Imaging/vtkImageIdealHighPass.cxx
index 711215e9dbbbe9ccd858fc430d6a1102a9fc2c66..eb45521da8fc3e36a1efb9fcfc44a3c7c390da02 100644
--- a/Imaging/vtkImageIdealHighPass.cxx
+++ b/Imaging/vtkImageIdealHighPass.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageIdealHighPass, "1.23");
 vtkStandardNewMacro(vtkImageIdealHighPass);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageIdealHighPass.h b/Imaging/vtkImageIdealHighPass.h
index d07d4c15fd773a467fb3cf5f5e0cd9d13160983c..19bdd4f599fd2460e2a10a9417a3575cdc8bf4f6 100644
--- a/Imaging/vtkImageIdealHighPass.h
+++ b/Imaging/vtkImageIdealHighPass.h
@@ -36,7 +36,7 @@ class VTK_IMAGING_EXPORT vtkImageIdealHighPass : public vtkThreadedImageAlgorith
 {
 public:
   static vtkImageIdealHighPass *New();
-  vtkTypeRevisionMacro(vtkImageIdealHighPass,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageIdealHighPass,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageIdealLowPass.cxx b/Imaging/vtkImageIdealLowPass.cxx
index 60974b05a305e0cd582869ba8ac086a588e707e8..fdf4a0a709625228a8ad00bed57e522691ba124c 100644
--- a/Imaging/vtkImageIdealLowPass.cxx
+++ b/Imaging/vtkImageIdealLowPass.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageIdealLowPass, "1.23");
 vtkStandardNewMacro(vtkImageIdealLowPass);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageIdealLowPass.h b/Imaging/vtkImageIdealLowPass.h
index 6654ff0538931c94f50b44b98cbdb3ed7d3789f3..13b0c768da16760730ea6d09240a7a399a4d4a9b 100644
--- a/Imaging/vtkImageIdealLowPass.h
+++ b/Imaging/vtkImageIdealLowPass.h
@@ -37,7 +37,7 @@ class VTK_IMAGING_EXPORT vtkImageIdealLowPass : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageIdealLowPass *New();
-  vtkTypeRevisionMacro(vtkImageIdealLowPass,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageIdealLowPass,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageImport.cxx b/Imaging/vtkImageImport.cxx
index a23e705b6e5b28b31fcc946116ffcc4f0a281ee9..2c37ec14b50b5b399127bdcaea8d9b11e9497fed 100644
--- a/Imaging/vtkImageImport.cxx
+++ b/Imaging/vtkImageImport.cxx
@@ -27,7 +27,6 @@
 #include <ctype.h>
 #include <vtkstd/exception>
 
-vtkCxxRevisionMacro(vtkImageImport, "1.54");
 vtkStandardNewMacro(vtkImageImport);
 
 
diff --git a/Imaging/vtkImageImport.h b/Imaging/vtkImageImport.h
index 406b4ad65a78f82749042343adca2c65da7974fa..a09141c54048df303e8029138390cc689323edf8 100644
--- a/Imaging/vtkImageImport.h
+++ b/Imaging/vtkImageImport.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageImport : public vtkImageAlgorithm
 {
 public:
   static vtkImageImport *New();
-  vtkTypeRevisionMacro(vtkImageImport,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageImport,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Imaging/vtkImageImportExecutive.cxx b/Imaging/vtkImageImportExecutive.cxx
index 9960596694fd40be4428def9b63c96c662ff35fa..ce28ee622e26f02da30326cdedc4c684651ec58c 100644
--- a/Imaging/vtkImageImportExecutive.cxx
+++ b/Imaging/vtkImageImportExecutive.cxx
@@ -24,7 +24,6 @@
 #include "vtkInformationVector.h"
 #include "vtkImageImport.h"
 
-vtkCxxRevisionMacro(vtkImageImportExecutive, "1.3");
 vtkStandardNewMacro(vtkImageImportExecutive);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageImportExecutive.h b/Imaging/vtkImageImportExecutive.h
index f4a8a15115864a78b83fe9d9098461e1734cd28f..6189daf5a2a6e942c6a0803dc96ca8f418658576 100644
--- a/Imaging/vtkImageImportExecutive.h
+++ b/Imaging/vtkImageImportExecutive.h
@@ -26,7 +26,7 @@ class VTK_IMAGING_EXPORT vtkImageImportExecutive :
 {
 public:
   static vtkImageImportExecutive* New();
-  vtkTypeRevisionMacro(vtkImageImportExecutive,
+  vtkTypeMacro(vtkImageImportExecutive,
                        vtkStreamingDemandDrivenPipeline);
 
   // Description:
diff --git a/Imaging/vtkImageIslandRemoval2D.cxx b/Imaging/vtkImageIslandRemoval2D.cxx
index 2d3b452046c28e501e5e49e62bcd7d3979b873b2..49385876fcf7b2fa03e61a394bf35716cc419eb1 100644
--- a/Imaging/vtkImageIslandRemoval2D.cxx
+++ b/Imaging/vtkImageIslandRemoval2D.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageIslandRemoval2D, "1.50");
 vtkStandardNewMacro(vtkImageIslandRemoval2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageIslandRemoval2D.h b/Imaging/vtkImageIslandRemoval2D.h
index 1aa1e07d1a7c3c501da10640291c56b935f6685f..ea5547b9cc31e252a494117d7b78b168313cc05a 100644
--- a/Imaging/vtkImageIslandRemoval2D.h
+++ b/Imaging/vtkImageIslandRemoval2D.h
@@ -41,7 +41,7 @@ public:
   // Description:
   // Constructor: Sets default filter to be identity.
   static vtkImageIslandRemoval2D *New();
-  vtkTypeRevisionMacro(vtkImageIslandRemoval2D,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageIslandRemoval2D,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageIterateFilter.cxx b/Imaging/vtkImageIterateFilter.cxx
index fb3f16f502980d170721856f3e9287936bce8746..59beb6a2abf7526a8fbcba6eacd51f8f1f04ffad 100644
--- a/Imaging/vtkImageIterateFilter.cxx
+++ b/Imaging/vtkImageIterateFilter.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageIterateFilter, "1.40");
 
 //----------------------------------------------------------------------------
 vtkImageIterateFilter::vtkImageIterateFilter()
diff --git a/Imaging/vtkImageIterateFilter.h b/Imaging/vtkImageIterateFilter.h
index 2e6c65f0585ec1ee2d8ae31b99d89b90ba090177..3e0f221b9ec5bd0afa7b80f2f2a2c68f18fc443e 100644
--- a/Imaging/vtkImageIterateFilter.h
+++ b/Imaging/vtkImageIterateFilter.h
@@ -29,7 +29,7 @@
 class VTK_IMAGING_EXPORT vtkImageIterateFilter : public vtkThreadedImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkImageIterateFilter,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageIterateFilter,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageLaplacian.cxx b/Imaging/vtkImageLaplacian.cxx
index f0ce0dbe6091aa2420739ab713c0f1f0f3e205a2..a108ea6857d011209fb89805ae19fb7d9781e4dd 100644
--- a/Imaging/vtkImageLaplacian.cxx
+++ b/Imaging/vtkImageLaplacian.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageLaplacian, "1.35");
 vtkStandardNewMacro(vtkImageLaplacian);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageLaplacian.h b/Imaging/vtkImageLaplacian.h
index f0f3ff422f2a56e68e556bfebf53d8b005ce2708..a39c8d4dd52c433247ac035c84529f17dd05bf69 100644
--- a/Imaging/vtkImageLaplacian.h
+++ b/Imaging/vtkImageLaplacian.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageLaplacian : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageLaplacian *New();
-  vtkTypeRevisionMacro(vtkImageLaplacian,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageLaplacian,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageLogarithmicScale.cxx b/Imaging/vtkImageLogarithmicScale.cxx
index e204175cc759207a6508b2d4be8e7d7d4de81cb1..c793c2aa283aefbce7255c8799f2b16efe65d4dc 100644
--- a/Imaging/vtkImageLogarithmicScale.cxx
+++ b/Imaging/vtkImageLogarithmicScale.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageLogarithmicScale, "1.27");
 vtkStandardNewMacro(vtkImageLogarithmicScale);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageLogarithmicScale.h b/Imaging/vtkImageLogarithmicScale.h
index c27498b19522fab286d369f2f2d43d964ddc9c50..fa0eb59704ebe646fe91572a196659f19b913827 100644
--- a/Imaging/vtkImageLogarithmicScale.h
+++ b/Imaging/vtkImageLogarithmicScale.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageLogarithmicScale : public vtkThreadedImageAlgor
 {
 public:
   static vtkImageLogarithmicScale *New();
-  vtkTypeRevisionMacro(vtkImageLogarithmicScale,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageLogarithmicScale,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageLogic.cxx b/Imaging/vtkImageLogic.cxx
index 7939ea0b3cb74d22ed2bc289c6c5d626857d6acd..d9a42d264f738fc590df3c3213e7550555dffd59 100644
--- a/Imaging/vtkImageLogic.cxx
+++ b/Imaging/vtkImageLogic.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageLogic, "1.36");
 vtkStandardNewMacro(vtkImageLogic);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageLogic.h b/Imaging/vtkImageLogic.h
index 7351ed928f92704912ba4f5efbb2a1113b496e00..d760a200a09aed0d45930f2dded5ed6585f91fb7 100644
--- a/Imaging/vtkImageLogic.h
+++ b/Imaging/vtkImageLogic.h
@@ -40,7 +40,7 @@ class VTK_IMAGING_EXPORT vtkImageLogic : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageLogic *New();
-  vtkTypeRevisionMacro(vtkImageLogic,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageLogic,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageLuminance.cxx b/Imaging/vtkImageLuminance.cxx
index 0631adf739f25a64ffcc73b73fb667ea69086be8..fa2b216b02bc7607d610bca1d6061de7f0ee27c5 100644
--- a/Imaging/vtkImageLuminance.cxx
+++ b/Imaging/vtkImageLuminance.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageLuminance, "1.28");
 vtkStandardNewMacro(vtkImageLuminance);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageLuminance.h b/Imaging/vtkImageLuminance.h
index a702168524710e8510d26813ecc8e3c068cf6258..22833803cda4491f3cf75215e65968e2926504b4 100644
--- a/Imaging/vtkImageLuminance.h
+++ b/Imaging/vtkImageLuminance.h
@@ -26,7 +26,7 @@ class VTK_IMAGING_EXPORT vtkImageLuminance : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageLuminance *New();
-  vtkTypeRevisionMacro(vtkImageLuminance,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageLuminance,vtkThreadedImageAlgorithm);
 
 protected:
   vtkImageLuminance();
diff --git a/Imaging/vtkImageMagnify.cxx b/Imaging/vtkImageMagnify.cxx
index 6be894ba7beee6057ea98ca70ac6adf306bbd740..0eb37c924fa94421a6adce13c6b01e8c181dcf83 100644
--- a/Imaging/vtkImageMagnify.cxx
+++ b/Imaging/vtkImageMagnify.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageMagnify, "1.51");
 vtkStandardNewMacro(vtkImageMagnify);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMagnify.h b/Imaging/vtkImageMagnify.h
index 0e25ba96e90a1985be4f0c020ec27abe10646627..62a26d3a75ff0570436d0585a8b6ab7817dc3e32 100644
--- a/Imaging/vtkImageMagnify.h
+++ b/Imaging/vtkImageMagnify.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageMagnify : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMagnify *New();
-  vtkTypeRevisionMacro(vtkImageMagnify,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMagnify,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageMagnitude.cxx b/Imaging/vtkImageMagnitude.cxx
index bd7795e658998bb970deae240e8d6bdd090dde71..332c674c1368a1b6daa213daffd13168b78d6928 100644
--- a/Imaging/vtkImageMagnitude.cxx
+++ b/Imaging/vtkImageMagnitude.cxx
@@ -25,7 +25,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageMagnitude, "1.43");
 vtkStandardNewMacro(vtkImageMagnitude);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMagnitude.h b/Imaging/vtkImageMagnitude.h
index 16b4c4b84e863f81bd95a4b5cf7a094d9f124fe4..4bf022671a3b8833fe4e9fb68e9b8eb476cde118 100644
--- a/Imaging/vtkImageMagnitude.h
+++ b/Imaging/vtkImageMagnitude.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageMagnitude : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMagnitude *New();
-  vtkTypeRevisionMacro(vtkImageMagnitude,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMagnitude,vtkThreadedImageAlgorithm);
 
 protected:
   vtkImageMagnitude();
diff --git a/Imaging/vtkImageMandelbrotSource.cxx b/Imaging/vtkImageMandelbrotSource.cxx
index 7ed676cf3f65694f0fc906fce96231232728d559..a9806394c621c0ed53702e5ebdedbd8451d72e62 100644
--- a/Imaging/vtkImageMandelbrotSource.cxx
+++ b/Imaging/vtkImageMandelbrotSource.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageMandelbrotSource, "1.48");
 vtkStandardNewMacro(vtkImageMandelbrotSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMandelbrotSource.h b/Imaging/vtkImageMandelbrotSource.h
index a7851cb7dc00dde2b4b4a77942ba36ec583be9f3..796b14bedb0274ec51845517f7d0e9e99e7ed7db 100644
--- a/Imaging/vtkImageMandelbrotSource.h
+++ b/Imaging/vtkImageMandelbrotSource.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageMandelbrotSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageMandelbrotSource *New();
-  vtkTypeRevisionMacro(vtkImageMandelbrotSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageMandelbrotSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
   
   // Description:
diff --git a/Imaging/vtkImageMapToColors.cxx b/Imaging/vtkImageMapToColors.cxx
index 79a2941143667b70138a3f10289bca7923682b24..f7b5386854a412795773b2aa9fc876b2abf699e4 100644
--- a/Imaging/vtkImageMapToColors.cxx
+++ b/Imaging/vtkImageMapToColors.cxx
@@ -22,7 +22,6 @@
 #include "vtkScalarsToColors.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageMapToColors, "1.30");
 vtkStandardNewMacro(vtkImageMapToColors);
 vtkCxxSetObjectMacro(vtkImageMapToColors,LookupTable,vtkScalarsToColors);
 
diff --git a/Imaging/vtkImageMapToColors.h b/Imaging/vtkImageMapToColors.h
index f0f8a7e4639bac885e7618bfae0093523f3bd36c..2de1fc654d9baac4cb8f4f4d678f55b108a1b6f0 100644
--- a/Imaging/vtkImageMapToColors.h
+++ b/Imaging/vtkImageMapToColors.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageMapToColors : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMapToColors *New();
-  vtkTypeRevisionMacro(vtkImageMapToColors,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMapToColors,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageMapToRGBA.cxx b/Imaging/vtkImageMapToRGBA.cxx
index 5925f922ba3ac941004b11765446f6ce2d697f71..a451119148c31e5e33d8689ecdadec5256673f7a 100644
--- a/Imaging/vtkImageMapToRGBA.cxx
+++ b/Imaging/vtkImageMapToRGBA.cxx
@@ -15,5 +15,4 @@
 #include "vtkImageMapToRGBA.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageMapToRGBA, "1.17");
 vtkStandardNewMacro(vtkImageMapToRGBA);
diff --git a/Imaging/vtkImageMapToRGBA.h b/Imaging/vtkImageMapToRGBA.h
index e28bc3db93f2539982fe5ab89543a54bb88d72d1..2b3f97bbdf622be3d6d3898d9c1c6608595a6c0d 100644
--- a/Imaging/vtkImageMapToRGBA.h
+++ b/Imaging/vtkImageMapToRGBA.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageMapToRGBA : public vtkImageMapToColors
 {
 public:
   static vtkImageMapToRGBA *New();
-  vtkTypeRevisionMacro(vtkImageMapToRGBA,vtkImageMapToColors);
+  vtkTypeMacro(vtkImageMapToRGBA,vtkImageMapToColors);
 
 protected:
   vtkImageMapToRGBA() {};
diff --git a/Imaging/vtkImageMapToWindowLevelColors.cxx b/Imaging/vtkImageMapToWindowLevelColors.cxx
index 8afdb6130a203ecf38653491e0bbfd7d58e1282c..028c760a580363eef5c1cb3ecfd2aeebb14e0db8 100644
--- a/Imaging/vtkImageMapToWindowLevelColors.cxx
+++ b/Imaging/vtkImageMapToWindowLevelColors.cxx
@@ -22,7 +22,6 @@
 #include "vtkScalarsToColors.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageMapToWindowLevelColors, "1.26");
 vtkStandardNewMacro(vtkImageMapToWindowLevelColors);
 
 // Constructor sets default values
diff --git a/Imaging/vtkImageMapToWindowLevelColors.h b/Imaging/vtkImageMapToWindowLevelColors.h
index 72d35f8c69410dea8f561344ca4b66502c0a3d0a..77567f49f85a8cf0c85f4b84cd0445a7863d8755 100644
--- a/Imaging/vtkImageMapToWindowLevelColors.h
+++ b/Imaging/vtkImageMapToWindowLevelColors.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageMapToWindowLevelColors : public vtkImageMapToCo
 {
 public:
   static vtkImageMapToWindowLevelColors *New();
-  vtkTypeRevisionMacro(vtkImageMapToWindowLevelColors,vtkImageMapToColors);
+  vtkTypeMacro(vtkImageMapToWindowLevelColors,vtkImageMapToColors);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageMask.cxx b/Imaging/vtkImageMask.cxx
index 783c89c65de6e9e8949780731675e90fd9d1f3a6..37e786e4571a9d9f4f1987ec2dd78d8099ee780f 100644
--- a/Imaging/vtkImageMask.cxx
+++ b/Imaging/vtkImageMask.cxx
@@ -20,7 +20,6 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageMask, "1.42");
 vtkStandardNewMacro(vtkImageMask);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMask.h b/Imaging/vtkImageMask.h
index 661c544132460c6bca65abc60d62ac1bdbe0b4c6..a59b363999c1a38c39b6e1814e80534b8e9701d0 100644
--- a/Imaging/vtkImageMask.h
+++ b/Imaging/vtkImageMask.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageMask : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMask *New();
-  vtkTypeRevisionMacro(vtkImageMask,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMask,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageMaskBits.cxx b/Imaging/vtkImageMaskBits.cxx
index 19728f8d5e95d62a86d731e686b5bbaa73022720..909715a7dae1cdd92c48bb2f3424a7d37f5b4321 100644
--- a/Imaging/vtkImageMaskBits.cxx
+++ b/Imaging/vtkImageMaskBits.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageMaskBits, "1.18");
 vtkStandardNewMacro(vtkImageMaskBits);
 
 vtkImageMaskBits::vtkImageMaskBits()
diff --git a/Imaging/vtkImageMaskBits.h b/Imaging/vtkImageMaskBits.h
index c4c3693cc7b4d834c2d59084a5310bdf9948f253..08815be680330a135a10cde324975dec172e9242 100644
--- a/Imaging/vtkImageMaskBits.h
+++ b/Imaging/vtkImageMaskBits.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageMaskBits : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMaskBits *New();
-  vtkTypeRevisionMacro(vtkImageMaskBits,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMaskBits,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageMathematics.cxx b/Imaging/vtkImageMathematics.cxx
index 62c564bf0095f7631795cd5a8dab72ea389b032b..4cd4d20bbe7ee8ca2a37590f2a7b4a2678b46a98 100644
--- a/Imaging/vtkImageMathematics.cxx
+++ b/Imaging/vtkImageMathematics.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageMathematics, "1.56");
 vtkStandardNewMacro(vtkImageMathematics);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMathematics.h b/Imaging/vtkImageMathematics.h
index ae6189e971bd37a8c9d2cc3185052869a1d25ba7..5ecd6e034536b1fc1bb494c38f7b51eaf1593897 100644
--- a/Imaging/vtkImageMathematics.h
+++ b/Imaging/vtkImageMathematics.h
@@ -53,7 +53,7 @@ class VTK_IMAGING_EXPORT vtkImageMathematics : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageMathematics *New();
-  vtkTypeRevisionMacro(vtkImageMathematics,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageMathematics,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageMedian3D.cxx b/Imaging/vtkImageMedian3D.cxx
index 893a8c5f642e78bbb6955e0b0b6c0ebd30b5c0e0..4eeee290ae11821f571d89bf9d90925f15ed5f3b 100644
--- a/Imaging/vtkImageMedian3D.cxx
+++ b/Imaging/vtkImageMedian3D.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageMedian3D, "1.49");
 vtkStandardNewMacro(vtkImageMedian3D);
 
 //-----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMedian3D.h b/Imaging/vtkImageMedian3D.h
index 38e0a2d18999b0b2c15b9535598439d3c3571dc1..952bd57e1283043e1f700ef8c582cc55f173e704 100644
--- a/Imaging/vtkImageMedian3D.h
+++ b/Imaging/vtkImageMedian3D.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageMedian3D : public vtkImageSpatialAlgorithm
 {
 public:
   static vtkImageMedian3D *New();
-  vtkTypeRevisionMacro(vtkImageMedian3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageMedian3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageMirrorPad.cxx b/Imaging/vtkImageMirrorPad.cxx
index 87d21483b321135bebbcd8e286e6e574b4ef85b1..e53620cfe60c66b30febe2fd4cf81f3f247039dd 100644
--- a/Imaging/vtkImageMirrorPad.cxx
+++ b/Imaging/vtkImageMirrorPad.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageMirrorPad, "1.37");
 vtkStandardNewMacro(vtkImageMirrorPad);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageMirrorPad.h b/Imaging/vtkImageMirrorPad.h
index c78a30cba57341694a6b5cc3671a682b28b57ed4..5bde6e7b977bcff656db0702655ad3d1320327c6 100644
--- a/Imaging/vtkImageMirrorPad.h
+++ b/Imaging/vtkImageMirrorPad.h
@@ -28,7 +28,7 @@ class VTK_IMAGING_EXPORT vtkImageMirrorPad : public vtkImagePadFilter
 {
 public:
   static vtkImageMirrorPad *New();
-  vtkTypeRevisionMacro(vtkImageMirrorPad,vtkImagePadFilter);
+  vtkTypeMacro(vtkImageMirrorPad,vtkImagePadFilter);
 
 protected:
   vtkImageMirrorPad() {};
diff --git a/Imaging/vtkImageNoiseSource.cxx b/Imaging/vtkImageNoiseSource.cxx
index bfd40a7dcf1180f55a0dbb591245608515842907..7b66528c897995991587fb6e4539f3a577b88173 100644
--- a/Imaging/vtkImageNoiseSource.cxx
+++ b/Imaging/vtkImageNoiseSource.cxx
@@ -22,7 +22,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageNoiseSource, "1.32");
 vtkStandardNewMacro(vtkImageNoiseSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageNoiseSource.h b/Imaging/vtkImageNoiseSource.h
index d9f51cedb55705f0d87265c837601a86254522fb..61e63ee0558afc9e2f71fc663090bc7b8cdc688e 100644
--- a/Imaging/vtkImageNoiseSource.h
+++ b/Imaging/vtkImageNoiseSource.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageNoiseSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageNoiseSource *New();
-  vtkTypeRevisionMacro(vtkImageNoiseSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageNoiseSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageNonMaximumSuppression.cxx b/Imaging/vtkImageNonMaximumSuppression.cxx
index efbbb15a9dbf40bf5448c9ac510d2f8d93073be7..44001283c3f1fffe6578b43231ea2d4290097ac8 100644
--- a/Imaging/vtkImageNonMaximumSuppression.cxx
+++ b/Imaging/vtkImageNonMaximumSuppression.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageNonMaximumSuppression, "1.58");
 vtkStandardNewMacro(vtkImageNonMaximumSuppression);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageNonMaximumSuppression.h b/Imaging/vtkImageNonMaximumSuppression.h
index a81d0a842ab0ba37ce073f3119d87f3622ae1c39..282abec3f808ca52df3a75389306bfe083f8accc 100644
--- a/Imaging/vtkImageNonMaximumSuppression.h
+++ b/Imaging/vtkImageNonMaximumSuppression.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageNonMaximumSuppression : public vtkThreadedImage
 {
 public:
   static vtkImageNonMaximumSuppression *New();
-  vtkTypeRevisionMacro(vtkImageNonMaximumSuppression,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageNonMaximumSuppression,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageNormalize.cxx b/Imaging/vtkImageNormalize.cxx
index 32a7417fc4ab1f10f62897ad75bddc8ed2c7bedd..26aa8fcf8d9f027157e6f0d8f5ef7d0fe81d41ec 100644
--- a/Imaging/vtkImageNormalize.cxx
+++ b/Imaging/vtkImageNormalize.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageNormalize, "1.20");
 vtkStandardNewMacro(vtkImageNormalize);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageNormalize.h b/Imaging/vtkImageNormalize.h
index f6b8f1999f8042fbddd7fbed8123eafb01103530..b81d57eb8082da2485dcdf8ed42d0e2356ce601f 100644
--- a/Imaging/vtkImageNormalize.h
+++ b/Imaging/vtkImageNormalize.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageNormalize : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageNormalize *New();
-  vtkTypeRevisionMacro(vtkImageNormalize,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageNormalize,vtkThreadedImageAlgorithm);
 
 protected:
   vtkImageNormalize();
diff --git a/Imaging/vtkImageOpenClose3D.cxx b/Imaging/vtkImageOpenClose3D.cxx
index 5ded88da39fe8bf76ad80942b1b95744526cf2b6..90abec36f9e5892842145c75eb62e3668892f28b 100644
--- a/Imaging/vtkImageOpenClose3D.cxx
+++ b/Imaging/vtkImageOpenClose3D.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageOpenClose3D, "1.32");
 vtkStandardNewMacro(vtkImageOpenClose3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageOpenClose3D.h b/Imaging/vtkImageOpenClose3D.h
index 60b4adafcaf68969c0d69b8cfbf5ce549659cd00..5e2fa32700c36fa9bdbb0f35d38b2c102cb528ff 100644
--- a/Imaging/vtkImageOpenClose3D.h
+++ b/Imaging/vtkImageOpenClose3D.h
@@ -42,7 +42,7 @@ public:
   // Description:
   // Default open value is 0, and default close value is 255.
   static vtkImageOpenClose3D *New();
-  vtkTypeRevisionMacro(vtkImageOpenClose3D,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageOpenClose3D,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImagePadFilter.cxx b/Imaging/vtkImagePadFilter.cxx
index a7c2a125ab503c644fb065ccd88b0ba25f1f5ded..969c17e484d390b2ab2d5828d73c0d7a1f926844 100644
--- a/Imaging/vtkImagePadFilter.cxx
+++ b/Imaging/vtkImagePadFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkDataSetAttributes.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImagePadFilter, "1.34");
 vtkStandardNewMacro(vtkImagePadFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImagePadFilter.h b/Imaging/vtkImagePadFilter.h
index 57c0879c2a4b6783079597ec1a1c03564a518fb1..243ee04cd0ac1fbe6eb448495bfee207687afee2 100644
--- a/Imaging/vtkImagePadFilter.h
+++ b/Imaging/vtkImagePadFilter.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImagePadFilter : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImagePadFilter *New();
-  vtkTypeRevisionMacro(vtkImagePadFilter,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImagePadFilter,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImagePermute.cxx b/Imaging/vtkImagePermute.cxx
index 43680e4cf1fe714b67ec3b6757f8e8fe6243e680..9bfad9fae724311101b87143a3b247afd78551a0 100644
--- a/Imaging/vtkImagePermute.cxx
+++ b/Imaging/vtkImagePermute.cxx
@@ -15,7 +15,6 @@
 #include "vtkImagePermute.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImagePermute, "1.32");
 vtkStandardNewMacro(vtkImagePermute);
 
 vtkImagePermute::vtkImagePermute()
diff --git a/Imaging/vtkImagePermute.h b/Imaging/vtkImagePermute.h
index f75ba33ecbd6d2d27b359f168e6d12c175a7de86..1a0f443ca6c7e98e2bee3f2683bc5bf0b6efd679 100644
--- a/Imaging/vtkImagePermute.h
+++ b/Imaging/vtkImagePermute.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImagePermute : public vtkImageReslice
 {
 public:
   static vtkImagePermute *New();
-  vtkTypeRevisionMacro(vtkImagePermute,vtkImageReslice);
+  vtkTypeMacro(vtkImagePermute,vtkImageReslice);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageQuantizeRGBToIndex.cxx b/Imaging/vtkImageQuantizeRGBToIndex.cxx
index acf73aef5b6077503ab01b9b68f9354067211224..67b2d4abe81664c6aa5d981ab501f16483ca8365 100644
--- a/Imaging/vtkImageQuantizeRGBToIndex.cxx
+++ b/Imaging/vtkImageQuantizeRGBToIndex.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageQuantizeRGBToIndex, "1.45");
 vtkStandardNewMacro(vtkImageQuantizeRGBToIndex);
 
 class vtkColorQuantizeNode
diff --git a/Imaging/vtkImageQuantizeRGBToIndex.h b/Imaging/vtkImageQuantizeRGBToIndex.h
index 97ea9e6b566bc098ac6afdcaf2d4059076b44f86..c79d92d198c6df0459ba31e98030f0cfb1e213f0 100644
--- a/Imaging/vtkImageQuantizeRGBToIndex.h
+++ b/Imaging/vtkImageQuantizeRGBToIndex.h
@@ -36,7 +36,7 @@ class VTK_IMAGING_EXPORT vtkImageQuantizeRGBToIndex : public vtkImageAlgorithm
 {
 public:
   static vtkImageQuantizeRGBToIndex *New();
-  vtkTypeRevisionMacro(vtkImageQuantizeRGBToIndex,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageQuantizeRGBToIndex,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageRFFT.cxx b/Imaging/vtkImageRFFT.cxx
index 03924aa92c63908971e97f2174983f1d83e7b006..4aab8e74ef3a88705fbb2cad66dfe3747c04178c 100644
--- a/Imaging/vtkImageRFFT.cxx
+++ b/Imaging/vtkImageRFFT.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageRFFT, "1.38");
 vtkStandardNewMacro(vtkImageRFFT);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageRFFT.h b/Imaging/vtkImageRFFT.h
index 88aac7d766a0a8779034cd86c01050937352bb61..2d0ed93f755dedd2694566526e05cb4e5309e3ea 100644
--- a/Imaging/vtkImageRFFT.h
+++ b/Imaging/vtkImageRFFT.h
@@ -41,7 +41,7 @@ class VTK_IMAGING_EXPORT vtkImageRFFT : public vtkImageFourierFilter
 {
 public:
   static vtkImageRFFT *New();
-  vtkTypeRevisionMacro(vtkImageRFFT,vtkImageFourierFilter);
+  vtkTypeMacro(vtkImageRFFT,vtkImageFourierFilter);
 
   
   // Description:
diff --git a/Imaging/vtkImageRGBToHSI.cxx b/Imaging/vtkImageRGBToHSI.cxx
index 4bb31bd91ed0e9f9894ef3b36008da613745aa67..7f808ffeaa2d4da87cc3f66d9e24e857fa1a6d51 100644
--- a/Imaging/vtkImageRGBToHSI.cxx
+++ b/Imaging/vtkImageRGBToHSI.cxx
@@ -20,7 +20,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageRGBToHSI, "1.6");
 vtkStandardNewMacro(vtkImageRGBToHSI);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageRGBToHSI.h b/Imaging/vtkImageRGBToHSI.h
index 402755a082f59dcf2c4f24b82606e656c2c3eea6..d890b3616c85525313dd88115ba1940eefa637d3 100644
--- a/Imaging/vtkImageRGBToHSI.h
+++ b/Imaging/vtkImageRGBToHSI.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageRGBToHSI : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageRGBToHSI *New();
-  vtkTypeRevisionMacro(vtkImageRGBToHSI,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageRGBToHSI,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageRGBToHSV.cxx b/Imaging/vtkImageRGBToHSV.cxx
index 860c154e8362159f964158f0517500d515c2b7b6..ee7e4c78a574a276acbac701773091560ddad997 100644
--- a/Imaging/vtkImageRGBToHSV.cxx
+++ b/Imaging/vtkImageRGBToHSV.cxx
@@ -19,7 +19,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkImageRGBToHSV, "1.31");
 vtkStandardNewMacro(vtkImageRGBToHSV);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageRGBToHSV.h b/Imaging/vtkImageRGBToHSV.h
index fb1dc7b48dfb048b3de15b1d64fc6cfe68956e66..ae0a71c95d28a32c170297bf0d331c4f895b1c8d 100644
--- a/Imaging/vtkImageRGBToHSV.h
+++ b/Imaging/vtkImageRGBToHSV.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageRGBToHSV : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageRGBToHSV *New();
-  vtkTypeRevisionMacro(vtkImageRGBToHSV,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageRGBToHSV,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageRange3D.cxx b/Imaging/vtkImageRange3D.cxx
index b39465309aec4fa9774bc8a1f1d6c47eaa89f96e..fd14abadd35a714b89ecd564a741c8f54c475062 100644
--- a/Imaging/vtkImageRange3D.cxx
+++ b/Imaging/vtkImageRange3D.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageRange3D, "1.33");
 vtkStandardNewMacro(vtkImageRange3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageRange3D.h b/Imaging/vtkImageRange3D.h
index 5f2fa6f9df7ccdb12795468411c501af6a7ce07d..684439642d59fa99b00ca3d2f7a2ffca728d6518 100644
--- a/Imaging/vtkImageRange3D.h
+++ b/Imaging/vtkImageRange3D.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageRange3D : public vtkImageSpatialAlgorithm
 {
 public:
   static vtkImageRange3D *New();
-  vtkTypeRevisionMacro(vtkImageRange3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageRange3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageRectilinearWipe.cxx b/Imaging/vtkImageRectilinearWipe.cxx
index 3a3fb5b0580bd2bdc6a3bf454a2f3cec1400dca1..733d5a1b594937cc3c1ceaae4161358dd6790311 100644
--- a/Imaging/vtkImageRectilinearWipe.cxx
+++ b/Imaging/vtkImageRectilinearWipe.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageRectilinearWipe, "1.6");
 vtkStandardNewMacro(vtkImageRectilinearWipe);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageRectilinearWipe.h b/Imaging/vtkImageRectilinearWipe.h
index 8ef854549670197826efaefd36bc97037d12248a..0779dabedec176e951ec387cb0b741168d437eb7 100644
--- a/Imaging/vtkImageRectilinearWipe.h
+++ b/Imaging/vtkImageRectilinearWipe.h
@@ -58,7 +58,7 @@ class VTK_IMAGING_EXPORT vtkImageRectilinearWipe : public vtkThreadedImageAlgori
 {
 public:
   static vtkImageRectilinearWipe *New();
-  vtkTypeRevisionMacro(vtkImageRectilinearWipe,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageRectilinearWipe,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageResample.cxx b/Imaging/vtkImageResample.cxx
index 8b596f84e6395bbc0f0d47e0070f94f01b9ac91f..0840629cd355a161dfd60dc24db572bd8f93b45c 100644
--- a/Imaging/vtkImageResample.cxx
+++ b/Imaging/vtkImageResample.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageResample, "1.43");
 vtkStandardNewMacro(vtkImageResample);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageResample.h b/Imaging/vtkImageResample.h
index 361fd29f13d872d1f02dadf4bc482f6d46bcf874..89abdf7df5314ecd77ac4c27e9056379092b15bb 100644
--- a/Imaging/vtkImageResample.h
+++ b/Imaging/vtkImageResample.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageResample : public vtkImageReslice
 {
 public:
   static vtkImageResample *New();
-  vtkTypeRevisionMacro(vtkImageResample,vtkImageReslice);
+  vtkTypeMacro(vtkImageResample,vtkImageReslice);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageReslice.cxx b/Imaging/vtkImageReslice.cxx
index 45a053d8af0735a90b274a729e18821ba46bc306..124c978781dc8f526245bc5854540683bc5b6219 100644
--- a/Imaging/vtkImageReslice.cxx
+++ b/Imaging/vtkImageReslice.cxx
@@ -36,7 +36,6 @@
 #include <float.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageReslice, "1.75");
 vtkStandardNewMacro(vtkImageReslice);
 vtkCxxSetObjectMacro(vtkImageReslice, InformationInput, vtkImageData);
 vtkCxxSetObjectMacro(vtkImageReslice,ResliceAxes,vtkMatrix4x4);
diff --git a/Imaging/vtkImageReslice.h b/Imaging/vtkImageReslice.h
index b3e2a27f6a63e382c7f23004d6ffee45bc2f625d..44a2a2e9f4e9c0df8ac38c688f2e60da4784b685 100644
--- a/Imaging/vtkImageReslice.h
+++ b/Imaging/vtkImageReslice.h
@@ -68,7 +68,7 @@ class VTK_IMAGING_EXPORT vtkImageReslice : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageReslice *New();
-  vtkTypeRevisionMacro(vtkImageReslice, vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageReslice, vtkThreadedImageAlgorithm);
 
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageSeedConnectivity.cxx b/Imaging/vtkImageSeedConnectivity.cxx
index cf845172acfd3320e5137529170252773619f198..e97348127656f6ee5ccefe2643a29a2fb859e109 100644
--- a/Imaging/vtkImageSeedConnectivity.cxx
+++ b/Imaging/vtkImageSeedConnectivity.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageSeedConnectivity, "1.33");
 vtkStandardNewMacro(vtkImageSeedConnectivity);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSeedConnectivity.h b/Imaging/vtkImageSeedConnectivity.h
index 15318c833595f1721ce5e6fe3e66ff6a8d7a7ef1..f54ab5afcd71b41a85be94916466b223c1f56af0 100644
--- a/Imaging/vtkImageSeedConnectivity.h
+++ b/Imaging/vtkImageSeedConnectivity.h
@@ -37,7 +37,7 @@ class VTK_IMAGING_EXPORT vtkImageSeedConnectivity : public vtkImageAlgorithm
 {
 public:
   static vtkImageSeedConnectivity *New();
-  vtkTypeRevisionMacro(vtkImageSeedConnectivity,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageSeedConnectivity,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageSeparableConvolution.cxx b/Imaging/vtkImageSeparableConvolution.cxx
index 200ccd1fc84c31fa1448ba45a3ab86e27d36410b..95f1ae89ee534ef5dac54fbc6b870cf74b258964 100644
--- a/Imaging/vtkImageSeparableConvolution.cxx
+++ b/Imaging/vtkImageSeparableConvolution.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageSeparableConvolution, "1.21");
 vtkStandardNewMacro(vtkImageSeparableConvolution);
 vtkCxxSetObjectMacro(vtkImageSeparableConvolution,XKernel,vtkFloatArray);
 vtkCxxSetObjectMacro(vtkImageSeparableConvolution,YKernel,vtkFloatArray);
diff --git a/Imaging/vtkImageSeparableConvolution.h b/Imaging/vtkImageSeparableConvolution.h
index d8dc24c2de00d013a86bac3596973aa7e9013021..67840e86958ab7f9099e7a39303ebd9489ad1118 100644
--- a/Imaging/vtkImageSeparableConvolution.h
+++ b/Imaging/vtkImageSeparableConvolution.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageSeparableConvolution : public vtkImageDecompose
 {
 public:
   static vtkImageSeparableConvolution *New();
-  vtkTypeRevisionMacro(vtkImageSeparableConvolution,vtkImageDecomposeFilter);
+  vtkTypeMacro(vtkImageSeparableConvolution,vtkImageDecomposeFilter);
 
 
   // Set the X convolution kernel, a null value indicates no convolution to
diff --git a/Imaging/vtkImageShiftScale.cxx b/Imaging/vtkImageShiftScale.cxx
index 984a22ce999d0a95a2c479a760228bd7c1aea1b6..da5eadc4d3e633281495fd1a27c91721cbc11113 100644
--- a/Imaging/vtkImageShiftScale.cxx
+++ b/Imaging/vtkImageShiftScale.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageShiftScale, "1.54");
 vtkStandardNewMacro(vtkImageShiftScale);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageShiftScale.h b/Imaging/vtkImageShiftScale.h
index 3c3ddd593cb9103baa58cef502c0bec42daf91c6..b51ff42f459cd4cc86b3a1734341cd5a739b17e0 100644
--- a/Imaging/vtkImageShiftScale.h
+++ b/Imaging/vtkImageShiftScale.h
@@ -30,7 +30,7 @@ class VTK_IMAGING_EXPORT vtkImageShiftScale : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageShiftScale *New();
-  vtkTypeRevisionMacro(vtkImageShiftScale,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageShiftScale,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageShrink3D.cxx b/Imaging/vtkImageShrink3D.cxx
index 97609fadf60d3afac1cb91d8ddf4fc1e04bcfa33..dd4e09271e270bcf6998d84018a4a068f6bee95a 100644
--- a/Imaging/vtkImageShrink3D.cxx
+++ b/Imaging/vtkImageShrink3D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageShrink3D, "1.70");
 vtkStandardNewMacro(vtkImageShrink3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageShrink3D.h b/Imaging/vtkImageShrink3D.h
index 386a0f8c48cd796537c0859dbe9b8ddfee417263..f462b429e218c56d4dee8039eedbcba05817b63e 100644
--- a/Imaging/vtkImageShrink3D.h
+++ b/Imaging/vtkImageShrink3D.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageShrink3D : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageShrink3D *New();
-  vtkTypeRevisionMacro(vtkImageShrink3D,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageShrink3D,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageSinusoidSource.cxx b/Imaging/vtkImageSinusoidSource.cxx
index 6bfc93713ecec9cc796c3448635645d555bbf7cf..6e81e068952a2635318ab0b4736056906ef9d72d 100644
--- a/Imaging/vtkImageSinusoidSource.cxx
+++ b/Imaging/vtkImageSinusoidSource.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageSinusoidSource, "1.43");
 vtkStandardNewMacro(vtkImageSinusoidSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSinusoidSource.h b/Imaging/vtkImageSinusoidSource.h
index 11cc1d8838a21994772ab1afddd8a0d054710f8f..7c9ebdf858559f7f59becdfa06af910ec96f716a 100644
--- a/Imaging/vtkImageSinusoidSource.h
+++ b/Imaging/vtkImageSinusoidSource.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkImageSinusoidSource : public vtkImageAlgorithm
 {
 public:
   static vtkImageSinusoidSource *New();
-  vtkTypeRevisionMacro(vtkImageSinusoidSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageSinusoidSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageSkeleton2D.cxx b/Imaging/vtkImageSkeleton2D.cxx
index 38246299024bede22e6bff10074164eb5a26cb32..da053ad6a61078721e672394927118d758f44c60 100644
--- a/Imaging/vtkImageSkeleton2D.cxx
+++ b/Imaging/vtkImageSkeleton2D.cxx
@@ -22,7 +22,6 @@
 #include "vtkDataSetAttributes.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageSkeleton2D, "1.39");
 vtkStandardNewMacro(vtkImageSkeleton2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSkeleton2D.h b/Imaging/vtkImageSkeleton2D.h
index 57829558e3e6b034c433d0f41384e27cfe8b8fbf..4880d69116eaebbf0345d85d99a4ddd71d55043b 100644
--- a/Imaging/vtkImageSkeleton2D.h
+++ b/Imaging/vtkImageSkeleton2D.h
@@ -35,7 +35,7 @@ class VTK_IMAGING_EXPORT vtkImageSkeleton2D : public vtkImageIterateFilter
 {
 public:
   static vtkImageSkeleton2D *New();
-  vtkTypeRevisionMacro(vtkImageSkeleton2D,vtkImageIterateFilter);
+  vtkTypeMacro(vtkImageSkeleton2D,vtkImageIterateFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageSobel2D.cxx b/Imaging/vtkImageSobel2D.cxx
index 17971a2f2f86b74e49b23c092766c9a9e4316393..d6c185597a332ed6db887317b48c7d96f77ace91 100644
--- a/Imaging/vtkImageSobel2D.cxx
+++ b/Imaging/vtkImageSobel2D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageSobel2D, "1.38");
 vtkStandardNewMacro(vtkImageSobel2D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSobel2D.h b/Imaging/vtkImageSobel2D.h
index b6eed3d2668f9aac1f9d1607eeffd90cc3dc5abb..8b828b9359aaea0ac914e863ebc403241cf96e5a 100644
--- a/Imaging/vtkImageSobel2D.h
+++ b/Imaging/vtkImageSobel2D.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageSobel2D : public vtkImageSpatialAlgorithm
 {
 public:
   static vtkImageSobel2D *New();
-  vtkTypeRevisionMacro(vtkImageSobel2D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageSobel2D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Imaging/vtkImageSobel3D.cxx b/Imaging/vtkImageSobel3D.cxx
index 7b13172ed56bb8570b5eddedf494d0e0ef478ede..041583adf073bb25c7f812cf60cfe8ccc625e268 100644
--- a/Imaging/vtkImageSobel3D.cxx
+++ b/Imaging/vtkImageSobel3D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageSobel3D, "1.39");
 vtkStandardNewMacro(vtkImageSobel3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSobel3D.h b/Imaging/vtkImageSobel3D.h
index a8c15145e42901641be040ff718c57ed3a3e0517..e3fe6200bc82423aa2c85d98f5152d49dfc155c3 100644
--- a/Imaging/vtkImageSobel3D.h
+++ b/Imaging/vtkImageSobel3D.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageSobel3D : public vtkImageSpatialAlgorithm
 {
 public:
   static vtkImageSobel3D *New();
-  vtkTypeRevisionMacro(vtkImageSobel3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageSobel3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Imaging/vtkImageSpatialAlgorithm.cxx b/Imaging/vtkImageSpatialAlgorithm.cxx
index d2cc9c80a6d32da114a5f89ba7538c47b867dc70..70b8f4085b53777675d9d1994b766424f65bc0db 100644
--- a/Imaging/vtkImageSpatialAlgorithm.cxx
+++ b/Imaging/vtkImageSpatialAlgorithm.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageSpatialAlgorithm, "1.3");
 vtkStandardNewMacro(vtkImageSpatialAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSpatialAlgorithm.h b/Imaging/vtkImageSpatialAlgorithm.h
index db753f5ef1efe05f60c77d9511563ca0e9d00c4f..f443fccea1147e313e3bff0ad44f1eff35dd2d4c 100644
--- a/Imaging/vtkImageSpatialAlgorithm.h
+++ b/Imaging/vtkImageSpatialAlgorithm.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageSpatialAlgorithm : public vtkThreadedImageAlgor
 {
 public:
   static vtkImageSpatialAlgorithm *New();
-  vtkTypeRevisionMacro(vtkImageSpatialAlgorithm,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageSpatialAlgorithm,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageSpatialFilter.cxx b/Imaging/vtkImageSpatialFilter.cxx
index 790f86a07cf7ee11e0519f0b945aa597458b9717..81fff6a6ec009ad4957a07bf0573eff5294b2f14 100644
--- a/Imaging/vtkImageSpatialFilter.cxx
+++ b/Imaging/vtkImageSpatialFilter.cxx
@@ -21,7 +21,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageSpatialFilter, "1.52");
 vtkStandardNewMacro(vtkImageSpatialFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageSpatialFilter.h b/Imaging/vtkImageSpatialFilter.h
index 5cc048a9eaddf6986e5e3489035c32d95329ea50..b98bc84f7d4bec6fdc6dbcb852d7c546796bdbc8 100644
--- a/Imaging/vtkImageSpatialFilter.h
+++ b/Imaging/vtkImageSpatialFilter.h
@@ -39,7 +39,7 @@ class VTK_IMAGING_EXPORT vtkImageSpatialFilter : public vtkImageToImageFilter
 {
 public:
   static vtkImageSpatialFilter *New();
-  vtkTypeRevisionMacro(vtkImageSpatialFilter,vtkImageToImageFilter);
+  vtkTypeMacro(vtkImageSpatialFilter,vtkImageToImageFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageStencil.cxx b/Imaging/vtkImageStencil.cxx
index 9dafc651dbcb00f3bf5ae8e4c68a7ba669f2320c..9062b1e0bacfd366f133d8a306792699b1a7e884 100644
--- a/Imaging/vtkImageStencil.cxx
+++ b/Imaging/vtkImageStencil.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageStencil, "1.22");
 vtkStandardNewMacro(vtkImageStencil);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageStencil.h b/Imaging/vtkImageStencil.h
index cc99c6c8da0b25ab92dd410c5da9605656288371..5fe0b701e1940a854a587acaee4c6af71a7eb2e0 100644
--- a/Imaging/vtkImageStencil.h
+++ b/Imaging/vtkImageStencil.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageStencil : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageStencil *New();
-  vtkTypeRevisionMacro(vtkImageStencil, vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageStencil, vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageStencilData.cxx b/Imaging/vtkImageStencilData.cxx
index 3e9ca1ed0333157fc3f0c338ad4105b9e1eab0ca..1e926524d556bc547818473ae2f5deefa0d1f86c 100644
--- a/Imaging/vtkImageStencilData.cxx
+++ b/Imaging/vtkImageStencilData.cxx
@@ -25,7 +25,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageStencilData, "1.33");
 vtkStandardNewMacro(vtkImageStencilData);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageStencilData.h b/Imaging/vtkImageStencilData.h
index 84d0a100e27e764ef425e59c517b3bcfce3f47cb..051b93892bb471b6f688ba73fabef445a87bb5f3 100644
--- a/Imaging/vtkImageStencilData.h
+++ b/Imaging/vtkImageStencilData.h
@@ -31,7 +31,7 @@ class VTK_IMAGING_EXPORT vtkImageStencilData : public vtkDataObject
 {
 public:
   static vtkImageStencilData *New();
-  vtkTypeRevisionMacro(vtkImageStencilData, vtkDataObject);
+  vtkTypeMacro(vtkImageStencilData, vtkDataObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void Initialize();
diff --git a/Imaging/vtkImageStencilSource.cxx b/Imaging/vtkImageStencilSource.cxx
index ed7be72c328dcf9479f00da5af8fc75c073dfe08..bed690a3679e834fc478417396145b036edf1a3a 100644
--- a/Imaging/vtkImageStencilSource.cxx
+++ b/Imaging/vtkImageStencilSource.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageStencilSource, "1.12");
 vtkStandardNewMacro(vtkImageStencilSource);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageStencilSource.h b/Imaging/vtkImageStencilSource.h
index 4f340f420f0daad1854e7bfecdbf768d10282f64..09dd4c22e555f252107831123fae47e70b78861b 100644
--- a/Imaging/vtkImageStencilSource.h
+++ b/Imaging/vtkImageStencilSource.h
@@ -38,7 +38,7 @@ class VTK_IMAGING_EXPORT vtkImageStencilSource : public vtkAlgorithm
 {
 public:
   static vtkImageStencilSource *New();
-  vtkTypeRevisionMacro(vtkImageStencilSource, vtkAlgorithm);
+  vtkTypeMacro(vtkImageStencilSource, vtkAlgorithm);
 
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Imaging/vtkImageThreshold.cxx b/Imaging/vtkImageThreshold.cxx
index 8d66a2a9287f1bc2dca270f4de799e6c2b8d688a..0ca857be8ae3647a251a320dcd8ecd276991d264 100644
--- a/Imaging/vtkImageThreshold.cxx
+++ b/Imaging/vtkImageThreshold.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkDataSetAttributes.h"
 
-vtkCxxRevisionMacro(vtkImageThreshold, "1.52");
 vtkStandardNewMacro(vtkImageThreshold);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageThreshold.h b/Imaging/vtkImageThreshold.h
index 1177dc4c2c8a6ad18acc2aafadf1936b75e41e8e..e1bda85a90ab0355ff848f19357639107acdeaf3 100644
--- a/Imaging/vtkImageThreshold.h
+++ b/Imaging/vtkImageThreshold.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkImageThreshold : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageThreshold *New();
-  vtkTypeRevisionMacro(vtkImageThreshold,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageThreshold,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageToImageStencil.cxx b/Imaging/vtkImageToImageStencil.cxx
index 192329f62d2367def0ee08e81ac2fa0b782870a4..1bdfddfd8770942b58099dd5aa60a6721a69239f 100644
--- a/Imaging/vtkImageToImageStencil.cxx
+++ b/Imaging/vtkImageToImageStencil.cxx
@@ -25,7 +25,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImageToImageStencil, "1.20");
 vtkStandardNewMacro(vtkImageToImageStencil);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageToImageStencil.h b/Imaging/vtkImageToImageStencil.h
index 2fd7987a10b3b86e372ee5929e05a4154aaa5fa7..be53d33ec038bb4a07659af773d46b88e6a5eebb 100644
--- a/Imaging/vtkImageToImageStencil.h
+++ b/Imaging/vtkImageToImageStencil.h
@@ -32,7 +32,7 @@ class VTK_IMAGING_EXPORT vtkImageToImageStencil : public vtkImageStencilSource
 {
 public:
   static vtkImageToImageStencil *New();
-  vtkTypeRevisionMacro(vtkImageToImageStencil, vtkImageStencilSource);
+  vtkTypeMacro(vtkImageToImageStencil, vtkImageStencilSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageTranslateExtent.cxx b/Imaging/vtkImageTranslateExtent.cxx
index 8b26fbd1fb6bb54b195259cfc0b886870dfbd2f8..696a09a8505ec2bfcc471f75cf8dcac0b1f9cb0a 100644
--- a/Imaging/vtkImageTranslateExtent.cxx
+++ b/Imaging/vtkImageTranslateExtent.cxx
@@ -21,7 +21,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkImageTranslateExtent, "1.27");
 vtkStandardNewMacro(vtkImageTranslateExtent);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageTranslateExtent.h b/Imaging/vtkImageTranslateExtent.h
index 1e31f56e6b2e50401fe098c9952bdbe8499d78d9..9c59c56cf96e29000876e9e3a5124cfc2b4f327d 100644
--- a/Imaging/vtkImageTranslateExtent.h
+++ b/Imaging/vtkImageTranslateExtent.h
@@ -26,7 +26,7 @@ class VTK_IMAGING_EXPORT vtkImageTranslateExtent : public vtkImageAlgorithm
 {
 public:
   static vtkImageTranslateExtent *New();
-  vtkTypeRevisionMacro(vtkImageTranslateExtent,vtkImageAlgorithm);
+  vtkTypeMacro(vtkImageTranslateExtent,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageVariance3D.cxx b/Imaging/vtkImageVariance3D.cxx
index fd8289e90402c617e9d4f207c6faee52f9fc1454..24e017510ee96b4851ac0690e09aa8f3a09ff5c0 100644
--- a/Imaging/vtkImageVariance3D.cxx
+++ b/Imaging/vtkImageVariance3D.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageVariance3D, "1.33");
 vtkStandardNewMacro(vtkImageVariance3D);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageVariance3D.h b/Imaging/vtkImageVariance3D.h
index 272cc32969891e11bebb6e3437d20e9566a2bc5c..f7e8c5717aea84e9017eb3d3df2c53f965a187ca 100644
--- a/Imaging/vtkImageVariance3D.h
+++ b/Imaging/vtkImageVariance3D.h
@@ -34,7 +34,7 @@ class VTK_IMAGING_EXPORT vtkImageVariance3D : public vtkImageSpatialAlgorithm
 {
 public:
   static vtkImageVariance3D *New();
-  vtkTypeRevisionMacro(vtkImageVariance3D,vtkImageSpatialAlgorithm);
+  vtkTypeMacro(vtkImageVariance3D,vtkImageSpatialAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Imaging/vtkImageWeightedSum.cxx b/Imaging/vtkImageWeightedSum.cxx
index 2dc805bb50943de5065c1754c4991be753c91e90..1f3bdd91be3784c03fe2ff7ab938419983e19cc3 100644
--- a/Imaging/vtkImageWeightedSum.cxx
+++ b/Imaging/vtkImageWeightedSum.cxx
@@ -24,7 +24,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkDataSetAttributes.h"
 
-vtkCxxRevisionMacro(vtkImageWeightedSum, "1.9");
 vtkStandardNewMacro(vtkImageWeightedSum);
 
 vtkCxxSetObjectMacro(vtkImageWeightedSum,Weights,vtkDoubleArray);
diff --git a/Imaging/vtkImageWeightedSum.h b/Imaging/vtkImageWeightedSum.h
index a888e612a53f67c3273246296dbfd86bc2dc8bc3..b9b7ec53d8931022e25efd5095f5c90f0fa30b2d 100644
--- a/Imaging/vtkImageWeightedSum.h
+++ b/Imaging/vtkImageWeightedSum.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageWeightedSum : public vtkThreadedImageAlgorithm
 {
 public:
   static vtkImageWeightedSum *New();
-  vtkTypeRevisionMacro(vtkImageWeightedSum,vtkThreadedImageAlgorithm);
+  vtkTypeMacro(vtkImageWeightedSum,vtkThreadedImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkImageWrapPad.cxx b/Imaging/vtkImageWrapPad.cxx
index 5225fff7774c33126564266600a83361394e58f4..fc75121920f44a9a5c0a410918e99564e1fd1f8d 100644
--- a/Imaging/vtkImageWrapPad.cxx
+++ b/Imaging/vtkImageWrapPad.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkImageWrapPad, "1.34");
 vtkStandardNewMacro(vtkImageWrapPad);
 
 //----------------------------------------------------------------------------
diff --git a/Imaging/vtkImageWrapPad.h b/Imaging/vtkImageWrapPad.h
index 4658934a791167a279e40601a24250e9a227e1b4..df086649ea620ae75fd1f58f6d8cd735ca68d1c6 100644
--- a/Imaging/vtkImageWrapPad.h
+++ b/Imaging/vtkImageWrapPad.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImageWrapPad : public vtkImagePadFilter
 {
 public:
   static vtkImageWrapPad *New();
-  vtkTypeRevisionMacro(vtkImageWrapPad,vtkImagePadFilter);
+  vtkTypeMacro(vtkImageWrapPad,vtkImagePadFilter);
 
 protected:
   vtkImageWrapPad() {};
diff --git a/Imaging/vtkImplicitFunctionToImageStencil.cxx b/Imaging/vtkImplicitFunctionToImageStencil.cxx
index 1db9326d12211baa6edbd128074091fca3405d9f..c1e5388873bff2572cdfbbba246564a645cf998b 100644
--- a/Imaging/vtkImplicitFunctionToImageStencil.cxx
+++ b/Imaging/vtkImplicitFunctionToImageStencil.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkImplicitFunctionToImageStencil, "1.14");
 vtkStandardNewMacro(vtkImplicitFunctionToImageStencil);
 vtkCxxSetObjectMacro(vtkImplicitFunctionToImageStencil, Input,
                      vtkImplicitFunction);
diff --git a/Imaging/vtkImplicitFunctionToImageStencil.h b/Imaging/vtkImplicitFunctionToImageStencil.h
index 4e3e0a3fc1a90017e132f9a69f7b8ff1b16bcf98..d30d0259dc6664138c14996f8c1c92d46d291f1c 100644
--- a/Imaging/vtkImplicitFunctionToImageStencil.h
+++ b/Imaging/vtkImplicitFunctionToImageStencil.h
@@ -33,7 +33,7 @@ class VTK_IMAGING_EXPORT vtkImplicitFunctionToImageStencil : public vtkImageSten
 {
 public:
   static vtkImplicitFunctionToImageStencil *New();
-  vtkTypeRevisionMacro(vtkImplicitFunctionToImageStencil, vtkImageStencilSource);
+  vtkTypeMacro(vtkImplicitFunctionToImageStencil, vtkImageStencilSource);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkPointLoad.cxx b/Imaging/vtkPointLoad.cxx
index 5ee240d6161708767a84646c6e55722bda03c345..5f2dbe1e91f6b75198cb278cc42a69062b59f865 100644
--- a/Imaging/vtkPointLoad.cxx
+++ b/Imaging/vtkPointLoad.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkPointLoad, "1.49");
 vtkStandardNewMacro(vtkPointLoad);
 
 // Construct with ModelBounds=(-1,1,-1,1,-1,1), SampleDimensions=(50,50,50),
diff --git a/Imaging/vtkPointLoad.h b/Imaging/vtkPointLoad.h
index 3fa92012a66713cce66c262ef3f7b38311fe0eab..74bbaa29925df01c6a1284cf9b93bae791fb90ab 100644
--- a/Imaging/vtkPointLoad.h
+++ b/Imaging/vtkPointLoad.h
@@ -32,7 +32,7 @@
 class VTK_IMAGING_EXPORT vtkPointLoad :  public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkPointLoad,vtkImageAlgorithm);
+  vtkTypeMacro(vtkPointLoad,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkRTAnalyticSource.cxx b/Imaging/vtkRTAnalyticSource.cxx
index b0bd051eb6e7558bebec6ac0c2f1c4b00cc384e9..35c60716211ddac0b6f56e2af899dc5812dfc619 100644
--- a/Imaging/vtkRTAnalyticSource.cxx
+++ b/Imaging/vtkRTAnalyticSource.cxx
@@ -24,7 +24,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkRTAnalyticSource, "1.1");
 vtkStandardNewMacro(vtkRTAnalyticSource);
 
 // ----------------------------------------------------------------------------
diff --git a/Imaging/vtkRTAnalyticSource.h b/Imaging/vtkRTAnalyticSource.h
index b4c8419fc5d7414cce144d5c855b4afaf311e6b2..dbeaf8c3a8bb0280561c5588a13b1a53290edb38 100644
--- a/Imaging/vtkRTAnalyticSource.h
+++ b/Imaging/vtkRTAnalyticSource.h
@@ -27,7 +27,7 @@ class VTK_IMAGING_EXPORT vtkRTAnalyticSource : public vtkImageAlgorithm
 {
 public:
   static vtkRTAnalyticSource *New();
-  vtkTypeRevisionMacro(vtkRTAnalyticSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkRTAnalyticSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkSampleFunction.cxx b/Imaging/vtkSampleFunction.cxx
index 5cfe3ab8a3705e91f2fe57a6a6c1c3d659294187..a8b9a7b4937bcfde32ecbed6755cfa28ccd2c536 100644
--- a/Imaging/vtkSampleFunction.cxx
+++ b/Imaging/vtkSampleFunction.cxx
@@ -26,7 +26,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkSampleFunction, "1.78");
 vtkStandardNewMacro(vtkSampleFunction);
 vtkCxxSetObjectMacro(vtkSampleFunction,ImplicitFunction,vtkImplicitFunction);
 
diff --git a/Imaging/vtkSampleFunction.h b/Imaging/vtkSampleFunction.h
index ebe1706a4b166e7216502dc94fb761f33a93646b..c58ce610c0ea881fdd85ba3b57969b39a41a46c4 100644
--- a/Imaging/vtkSampleFunction.h
+++ b/Imaging/vtkSampleFunction.h
@@ -35,7 +35,7 @@ class vtkDataArray;
 class VTK_IMAGING_EXPORT vtkSampleFunction : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSampleFunction,vtkImageAlgorithm);
+  vtkTypeMacro(vtkSampleFunction,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkShepardMethod.cxx b/Imaging/vtkShepardMethod.cxx
index 7485c8dd8b8287ee9a757ddfb109f545748f64eb..6ade2068797eceb5c9e37423d2ef46f6aeb2de06 100644
--- a/Imaging/vtkShepardMethod.cxx
+++ b/Imaging/vtkShepardMethod.cxx
@@ -23,7 +23,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkShepardMethod, "1.50");
 vtkStandardNewMacro(vtkShepardMethod);
 
 // Construct with sample dimensions=(50,50,50) and so that model bounds are
diff --git a/Imaging/vtkShepardMethod.h b/Imaging/vtkShepardMethod.h
index 9529449a5153b1957465c3f521eb117a1930caf3..73c3c882483495d4085ade4baf6135dccd49a382 100644
--- a/Imaging/vtkShepardMethod.h
+++ b/Imaging/vtkShepardMethod.h
@@ -40,7 +40,7 @@
 class VTK_IMAGING_EXPORT vtkShepardMethod : public vtkImageAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkShepardMethod,vtkImageAlgorithm);
+  vtkTypeMacro(vtkShepardMethod,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkSimpleImageFilterExample.cxx b/Imaging/vtkSimpleImageFilterExample.cxx
index 26abdcc4077f2c85612a270cd07e608c7eb33e50..75da6db8583325a5c12397a0ca3a82550fcc117f 100644
--- a/Imaging/vtkSimpleImageFilterExample.cxx
+++ b/Imaging/vtkSimpleImageFilterExample.cxx
@@ -17,7 +17,6 @@
 #include "vtkImageData.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkSimpleImageFilterExample, "1.13");
 vtkStandardNewMacro(vtkSimpleImageFilterExample);
 
 // The switch statement in Execute will call this method with
diff --git a/Imaging/vtkSimpleImageFilterExample.h b/Imaging/vtkSimpleImageFilterExample.h
index aaa82fb12b23fe51c9c25aa726e8aa1f98a12b9b..6f122c354662f09ce052e9465a61a75a2410bbc6 100644
--- a/Imaging/vtkSimpleImageFilterExample.h
+++ b/Imaging/vtkSimpleImageFilterExample.h
@@ -29,7 +29,7 @@ class VTK_IMAGING_EXPORT vtkSimpleImageFilterExample : public vtkSimpleImageToIm
 {
 public:
   static vtkSimpleImageFilterExample *New();
-  vtkTypeRevisionMacro(vtkSimpleImageFilterExample,vtkSimpleImageToImageFilter);
+  vtkTypeMacro(vtkSimpleImageFilterExample,vtkSimpleImageToImageFilter);
 
 protected:
 
diff --git a/Imaging/vtkSurfaceReconstructionFilter.cxx b/Imaging/vtkSurfaceReconstructionFilter.cxx
index 9d9ef02e95215398407fb4a2a2cfabbf006f33c3..07df5e3c1e1eb9b0e40a6264e56c1d7391f9bef9 100644
--- a/Imaging/vtkSurfaceReconstructionFilter.cxx
+++ b/Imaging/vtkSurfaceReconstructionFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointLocator.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkSurfaceReconstructionFilter, "1.37");
 vtkStandardNewMacro(vtkSurfaceReconstructionFilter);
 
 vtkSurfaceReconstructionFilter::vtkSurfaceReconstructionFilter()
diff --git a/Imaging/vtkSurfaceReconstructionFilter.h b/Imaging/vtkSurfaceReconstructionFilter.h
index bd3397ba394730e7eaf4debddaaaef89ea126fce..b1c9785824aada50bda7819f0352a8f2f0bf0f73 100644
--- a/Imaging/vtkSurfaceReconstructionFilter.h
+++ b/Imaging/vtkSurfaceReconstructionFilter.h
@@ -30,7 +30,7 @@
 class VTK_IMAGING_EXPORT vtkSurfaceReconstructionFilter : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSurfaceReconstructionFilter,vtkImageAlgorithm);
+  vtkTypeMacro(vtkSurfaceReconstructionFilter,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkTriangularTexture.cxx b/Imaging/vtkTriangularTexture.cxx
index 7aeb28a348d02db0a96587e1eb349c12cb9c7e57..dc77045adc15b3fbaac02d3fe8037a98c04fa86e 100644
--- a/Imaging/vtkTriangularTexture.cxx
+++ b/Imaging/vtkTriangularTexture.cxx
@@ -23,7 +23,6 @@
 #include "vtkPointData.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkTriangularTexture, "1.31");
 vtkStandardNewMacro(vtkTriangularTexture);
 
 // Instantiate object with XSize and YSize = 64; the texture pattern =1
diff --git a/Imaging/vtkTriangularTexture.h b/Imaging/vtkTriangularTexture.h
index 75e01393c5c14ebaba8abaf9199bf02a702ea26d..bc17d8598e0651a38add95e0da4a9c47766b5e39 100644
--- a/Imaging/vtkTriangularTexture.h
+++ b/Imaging/vtkTriangularTexture.h
@@ -33,7 +33,7 @@
 class VTK_IMAGING_EXPORT vtkTriangularTexture : public vtkImageAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkTriangularTexture,vtkImageAlgorithm);
+  vtkTypeMacro(vtkTriangularTexture,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Imaging/vtkVoxelModeller.cxx b/Imaging/vtkVoxelModeller.cxx
index 8b99cebe5a68ddfdaad952dd7615600f41cea9ec..fa26d8b87865786ef37bb711b721e32c2c50247d 100644
--- a/Imaging/vtkVoxelModeller.cxx
+++ b/Imaging/vtkVoxelModeller.cxx
@@ -25,7 +25,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVoxelModeller, "1.60");
 vtkStandardNewMacro(vtkVoxelModeller);
 
 // Construct an instance of vtkVoxelModeller with its sample dimensions
diff --git a/Imaging/vtkVoxelModeller.h b/Imaging/vtkVoxelModeller.h
index 5d2ebced5dc982a8babd0aa863d4a7b7a94bb077..8e2efb56c1860b1b569f58075e85fc0a7e0e0a6a 100644
--- a/Imaging/vtkVoxelModeller.h
+++ b/Imaging/vtkVoxelModeller.h
@@ -33,7 +33,7 @@
 class VTK_IMAGING_EXPORT vtkVoxelModeller : public vtkImageAlgorithm 
 {
 public:
-  vtkTypeRevisionMacro(vtkVoxelModeller,vtkImageAlgorithm);
+  vtkTypeMacro(vtkVoxelModeller,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAddMembershipArray.cxx b/Infovis/vtkAddMembershipArray.cxx
index 38617f5356ce8cf6a45122ad2501b35bdb75bfa9..bd16749c966b4ec0e54ca80d4c49be9cb7b457af 100644
--- a/Infovis/vtkAddMembershipArray.cxx
+++ b/Infovis/vtkAddMembershipArray.cxx
@@ -44,7 +44,6 @@
 #include "vtkVariant.h"
 #include "vtkVariantArray.h"
 
-vtkCxxRevisionMacro(vtkAddMembershipArray, "1.7");
 vtkStandardNewMacro(vtkAddMembershipArray);
 vtkCxxSetObjectMacro(vtkAddMembershipArray,InputValues,vtkAbstractArray);
 
diff --git a/Infovis/vtkAddMembershipArray.h b/Infovis/vtkAddMembershipArray.h
index a84f610b7c21c38e05ca6a3a168689cebd0524a6..bddad3533ffadf167f55458fa4900c26034e1317 100644
--- a/Infovis/vtkAddMembershipArray.h
+++ b/Infovis/vtkAddMembershipArray.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkAddMembershipArray : public vtkPassInputTypeAlgorith
 {
 public:
   static vtkAddMembershipArray* New();
-  vtkTypeRevisionMacro(vtkAddMembershipArray,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkAddMembershipArray,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Infovis/vtkAdjacencyMatrixToEdgeTable.cxx b/Infovis/vtkAdjacencyMatrixToEdgeTable.cxx
index cfbf4178acd65905fbff0224878fced0476d8be9..be79737c5d2159e4cd6b228944035ffb96733158 100644
--- a/Infovis/vtkAdjacencyMatrixToEdgeTable.cxx
+++ b/Infovis/vtkAdjacencyMatrixToEdgeTable.cxx
@@ -35,7 +35,6 @@
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkAdjacencyMatrixToEdgeTable, "1.6");
 vtkStandardNewMacro(vtkAdjacencyMatrixToEdgeTable);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkAdjacencyMatrixToEdgeTable.h b/Infovis/vtkAdjacencyMatrixToEdgeTable.h
index 6046604c4785177e52acf8efe844f5f67b4136e9..d5a8418bf2484931adb5836667d3e349d9f0971d 100644
--- a/Infovis/vtkAdjacencyMatrixToEdgeTable.h
+++ b/Infovis/vtkAdjacencyMatrixToEdgeTable.h
@@ -37,7 +37,7 @@ class VTK_INFOVIS_EXPORT vtkAdjacencyMatrixToEdgeTable : public vtkTableAlgorith
 {
 public:
   static vtkAdjacencyMatrixToEdgeTable* New();
-  vtkTypeRevisionMacro(vtkAdjacencyMatrixToEdgeTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkAdjacencyMatrixToEdgeTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAppendPoints.cxx b/Infovis/vtkAppendPoints.cxx
index a0074e3b0547888b7063af0298e98e7b779a76ce..281904e813e60b55023526d37678c32bff2aae22 100644
--- a/Infovis/vtkAppendPoints.cxx
+++ b/Infovis/vtkAppendPoints.cxx
@@ -28,7 +28,6 @@
 #include <vtkstd/set>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkAppendPoints, "1.2");
 vtkStandardNewMacro(vtkAppendPoints);
 
 //----------------------------------------------------------------------------
diff --git a/Infovis/vtkAppendPoints.h b/Infovis/vtkAppendPoints.h
index 9648c5f49383ae19035fd45a15712c04e7332262..9adfe263bf3631308e47e489927500669e9381ad 100644
--- a/Infovis/vtkAppendPoints.h
+++ b/Infovis/vtkAppendPoints.h
@@ -31,7 +31,7 @@ class VTK_INFOVIS_EXPORT vtkAppendPoints : public vtkPolyDataAlgorithm
 {
 public:
   static vtkAppendPoints *New();
-  vtkTypeRevisionMacro(vtkAppendPoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkAppendPoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkApplyColors.cxx b/Infovis/vtkApplyColors.cxx
index c98c0458ec6660a5e28b14ab4dbe219b8340aad7..07614c6000a238773d55e4bd5a7e34b3c61fa76e 100644
--- a/Infovis/vtkApplyColors.cxx
+++ b/Infovis/vtkApplyColors.cxx
@@ -35,7 +35,6 @@
 #include "vtkTable.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkApplyColors, "1.9");
 vtkStandardNewMacro(vtkApplyColors);
 vtkCxxSetObjectMacro(vtkApplyColors, PointLookupTable, vtkScalarsToColors);
 vtkCxxSetObjectMacro(vtkApplyColors, CellLookupTable, vtkScalarsToColors);
diff --git a/Infovis/vtkApplyColors.h b/Infovis/vtkApplyColors.h
index c511c996eeea58ba2a04f38ff39a995f6d5923b2..073522d388df9ec544a5f76f9f77b83e842d744a 100644
--- a/Infovis/vtkApplyColors.h
+++ b/Infovis/vtkApplyColors.h
@@ -83,7 +83,7 @@ class VTK_INFOVIS_EXPORT vtkApplyColors : public vtkPassInputTypeAlgorithm
 {
 public:
   static vtkApplyColors *New();
-  vtkTypeRevisionMacro(vtkApplyColors, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkApplyColors, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkApplyIcons.cxx b/Infovis/vtkApplyIcons.cxx
index b8269d088c201241c52b96582c4bce8a6b4f95e7..b6e23fede8197a32bc4063dc2fd84e1b97bf73e5 100644
--- a/Infovis/vtkApplyIcons.cxx
+++ b/Infovis/vtkApplyIcons.cxx
@@ -37,7 +37,6 @@
 
 #include <vtksys/stl/map>
 
-vtkCxxRevisionMacro(vtkApplyIcons, "1.1");
 vtkStandardNewMacro(vtkApplyIcons);
 
 class vtkApplyIcons::Internals {
diff --git a/Infovis/vtkApplyIcons.h b/Infovis/vtkApplyIcons.h
index 73834ae133d094fb4157115be13c938e09fb0a4d..7c28aac2596319dfd350cb8a861dadcbd6d8cb4d 100644
--- a/Infovis/vtkApplyIcons.h
+++ b/Infovis/vtkApplyIcons.h
@@ -67,7 +67,7 @@ class VTK_INFOVIS_EXPORT vtkApplyIcons : public vtkPassInputTypeAlgorithm
 {
 public:
   static vtkApplyIcons *New();
-  vtkTypeRevisionMacro(vtkApplyIcons, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkApplyIcons, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkArcParallelEdgeStrategy.cxx b/Infovis/vtkArcParallelEdgeStrategy.cxx
index 9ace39687b11a26c739d610097e0c1445eb8ecb6..eba650e88da1f077eb11e134a3ed46718702d1a6 100644
--- a/Infovis/vtkArcParallelEdgeStrategy.cxx
+++ b/Infovis/vtkArcParallelEdgeStrategy.cxx
@@ -33,7 +33,6 @@
 #include <vtksys/stl/map>
 
 vtkStandardNewMacro(vtkArcParallelEdgeStrategy);
-vtkCxxRevisionMacro(vtkArcParallelEdgeStrategy, "1.5");
 
 vtkArcParallelEdgeStrategy::vtkArcParallelEdgeStrategy()
 {
diff --git a/Infovis/vtkArcParallelEdgeStrategy.h b/Infovis/vtkArcParallelEdgeStrategy.h
index 6a27d53cffb56e032c056cef46ef1896c47bfa02..1a54b37935c5c61f7a31d04f60754a1d00c4c665 100644
--- a/Infovis/vtkArcParallelEdgeStrategy.h
+++ b/Infovis/vtkArcParallelEdgeStrategy.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkArcParallelEdgeStrategy : public vtkEdgeLayoutStrate
 {
 public:
   static vtkArcParallelEdgeStrategy* New();
-  vtkTypeRevisionMacro(vtkArcParallelEdgeStrategy,vtkEdgeLayoutStrategy);
+  vtkTypeMacro(vtkArcParallelEdgeStrategy,vtkEdgeLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAreaLayout.cxx b/Infovis/vtkAreaLayout.cxx
index bf377b1a5aab6e475ba0ab194080085dcb42fcbb..57c2ef111fa6ed8897f4f223060141bf6795812b 100644
--- a/Infovis/vtkAreaLayout.cxx
+++ b/Infovis/vtkAreaLayout.cxx
@@ -36,7 +36,6 @@
 #include "vtkTreeFieldAggregator.h"
 #include "vtkTreeDFSIterator.h"
 
-vtkCxxRevisionMacro(vtkAreaLayout, "1.3");
 vtkStandardNewMacro(vtkAreaLayout);
 vtkCxxSetObjectMacro(vtkAreaLayout, LayoutStrategy, vtkAreaLayoutStrategy);
 
diff --git a/Infovis/vtkAreaLayout.h b/Infovis/vtkAreaLayout.h
index 8d5680454ba26e75b54d931d59d07f623f736bd9..93cbf6e99cef6e4fab739123c7fc3fea4d70fc26 100644
--- a/Infovis/vtkAreaLayout.h
+++ b/Infovis/vtkAreaLayout.h
@@ -43,7 +43,7 @@ class VTK_INFOVIS_EXPORT vtkAreaLayout : public vtkTreeAlgorithm
 {
 public:
   static vtkAreaLayout *New();
-  vtkTypeRevisionMacro(vtkAreaLayout,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkAreaLayout,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAreaLayoutStrategy.cxx b/Infovis/vtkAreaLayoutStrategy.cxx
index 472ea862168fd55c58e48b2c9e58bad832cf798c..29611960cc577dc00061bedd883b11fdb23a7776 100644
--- a/Infovis/vtkAreaLayoutStrategy.cxx
+++ b/Infovis/vtkAreaLayoutStrategy.cxx
@@ -22,7 +22,6 @@
 
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkAreaLayoutStrategy, "1.1");
 
 vtkAreaLayoutStrategy::vtkAreaLayoutStrategy()
 {
diff --git a/Infovis/vtkAreaLayoutStrategy.h b/Infovis/vtkAreaLayoutStrategy.h
index f8e1caab35d81bf1d74be79a5b860e24d2a25944..d9e2a8e63cdc010336fa4bd77fd7890faa600495 100644
--- a/Infovis/vtkAreaLayoutStrategy.h
+++ b/Infovis/vtkAreaLayoutStrategy.h
@@ -44,7 +44,7 @@ class vtkDataArray;
 class VTK_INFOVIS_EXPORT vtkAreaLayoutStrategy : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAreaLayoutStrategy,vtkObject);
+  vtkTypeMacro(vtkAreaLayoutStrategy,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkArrayNorm.cxx b/Infovis/vtkArrayNorm.cxx
index 19b58842a0c1b1e9ff9aed7a40a186c9a87f7d07..63c53216758fdf2cc2e014e2bc83599617703554 100644
--- a/Infovis/vtkArrayNorm.cxx
+++ b/Infovis/vtkArrayNorm.cxx
@@ -34,7 +34,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkArrayNorm
 
-vtkCxxRevisionMacro(vtkArrayNorm, "1.7");
 vtkStandardNewMacro(vtkArrayNorm);
 
 vtkArrayNorm::vtkArrayNorm() :
diff --git a/Infovis/vtkArrayNorm.h b/Infovis/vtkArrayNorm.h
index 8de31e10c6652e17d9f50012597712f297c4fa42..db57f0045efd2765cddbf09a0094db44bfbd16fa 100644
--- a/Infovis/vtkArrayNorm.h
+++ b/Infovis/vtkArrayNorm.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkArrayNorm : public vtkArrayDataAlgorithm
 {
 public:
   static vtkArrayNorm* New();
-  vtkTypeRevisionMacro(vtkArrayNorm, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkArrayNorm, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkArrayToTable.cxx b/Infovis/vtkArrayToTable.cxx
index 1b4584c32c6d9c144cafb7640e0bbbc509feb111..bbe4d716ade6ca086ffaaf97b0f746067aff2728 100644
--- a/Infovis/vtkArrayToTable.cxx
+++ b/Infovis/vtkArrayToTable.cxx
@@ -114,7 +114,6 @@ static bool ConvertMatrix(vtkArray* Array, vtkTable* Output)
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkArrayToTable, "1.8");
 vtkStandardNewMacro(vtkArrayToTable);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkArrayToTable.h b/Infovis/vtkArrayToTable.h
index 4d080fa7c13955a0ef8144a2004d2fa61c3377cb..add84933e6b7a2852cedcbbe0b8eea3a41b8d0c3 100644
--- a/Infovis/vtkArrayToTable.h
+++ b/Infovis/vtkArrayToTable.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkArrayToTable : public vtkTableAlgorithm
 {
 public:
   static vtkArrayToTable* New();
-  vtkTypeRevisionMacro(vtkArrayToTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkArrayToTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkAssignCoordinates.cxx b/Infovis/vtkAssignCoordinates.cxx
index abb2fc3325fd4d25b77a7cd86d2875bccabcc87c..d57eb07f5cd74d7a54b7c5290cd801431e514587 100644
--- a/Infovis/vtkAssignCoordinates.cxx
+++ b/Infovis/vtkAssignCoordinates.cxx
@@ -29,7 +29,6 @@
 #include "vtkPointSet.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkAssignCoordinates, "1.4");
 vtkStandardNewMacro(vtkAssignCoordinates);
 
 vtkAssignCoordinates::vtkAssignCoordinates()
diff --git a/Infovis/vtkAssignCoordinates.h b/Infovis/vtkAssignCoordinates.h
index 4da820c256b26187eebaf1de64ab7b0d5479e38d..d53d993a0d5ab17b380faf8e222900220565e6f8 100644
--- a/Infovis/vtkAssignCoordinates.h
+++ b/Infovis/vtkAssignCoordinates.h
@@ -35,7 +35,7 @@ class VTK_INFOVIS_EXPORT vtkAssignCoordinates : public vtkPassInputTypeAlgorithm
 public:
   static vtkAssignCoordinates *New();
 
-  vtkTypeRevisionMacro(vtkAssignCoordinates, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkAssignCoordinates, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAssignCoordinatesLayoutStrategy.cxx b/Infovis/vtkAssignCoordinatesLayoutStrategy.cxx
index 7a13cf2c488f47e8a7c8becd3a2bb4d4020d1e1e..f48b2970778a75d5ee8e7b764b54d84d54be405a 100644
--- a/Infovis/vtkAssignCoordinatesLayoutStrategy.cxx
+++ b/Infovis/vtkAssignCoordinatesLayoutStrategy.cxx
@@ -33,7 +33,6 @@
 #include "vtkPoints.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkAssignCoordinatesLayoutStrategy, "1.1");
 vtkStandardNewMacro(vtkAssignCoordinatesLayoutStrategy);
 
 vtkAssignCoordinatesLayoutStrategy::vtkAssignCoordinatesLayoutStrategy()
diff --git a/Infovis/vtkAssignCoordinatesLayoutStrategy.h b/Infovis/vtkAssignCoordinatesLayoutStrategy.h
index 9b700d4b885ce463192988075eef352faf82da62..15ec8a7a0c9de02ec1c4e9a01b064b0b6912f31d 100644
--- a/Infovis/vtkAssignCoordinatesLayoutStrategy.h
+++ b/Infovis/vtkAssignCoordinatesLayoutStrategy.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkAssignCoordinatesLayoutStrategy : public vtkGraphLay
 {
 public:
   static vtkAssignCoordinatesLayoutStrategy *New();
-  vtkTypeRevisionMacro(vtkAssignCoordinatesLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkAssignCoordinatesLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkAttributeClustering2DLayoutStrategy.cxx b/Infovis/vtkAttributeClustering2DLayoutStrategy.cxx
index 4e2bfefbac9f5a56b6283213abd1b06bf4df13ef..2b2359ddd6d9041858dcd0e8fe6dfb3289114426 100644
--- a/Infovis/vtkAttributeClustering2DLayoutStrategy.cxx
+++ b/Infovis/vtkAttributeClustering2DLayoutStrategy.cxx
@@ -62,7 +62,6 @@ public:
 };
 
 
-vtkCxxRevisionMacro(vtkAttributeClustering2DLayoutStrategy, "1.3");
 vtkStandardNewMacro(vtkAttributeClustering2DLayoutStrategy);
 
 // This is just a convenient macro for smart pointers
diff --git a/Infovis/vtkAttributeClustering2DLayoutStrategy.h b/Infovis/vtkAttributeClustering2DLayoutStrategy.h
index ad560ef36682b8ffbe6c9b6e746be95aeb7cfe1b..7fc6082e49bc4a97ac6ae192f437ac570fe56793 100644
--- a/Infovis/vtkAttributeClustering2DLayoutStrategy.h
+++ b/Infovis/vtkAttributeClustering2DLayoutStrategy.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkAttributeClustering2DLayoutStrategy : public vtkGrap
 public:
   static vtkAttributeClustering2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkAttributeClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkAttributeClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkBivariateLinearTableThreshold.cxx b/Infovis/vtkBivariateLinearTableThreshold.cxx
index 76d529b6a234df420b0952af5bfc172aac0e9c66..371298d6b727d98ed4c7f6a01854c08b2bf3a75a 100644
--- a/Infovis/vtkBivariateLinearTableThreshold.cxx
+++ b/Infovis/vtkBivariateLinearTableThreshold.cxx
@@ -30,7 +30,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkBivariateLinearTableThreshold, "1.3");
 vtkStandardNewMacro(vtkBivariateLinearTableThreshold);
 
 class vtkBivariateLinearTableThreshold::Internals
diff --git a/Infovis/vtkBivariateLinearTableThreshold.h b/Infovis/vtkBivariateLinearTableThreshold.h
index e9d0a1fab624e61c1bc807d7b3cb3290d4cc260d..78b444d532cabbbf2b6d984be9b841522850ee91 100644
--- a/Infovis/vtkBivariateLinearTableThreshold.h
+++ b/Infovis/vtkBivariateLinearTableThreshold.h
@@ -49,7 +49,7 @@ class VTK_INFOVIS_EXPORT vtkBivariateLinearTableThreshold : public vtkTableAlgor
 {
 public:
   static vtkBivariateLinearTableThreshold* New();
-  vtkTypeRevisionMacro(vtkBivariateLinearTableThreshold, vtkTableAlgorithm);
+  vtkTypeMacro(vtkBivariateLinearTableThreshold, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkBivariateStatisticsAlgorithm.cxx b/Infovis/vtkBivariateStatisticsAlgorithm.cxx
index ae189f871050c3d4995f90ddfa4c9d40c2d08d22..96de39b3e507353578297f14586286d8516d7eb8 100644
--- a/Infovis/vtkBivariateStatisticsAlgorithm.cxx
+++ b/Infovis/vtkBivariateStatisticsAlgorithm.cxx
@@ -34,7 +34,6 @@
 
 #define VTK_STATISTICS_NUMBER_OF_VARIABLES 2
 
-vtkCxxRevisionMacro(vtkBivariateStatisticsAlgorithm, "1.22");
 
 // ----------------------------------------------------------------------
 vtkBivariateStatisticsAlgorithm::vtkBivariateStatisticsAlgorithm()
diff --git a/Infovis/vtkBivariateStatisticsAlgorithm.h b/Infovis/vtkBivariateStatisticsAlgorithm.h
index 41fd8c935dddb2ed8a27111dc430b45ccbad712a..863d85ce928260a6d79906c101db8be48fe6a3c5 100644
--- a/Infovis/vtkBivariateStatisticsAlgorithm.h
+++ b/Infovis/vtkBivariateStatisticsAlgorithm.h
@@ -49,7 +49,7 @@ class vtkTable;
 class VTK_INFOVIS_EXPORT vtkBivariateStatisticsAlgorithm : public vtkStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkBivariateStatisticsAlgorithm, vtkStatisticsAlgorithm);
+  vtkTypeMacro(vtkBivariateStatisticsAlgorithm, vtkStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkBoostBiconnectedComponents.cxx b/Infovis/vtkBoostBiconnectedComponents.cxx
index 346d0dfe5215c872949a3be733412c633e696c98..3319eeb179e18a18b557625d15857858c9997368 100644
--- a/Infovis/vtkBoostBiconnectedComponents.cxx
+++ b/Infovis/vtkBoostBiconnectedComponents.cxx
@@ -40,7 +40,6 @@ using namespace boost;
 using vtksys_stl::vector;
 using vtksys_stl::pair;
 
-vtkCxxRevisionMacro(vtkBoostBiconnectedComponents, "1.13");
 vtkStandardNewMacro(vtkBoostBiconnectedComponents);
 
 vtkBoostBiconnectedComponents::vtkBoostBiconnectedComponents()
diff --git a/Infovis/vtkBoostBiconnectedComponents.h b/Infovis/vtkBoostBiconnectedComponents.h
index 78c249646e279eed615ed30ff0643e2ff65ad357..8f8831fbc5ea38925120f8d76cf7f7de1c2dbdad 100644
--- a/Infovis/vtkBoostBiconnectedComponents.h
+++ b/Infovis/vtkBoostBiconnectedComponents.h
@@ -45,7 +45,7 @@ class VTK_INFOVIS_EXPORT vtkBoostBiconnectedComponents : public vtkUndirectedGra
 {
 public:
   static vtkBoostBiconnectedComponents *New();
-  vtkTypeRevisionMacro(vtkBoostBiconnectedComponents, vtkUndirectedGraphAlgorithm);
+  vtkTypeMacro(vtkBoostBiconnectedComponents, vtkUndirectedGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkBoostBrandesCentrality.cxx b/Infovis/vtkBoostBrandesCentrality.cxx
index b6c361cf20017a469cf6160cd9518f37dede01fd..5f62f48f347330bf5bafa33a63a5981935d4fbb6 100644
--- a/Infovis/vtkBoostBrandesCentrality.cxx
+++ b/Infovis/vtkBoostBrandesCentrality.cxx
@@ -39,7 +39,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostBrandesCentrality, "1.7");
 vtkStandardNewMacro(vtkBoostBrandesCentrality);
 
 // Constructor/Destructor
diff --git a/Infovis/vtkBoostBrandesCentrality.h b/Infovis/vtkBoostBrandesCentrality.h
index ceac5b3d7f73266e8d8f30c1c22975999cbe701a..2792dab4d1cf093d7d3018d737abc80660d3b243 100644
--- a/Infovis/vtkBoostBrandesCentrality.h
+++ b/Infovis/vtkBoostBrandesCentrality.h
@@ -40,7 +40,7 @@ class VTK_INFOVIS_EXPORT vtkBoostBrandesCentrality : public vtkGraphAlgorithm
 {
 public:
   static vtkBoostBrandesCentrality *New();
-  vtkTypeRevisionMacro(vtkBoostBrandesCentrality, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkBoostBrandesCentrality, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkBoostBreadthFirstSearch.cxx b/Infovis/vtkBoostBreadthFirstSearch.cxx
index 4211e79c30e40f6cdf74e9fe2c7fc6444d27130e..7aebae54f481494493da24eab7b85303b882d6fe 100644
--- a/Infovis/vtkBoostBreadthFirstSearch.cxx
+++ b/Infovis/vtkBoostBreadthFirstSearch.cxx
@@ -52,7 +52,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostBreadthFirstSearch, "1.18");
 vtkStandardNewMacro(vtkBoostBreadthFirstSearch);
 
 // Redefine the bfs visitor, the only visitor we
diff --git a/Infovis/vtkBoostBreadthFirstSearch.h b/Infovis/vtkBoostBreadthFirstSearch.h
index 6028aef73415bdbd7db0f1bfbe04db1fdf75bcdf..3f7b7cc94bfa7d83d59f1c53777e74b9bfa9958f 100644
--- a/Infovis/vtkBoostBreadthFirstSearch.h
+++ b/Infovis/vtkBoostBreadthFirstSearch.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkBoostBreadthFirstSearch : public vtkGraphAlgorithm
 {
 public:
   static vtkBoostBreadthFirstSearch *New();
-  vtkTypeRevisionMacro(vtkBoostBreadthFirstSearch, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkBoostBreadthFirstSearch, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.cxx b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
index d3d43cb9241805b58d86e11e7e76a4a3b903431c..89ee5e7d44aeec878a37335c428a6d43093028df 100644
--- a/Infovis/vtkBoostBreadthFirstSearchTree.cxx
+++ b/Infovis/vtkBoostBreadthFirstSearchTree.cxx
@@ -44,7 +44,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostBreadthFirstSearchTree, "1.10");
 vtkStandardNewMacro(vtkBoostBreadthFirstSearchTree);
 
 
diff --git a/Infovis/vtkBoostBreadthFirstSearchTree.h b/Infovis/vtkBoostBreadthFirstSearchTree.h
index 602552f6a9d7aa9125b21f7f2f187ec917354c11..9f032fdabda5bb76aeec29e36c6f6a95b6ce716d 100644
--- a/Infovis/vtkBoostBreadthFirstSearchTree.h
+++ b/Infovis/vtkBoostBreadthFirstSearchTree.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkBoostBreadthFirstSearchTree : public vtkTreeAlgorith
 {
 public:
   static vtkBoostBreadthFirstSearchTree *New();
-  vtkTypeRevisionMacro(vtkBoostBreadthFirstSearchTree, vtkTreeAlgorithm);
+  vtkTypeMacro(vtkBoostBreadthFirstSearchTree, vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkBoostConnectedComponents.cxx b/Infovis/vtkBoostConnectedComponents.cxx
index a55d03718c1d6fd795e15ff1c6a64534a8bb79fc..48b112a33db6ff41ab51c949fb3d82a18bcce514 100644
--- a/Infovis/vtkBoostConnectedComponents.cxx
+++ b/Infovis/vtkBoostConnectedComponents.cxx
@@ -36,7 +36,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostConnectedComponents, "1.8");
 vtkStandardNewMacro(vtkBoostConnectedComponents);
 
 vtkBoostConnectedComponents::vtkBoostConnectedComponents()
diff --git a/Infovis/vtkBoostConnectedComponents.h b/Infovis/vtkBoostConnectedComponents.h
index 047b8f1de1c7e9d95f9a9c4f81307746d1a072f8..e592ce416bab0d955d165d2d7907044c4f638749 100644
--- a/Infovis/vtkBoostConnectedComponents.h
+++ b/Infovis/vtkBoostConnectedComponents.h
@@ -37,7 +37,7 @@ class VTK_INFOVIS_EXPORT vtkBoostConnectedComponents : public vtkGraphAlgorithm
 {
 public:
   static vtkBoostConnectedComponents *New();
-  vtkTypeRevisionMacro(vtkBoostConnectedComponents, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkBoostConnectedComponents, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
index 9c8068014f753c4d1edead057c77d20c0042c05b..f5644381b0a9c9b95108eedec3accbb1797ef7af 100644
--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
+++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.cxx
@@ -44,7 +44,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostKruskalMinimumSpanningTree, "1.5");
 vtkStandardNewMacro(vtkBoostKruskalMinimumSpanningTree);
 
 // Constructor/Destructor
diff --git a/Infovis/vtkBoostKruskalMinimumSpanningTree.h b/Infovis/vtkBoostKruskalMinimumSpanningTree.h
index 99f496b44fcdcc0f801baf00d1ff8d8dcf6175b3..0166ca3015e93a142180d640e31b32ccd3890038 100644
--- a/Infovis/vtkBoostKruskalMinimumSpanningTree.h
+++ b/Infovis/vtkBoostKruskalMinimumSpanningTree.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkBoostKruskalMinimumSpanningTree : public vtkSelectio
 {
 public:
   static vtkBoostKruskalMinimumSpanningTree *New();
-  vtkTypeRevisionMacro(vtkBoostKruskalMinimumSpanningTree, vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkBoostKruskalMinimumSpanningTree, vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkBoostLogWeighting.cxx b/Infovis/vtkBoostLogWeighting.cxx
index 412d6ba90379282151ebaccda8e5a0da020047e1..3a2381e83b7cf10285e39f6c9ef1078c0f53094c 100644
--- a/Infovis/vtkBoostLogWeighting.cxx
+++ b/Infovis/vtkBoostLogWeighting.cxx
@@ -40,7 +40,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkBoostLogWeighting
 
-vtkCxxRevisionMacro(vtkBoostLogWeighting, "1.7");
 vtkStandardNewMacro(vtkBoostLogWeighting);
 
 vtkBoostLogWeighting::vtkBoostLogWeighting() :
diff --git a/Infovis/vtkBoostLogWeighting.h b/Infovis/vtkBoostLogWeighting.h
index e12e912e67727c01112bf50f126a9cf1f6d9ad37..4db0c558b19ab5fab3c253a2c2ae06d9b3ab5921 100644
--- a/Infovis/vtkBoostLogWeighting.h
+++ b/Infovis/vtkBoostLogWeighting.h
@@ -37,7 +37,7 @@ class VTK_INFOVIS_EXPORT vtkBoostLogWeighting : public vtkArrayDataAlgorithm
 {
 public:
   static vtkBoostLogWeighting* New();
-  vtkTypeRevisionMacro(vtkBoostLogWeighting, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkBoostLogWeighting, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
index 5163ed3a2c384a9468185a35a57206b6e1d4ec58..bb2444f80429cca6e180ea9821218743186044c0 100644
--- a/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
+++ b/Infovis/vtkBoostPrimMinimumSpanningTree.cxx
@@ -43,7 +43,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkBoostPrimMinimumSpanningTree, "1.6");
 vtkStandardNewMacro(vtkBoostPrimMinimumSpanningTree);
 
 // Constructor/Destructor
diff --git a/Infovis/vtkBoostPrimMinimumSpanningTree.h b/Infovis/vtkBoostPrimMinimumSpanningTree.h
index 84a63ed0ec269d495a91bbc560131e9fd3254dc8..6e612a3db4f993261b9e3fe3c196e72ad81ff2eb 100644
--- a/Infovis/vtkBoostPrimMinimumSpanningTree.h
+++ b/Infovis/vtkBoostPrimMinimumSpanningTree.h
@@ -52,7 +52,7 @@ class VTK_INFOVIS_EXPORT vtkBoostPrimMinimumSpanningTree : public vtkTreeAlgorit
 {
 public:
   static vtkBoostPrimMinimumSpanningTree *New();
-  vtkTypeRevisionMacro(vtkBoostPrimMinimumSpanningTree, vtkTreeAlgorithm);
+  vtkTypeMacro(vtkBoostPrimMinimumSpanningTree, vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkBoostRandomSparseArraySource.cxx b/Infovis/vtkBoostRandomSparseArraySource.cxx
index 2cba1631083b2105b78684b76e556306fc961f98..d78fea0acac9e08a6c3f718a9eafb687f1661222 100644
--- a/Infovis/vtkBoostRandomSparseArraySource.cxx
+++ b/Infovis/vtkBoostRandomSparseArraySource.cxx
@@ -30,7 +30,6 @@
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkBoostRandomSparseArraySource, "1.3");
 vtkStandardNewMacro(vtkBoostRandomSparseArraySource);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkBoostRandomSparseArraySource.h b/Infovis/vtkBoostRandomSparseArraySource.h
index f7db0c027d6ba11d0fcf4416706788ceb8d1bc92..663905e73394038a18eb5eb3ef5c762a71b2fbdc 100644
--- a/Infovis/vtkBoostRandomSparseArraySource.h
+++ b/Infovis/vtkBoostRandomSparseArraySource.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkBoostRandomSparseArraySource : public vtkArrayDataAl
 {
 public:
   static vtkBoostRandomSparseArraySource* New();
-  vtkTypeRevisionMacro(vtkBoostRandomSparseArraySource, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkBoostRandomSparseArraySource, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Infovis/vtkBoostSplitTableField.cxx b/Infovis/vtkBoostSplitTableField.cxx
index 09588d6fb3900f92f9a3a281d99bb457950a56ec..89231eb9f7703c77f32d30fa6f85c65133ae947a 100644
--- a/Infovis/vtkBoostSplitTableField.cxx
+++ b/Infovis/vtkBoostSplitTableField.cxx
@@ -26,7 +26,6 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/tokenizer.hpp>
 
-vtkCxxRevisionMacro(vtkBoostSplitTableField, "1.2");
 vtkStandardNewMacro(vtkBoostSplitTableField);
 
 /// Ecapsulates private implementation details of vtkBoostSplitTableField
diff --git a/Infovis/vtkBoostSplitTableField.h b/Infovis/vtkBoostSplitTableField.h
index 7dcae4e7bf06d37f5e916d2dfa4f6a903a8387e9..3a9d5299332150d48c5171069d87ecf1f77bbc70 100644
--- a/Infovis/vtkBoostSplitTableField.h
+++ b/Infovis/vtkBoostSplitTableField.h
@@ -59,7 +59,7 @@ class VTK_INFOVIS_EXPORT vtkBoostSplitTableField : public vtkTableAlgorithm
 {
 public:
   static vtkBoostSplitTableField* New();
-  vtkTypeRevisionMacro(vtkBoostSplitTableField, vtkTableAlgorithm);
+  vtkTypeMacro(vtkBoostSplitTableField, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void ClearFields();
diff --git a/Infovis/vtkBoxLayoutStrategy.cxx b/Infovis/vtkBoxLayoutStrategy.cxx
index f31529429382e12791743d78145c53eda21538d6..07261e39d0a2eaef453715f55f365b0c4679d29d 100644
--- a/Infovis/vtkBoxLayoutStrategy.cxx
+++ b/Infovis/vtkBoxLayoutStrategy.cxx
@@ -35,7 +35,6 @@
 #include "vtkTree.h"
 #include "vtkTreeDFSIterator.h"
 
-vtkCxxRevisionMacro(vtkBoxLayoutStrategy, "1.8");
 vtkStandardNewMacro(vtkBoxLayoutStrategy);
 
 vtkBoxLayoutStrategy::vtkBoxLayoutStrategy()
diff --git a/Infovis/vtkBoxLayoutStrategy.h b/Infovis/vtkBoxLayoutStrategy.h
index 2ffd07b68467d8d782d5da5dcb395af2a2e489b3..bfb9f448d81053c13e65d5205e00ef2e7b683322 100644
--- a/Infovis/vtkBoxLayoutStrategy.h
+++ b/Infovis/vtkBoxLayoutStrategy.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkBoxLayoutStrategy : public vtkTreeMapLayoutStrategy
 public:
   static vtkBoxLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkBoxLayoutStrategy,vtkTreeMapLayoutStrategy);
+  vtkTypeMacro(vtkBoxLayoutStrategy,vtkTreeMapLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkChacoGraphReader.cxx b/Infovis/vtkChacoGraphReader.cxx
index 2c37544f495766ea5b9f27d9dea731522ad08570..551baff8ccbb7cb84d18dd2a10bd1680fd097feb 100644
--- a/Infovis/vtkChacoGraphReader.cxx
+++ b/Infovis/vtkChacoGraphReader.cxx
@@ -64,7 +64,6 @@
 // so it would be nice to put this in a common file.
 static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
 
-vtkCxxRevisionMacro(vtkChacoGraphReader, "1.5");
 vtkStandardNewMacro(vtkChacoGraphReader);
 
 vtkChacoGraphReader::vtkChacoGraphReader()
diff --git a/Infovis/vtkChacoGraphReader.h b/Infovis/vtkChacoGraphReader.h
index f8aeb9df53e20b049ffa0cd16fc46b84206edcc7..dfdb6c4b5dfe092dff40dd26b027c1d40f4dd9e2 100644
--- a/Infovis/vtkChacoGraphReader.h
+++ b/Infovis/vtkChacoGraphReader.h
@@ -51,7 +51,7 @@ class VTK_INFOVIS_EXPORT vtkChacoGraphReader : public vtkUndirectedGraphAlgorith
 {
 public:
   static vtkChacoGraphReader *New();
-  vtkTypeRevisionMacro(vtkChacoGraphReader, vtkUndirectedGraphAlgorithm);
+  vtkTypeMacro(vtkChacoGraphReader, vtkUndirectedGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkCircularLayoutStrategy.cxx b/Infovis/vtkCircularLayoutStrategy.cxx
index e57ba99bda4c94c110998c40e2ef65aaaf63e100..b4514f8a3d3969865a3ca510893299457bd7f77d 100644
--- a/Infovis/vtkCircularLayoutStrategy.cxx
+++ b/Infovis/vtkCircularLayoutStrategy.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkCircularLayoutStrategy, "1.3");
 vtkStandardNewMacro(vtkCircularLayoutStrategy);
 
 vtkCircularLayoutStrategy::vtkCircularLayoutStrategy()
diff --git a/Infovis/vtkCircularLayoutStrategy.h b/Infovis/vtkCircularLayoutStrategy.h
index b9cfc30a92f833ca83b01994e5eccadcbbf157ad..6102ef3368079f13d8800f021a0e3f2b9e5733d2 100644
--- a/Infovis/vtkCircularLayoutStrategy.h
+++ b/Infovis/vtkCircularLayoutStrategy.h
@@ -32,7 +32,7 @@ class VTK_INFOVIS_EXPORT vtkCircularLayoutStrategy : public vtkGraphLayoutStrate
 public:
   static vtkCircularLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkCircularLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkCircularLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkClustering2DLayoutStrategy.cxx b/Infovis/vtkClustering2DLayoutStrategy.cxx
index 7a8b388ac01bc0d3a174ef54d4f760b51fc24d9c..648ed0de225996661c06a2008cd0b30039a790d1 100644
--- a/Infovis/vtkClustering2DLayoutStrategy.cxx
+++ b/Infovis/vtkClustering2DLayoutStrategy.cxx
@@ -41,7 +41,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkClustering2DLayoutStrategy, "1.18");
 vtkStandardNewMacro(vtkClustering2DLayoutStrategy);
 
 // This is just a convenient macro for smart pointers
diff --git a/Infovis/vtkClustering2DLayoutStrategy.h b/Infovis/vtkClustering2DLayoutStrategy.h
index 622cb0fb66f57658fc491a552f3040c706397dc1..dac50cdd86b5ef48a8a3999b029249b047e3fee1 100644
--- a/Infovis/vtkClustering2DLayoutStrategy.h
+++ b/Infovis/vtkClustering2DLayoutStrategy.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkClustering2DLayoutStrategy : public vtkGraphLayoutSt
 public:
   static vtkClustering2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkClustering2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkCollapseGraph.cxx b/Infovis/vtkCollapseGraph.cxx
index 1bfc7375fced54d7c754aa85b61edbc9f9b2bad8..3d01870317bcd9ce3d9f2591f87f445e659fa561 100644
--- a/Infovis/vtkCollapseGraph.cxx
+++ b/Infovis/vtkCollapseGraph.cxx
@@ -73,7 +73,6 @@ static void BuildGraph(vtkGraph* input_graph, const vtkstd::vector<vtkIdType>& v
 ///////////////////////////////////////////////////////////////////////////////////
 // vtkCollapseGraph
 
-vtkCxxRevisionMacro(vtkCollapseGraph, "1.2");
 vtkStandardNewMacro(vtkCollapseGraph);
 
 vtkCollapseGraph::vtkCollapseGraph()
diff --git a/Infovis/vtkCollapseGraph.h b/Infovis/vtkCollapseGraph.h
index bebcd44fdd1e270a20b25d12f62a54e55a55280f..0394b706be6d295a1ba5eed4acebcd3117873557 100644
--- a/Infovis/vtkCollapseGraph.h
+++ b/Infovis/vtkCollapseGraph.h
@@ -46,7 +46,7 @@ class VTK_INFOVIS_EXPORT vtkCollapseGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkCollapseGraph* New();
-  vtkTypeRevisionMacro(vtkCollapseGraph,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkCollapseGraph,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   /// Convenience function provided for setting the graph input.
diff --git a/Infovis/vtkCollapseVerticesByArray.cxx b/Infovis/vtkCollapseVerticesByArray.cxx
index 52149647934007bf4f2b92cd18efca27b480bc07..19bab98b2ecef30ff5f1600ffb7e3ce8eae92acc 100644
--- a/Infovis/vtkCollapseVerticesByArray.cxx
+++ b/Infovis/vtkCollapseVerticesByArray.cxx
@@ -36,7 +36,6 @@
 #include "vtkstd/vector" // Using STL.
 #include "vtkstd/string" // Using STL.
 
-vtkCxxRevisionMacro(vtkCollapseVerticesByArray, "$Revision");
 vtkStandardNewMacro(vtkCollapseVerticesByArray);
 
 //------------------------------------------------------------------------------
diff --git a/Infovis/vtkCollapseVerticesByArray.h b/Infovis/vtkCollapseVerticesByArray.h
index 025446e61df696297969b8b1f71fb35e4adca0df..3e5f9d5272885a4f6d99d68986bd9d03eb239ff5 100644
--- a/Infovis/vtkCollapseVerticesByArray.h
+++ b/Infovis/vtkCollapseVerticesByArray.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkCollapseVerticesByArray : public vtkGraphAlgorithm
 {
 public:
     static vtkCollapseVerticesByArray* New();
-    vtkTypeRevisionMacro(vtkCollapseVerticesByArray, vtkGraphAlgorithm);
+    vtkTypeMacro(vtkCollapseVerticesByArray, vtkGraphAlgorithm);
 
     void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Infovis/vtkCommunity2DLayoutStrategy.cxx b/Infovis/vtkCommunity2DLayoutStrategy.cxx
index 3d55a773040781edff0e2ab53c3c21c07c541217..a1902c37bfc220b0ddb5832389b6231f1e8b572b 100644
--- a/Infovis/vtkCommunity2DLayoutStrategy.cxx
+++ b/Infovis/vtkCommunity2DLayoutStrategy.cxx
@@ -41,7 +41,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkCommunity2DLayoutStrategy, "1.21");
 vtkStandardNewMacro(vtkCommunity2DLayoutStrategy);
 
 // This is just a convenient macro for smart pointers
diff --git a/Infovis/vtkCommunity2DLayoutStrategy.h b/Infovis/vtkCommunity2DLayoutStrategy.h
index 7fbb2b0f66830947e3cedd7b4b37941fd268dcd4..acbcffee8f59ae3331ff3aabc454eceb4aa28132 100644
--- a/Infovis/vtkCommunity2DLayoutStrategy.h
+++ b/Infovis/vtkCommunity2DLayoutStrategy.h
@@ -45,7 +45,7 @@ class VTK_INFOVIS_EXPORT vtkCommunity2DLayoutStrategy : public vtkGraphLayoutStr
 public:
   static vtkCommunity2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkCommunity2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkCommunity2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkComputeHistogram2DOutliers.cxx b/Infovis/vtkComputeHistogram2DOutliers.cxx
index 9573efce8e494f7c0e3bfe62f1d67ee3f2e42300..56c21ce39d5396de9f07fecd2b7afc128d64e32a 100644
--- a/Infovis/vtkComputeHistogram2DOutliers.cxx
+++ b/Infovis/vtkComputeHistogram2DOutliers.cxx
@@ -37,7 +37,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkSortDataArray.h"
 #include "vtkTable.h"
 //------------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkComputeHistogram2DOutliers, "1.2");
 vtkStandardNewMacro(vtkComputeHistogram2DOutliers);
 //------------------------------------------------------------------------------
 vtkComputeHistogram2DOutliers::vtkComputeHistogram2DOutliers()
diff --git a/Infovis/vtkComputeHistogram2DOutliers.h b/Infovis/vtkComputeHistogram2DOutliers.h
index c3c599b4b12d7ea6589bfbbe566464707db9c0af..6bb8b534b110dbdd77bb9c3d11b959eee58aa575 100644
--- a/Infovis/vtkComputeHistogram2DOutliers.h
+++ b/Infovis/vtkComputeHistogram2DOutliers.h
@@ -58,7 +58,7 @@ class VTK_INFOVIS_EXPORT vtkComputeHistogram2DOutliers : public vtkSelectionAlgo
 {
 public:
   static vtkComputeHistogram2DOutliers* New();
-  vtkTypeRevisionMacro(vtkComputeHistogram2DOutliers, vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkComputeHistogram2DOutliers, vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkSetMacro(PreferredNumberOfOutliers,int);
diff --git a/Infovis/vtkConeLayoutStrategy.cxx b/Infovis/vtkConeLayoutStrategy.cxx
index 7acc3968dda5f7612cd6c40331258853dd67dd2c..5f11352cda80f832dcb5ba2f07939843e23695e4 100644
--- a/Infovis/vtkConeLayoutStrategy.cxx
+++ b/Infovis/vtkConeLayoutStrategy.cxx
@@ -33,7 +33,6 @@ the U.S. Government retains certain rights in this software.
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkConeLayoutStrategy, "1.3");
 vtkStandardNewMacro(vtkConeLayoutStrategy);
 
 vtkConeLayoutStrategy::vtkConeLayoutStrategy()
diff --git a/Infovis/vtkConeLayoutStrategy.h b/Infovis/vtkConeLayoutStrategy.h
index daf34758eebfc00acdb3cb542b1011c99d540336..efdd56d6bde4384e4e81ef85e2e9eb8b87e28e10 100644
--- a/Infovis/vtkConeLayoutStrategy.h
+++ b/Infovis/vtkConeLayoutStrategy.h
@@ -53,7 +53,7 @@ class VTK_INFOVIS_EXPORT vtkConeLayoutStrategy : public vtkGraphLayoutStrategy
 public:
   static vtkConeLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkConeLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkConeLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkConstrained2DLayoutStrategy.cxx b/Infovis/vtkConstrained2DLayoutStrategy.cxx
index 6aca3e61ce913bf6bd8fe9134521ef8ab02e17bc..61eda11351cb92591b5ac04b7a6638b375bf8d67 100644
--- a/Infovis/vtkConstrained2DLayoutStrategy.cxx
+++ b/Infovis/vtkConstrained2DLayoutStrategy.cxx
@@ -41,7 +41,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkConstrained2DLayoutStrategy, "1.8");
 vtkStandardNewMacro(vtkConstrained2DLayoutStrategy);
 
 // This is just a convenient macro for smart pointers
diff --git a/Infovis/vtkConstrained2DLayoutStrategy.h b/Infovis/vtkConstrained2DLayoutStrategy.h
index 17def5549c6248e68a3811f3e96fa4143c6f486e..92adc485df493e51765bd3a62f126a9f8835aaf2 100644
--- a/Infovis/vtkConstrained2DLayoutStrategy.h
+++ b/Infovis/vtkConstrained2DLayoutStrategy.h
@@ -49,7 +49,7 @@ class VTK_INFOVIS_EXPORT vtkConstrained2DLayoutStrategy : public vtkGraphLayoutS
 public:
   static vtkConstrained2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkConstrained2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkConstrained2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkContingencyStatistics.cxx b/Infovis/vtkContingencyStatistics.cxx
index 5c141dfad5b4101d378cf2a0ff4b67477da1bee7..1525416ebd7087ae6cd96162f3c15124d01e410e 100644
--- a/Infovis/vtkContingencyStatistics.cxx
+++ b/Infovis/vtkContingencyStatistics.cxx
@@ -47,7 +47,6 @@ PURPOSE.  See the above copyright notice for more information.
 typedef vtksys_stl::map<vtkStdString,vtkIdType> Counts;
 typedef vtksys_stl::map<vtkStdString,double> PDF;
 
-vtkCxxRevisionMacro(vtkContingencyStatistics, "1.82");
 vtkStandardNewMacro(vtkContingencyStatistics);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkContingencyStatistics.h b/Infovis/vtkContingencyStatistics.h
index 00a2e9a8e83229526298673d899789473c565321..a807a13e07cf750779175dfa0e82cd408f55824a 100644
--- a/Infovis/vtkContingencyStatistics.h
+++ b/Infovis/vtkContingencyStatistics.h
@@ -45,7 +45,7 @@ class vtkVariant;
 class VTK_INFOVIS_EXPORT vtkContingencyStatistics : public vtkBivariateStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkContingencyStatistics, vtkBivariateStatisticsAlgorithm);
+  vtkTypeMacro(vtkContingencyStatistics, vtkBivariateStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkContingencyStatistics* New();
 
diff --git a/Infovis/vtkCorrelativeStatistics.cxx b/Infovis/vtkCorrelativeStatistics.cxx
index 4b12eb04274620bffc7d4fd9c107561086402825..ac0b0f9df28db1299a226f37f44259f50d367871 100644
--- a/Infovis/vtkCorrelativeStatistics.cxx
+++ b/Infovis/vtkCorrelativeStatistics.cxx
@@ -39,7 +39,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkCorrelativeStatistics, "1.65");
 vtkStandardNewMacro(vtkCorrelativeStatistics);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkCorrelativeStatistics.h b/Infovis/vtkCorrelativeStatistics.h
index 6ea17829523b4d93dfbf4ae03362d809ae87cbbd..c7713946d9ccd3ffad56b58bfe678fa51ae7be40 100644
--- a/Infovis/vtkCorrelativeStatistics.h
+++ b/Infovis/vtkCorrelativeStatistics.h
@@ -52,7 +52,7 @@ class vtkVariant;
 class VTK_INFOVIS_EXPORT vtkCorrelativeStatistics : public vtkBivariateStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkCorrelativeStatistics, vtkBivariateStatisticsAlgorithm);
+  vtkTypeMacro(vtkCorrelativeStatistics, vtkBivariateStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkCorrelativeStatistics* New();
 
diff --git a/Infovis/vtkCosmicTreeLayoutStrategy.cxx b/Infovis/vtkCosmicTreeLayoutStrategy.cxx
index 76d73db67c3d6b7195b5d28af4a333ec638df9c4..e9f7d52b0d4d9652a324d7928dfefc0bd4273a80 100644
--- a/Infovis/vtkCosmicTreeLayoutStrategy.cxx
+++ b/Infovis/vtkCosmicTreeLayoutStrategy.cxx
@@ -23,7 +23,6 @@
 #undef VTK_COSMIC_DBG
 
 vtkStandardNewMacro(vtkCosmicTreeLayoutStrategy);
-vtkCxxRevisionMacro(vtkCosmicTreeLayoutStrategy,"1.6");
 
 /// Represent a circle to be placed
 class vtkCosmicTreeEntry
diff --git a/Infovis/vtkCosmicTreeLayoutStrategy.h b/Infovis/vtkCosmicTreeLayoutStrategy.h
index 4ae8281ec486ccd714916449b8dc17880f5cdbfe..79ec313b4ad45c6b2ad7243418a4547bacea9ddc 100644
--- a/Infovis/vtkCosmicTreeLayoutStrategy.h
+++ b/Infovis/vtkCosmicTreeLayoutStrategy.h
@@ -39,7 +39,7 @@ class VTK_INFOVIS_EXPORT vtkCosmicTreeLayoutStrategy : public vtkGraphLayoutStra
 public:
   static vtkCosmicTreeLayoutStrategy* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkCosmicTreeLayoutStrategy,vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkCosmicTreeLayoutStrategy,vtkGraphLayoutStrategy);
 
   // Description:
   // Perform the layout.
diff --git a/Infovis/vtkDataObjectToTable.cxx b/Infovis/vtkDataObjectToTable.cxx
index 210660e7b42b56c117d4ea295d8c0ec374ce9771..797da8ce349bf3b78f08d6e6d8ae964de617be30 100644
--- a/Infovis/vtkDataObjectToTable.cxx
+++ b/Infovis/vtkDataObjectToTable.cxx
@@ -31,7 +31,6 @@
 #include "vtkPointData.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkDataObjectToTable, "1.7");
 vtkStandardNewMacro(vtkDataObjectToTable);
 //---------------------------------------------------------------------------
 vtkDataObjectToTable::vtkDataObjectToTable()
diff --git a/Infovis/vtkDataObjectToTable.h b/Infovis/vtkDataObjectToTable.h
index 93a8e476e9f1abc8350e61e47e0fd4d34acc28d3..9fcc190a2377115ffdcf6e8dfdc1837f8cb4f242 100644
--- a/Infovis/vtkDataObjectToTable.h
+++ b/Infovis/vtkDataObjectToTable.h
@@ -32,7 +32,7 @@ class VTK_INFOVIS_EXPORT vtkDataObjectToTable : public vtkTableAlgorithm
 {
 public:
   static vtkDataObjectToTable* New();
-  vtkTypeRevisionMacro(vtkDataObjectToTable,vtkTableAlgorithm);
+  vtkTypeMacro(vtkDataObjectToTable,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //BTX
diff --git a/Infovis/vtkDelimitedTextReader.cxx b/Infovis/vtkDelimitedTextReader.cxx
index 6b1f37ad9a1b9d8fd41c782c831f018ec7ec3b1b..f6dc3119a6115a0850578e78ef491b4910860a73 100644
--- a/Infovis/vtkDelimitedTextReader.cxx
+++ b/Infovis/vtkDelimitedTextReader.cxx
@@ -417,7 +417,6 @@ void utf16_to_unicode(const bool big_endian, OctetIteratorT begin, OctetIterator
 /////////////////////////////////////////////////////////////////////////////////////////
 // vtkDelimitedTextReader
 
-vtkCxxRevisionMacro(vtkDelimitedTextReader, "1.38");
 vtkStandardNewMacro(vtkDelimitedTextReader);
 
 vtkDelimitedTextReader::vtkDelimitedTextReader() :
diff --git a/Infovis/vtkDelimitedTextReader.h b/Infovis/vtkDelimitedTextReader.h
index c4e44e417384221b13decf08885829402c29f5f7..dc8d2556617fe54bc1143dc570705dcfc89d9dee 100644
--- a/Infovis/vtkDelimitedTextReader.h
+++ b/Infovis/vtkDelimitedTextReader.h
@@ -57,7 +57,7 @@ class VTK_INFOVIS_EXPORT vtkDelimitedTextReader : public vtkTableAlgorithm
 {
 public:
   static vtkDelimitedTextReader* New();
-  vtkTypeRevisionMacro(vtkDelimitedTextReader, vtkTableAlgorithm);
+  vtkTypeMacro(vtkDelimitedTextReader, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descriptin:
diff --git a/Infovis/vtkDescriptiveStatistics.cxx b/Infovis/vtkDescriptiveStatistics.cxx
index e79439d28ff2cd93ba81f56b9315c97682f7cfed..88e906324afbcc843e306f3cfab63eaa41047e81 100644
--- a/Infovis/vtkDescriptiveStatistics.cxx
+++ b/Infovis/vtkDescriptiveStatistics.cxx
@@ -42,7 +42,6 @@
 #include <vtksys/ios/sstream> 
 #include <vtkstd/limits>
 
-vtkCxxRevisionMacro(vtkDescriptiveStatistics, "1.106");
 vtkStandardNewMacro(vtkDescriptiveStatistics);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkDescriptiveStatistics.h b/Infovis/vtkDescriptiveStatistics.h
index ac84103983081349e153d0a67b7b2f0bfa9de9d9..9377b2816b917b29da9ad050d96cbddb4451ea89 100644
--- a/Infovis/vtkDescriptiveStatistics.h
+++ b/Infovis/vtkDescriptiveStatistics.h
@@ -52,7 +52,7 @@ class vtkVariant;
 class VTK_INFOVIS_EXPORT vtkDescriptiveStatistics : public vtkUnivariateStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkDescriptiveStatistics, vtkUnivariateStatisticsAlgorithm);
+  vtkTypeMacro(vtkDescriptiveStatistics, vtkUnivariateStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkDescriptiveStatistics* New();
 
diff --git a/Infovis/vtkDiagonalMatrixSource.cxx b/Infovis/vtkDiagonalMatrixSource.cxx
index 9ad5f74622d2801a042ced8f07046d4f0431aa0d..cfb7b6d288cdaa321bbe04a02d33f61af46f17c9 100644
--- a/Infovis/vtkDiagonalMatrixSource.cxx
+++ b/Infovis/vtkDiagonalMatrixSource.cxx
@@ -29,7 +29,6 @@
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkDiagonalMatrixSource, "1.3");
 vtkStandardNewMacro(vtkDiagonalMatrixSource);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkDiagonalMatrixSource.h b/Infovis/vtkDiagonalMatrixSource.h
index 4e2ffecdfb56f80709a38d2266d36710c542bcf5..f64f8615a23914986db9dd33ea71a9f4f8a4feca 100644
--- a/Infovis/vtkDiagonalMatrixSource.h
+++ b/Infovis/vtkDiagonalMatrixSource.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkDiagonalMatrixSource : public vtkArrayDataAlgorithm
 {
 public:
   static vtkDiagonalMatrixSource* New();
-  vtkTypeRevisionMacro(vtkDiagonalMatrixSource, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkDiagonalMatrixSource, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Infovis/vtkDotProductSimilarity.cxx b/Infovis/vtkDotProductSimilarity.cxx
index dc58062ab3fb7bee3c9029dc50beb3abacba7701..df73c3925cf405eb8d654ab8516f27dc7b338ec0 100644
--- a/Infovis/vtkDotProductSimilarity.cxx
+++ b/Infovis/vtkDotProductSimilarity.cxx
@@ -85,7 +85,6 @@ private:
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkDotProductSimilarity, "1.5");
 vtkStandardNewMacro(vtkDotProductSimilarity);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkDotProductSimilarity.h b/Infovis/vtkDotProductSimilarity.h
index 1a0e679e1d142d9a2bdf492cf47a4f6d78be0bf0..2acfccbca532c0ff8e7df62cba77daa612f82100 100644
--- a/Infovis/vtkDotProductSimilarity.h
+++ b/Infovis/vtkDotProductSimilarity.h
@@ -61,7 +61,7 @@ class VTK_INFOVIS_EXPORT vtkDotProductSimilarity : public vtkTableAlgorithm
 {
 public:
   static vtkDotProductSimilarity* New();
-  vtkTypeRevisionMacro(vtkDotProductSimilarity, vtkTableAlgorithm);
+  vtkTypeMacro(vtkDotProductSimilarity, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkEdgeCenters.cxx b/Infovis/vtkEdgeCenters.cxx
index d6ae3668f1f1687243b2f2851f2a2e4c2422931c..f47ff2c3c391450883d0f16b404f0ce14dd4b451 100644
--- a/Infovis/vtkEdgeCenters.cxx
+++ b/Infovis/vtkEdgeCenters.cxx
@@ -27,7 +27,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkEdgeCenters, "1.3");
 vtkStandardNewMacro(vtkEdgeCenters);
 
 // Construct object with vertex cell generation turned off.
diff --git a/Infovis/vtkEdgeCenters.h b/Infovis/vtkEdgeCenters.h
index f8900a1a8b259e3f3ee1c34c0eb187ea69f892ab..d524827f661935998ecee880034d53d81e4889ab 100644
--- a/Infovis/vtkEdgeCenters.h
+++ b/Infovis/vtkEdgeCenters.h
@@ -37,7 +37,7 @@
 class VTK_INFOVIS_EXPORT vtkEdgeCenters : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkEdgeCenters,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkEdgeCenters,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkEdgeLayout.cxx b/Infovis/vtkEdgeLayout.cxx
index c6632eeca267725cf29aea60e9468ff339a41776..8fedd31ff06aa9a6b9b2aaccd26b3a4d88e11401 100644
--- a/Infovis/vtkEdgeLayout.cxx
+++ b/Infovis/vtkEdgeLayout.cxx
@@ -32,7 +32,6 @@
 #include "vtkPointData.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkEdgeLayout, "1.3");
 vtkStandardNewMacro(vtkEdgeLayout);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkEdgeLayout.h b/Infovis/vtkEdgeLayout.h
index 7761fe36139442ff04c31c3f9bed3231c7eb653e..a1ccf0633cf2ec1e7a75fc8f18f4e80395b8bcb9 100644
--- a/Infovis/vtkEdgeLayout.h
+++ b/Infovis/vtkEdgeLayout.h
@@ -35,7 +35,7 @@ class VTK_INFOVIS_EXPORT vtkEdgeLayout : public vtkGraphAlgorithm
 {
 public:
   static vtkEdgeLayout *New();
-  vtkTypeRevisionMacro(vtkEdgeLayout, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkEdgeLayout, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkEdgeLayoutStrategy.cxx b/Infovis/vtkEdgeLayoutStrategy.cxx
index 72299ea00e3e59406c80231f1c0809613acedd01..e4517ef2c4a5a4cb8d2df1788c9f4ba596ec2a61 100644
--- a/Infovis/vtkEdgeLayoutStrategy.cxx
+++ b/Infovis/vtkEdgeLayoutStrategy.cxx
@@ -20,7 +20,6 @@
 
 #include "vtkGraph.h"
 
-vtkCxxRevisionMacro(vtkEdgeLayoutStrategy, "1.1");
 
 void vtkEdgeLayoutStrategy::SetGraph(vtkGraph *graph)
 {
diff --git a/Infovis/vtkEdgeLayoutStrategy.h b/Infovis/vtkEdgeLayoutStrategy.h
index 0f676211058b1ba5ad2544ccb1c2d5fad1cae5c4..9817a1c3a9aff0d35278deabfa41f23ba67af87e 100644
--- a/Infovis/vtkEdgeLayoutStrategy.h
+++ b/Infovis/vtkEdgeLayoutStrategy.h
@@ -32,7 +32,7 @@ class vtkGraph;
 class VTK_INFOVIS_EXPORT vtkEdgeLayoutStrategy : public vtkObject 
 {
 public:
-  vtkTypeRevisionMacro(vtkEdgeLayoutStrategy,vtkObject);
+  vtkTypeMacro(vtkEdgeLayoutStrategy,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkExpandSelectedGraph.cxx b/Infovis/vtkExpandSelectedGraph.cxx
index 3b17ae234d7ce6d0c5fe76590caa89516dde097f..bf8f26eb032492a8d0a1503aaa9ff159b6aaaa90 100644
--- a/Infovis/vtkExpandSelectedGraph.cxx
+++ b/Infovis/vtkExpandSelectedGraph.cxx
@@ -44,7 +44,6 @@
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkExpandSelectedGraph, "1.5");
 vtkStandardNewMacro(vtkExpandSelectedGraph);
 
 vtkExpandSelectedGraph::vtkExpandSelectedGraph()
diff --git a/Infovis/vtkExpandSelectedGraph.h b/Infovis/vtkExpandSelectedGraph.h
index b3671c37d057a1fe1fe565689004774858bc6073..543c85729e0e3d6b90385174d200b432f587cb9e 100644
--- a/Infovis/vtkExpandSelectedGraph.h
+++ b/Infovis/vtkExpandSelectedGraph.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkExpandSelectedGraph : public vtkSelectionAlgorithm
 {
 public:
   static vtkExpandSelectedGraph* New();
-  vtkTypeRevisionMacro(vtkExpandSelectedGraph,vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkExpandSelectedGraph,vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkExtractArray.cxx b/Infovis/vtkExtractArray.cxx
index e973cb942097292dad1981cff6b1c17e32218903..2b42bf7d6cde5ebed2711084ec751d10af91df18 100644
--- a/Infovis/vtkExtractArray.cxx
+++ b/Infovis/vtkExtractArray.cxx
@@ -30,7 +30,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkExtractArray
 
-vtkCxxRevisionMacro(vtkExtractArray, "1.1");
 vtkStandardNewMacro(vtkExtractArray);
 
 vtkExtractArray::vtkExtractArray() :
diff --git a/Infovis/vtkExtractArray.h b/Infovis/vtkExtractArray.h
index df438bcca1b668c9ddbf271fe6591e2a765c8139..78b6d3cc8a36b086f02c1f2aefbd030cd7182675 100644
--- a/Infovis/vtkExtractArray.h
+++ b/Infovis/vtkExtractArray.h
@@ -35,7 +35,7 @@ class VTK_INFOVIS_EXPORT vtkExtractArray : public vtkArrayDataAlgorithm
 {
 public:
   static vtkExtractArray* New();
-  vtkTypeRevisionMacro(vtkExtractArray, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkExtractArray, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkExtractHistogram2D.cxx b/Infovis/vtkExtractHistogram2D.cxx
index e6e55dc4433013d37908335db8a705e0867f4786..5c4291a561ea12e5a1f87faf98854fd42a6a90db 100644
--- a/Infovis/vtkExtractHistogram2D.cxx
+++ b/Infovis/vtkExtractHistogram2D.cxx
@@ -35,7 +35,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkTimerLog.h"
 #include "vtkUnsignedIntArray.h"
 //------------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkExtractHistogram2D, "1.8");
 vtkStandardNewMacro(vtkExtractHistogram2D);
 vtkCxxSetObjectMacro(vtkExtractHistogram2D,RowMask,vtkDataArray);
 //------------------------------------------------------------------------------
diff --git a/Infovis/vtkExtractHistogram2D.h b/Infovis/vtkExtractHistogram2D.h
index 2b2b2e11a6cedfd896e0b7a83388c1496b8501ed..db1dc590f3f13f5a29fbc381db73b0e0f92f05ab 100644
--- a/Infovis/vtkExtractHistogram2D.h
+++ b/Infovis/vtkExtractHistogram2D.h
@@ -54,7 +54,7 @@ class VTK_INFOVIS_EXPORT vtkExtractHistogram2D : public vtkBivariateStatisticsAl
 {
 public:
   static vtkExtractHistogram2D* New();
-  vtkTypeRevisionMacro(vtkExtractHistogram2D, vtkBivariateStatisticsAlgorithm);
+  vtkTypeMacro(vtkExtractHistogram2D, vtkBivariateStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Infovis/vtkExtractSelectedGraph.cxx b/Infovis/vtkExtractSelectedGraph.cxx
index 4552fa3749621f7f324eca3fddca75fed52e2913..8e68fbe3f212156e3a5a2784125b6b473f536c4a 100644
--- a/Infovis/vtkExtractSelectedGraph.cxx
+++ b/Infovis/vtkExtractSelectedGraph.cxx
@@ -50,7 +50,6 @@
 #include <vtksys/stl/map>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkExtractSelectedGraph, "1.33");
 vtkStandardNewMacro(vtkExtractSelectedGraph);
 //----------------------------------------------------------------------------
 vtkExtractSelectedGraph::vtkExtractSelectedGraph()
diff --git a/Infovis/vtkExtractSelectedGraph.h b/Infovis/vtkExtractSelectedGraph.h
index 245dd3250b19f08b6d1a3bc2906628f60fc34f34..74cab9175693fa2600c7a3897a7f66bb486a8e04 100644
--- a/Infovis/vtkExtractSelectedGraph.h
+++ b/Infovis/vtkExtractSelectedGraph.h
@@ -43,7 +43,7 @@ class VTK_INFOVIS_EXPORT vtkExtractSelectedGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkExtractSelectedGraph* New();
-  vtkTypeRevisionMacro(vtkExtractSelectedGraph,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkExtractSelectedGraph,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkFast2DLayoutStrategy.cxx b/Infovis/vtkFast2DLayoutStrategy.cxx
index 43e217af988b1503791fe8d837c9aadffb02669b..4f4f4f0ab8a5877f7eed97ff914ebbc99cb3138d 100644
--- a/Infovis/vtkFast2DLayoutStrategy.cxx
+++ b/Infovis/vtkFast2DLayoutStrategy.cxx
@@ -41,7 +41,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkFast2DLayoutStrategy, "1.24");
 vtkStandardNewMacro(vtkFast2DLayoutStrategy);
 
 // This is just a convenient macro for smart pointers
diff --git a/Infovis/vtkFast2DLayoutStrategy.h b/Infovis/vtkFast2DLayoutStrategy.h
index 49486c8f89f57b86d888c9043034c1c9700940cd..d7d8fd53171de3f67b793ddad5dcf383dc01f18d 100644
--- a/Infovis/vtkFast2DLayoutStrategy.h
+++ b/Infovis/vtkFast2DLayoutStrategy.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkFast2DLayoutStrategy : public vtkGraphLayoutStrategy
 public:
   static vtkFast2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkFast2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkFast2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkFixedWidthTextReader.cxx b/Infovis/vtkFixedWidthTextReader.cxx
index 8536960ae8f00997b26f68d66725d94adce46fc8..e920fc116c88e153447209f39cb5538954a9dcaa 100644
--- a/Infovis/vtkFixedWidthTextReader.cxx
+++ b/Infovis/vtkFixedWidthTextReader.cxx
@@ -35,7 +35,6 @@
 
 #include <ctype.h>
 
-vtkCxxRevisionMacro(vtkFixedWidthTextReader, "1.8");
 vtkStandardNewMacro(vtkFixedWidthTextReader);
 
 // Function body at bottom of file
diff --git a/Infovis/vtkFixedWidthTextReader.h b/Infovis/vtkFixedWidthTextReader.h
index 2793b04dc3cb9b6c9ad9b2aa13fd2efad905b2fc..73b6878783b2316b8cb0892878165faedf0aaed9 100644
--- a/Infovis/vtkFixedWidthTextReader.h
+++ b/Infovis/vtkFixedWidthTextReader.h
@@ -50,7 +50,7 @@ class VTK_INFOVIS_EXPORT vtkFixedWidthTextReader : public vtkTableAlgorithm
 {
 public:
   static vtkFixedWidthTextReader* New();
-  vtkTypeRevisionMacro(vtkFixedWidthTextReader,vtkTableAlgorithm);
+  vtkTypeMacro(vtkFixedWidthTextReader,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGetStringMacro(FileName);
diff --git a/Infovis/vtkForceDirectedLayoutStrategy.cxx b/Infovis/vtkForceDirectedLayoutStrategy.cxx
index 07a3ae28bc92300716a2e55510bdc3c3847d4b28..4555d15e57919350797a94f921f0dab36b2517b9 100644
--- a/Infovis/vtkForceDirectedLayoutStrategy.cxx
+++ b/Infovis/vtkForceDirectedLayoutStrategy.cxx
@@ -35,7 +35,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkForceDirectedLayoutStrategy, "1.9");
 vtkStandardNewMacro(vtkForceDirectedLayoutStrategy);
 
 vtkForceDirectedLayoutStrategy::vtkForceDirectedLayoutStrategy()
diff --git a/Infovis/vtkForceDirectedLayoutStrategy.h b/Infovis/vtkForceDirectedLayoutStrategy.h
index 85e587f51ca9be7bb8c2389eeb7276555a588776..38e2f462b8530ab32ba11d2c8f7e89c0448db8c5 100644
--- a/Infovis/vtkForceDirectedLayoutStrategy.h
+++ b/Infovis/vtkForceDirectedLayoutStrategy.h
@@ -39,7 +39,7 @@ class VTK_INFOVIS_EXPORT vtkForceDirectedLayoutStrategy : public vtkGraphLayoutS
 public:
   static vtkForceDirectedLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkForceDirectedLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkForceDirectedLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGenerateIndexArray.cxx b/Infovis/vtkGenerateIndexArray.cxx
index e47cb6f8699b00243ceef0b176a484ca3913927a..58c83b2a397cfb2ef86f2b3572abc5a2e648bb93 100644
--- a/Infovis/vtkGenerateIndexArray.cxx
+++ b/Infovis/vtkGenerateIndexArray.cxx
@@ -27,7 +27,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkGenerateIndexArray, "1.4");
 vtkStandardNewMacro(vtkGenerateIndexArray);
 
 vtkGenerateIndexArray::vtkGenerateIndexArray() :
diff --git a/Infovis/vtkGenerateIndexArray.h b/Infovis/vtkGenerateIndexArray.h
index 30819fdb33f7d11b2b740df557001a8d4f2d1331..8ac86ee7549c5fec70e2771c666b6bd91e25e999 100644
--- a/Infovis/vtkGenerateIndexArray.h
+++ b/Infovis/vtkGenerateIndexArray.h
@@ -50,7 +50,7 @@ class VTK_INFOVIS_EXPORT vtkGenerateIndexArray : public vtkDataObjectAlgorithm
 public:
   static vtkGenerateIndexArray *New();
 
-  vtkTypeRevisionMacro(vtkGenerateIndexArray, vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkGenerateIndexArray, vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGeoEdgeStrategy.cxx b/Infovis/vtkGeoEdgeStrategy.cxx
index a4ccb7b864fa0a07de7ae10d940505850da9b3d5..a4d4075238e147cc0b8d36c2045bbe4a7a1d6703 100644
--- a/Infovis/vtkGeoEdgeStrategy.cxx
+++ b/Infovis/vtkGeoEdgeStrategy.cxx
@@ -37,7 +37,6 @@
 #include <vtksys/stl/vector>
 #include <vtksys/stl/map>
 
-vtkCxxRevisionMacro(vtkGeoEdgeStrategy, "1.2");
 vtkStandardNewMacro(vtkGeoEdgeStrategy);
 
 vtkGeoEdgeStrategy::vtkGeoEdgeStrategy()
diff --git a/Infovis/vtkGeoEdgeStrategy.h b/Infovis/vtkGeoEdgeStrategy.h
index 2b575c79da618cacb43e5dfd05990fa1c6b06d64..5809206d9aa661cdb8aac95e69f255480e31afd4 100644
--- a/Infovis/vtkGeoEdgeStrategy.h
+++ b/Infovis/vtkGeoEdgeStrategy.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkGeoEdgeStrategy : public vtkEdgeLayoutStrategy
 {
 public:
   static vtkGeoEdgeStrategy *New();
-  vtkTypeRevisionMacro(vtkGeoEdgeStrategy,vtkEdgeLayoutStrategy);
+  vtkTypeMacro(vtkGeoEdgeStrategy,vtkEdgeLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGeoMath.cxx b/Infovis/vtkGeoMath.cxx
index 892089d3458695277a8615527afea425f68819c2..6712f44c3a9ff0e165e3154dd3ae0a2b48a61d27 100644
--- a/Infovis/vtkGeoMath.cxx
+++ b/Infovis/vtkGeoMath.cxx
@@ -23,7 +23,6 @@
 #include "vtkGeoMath.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkGeoMath, "1.1");
 vtkStandardNewMacro(vtkGeoMath);
 
 
diff --git a/Infovis/vtkGeoMath.h b/Infovis/vtkGeoMath.h
index bb4b8dcd389ce67f8bda133cae019e4ade5ff7d3..ea3ce3674af2c8af8ab26100562255d52dfa6051 100644
--- a/Infovis/vtkGeoMath.h
+++ b/Infovis/vtkGeoMath.h
@@ -31,7 +31,7 @@ class VTK_INFOVIS_EXPORT vtkGeoMath : public vtkObject
 {
 public:
   static vtkGeoMath *New();
-  vtkTypeRevisionMacro(vtkGeoMath, vtkObject);
+  vtkTypeMacro(vtkGeoMath, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGraphHierarchicalBundle.cxx b/Infovis/vtkGraphHierarchicalBundle.cxx
index e39187b0c1bac7ef820cb4fd01bccda2093a32ec..c9337f8454e6a4b9e067785272594b4847662750 100644
--- a/Infovis/vtkGraphHierarchicalBundle.cxx
+++ b/Infovis/vtkGraphHierarchicalBundle.cxx
@@ -58,7 +58,6 @@ static vtkVariant vtkGetVariantValue(vtkAbstractArray* arr, vtkIdType i)
 }
 
 
-vtkCxxRevisionMacro(vtkGraphHierarchicalBundle, "1.13");
 vtkStandardNewMacro(vtkGraphHierarchicalBundle);
 
 vtkGraphHierarchicalBundle::vtkGraphHierarchicalBundle()
diff --git a/Infovis/vtkGraphHierarchicalBundle.h b/Infovis/vtkGraphHierarchicalBundle.h
index aea31fb42c5e806b0307106e4ad7cdec0ad30ba0..ffb474bca1dd5c9da5dab1558b9cdca181b1325d 100644
--- a/Infovis/vtkGraphHierarchicalBundle.h
+++ b/Infovis/vtkGraphHierarchicalBundle.h
@@ -59,7 +59,7 @@ class VTK_INFOVIS_EXPORT vtkGraphHierarchicalBundle : public vtkPolyDataAlgorith
 public:
   static vtkGraphHierarchicalBundle *New();
 
-  vtkTypeRevisionMacro(vtkGraphHierarchicalBundle,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGraphHierarchicalBundle,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGraphHierarchicalBundleEdges.cxx b/Infovis/vtkGraphHierarchicalBundleEdges.cxx
index 0b146ce630de0f7913069432aee6ad26e32c1f96..cc03970cb009d06e5c6ce3b0f0f73933a3b3562e 100644
--- a/Infovis/vtkGraphHierarchicalBundleEdges.cxx
+++ b/Infovis/vtkGraphHierarchicalBundleEdges.cxx
@@ -38,7 +38,6 @@
 #include <vtksys/stl/map>
 using vtksys_stl::map;
 
-vtkCxxRevisionMacro(vtkGraphHierarchicalBundleEdges, "1.5");
 vtkStandardNewMacro(vtkGraphHierarchicalBundleEdges);
 
 vtkGraphHierarchicalBundleEdges::vtkGraphHierarchicalBundleEdges()
diff --git a/Infovis/vtkGraphHierarchicalBundleEdges.h b/Infovis/vtkGraphHierarchicalBundleEdges.h
index c1afd1120e3bef2c8a1c9715a79fdfb260dcbddc..6302ea476b9752a1eb87e1bb2aac699903e01bc2 100644
--- a/Infovis/vtkGraphHierarchicalBundleEdges.h
+++ b/Infovis/vtkGraphHierarchicalBundleEdges.h
@@ -59,7 +59,7 @@ class VTK_INFOVIS_EXPORT vtkGraphHierarchicalBundleEdges : public vtkGraphAlgori
 public:
   static vtkGraphHierarchicalBundleEdges *New();
 
-  vtkTypeRevisionMacro(vtkGraphHierarchicalBundleEdges,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkGraphHierarchicalBundleEdges,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGraphLayout.cxx b/Infovis/vtkGraphLayout.cxx
index d213f56df5601770cc5988b7ccb3f5d759362306..53f89614268a4b626f99b184af6fe0830360fcd5 100644
--- a/Infovis/vtkGraphLayout.cxx
+++ b/Infovis/vtkGraphLayout.cxx
@@ -35,7 +35,6 @@
 #include "vtkPoints.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkGraphLayout, "1.11");
 vtkStandardNewMacro(vtkGraphLayout);
 vtkCxxSetObjectMacro(vtkGraphLayout, Transform, vtkAbstractTransform);
 
diff --git a/Infovis/vtkGraphLayout.h b/Infovis/vtkGraphLayout.h
index 7f95ece090f7140f2b7fb2f019ce69f300c589b9..bf1f1a3685aad3f4018a060bb94211060f74f505 100644
--- a/Infovis/vtkGraphLayout.h
+++ b/Infovis/vtkGraphLayout.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkGraphLayout : public vtkGraphAlgorithm
 {
 public:
   static vtkGraphLayout *New();
-  vtkTypeRevisionMacro(vtkGraphLayout, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkGraphLayout, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGraphLayoutStrategy.cxx b/Infovis/vtkGraphLayoutStrategy.cxx
index 81f34ac858efa8070c92721ff06c1bbcd00c4389..db9c4a73c362050c13ef1d6b41771e0d4e60bb1a 100644
--- a/Infovis/vtkGraphLayoutStrategy.cxx
+++ b/Infovis/vtkGraphLayoutStrategy.cxx
@@ -21,7 +21,6 @@
 
 #include "vtkGraph.h"
 
-vtkCxxRevisionMacro(vtkGraphLayoutStrategy, "1.10");
 
 void vtkGraphLayoutStrategy::SetGraph(vtkGraph *graph)
 {
diff --git a/Infovis/vtkGraphLayoutStrategy.h b/Infovis/vtkGraphLayoutStrategy.h
index b23a83eaa786051074ecf2a383a830e97381a1fc..2d742eda99a31ff02aa053db3506e2035c830647 100644
--- a/Infovis/vtkGraphLayoutStrategy.h
+++ b/Infovis/vtkGraphLayoutStrategy.h
@@ -41,7 +41,7 @@ class vtkGraph;
 class VTK_INFOVIS_EXPORT vtkGraphLayoutStrategy : public vtkObject 
 {
 public:
-  vtkTypeRevisionMacro(vtkGraphLayoutStrategy,vtkObject);
+  vtkTypeMacro(vtkGraphLayoutStrategy,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkGroupLeafVertices.cxx b/Infovis/vtkGroupLeafVertices.cxx
index bd1516e29f9c30aa249c3945e7663fb772a66381..5d3c35001f180ba9cb67507718804ad272510001 100644
--- a/Infovis/vtkGroupLeafVertices.cxx
+++ b/Infovis/vtkGroupLeafVertices.cxx
@@ -40,7 +40,6 @@
 #include <vtksys/stl/utility>
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkGroupLeafVertices, "1.19");
 vtkStandardNewMacro(vtkGroupLeafVertices);
 
 // Forward function reference (definition at bottom :)
diff --git a/Infovis/vtkGroupLeafVertices.h b/Infovis/vtkGroupLeafVertices.h
index 9c123fbf2bcd219632d6197ca1eed0a2827be27c..ccbebc3eea42d6a05b16abf67ddae543a1ee7d78 100644
--- a/Infovis/vtkGroupLeafVertices.h
+++ b/Infovis/vtkGroupLeafVertices.h
@@ -32,7 +32,7 @@ class VTK_INFOVIS_EXPORT vtkGroupLeafVertices : public vtkTreeAlgorithm
 {
 public:
   static vtkGroupLeafVertices* New();
-  vtkTypeRevisionMacro(vtkGroupLeafVertices,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkGroupLeafVertices,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkISIReader.cxx b/Infovis/vtkISIReader.cxx
index a82f6102784924b193fe64a8b4ad6dfce39cb01d..bff515e76e5388b5540e207932d341a29a5d9c43 100644
--- a/Infovis/vtkISIReader.cxx
+++ b/Infovis/vtkISIReader.cxx
@@ -29,7 +29,6 @@
 #include <vtkstd/map>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkISIReader, "1.6");
 vtkStandardNewMacro(vtkISIReader);
 
 // Not all platforms support vtkstd::getline(istream&, vtkstd::string) so
diff --git a/Infovis/vtkISIReader.h b/Infovis/vtkISIReader.h
index 5ca2a7df16462afdec6f3288d28d5c54006c4136..4d48eacb819a10024fc7434cd227a6b8e895bd25 100644
--- a/Infovis/vtkISIReader.h
+++ b/Infovis/vtkISIReader.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkISIReader : public vtkTableAlgorithm
 {
 public:
   static vtkISIReader* New();
-  vtkTypeRevisionMacro(vtkISIReader,vtkTableAlgorithm);
+  vtkTypeMacro(vtkISIReader,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkKMeansDistanceFunctor.cxx b/Infovis/vtkKMeansDistanceFunctor.cxx
index 0c09c7c83b047d3a09096f229240deadea1204c8..4c4e1d499a22fbfb46b49c864d26e7c63410c5c6 100644
--- a/Infovis/vtkKMeansDistanceFunctor.cxx
+++ b/Infovis/vtkKMeansDistanceFunctor.cxx
@@ -8,7 +8,6 @@
 #include "vtkIdTypeArray.h"
 
 vtkStandardNewMacro(vtkKMeansDistanceFunctor);
-vtkCxxRevisionMacro(vtkKMeansDistanceFunctor,"1.8");
 
 // ----------------------------------------------------------------------
 vtkKMeansDistanceFunctor::vtkKMeansDistanceFunctor()
diff --git a/Infovis/vtkKMeansDistanceFunctor.h b/Infovis/vtkKMeansDistanceFunctor.h
index 25308b72fd341d822d66d4bad0c8c79b7f90e0c6..2758a56c405d6897ba2b5855d2525ddcf359ece8 100644
--- a/Infovis/vtkKMeansDistanceFunctor.h
+++ b/Infovis/vtkKMeansDistanceFunctor.h
@@ -20,7 +20,7 @@ class VTK_INFOVIS_EXPORT vtkKMeansDistanceFunctor : public vtkObject
 {
 public:
   static vtkKMeansDistanceFunctor* New();
-  vtkTypeRevisionMacro(vtkKMeansDistanceFunctor,vtkObject);
+  vtkTypeMacro(vtkKMeansDistanceFunctor,vtkObject);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Infovis/vtkKMeansDistanceFunctorCalculator.cxx b/Infovis/vtkKMeansDistanceFunctorCalculator.cxx
index d3f9c2aa48fa700b28eebb2965ed5c1c32d98b4f..5df321c587d9cd63618398f230dd056bb07c5c8a 100644
--- a/Infovis/vtkKMeansDistanceFunctorCalculator.cxx
+++ b/Infovis/vtkKMeansDistanceFunctorCalculator.cxx
@@ -11,7 +11,6 @@
 #include <vtksys/ios/sstream>
 
 vtkStandardNewMacro(vtkKMeansDistanceFunctorCalculator);
-vtkCxxRevisionMacro(vtkKMeansDistanceFunctorCalculator,"1.1");
 vtkCxxSetObjectMacro(vtkKMeansDistanceFunctorCalculator,FunctionParser,vtkFunctionParser);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkKMeansDistanceFunctorCalculator.h b/Infovis/vtkKMeansDistanceFunctorCalculator.h
index 06668ee416a0ac2c2924530be0b442128912e844..0188246e4c0d93c22efcc172c51e7c320ca10b74 100644
--- a/Infovis/vtkKMeansDistanceFunctorCalculator.h
+++ b/Infovis/vtkKMeansDistanceFunctorCalculator.h
@@ -27,7 +27,7 @@ class VTK_INFOVIS_EXPORT vtkKMeansDistanceFunctorCalculator : public vtkKMeansDi
 {
 public:
   static vtkKMeansDistanceFunctorCalculator* New();
-  vtkTypeRevisionMacro(vtkKMeansDistanceFunctorCalculator,vtkKMeansDistanceFunctor);
+  vtkTypeMacro(vtkKMeansDistanceFunctorCalculator,vtkKMeansDistanceFunctor);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Infovis/vtkKMeansStatistics.cxx b/Infovis/vtkKMeansStatistics.cxx
index 9acae01d48db5b400da05fa105e4d238fc8b221d..04f1519858a7ca071f58e76b2bcbdd8b198fd1a7 100644
--- a/Infovis/vtkKMeansStatistics.cxx
+++ b/Infovis/vtkKMeansStatistics.cxx
@@ -19,7 +19,6 @@
 #include <vtksys/ios/sstream>
 
 vtkStandardNewMacro(vtkKMeansStatistics);
-vtkCxxRevisionMacro(vtkKMeansStatistics,"1.22");
 vtkCxxSetObjectMacro(vtkKMeansStatistics,DistanceFunctor,vtkKMeansDistanceFunctor);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkKMeansStatistics.h b/Infovis/vtkKMeansStatistics.h
index 8b03def2af07739642949c03f9e0c9251402e593..10acfcc14d89ae25202749fa33097b8ac7b9f627 100644
--- a/Infovis/vtkKMeansStatistics.h
+++ b/Infovis/vtkKMeansStatistics.h
@@ -103,7 +103,7 @@ class vtkMultiBlockDataSet;
 class VTK_INFOVIS_EXPORT vtkKMeansStatistics : public vtkStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkKMeansStatistics, vtkStatisticsAlgorithm);
+  vtkTypeMacro(vtkKMeansStatistics, vtkStatisticsAlgorithm);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
   static vtkKMeansStatistics* New();
  
diff --git a/Infovis/vtkMatricizeArray.cxx b/Infovis/vtkMatricizeArray.cxx
index e484216d135b332e93427ccf83d196483cf4bf09..4f4766887b42265db13a59ad22ecb308687f6fe7 100644
--- a/Infovis/vtkMatricizeArray.cxx
+++ b/Infovis/vtkMatricizeArray.cxx
@@ -32,7 +32,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkMatricizeArray
 
-vtkCxxRevisionMacro(vtkMatricizeArray, "1.4");
 vtkStandardNewMacro(vtkMatricizeArray);
 
 vtkMatricizeArray::vtkMatricizeArray() :
diff --git a/Infovis/vtkMatricizeArray.h b/Infovis/vtkMatricizeArray.h
index 02ea54863dbd1931c437a4115f3e248265ddc0c6..482234c8b4f7313e2b77d8b39dc76876e83ae6e1 100644
--- a/Infovis/vtkMatricizeArray.h
+++ b/Infovis/vtkMatricizeArray.h
@@ -39,7 +39,7 @@ class VTK_INFOVIS_EXPORT vtkMatricizeArray : public vtkArrayDataAlgorithm
 {
 public:
   static vtkMatricizeArray* New();
-  vtkTypeRevisionMacro(vtkMatricizeArray, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkMatricizeArray, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkMergeColumns.cxx b/Infovis/vtkMergeColumns.cxx
index 47e5f0e84d540048c2b538ca9645d5ba8bb6e662..ee6d8b4974f32feb8fa0808d1e5d149d05c2110c 100644
--- a/Infovis/vtkMergeColumns.cxx
+++ b/Infovis/vtkMergeColumns.cxx
@@ -27,7 +27,6 @@
 #include "vtkUnicodeStringArray.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkMergeColumns, "1.4");
 vtkStandardNewMacro(vtkMergeColumns);
 
 vtkMergeColumns::vtkMergeColumns()
diff --git a/Infovis/vtkMergeColumns.h b/Infovis/vtkMergeColumns.h
index a05a54bc2920b8eff9abe90179cfe00d068aa0ae..8d8b307d601e64747f1b078b7767bd797e0306c7 100644
--- a/Infovis/vtkMergeColumns.h
+++ b/Infovis/vtkMergeColumns.h
@@ -45,7 +45,7 @@ class VTK_INFOVIS_EXPORT vtkMergeColumns : public vtkTableAlgorithm
 {
 public:
   static vtkMergeColumns* New();
-  vtkTypeRevisionMacro(vtkMergeColumns,vtkTableAlgorithm);
+  vtkTypeMacro(vtkMergeColumns,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkMergeGraphs.cxx b/Infovis/vtkMergeGraphs.cxx
index f219d811635402f426d64af1e9c197aab54a5870..82818be8ad49ea7ae1b6cbf91bdac1ebde733a68 100644
--- a/Infovis/vtkMergeGraphs.cxx
+++ b/Infovis/vtkMergeGraphs.cxx
@@ -35,7 +35,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkMergeGraphs, "1.6");
 vtkStandardNewMacro(vtkMergeGraphs);
 //---------------------------------------------------------------------------
 vtkMergeGraphs::vtkMergeGraphs()
diff --git a/Infovis/vtkMergeGraphs.h b/Infovis/vtkMergeGraphs.h
index 502dab5859b5d1cd17ddf00f83e457e90980bbfa..5f5822342e0bcea36c2d9321fb1887dc703c5422 100644
--- a/Infovis/vtkMergeGraphs.h
+++ b/Infovis/vtkMergeGraphs.h
@@ -55,7 +55,7 @@ class VTK_INFOVIS_EXPORT vtkMergeGraphs : public vtkGraphAlgorithm
 {
 public:
   static vtkMergeGraphs* New();
-  vtkTypeRevisionMacro(vtkMergeGraphs,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkMergeGraphs,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkMergeTables.cxx b/Infovis/vtkMergeTables.cxx
index a91db3b62decc0628f612e3b60331e77527fda00..bb12d73a99556e0c912c22f036d5ee28a590f2be 100644
--- a/Infovis/vtkMergeTables.cxx
+++ b/Infovis/vtkMergeTables.cxx
@@ -28,7 +28,6 @@
 #include "vtkStringArray.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkMergeTables, "1.8");
 vtkStandardNewMacro(vtkMergeTables);
 //---------------------------------------------------------------------------
 vtkMergeTables::vtkMergeTables()
diff --git a/Infovis/vtkMergeTables.h b/Infovis/vtkMergeTables.h
index 48325be341da8306ae5b35e5f3cf1407bb79e3d5..d8b566a6304b7a79b9331ec2271bfa353ecceeb2 100644
--- a/Infovis/vtkMergeTables.h
+++ b/Infovis/vtkMergeTables.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkMergeTables : public vtkTableAlgorithm
 {
 public:
   static vtkMergeTables* New();
-  vtkTypeRevisionMacro(vtkMergeTables,vtkTableAlgorithm);
+  vtkTypeMacro(vtkMergeTables,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkMultiCorrelativeStatistics.cxx b/Infovis/vtkMultiCorrelativeStatistics.cxx
index 43f2c6fe0076370297c11846d23ee9fbeca6dd47..c6cb2436125c85c7b1e14d9598f107540018feba 100644
--- a/Infovis/vtkMultiCorrelativeStatistics.cxx
+++ b/Infovis/vtkMultiCorrelativeStatistics.cxx
@@ -22,7 +22,6 @@
 #define VTK_MULTICORRELATIVE_AVERAGECOL "Mean"
 #define VTK_MULTICORRELATIVE_COLUMNAMES "Column"
 
-vtkCxxRevisionMacro(vtkMultiCorrelativeStatistics,"1.27");
 vtkStandardNewMacro(vtkMultiCorrelativeStatistics);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkMultiCorrelativeStatistics.h b/Infovis/vtkMultiCorrelativeStatistics.h
index b60c1e82e04fd043fd5d7c079865e52d6b6a3853..9c5598e84ddff32bae8f2ef1d08b019908ecae58 100644
--- a/Infovis/vtkMultiCorrelativeStatistics.h
+++ b/Infovis/vtkMultiCorrelativeStatistics.h
@@ -68,7 +68,7 @@ class vtkVariant;
 class VTK_INFOVIS_EXPORT vtkMultiCorrelativeStatistics : public vtkStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMultiCorrelativeStatistics, vtkStatisticsAlgorithm);
+  vtkTypeMacro(vtkMultiCorrelativeStatistics, vtkStatisticsAlgorithm);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
   static vtkMultiCorrelativeStatistics* New();
 
diff --git a/Infovis/vtkMutableGraphHelper.cxx b/Infovis/vtkMutableGraphHelper.cxx
index 502d53eaeb38c6b4fba77b31c91bba31b4b90890..689d0909d5b3a64d6b888815333c3b93cf6a8d93 100644
--- a/Infovis/vtkMutableGraphHelper.cxx
+++ b/Infovis/vtkMutableGraphHelper.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 
 vtkCxxSetObjectMacro(vtkMutableGraphHelper, InternalGraph, vtkGraph);
-vtkCxxRevisionMacro(vtkMutableGraphHelper, "1.2");
 vtkStandardNewMacro(vtkMutableGraphHelper);
 //----------------------------------------------------------------------------
 vtkMutableGraphHelper::vtkMutableGraphHelper()
diff --git a/Infovis/vtkMutableGraphHelper.h b/Infovis/vtkMutableGraphHelper.h
index bad064def9b8b0227f005a22cc5cbebe51859602..05588a09cea1e87ce0fe1e05e0bf21f0392e394b 100644
--- a/Infovis/vtkMutableGraphHelper.h
+++ b/Infovis/vtkMutableGraphHelper.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkMutableGraphHelper : public vtkObject
 {
 public:
   static vtkMutableGraphHelper *New();
-  vtkTypeRevisionMacro(vtkMutableGraphHelper, vtkObject);
+  vtkTypeMacro(vtkMutableGraphHelper, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkNetworkHierarchy.cxx b/Infovis/vtkNetworkHierarchy.cxx
index 43855caedd5c7af8392f473d075b4d3016a46985..99c7e09ab73f3dbbfe44417a18f0f1d16304361a 100644
--- a/Infovis/vtkNetworkHierarchy.cxx
+++ b/Infovis/vtkNetworkHierarchy.cxx
@@ -40,7 +40,6 @@
 #include <vtksys/ios/sstream>
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkNetworkHierarchy, "1.5");
 vtkStandardNewMacro(vtkNetworkHierarchy);
 
 // This is just a macro wrapping for smart pointers
diff --git a/Infovis/vtkNetworkHierarchy.h b/Infovis/vtkNetworkHierarchy.h
index 907ca149cac1fbd277501cd44304c7e3bd2d3dd9..171ba26d4dceb59ed1d9e2cd6aaabae85370a858 100644
--- a/Infovis/vtkNetworkHierarchy.h
+++ b/Infovis/vtkNetworkHierarchy.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkNetworkHierarchy : public vtkTreeAlgorithm
 {
 public:
   static vtkNetworkHierarchy* New();
-  vtkTypeRevisionMacro(vtkNetworkHierarchy,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkNetworkHierarchy,vtkTreeAlgorithm);
   
   // Description:
   // Used to store the ip array name
diff --git a/Infovis/vtkNormalizeMatrixVectors.cxx b/Infovis/vtkNormalizeMatrixVectors.cxx
index e95c1ba1af4e3405239518e10e0f48dfb1cca73c..b642c363690659264fd0e2152672b5fc9c358a82 100644
--- a/Infovis/vtkNormalizeMatrixVectors.cxx
+++ b/Infovis/vtkNormalizeMatrixVectors.cxx
@@ -31,7 +31,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkNormalizeMatrixVectors
 
-vtkCxxRevisionMacro(vtkNormalizeMatrixVectors, "1.4");
 vtkStandardNewMacro(vtkNormalizeMatrixVectors);
 
 vtkNormalizeMatrixVectors::vtkNormalizeMatrixVectors() :
diff --git a/Infovis/vtkNormalizeMatrixVectors.h b/Infovis/vtkNormalizeMatrixVectors.h
index 9befd036aefb0c013dbb2293cd6e8d2f283e598a..50e993952b4d4ee6ad4ae1fe0e2276c257789ae8 100644
--- a/Infovis/vtkNormalizeMatrixVectors.h
+++ b/Infovis/vtkNormalizeMatrixVectors.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkNormalizeMatrixVectors : public vtkArrayDataAlgorith
 {
 public:
   static vtkNormalizeMatrixVectors* New();
-  vtkTypeRevisionMacro(vtkNormalizeMatrixVectors, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkNormalizeMatrixVectors, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkOrderStatistics.cxx b/Infovis/vtkOrderStatistics.cxx
index 6ef25924ff187ed2f8e4e6404ff0f0b3053c7f12..2e16990150366c4b6cb80c3c8ebeab894ccfdc26 100644
--- a/Infovis/vtkOrderStatistics.cxx
+++ b/Infovis/vtkOrderStatistics.cxx
@@ -38,7 +38,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtksys/stl/set>
 #include <vtksys/ios/sstream> 
 
-vtkCxxRevisionMacro(vtkOrderStatistics, "1.61");
 vtkStandardNewMacro(vtkOrderStatistics);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkOrderStatistics.h b/Infovis/vtkOrderStatistics.h
index 4b6881104ad75fc52b6c68c6cffca37f3ddda243..b09f0b7c93edd5a16b3a15b549ea3605e29d4d9d 100644
--- a/Infovis/vtkOrderStatistics.h
+++ b/Infovis/vtkOrderStatistics.h
@@ -45,7 +45,7 @@ class vtkVariant;
 class VTK_INFOVIS_EXPORT vtkOrderStatistics : public vtkUnivariateStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkOrderStatistics, vtkUnivariateStatisticsAlgorithm);
+  vtkTypeMacro(vtkOrderStatistics, vtkUnivariateStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkOrderStatistics* New();
 
diff --git a/Infovis/vtkPBivariateLinearTableThreshold.cxx b/Infovis/vtkPBivariateLinearTableThreshold.cxx
index 6cdd5a8082f765f0a91007990a585eb872f46e96..17cfcea14f3494d917f793f4b1e84ce24b802578 100644
--- a/Infovis/vtkPBivariateLinearTableThreshold.cxx
+++ b/Infovis/vtkPBivariateLinearTableThreshold.cxx
@@ -31,7 +31,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkPBivariateLinearTableThreshold, "1.3");
 vtkStandardNewMacro(vtkPBivariateLinearTableThreshold);
 vtkCxxSetObjectMacro(vtkPBivariateLinearTableThreshold, Controller, vtkMultiProcessController);
 
diff --git a/Infovis/vtkPBivariateLinearTableThreshold.h b/Infovis/vtkPBivariateLinearTableThreshold.h
index 504ca1691b8f6cc7840e548ad9bd83f471128d9f..d09470a772d16f3dc8fd9ea9ee7b92b5b1c3c72e 100644
--- a/Infovis/vtkPBivariateLinearTableThreshold.h
+++ b/Infovis/vtkPBivariateLinearTableThreshold.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkPBivariateLinearTableThreshold : public vtkBivariate
 {
 public:
   static vtkPBivariateLinearTableThreshold* New();
-  vtkTypeRevisionMacro(vtkPBivariateLinearTableThreshold, vtkBivariateLinearTableThreshold);
+  vtkTypeMacro(vtkPBivariateLinearTableThreshold, vtkBivariateLinearTableThreshold);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPCAStatistics.cxx b/Infovis/vtkPCAStatistics.cxx
index 05e3ac8099711bf095b288affcc59bd10be94106..ea7590fb7e3bf8d08e99f95cef9f78a5fe97b387 100644
--- a/Infovis/vtkPCAStatistics.cxx
+++ b/Infovis/vtkPCAStatistics.cxx
@@ -23,7 +23,6 @@
 #define VTK_PCA_COMPCOLUMN "PCA"
 
 
-vtkCxxRevisionMacro(vtkPCAStatistics,"1.13");
 vtkStandardNewMacro(vtkPCAStatistics);
 
 const char* vtkPCAStatistics::NormalizationSchemeEnumNames[NUM_NORMALIZATION_SCHEMES + 1] =
diff --git a/Infovis/vtkPCAStatistics.h b/Infovis/vtkPCAStatistics.h
index 6331d8294d8120f7667e716eaabd1f764ba48fad..def03aa58b65730d0e14b3442f593c6db54cd958 100644
--- a/Infovis/vtkPCAStatistics.h
+++ b/Infovis/vtkPCAStatistics.h
@@ -47,7 +47,7 @@ PURPOSE.  See the above copyright notice for more information.
 class VTK_INFOVIS_EXPORT vtkPCAStatistics : public vtkMultiCorrelativeStatistics
 {
 public:
-  vtkTypeRevisionMacro(vtkPCAStatistics,vtkMultiCorrelativeStatistics);
+  vtkTypeMacro(vtkPCAStatistics,vtkMultiCorrelativeStatistics);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
   static vtkPCAStatistics* New();
 
diff --git a/Infovis/vtkPComputeHistogram2DOutliers.cxx b/Infovis/vtkPComputeHistogram2DOutliers.cxx
index 09bad25fda5c43d24b595a61114dbfc848b5004b..368bfc7d20c610b277065a7ad198272d1d6241c6 100644
--- a/Infovis/vtkPComputeHistogram2DOutliers.cxx
+++ b/Infovis/vtkPComputeHistogram2DOutliers.cxx
@@ -38,7 +38,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkSmartPointer.h"
 #include "vtkTable.h"
 //------------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPComputeHistogram2DOutliers, "1.3");
 vtkStandardNewMacro(vtkPComputeHistogram2DOutliers);
 vtkCxxSetObjectMacro(vtkPComputeHistogram2DOutliers, Controller, vtkMultiProcessController);
 //------------------------------------------------------------------------------
diff --git a/Infovis/vtkPComputeHistogram2DOutliers.h b/Infovis/vtkPComputeHistogram2DOutliers.h
index 22e6f77bdb17e41f964806eb8a7d3e153c833031..20330a87ce469a38d74b20ef825795e980ede18b 100644
--- a/Infovis/vtkPComputeHistogram2DOutliers.h
+++ b/Infovis/vtkPComputeHistogram2DOutliers.h
@@ -47,7 +47,7 @@ class VTK_INFOVIS_EXPORT vtkPComputeHistogram2DOutliers : public vtkComputeHisto
 {
 public:
   static vtkPComputeHistogram2DOutliers* New();
-  vtkTypeRevisionMacro(vtkPComputeHistogram2DOutliers, vtkComputeHistogram2DOutliers);
+  vtkTypeMacro(vtkPComputeHistogram2DOutliers, vtkComputeHistogram2DOutliers);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void SetController(vtkMultiProcessController*);
diff --git a/Infovis/vtkPContingencyStatistics.cxx b/Infovis/vtkPContingencyStatistics.cxx
index 4f83786b81d6507675c83149861a733ca8d6bdc6..d235d214fba3fe495007f247de2840dd08d657b0 100644
--- a/Infovis/vtkPContingencyStatistics.cxx
+++ b/Infovis/vtkPContingencyStatistics.cxx
@@ -43,7 +43,6 @@
 #endif // DEBUG_PARALLEL_CONTINGENCY_STATISTICS
 
 vtkStandardNewMacro(vtkPContingencyStatistics);
-vtkCxxRevisionMacro(vtkPContingencyStatistics, "1.37");
 vtkCxxSetObjectMacro(vtkPContingencyStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPContingencyStatistics::vtkPContingencyStatistics()
diff --git a/Infovis/vtkPContingencyStatistics.h b/Infovis/vtkPContingencyStatistics.h
index 15c2a9158d11b17c9ee9e6eb8b60a0c3e3555ff4..eecce966f3f6e0a1e1ecbe24b8a22aae5d5884bc 100644
--- a/Infovis/vtkPContingencyStatistics.h
+++ b/Infovis/vtkPContingencyStatistics.h
@@ -45,7 +45,7 @@ class VTK_INFOVIS_EXPORT vtkPContingencyStatistics : public vtkContingencyStatis
 {
 public:
   static vtkPContingencyStatistics* New();
-  vtkTypeRevisionMacro(vtkPContingencyStatistics, vtkContingencyStatistics);
+  vtkTypeMacro(vtkPContingencyStatistics, vtkContingencyStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPCorrelativeStatistics.cxx b/Infovis/vtkPCorrelativeStatistics.cxx
index 4931b07647b5ea848c5f224101dcba9e159e66a5..599b392a8de0403335688fb3553f4357cdc0d0c0 100644
--- a/Infovis/vtkPCorrelativeStatistics.cxx
+++ b/Infovis/vtkPCorrelativeStatistics.cxx
@@ -26,7 +26,6 @@
 #include "vtkVariant.h"
 
 vtkStandardNewMacro(vtkPCorrelativeStatistics);
-vtkCxxRevisionMacro(vtkPCorrelativeStatistics, "1.8");
 vtkCxxSetObjectMacro(vtkPCorrelativeStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPCorrelativeStatistics::vtkPCorrelativeStatistics()
diff --git a/Infovis/vtkPCorrelativeStatistics.h b/Infovis/vtkPCorrelativeStatistics.h
index 265f9fcf4b923c93449dd96823134655066961a6..ad9559f5fabd7aaf147c8146b6ce45c670b5b06e 100644
--- a/Infovis/vtkPCorrelativeStatistics.h
+++ b/Infovis/vtkPCorrelativeStatistics.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkPCorrelativeStatistics : public vtkCorrelativeStatis
 {
 public:
   static vtkPCorrelativeStatistics* New();
-  vtkTypeRevisionMacro(vtkPCorrelativeStatistics, vtkCorrelativeStatistics);
+  vtkTypeMacro(vtkPCorrelativeStatistics, vtkCorrelativeStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPDescriptiveStatistics.cxx b/Infovis/vtkPDescriptiveStatistics.cxx
index 0f8987f2c31fdf811ab84ff4199eeb72c045ca9c..5eda205a184a50cd4b7e7a77d8544281aa443a58 100644
--- a/Infovis/vtkPDescriptiveStatistics.cxx
+++ b/Infovis/vtkPDescriptiveStatistics.cxx
@@ -26,7 +26,6 @@
 #include "vtkVariant.h"
 
 vtkStandardNewMacro(vtkPDescriptiveStatistics);
-vtkCxxRevisionMacro(vtkPDescriptiveStatistics, "1.12");
 vtkCxxSetObjectMacro(vtkPDescriptiveStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPDescriptiveStatistics::vtkPDescriptiveStatistics()
diff --git a/Infovis/vtkPDescriptiveStatistics.h b/Infovis/vtkPDescriptiveStatistics.h
index c4f9841394dd26ef5f2b226004c0c1b3b00f029a..d7b72f3a9d2c49b03fd8cbfc38cb925e95ae4dd9 100644
--- a/Infovis/vtkPDescriptiveStatistics.h
+++ b/Infovis/vtkPDescriptiveStatistics.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkPDescriptiveStatistics : public vtkDescriptiveStatis
 {
 public:
   static vtkPDescriptiveStatistics* New();
-  vtkTypeRevisionMacro(vtkPDescriptiveStatistics, vtkDescriptiveStatistics);
+  vtkTypeMacro(vtkPDescriptiveStatistics, vtkDescriptiveStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPExtractHistogram2D.cxx b/Infovis/vtkPExtractHistogram2D.cxx
index c3cedf6bb930dbbf17a83725beb30edce2c03f68..f8353fd68ed7133ad3be7b18025117035e9f4b01 100644
--- a/Infovis/vtkPExtractHistogram2D.cxx
+++ b/Infovis/vtkPExtractHistogram2D.cxx
@@ -29,7 +29,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkPointData.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkPExtractHistogram2D, "1.3");
 vtkStandardNewMacro(vtkPExtractHistogram2D);
 vtkCxxSetObjectMacro(vtkPExtractHistogram2D, Controller, vtkMultiProcessController);
 //------------------------------------------------------------------------------
diff --git a/Infovis/vtkPExtractHistogram2D.h b/Infovis/vtkPExtractHistogram2D.h
index 6f37316c5244b043ab45b6d3cd16db9ad52a1d18..6c32e26e6d9bea588b91a22ddac6492b914af616 100644
--- a/Infovis/vtkPExtractHistogram2D.h
+++ b/Infovis/vtkPExtractHistogram2D.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkPExtractHistogram2D : public vtkExtractHistogram2D
 {
 public:
   static vtkPExtractHistogram2D* New();
-  vtkTypeRevisionMacro(vtkPExtractHistogram2D, vtkExtractHistogram2D);
+  vtkTypeMacro(vtkPExtractHistogram2D, vtkExtractHistogram2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void SetController(vtkMultiProcessController*);
diff --git a/Infovis/vtkPKMeansStatistics.cxx b/Infovis/vtkPKMeansStatistics.cxx
index 223c9e17d66bbc44082e15bf9dd07def2a11154f..343b1e03bfd2949b29d213b02c14126d44d1ce7a 100644
--- a/Infovis/vtkPKMeansStatistics.cxx
+++ b/Infovis/vtkPKMeansStatistics.cxx
@@ -28,7 +28,6 @@
 
 
 vtkStandardNewMacro(vtkPKMeansStatistics);
-vtkCxxRevisionMacro(vtkPKMeansStatistics, "1.4");
 vtkCxxSetObjectMacro(vtkPKMeansStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPKMeansStatistics::vtkPKMeansStatistics()
diff --git a/Infovis/vtkPKMeansStatistics.h b/Infovis/vtkPKMeansStatistics.h
index 971a23178a3b881aee595541b76eca5308eeed26..9f9e6d6f59b27f46b0ceaeb2760b6924c88913c1 100644
--- a/Infovis/vtkPKMeansStatistics.h
+++ b/Infovis/vtkPKMeansStatistics.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkPKMeansStatistics : public vtkKMeansStatistics
 {
 public:
   static vtkPKMeansStatistics* New();
-  vtkTypeRevisionMacro(vtkPKMeansStatistics, vtkKMeansStatistics);
+  vtkTypeMacro(vtkPKMeansStatistics, vtkKMeansStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPMultiCorrelativeStatistics.cxx b/Infovis/vtkPMultiCorrelativeStatistics.cxx
index 6c8e88baf14d6b9cbf18fbf0fae7119fd85535d9..a3e5b00429691c256003e5c96a9e1f48c7f4e5ef 100644
--- a/Infovis/vtkPMultiCorrelativeStatistics.cxx
+++ b/Infovis/vtkPMultiCorrelativeStatistics.cxx
@@ -28,7 +28,6 @@
 #include <vtkstd/map>
 
 vtkStandardNewMacro(vtkPMultiCorrelativeStatistics);
-vtkCxxRevisionMacro(vtkPMultiCorrelativeStatistics, "1.14");
 vtkCxxSetObjectMacro(vtkPMultiCorrelativeStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPMultiCorrelativeStatistics::vtkPMultiCorrelativeStatistics()
diff --git a/Infovis/vtkPMultiCorrelativeStatistics.h b/Infovis/vtkPMultiCorrelativeStatistics.h
index d12a301f92fd0a1654d6505c6a02e5ec0e97d53f..d6507952f70108ea77c7a423d495ec0ef050cd28 100644
--- a/Infovis/vtkPMultiCorrelativeStatistics.h
+++ b/Infovis/vtkPMultiCorrelativeStatistics.h
@@ -32,7 +32,7 @@ class VTK_INFOVIS_EXPORT vtkPMultiCorrelativeStatistics : public vtkMultiCorrela
 {
 public:
   static vtkPMultiCorrelativeStatistics* New();
-  vtkTypeRevisionMacro(vtkPMultiCorrelativeStatistics, vtkMultiCorrelativeStatistics);
+  vtkTypeMacro(vtkPMultiCorrelativeStatistics, vtkMultiCorrelativeStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPPCAStatistics.cxx b/Infovis/vtkPPCAStatistics.cxx
index c019f741f76474d81e0ff840ac54712f4caa678e..b27066514daed20caf64e0189345f9d97abe12d0 100644
--- a/Infovis/vtkPPCAStatistics.cxx
+++ b/Infovis/vtkPPCAStatistics.cxx
@@ -29,7 +29,6 @@
 #include <vtkstd/map>
 
 vtkStandardNewMacro(vtkPPCAStatistics);
-vtkCxxRevisionMacro(vtkPPCAStatistics, "1.6");
 vtkCxxSetObjectMacro(vtkPPCAStatistics, Controller, vtkMultiProcessController);
 //-----------------------------------------------------------------------------
 vtkPPCAStatistics::vtkPPCAStatistics()
diff --git a/Infovis/vtkPPCAStatistics.h b/Infovis/vtkPPCAStatistics.h
index 61351ea4bd5a40edb03b1c30459fdf9b29c18e8e..4e12f7316b10a279d5e690dcdefb1940d44b2216 100644
--- a/Infovis/vtkPPCAStatistics.h
+++ b/Infovis/vtkPPCAStatistics.h
@@ -32,7 +32,7 @@ class vtkMultiProcessController;
 class VTK_INFOVIS_EXPORT vtkPPCAStatistics : public vtkPCAStatistics
 {
 public:
-  vtkTypeRevisionMacro(vtkPPCAStatistics, vtkPCAStatistics);
+  vtkTypeMacro(vtkPPCAStatistics, vtkPCAStatistics);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkPPCAStatistics* New();
 
diff --git a/Infovis/vtkPPairwiseExtractHistogram2D.cxx b/Infovis/vtkPPairwiseExtractHistogram2D.cxx
index c54e335c0547d8d897a1bdeb9c6d7b9ee8ca0b8c..b9b8668f5cf1dcdd00010eeecc068314c8274cdf 100644
--- a/Infovis/vtkPPairwiseExtractHistogram2D.cxx
+++ b/Infovis/vtkPPairwiseExtractHistogram2D.cxx
@@ -41,7 +41,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkPPairwiseExtractHistogram2D, "1.2");
 vtkStandardNewMacro(vtkPPairwiseExtractHistogram2D);
 vtkCxxSetObjectMacro(vtkPPairwiseExtractHistogram2D, Controller, vtkMultiProcessController);
 
diff --git a/Infovis/vtkPPairwiseExtractHistogram2D.h b/Infovis/vtkPPairwiseExtractHistogram2D.h
index 1e5bef9c8d547eb75488bf7fd46a1b4f36f8fbe0..889e0aff3b30ca0202b67fb0e339a4f829ccb8d9 100644
--- a/Infovis/vtkPPairwiseExtractHistogram2D.h
+++ b/Infovis/vtkPPairwiseExtractHistogram2D.h
@@ -49,7 +49,7 @@ class VTK_INFOVIS_EXPORT vtkPPairwiseExtractHistogram2D : public vtkPairwiseExtr
 {
 public:
   static vtkPPairwiseExtractHistogram2D* New();
-  vtkTypeRevisionMacro(vtkPPairwiseExtractHistogram2D, vtkPairwiseExtractHistogram2D);
+  vtkTypeMacro(vtkPPairwiseExtractHistogram2D, vtkPairwiseExtractHistogram2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void SetController(vtkMultiProcessController*);
diff --git a/Infovis/vtkPairwiseExtractHistogram2D.cxx b/Infovis/vtkPairwiseExtractHistogram2D.cxx
index 06809693854a7a0d0ec32be25ed3850576968d15..5ae2f1a3887b1c2e5f53e9872b9dfea867e25d26 100644
--- a/Infovis/vtkPairwiseExtractHistogram2D.cxx
+++ b/Infovis/vtkPairwiseExtractHistogram2D.cxx
@@ -45,7 +45,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtkstd/string>
 #include <vtkstd/map>
 //------------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPairwiseExtractHistogram2D, "1.7");
 vtkStandardNewMacro(vtkPairwiseExtractHistogram2D);
 //------------------------------------------------------------------------------
 class vtkPairwiseExtractHistogram2D::Internals
diff --git a/Infovis/vtkPairwiseExtractHistogram2D.h b/Infovis/vtkPairwiseExtractHistogram2D.h
index 374afa31edd4009301a1f8aaabbfdaa18d83405b..847f9fe2f415b6d06ce968a90c4cf39ea2892e66 100644
--- a/Infovis/vtkPairwiseExtractHistogram2D.h
+++ b/Infovis/vtkPairwiseExtractHistogram2D.h
@@ -53,7 +53,7 @@ class VTK_INFOVIS_EXPORT vtkPairwiseExtractHistogram2D : public vtkStatisticsAlg
 {
 public:
   static vtkPairwiseExtractHistogram2D* New();
-  vtkTypeRevisionMacro(vtkPairwiseExtractHistogram2D, vtkStatisticsAlgorithm);
+  vtkTypeMacro(vtkPairwiseExtractHistogram2D, vtkStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPassArrays.cxx b/Infovis/vtkPassArrays.cxx
index 02bae0b299e967ab4a5bf75fecd9d6dfcf857624..e130b4e435898037d7d55c224ec904167d63225b 100644
--- a/Infovis/vtkPassArrays.cxx
+++ b/Infovis/vtkPassArrays.cxx
@@ -32,7 +32,6 @@
 #include <vtksys/stl/utility>
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkPassArrays, "1.4");
 vtkStandardNewMacro(vtkPassArrays);
 
 class vtkPassArrays::Internals
diff --git a/Infovis/vtkPassArrays.h b/Infovis/vtkPassArrays.h
index 35f9011591103c5e9c855c173e9ad432de92cde7..06664ae3199b33a60ba5f0a8acc3748e71fda8bc 100644
--- a/Infovis/vtkPassArrays.h
+++ b/Infovis/vtkPassArrays.h
@@ -63,7 +63,7 @@ class VTK_INFOVIS_EXPORT vtkPassArrays : public vtkDataObjectAlgorithm
 {
 public:
   static vtkPassArrays* New();
-  vtkTypeRevisionMacro(vtkPassArrays,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkPassArrays,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkPassThrough.cxx b/Infovis/vtkPassThrough.cxx
index 632ec4990043a91d4893d450e220f9bc16f1f280..b0a531f031418829ad56d7177536c47a8a8e5d12 100644
--- a/Infovis/vtkPassThrough.cxx
+++ b/Infovis/vtkPassThrough.cxx
@@ -20,7 +20,6 @@
 #include "vtkInformationVector.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPassThrough, "1.3");
 vtkStandardNewMacro(vtkPassThrough);
 
 //----------------------------------------------------------------------------
diff --git a/Infovis/vtkPassThrough.h b/Infovis/vtkPassThrough.h
index e1f566f94bc65e40d886a3c2189b7733a4ee233c..dc95a5e0d777390cdbff820d812abf5513256a03 100644
--- a/Infovis/vtkPassThrough.h
+++ b/Infovis/vtkPassThrough.h
@@ -26,7 +26,7 @@ class VTK_INFOVIS_EXPORT vtkPassThrough : public vtkPassInputTypeAlgorithm
 {
 public:
   static vtkPassThrough* New();
-  vtkTypeRevisionMacro(vtkPassThrough, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkPassThrough, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPassThroughEdgeStrategy.cxx b/Infovis/vtkPassThroughEdgeStrategy.cxx
index f9ce0a903b2c0fbdf12d46d5b0f8608c8ae800ec..8f5c575d2aa11e2b07f53d00c33bce5ec74c4411 100644
--- a/Infovis/vtkPassThroughEdgeStrategy.cxx
+++ b/Infovis/vtkPassThroughEdgeStrategy.cxx
@@ -32,7 +32,6 @@
 #include <vtksys/stl/map>
 
 vtkStandardNewMacro(vtkPassThroughEdgeStrategy);
-vtkCxxRevisionMacro(vtkPassThroughEdgeStrategy, "1.1");
 
 vtkPassThroughEdgeStrategy::vtkPassThroughEdgeStrategy()
 {
diff --git a/Infovis/vtkPassThroughEdgeStrategy.h b/Infovis/vtkPassThroughEdgeStrategy.h
index b89f8f72a76782c6bbae04d288511d3c254c3c46..c8a23fe48352f6ad83a58bd034a35cb2bd17a70e 100644
--- a/Infovis/vtkPassThroughEdgeStrategy.h
+++ b/Infovis/vtkPassThroughEdgeStrategy.h
@@ -31,7 +31,7 @@ class VTK_INFOVIS_EXPORT vtkPassThroughEdgeStrategy : public vtkEdgeLayoutStrate
 {
 public:
   static vtkPassThroughEdgeStrategy* New();
-  vtkTypeRevisionMacro(vtkPassThroughEdgeStrategy,vtkEdgeLayoutStrategy);
+  vtkTypeMacro(vtkPassThroughEdgeStrategy,vtkEdgeLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPassThroughLayoutStrategy.cxx b/Infovis/vtkPassThroughLayoutStrategy.cxx
index c3b81d7c0d98be9768ecf03c9f2c25d99c3a4a31..95c436c0e3f324ff1370bd002356e7b96323c79f 100644
--- a/Infovis/vtkPassThroughLayoutStrategy.cxx
+++ b/Infovis/vtkPassThroughLayoutStrategy.cxx
@@ -22,7 +22,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPassThroughLayoutStrategy, "1.2");
 vtkStandardNewMacro(vtkPassThroughLayoutStrategy);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkPassThroughLayoutStrategy.h b/Infovis/vtkPassThroughLayoutStrategy.h
index 2624f0c36432ad9b4b67f2539b207c8aea6b4b68..8d876e417eab4566a8284b4fa78013e7cce83d41 100644
--- a/Infovis/vtkPassThroughLayoutStrategy.h
+++ b/Infovis/vtkPassThroughLayoutStrategy.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkPassThroughLayoutStrategy : public vtkGraphLayoutStr
 public:
   static vtkPassThroughLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkPassThroughLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkPassThroughLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Infovis/vtkPerturbCoincidentVertices.cxx b/Infovis/vtkPerturbCoincidentVertices.cxx
index cc3eda7f1ad1ac157c226e3c6688bbc8df757967..a51609096a1c1040f323a591e832926686539eaa 100644
--- a/Infovis/vtkPerturbCoincidentVertices.cxx
+++ b/Infovis/vtkPerturbCoincidentVertices.cxx
@@ -37,7 +37,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkPerturbCoincidentVertices, "1.17");
 vtkStandardNewMacro(vtkPerturbCoincidentVertices);
 //----------------------------------------------------------------------------
 vtkPerturbCoincidentVertices::vtkPerturbCoincidentVertices()
diff --git a/Infovis/vtkPerturbCoincidentVertices.h b/Infovis/vtkPerturbCoincidentVertices.h
index 77a432b30f659121e213d93076e9ba0039ed2f88..c9bcf28d8f65b39cd7a909062855f1d53d20c3d1 100644
--- a/Infovis/vtkPerturbCoincidentVertices.h
+++ b/Infovis/vtkPerturbCoincidentVertices.h
@@ -38,7 +38,7 @@ class VTK_INFOVIS_EXPORT vtkPerturbCoincidentVertices : public vtkGraphAlgorithm
 {
 public:
   static vtkPerturbCoincidentVertices* New();
-  vtkTypeRevisionMacro(vtkPerturbCoincidentVertices,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPerturbCoincidentVertices,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkPruneTreeFilter.cxx b/Infovis/vtkPruneTreeFilter.cxx
index b6abc1b3f12ac65e115a87f78fa3d146a13a9768..e133fc682c8f8e4ac3b80ed9fb7db4ca006fec3f 100644
--- a/Infovis/vtkPruneTreeFilter.cxx
+++ b/Infovis/vtkPruneTreeFilter.cxx
@@ -34,7 +34,6 @@
 #include <vtksys/stl/utility>
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkPruneTreeFilter, "1.7");
 vtkStandardNewMacro(vtkPruneTreeFilter);
 
 
diff --git a/Infovis/vtkPruneTreeFilter.h b/Infovis/vtkPruneTreeFilter.h
index bb793b3117b51a1e814bb4867134b65aea5658ca..244e20b52240b9d3a5f536c8df252f164868e846 100644
--- a/Infovis/vtkPruneTreeFilter.h
+++ b/Infovis/vtkPruneTreeFilter.h
@@ -35,7 +35,7 @@ class VTK_INFOVIS_EXPORT vtkPruneTreeFilter : public vtkTreeAlgorithm
 {
 public:
   static vtkPruneTreeFilter* New();
-  vtkTypeRevisionMacro(vtkPruneTreeFilter,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkPruneTreeFilter,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkRISReader.cxx b/Infovis/vtkRISReader.cxx
index 9b0d27c9e2dbede4420868c4d4dc2a4f4b099e03..3452a011fc81c6b512370da7e93fb632e8e48d87 100644
--- a/Infovis/vtkRISReader.cxx
+++ b/Infovis/vtkRISReader.cxx
@@ -29,7 +29,6 @@
 #include <vtkstd/map>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkRISReader, "1.5");
 vtkStandardNewMacro(vtkRISReader);
 
 // Not all platforms support vtkstd::getline(istream&, vtkstd::string) so
diff --git a/Infovis/vtkRISReader.h b/Infovis/vtkRISReader.h
index 644b18ae999679c81799f5c23508808c972d72d6..473cd4528e63e3baa46a126f070b214d56a58bd8 100644
--- a/Infovis/vtkRISReader.h
+++ b/Infovis/vtkRISReader.h
@@ -43,7 +43,7 @@ class VTK_INFOVIS_EXPORT vtkRISReader : public vtkTableAlgorithm
 {
 public:
   static vtkRISReader* New();
-  vtkTypeRevisionMacro(vtkRISReader,vtkTableAlgorithm);
+  vtkTypeMacro(vtkRISReader,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkRandomGraphSource.cxx b/Infovis/vtkRandomGraphSource.cxx
index d51ea514c7d46a8e66254e7d494f31dfb046001d..bd57a71e44406dabdc4e80ee96e67a62a4fdcf56 100644
--- a/Infovis/vtkRandomGraphSource.cxx
+++ b/Infovis/vtkRandomGraphSource.cxx
@@ -35,7 +35,6 @@
 #include <vtksys/stl/set>
 #include <vtksys/stl/algorithm>
 
-vtkCxxRevisionMacro(vtkRandomGraphSource, "1.13");
 vtkStandardNewMacro(vtkRandomGraphSource);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkRandomGraphSource.h b/Infovis/vtkRandomGraphSource.h
index c4748d9115705f05fbd82c1e55638221e6b027c9..b70435e0e90f93b64905b37db2da981cf9e7c7fe 100644
--- a/Infovis/vtkRandomGraphSource.h
+++ b/Infovis/vtkRandomGraphSource.h
@@ -38,7 +38,7 @@ class VTK_INFOVIS_EXPORT vtkRandomGraphSource : public vtkGraphAlgorithm
 {
 public:
   static vtkRandomGraphSource* New();
-  vtkTypeRevisionMacro(vtkRandomGraphSource,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkRandomGraphSource,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkRandomLayoutStrategy.cxx b/Infovis/vtkRandomLayoutStrategy.cxx
index 79e174916d4cca79852c1a05d985694e98013e59..28540955695a4a06279803f03b5127d6e7b1b3ef 100644
--- a/Infovis/vtkRandomLayoutStrategy.cxx
+++ b/Infovis/vtkRandomLayoutStrategy.cxx
@@ -32,7 +32,6 @@
 #include "vtkPoints.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkRandomLayoutStrategy, "1.8");
 vtkStandardNewMacro(vtkRandomLayoutStrategy);
 
 vtkRandomLayoutStrategy::vtkRandomLayoutStrategy()
diff --git a/Infovis/vtkRandomLayoutStrategy.h b/Infovis/vtkRandomLayoutStrategy.h
index be6a8f2e8d5f378e0b244ac6ab243f9be92424e7..44984f798686b7f45f36adc7876ecb901c121f84 100644
--- a/Infovis/vtkRandomLayoutStrategy.h
+++ b/Infovis/vtkRandomLayoutStrategy.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkRandomLayoutStrategy : public vtkGraphLayoutStrategy
 public:
   static vtkRandomLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkRandomLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkRandomLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkRemoveHiddenData.cxx b/Infovis/vtkRemoveHiddenData.cxx
index d6ab37ed0839fbb38ccb8517f2fde5ee9cb66f22..4b4abed69fa1743d55bead3ee475d26d181fee2b 100644
--- a/Infovis/vtkRemoveHiddenData.cxx
+++ b/Infovis/vtkRemoveHiddenData.cxx
@@ -41,7 +41,6 @@
 #include "vtkSelectionNode.h"
 
 
-vtkCxxRevisionMacro(vtkRemoveHiddenData, "1.2");
 vtkStandardNewMacro(vtkRemoveHiddenData);
 
 vtkRemoveHiddenData::vtkRemoveHiddenData()
diff --git a/Infovis/vtkRemoveHiddenData.h b/Infovis/vtkRemoveHiddenData.h
index ccf38aec6c4f04d2b8de868a402054fb72dfcb0c..cd59fe51a3b5cde579997f0a2c2f41fbd2a28be4 100644
--- a/Infovis/vtkRemoveHiddenData.h
+++ b/Infovis/vtkRemoveHiddenData.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkRemoveHiddenData : public vtkPassInputTypeAlgorithm
 {
 public:
   static vtkRemoveHiddenData *New();
-  vtkTypeRevisionMacro(vtkRemoveHiddenData, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkRemoveHiddenData, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkRemoveIsolatedVertices.cxx b/Infovis/vtkRemoveIsolatedVertices.cxx
index f26d3f4ecf949f7bd7a894a9b45f544c330011c6..972df98411f5343c959b3009f47cc966c23f1071 100644
--- a/Infovis/vtkRemoveIsolatedVertices.cxx
+++ b/Infovis/vtkRemoveIsolatedVertices.cxx
@@ -34,7 +34,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkRemoveIsolatedVertices, "1.1");
 vtkStandardNewMacro(vtkRemoveIsolatedVertices);
 //----------------------------------------------------------------------------
 vtkRemoveIsolatedVertices::vtkRemoveIsolatedVertices()
diff --git a/Infovis/vtkRemoveIsolatedVertices.h b/Infovis/vtkRemoveIsolatedVertices.h
index 188c5b2800784a9a66e8139e8dc52119f58b0351..74a4ede36732917e412d0b98aec07eea212e1f1c 100644
--- a/Infovis/vtkRemoveIsolatedVertices.h
+++ b/Infovis/vtkRemoveIsolatedVertices.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkRemoveIsolatedVertices : public vtkGraphAlgorithm
 {
 public:
   static vtkRemoveIsolatedVertices* New();
-  vtkTypeRevisionMacro(vtkRemoveIsolatedVertices,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkRemoveIsolatedVertices,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkSCurveSpline.cxx b/Infovis/vtkSCurveSpline.cxx
index 580b94d99c08cf55fd212a8ede5f674b5472de01..3533307ec1617ddd22b077be914817a20a8e405d 100644
--- a/Infovis/vtkSCurveSpline.cxx
+++ b/Infovis/vtkSCurveSpline.cxx
@@ -24,7 +24,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <assert.h>
 #include <vtkstd/algorithm> // for vtkstd::min()/vtkstd::max()
 
-vtkCxxRevisionMacro(vtkSCurveSpline, "1.3");
 vtkStandardNewMacro(vtkSCurveSpline);
 
 //----------------------------------------------------------------------------
diff --git a/Infovis/vtkSCurveSpline.h b/Infovis/vtkSCurveSpline.h
index 5a3c5634ddbc46adc0413812baa1556e6eec8ccf..8fe2da25ce68f89ff5c4b88a6af62c925e40d163 100644
--- a/Infovis/vtkSCurveSpline.h
+++ b/Infovis/vtkSCurveSpline.h
@@ -37,7 +37,7 @@ class VTK_INFOVIS_EXPORT vtkSCurveSpline : public vtkSpline
 public:
   static vtkSCurveSpline *New();
 
-  vtkTypeRevisionMacro(vtkSCurveSpline,vtkSpline);
+  vtkTypeMacro(vtkSCurveSpline,vtkSpline);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description
diff --git a/Infovis/vtkSQLDatabaseGraphSource.cxx b/Infovis/vtkSQLDatabaseGraphSource.cxx
index 983a0afc47df5aeefa6d0d4ce771530c6c7cd718..944801fea63fb9d840a65b790314efbbf77b03f5 100644
--- a/Infovis/vtkSQLDatabaseGraphSource.cxx
+++ b/Infovis/vtkSQLDatabaseGraphSource.cxx
@@ -78,7 +78,6 @@ public:
   vtkTableToGraph* TableToGraph;
 };
 
-vtkCxxRevisionMacro(vtkSQLDatabaseGraphSource, "1.2");
 vtkStandardNewMacro(vtkSQLDatabaseGraphSource);
 
 //---------------------------------------------------------------------------
diff --git a/Infovis/vtkSQLDatabaseGraphSource.h b/Infovis/vtkSQLDatabaseGraphSource.h
index 9a775a5ebb00d4463debaebf5de146a46dbfb17e..72e4bb974763f211876d42febe9fe85353eb8d1b 100644
--- a/Infovis/vtkSQLDatabaseGraphSource.h
+++ b/Infovis/vtkSQLDatabaseGraphSource.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkSQLDatabaseGraphSource : public vtkGraphAlgorithm
 {
 public:
   static vtkSQLDatabaseGraphSource* New();
-  vtkTypeRevisionMacro(vtkSQLDatabaseGraphSource, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkSQLDatabaseGraphSource, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkStdString GetURL();
diff --git a/Infovis/vtkSQLDatabaseTableSource.cxx b/Infovis/vtkSQLDatabaseTableSource.cxx
index 039b27fa6bc6ce6b8345b6897e7c7d91a1811a96..83343c59b791b141ac6235cef774d864331c25b5 100644
--- a/Infovis/vtkSQLDatabaseTableSource.cxx
+++ b/Infovis/vtkSQLDatabaseTableSource.cxx
@@ -63,7 +63,6 @@ public:
   vtkRowQueryToTable* Table;
 };
 
-vtkCxxRevisionMacro(vtkSQLDatabaseTableSource, "1.1");
 vtkStandardNewMacro(vtkSQLDatabaseTableSource);
 
 //---------------------------------------------------------------------------
diff --git a/Infovis/vtkSQLDatabaseTableSource.h b/Infovis/vtkSQLDatabaseTableSource.h
index a986c24838655e175bbdf568156b432513b9953b..8f0fefd9cc9228393a5f90d1f2f6224ad5fa8b8c 100644
--- a/Infovis/vtkSQLDatabaseTableSource.h
+++ b/Infovis/vtkSQLDatabaseTableSource.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkSQLDatabaseTableSource : public vtkTableAlgorithm
 {
 public:
   static vtkSQLDatabaseTableSource* New();
-  vtkTypeRevisionMacro(vtkSQLDatabaseTableSource, vtkTableAlgorithm);
+  vtkTypeMacro(vtkSQLDatabaseTableSource, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkStdString GetURL();
diff --git a/Infovis/vtkSQLGraphReader.cxx b/Infovis/vtkSQLGraphReader.cxx
index 3fbe2019c66b0ad24cec09794055a3bbb44e4e39..e3b69a3ed03e7e0ebbbb562e588b6eb6c36d0d2d 100644
--- a/Infovis/vtkSQLGraphReader.cxx
+++ b/Infovis/vtkSQLGraphReader.cxx
@@ -33,7 +33,6 @@
 #include "vtkTableToGraph.h"
 #include "vtkUndirectedGraph.h"
 
-vtkCxxRevisionMacro(vtkSQLGraphReader, "1.3");
 vtkStandardNewMacro(vtkSQLGraphReader);
 
 vtkSQLGraphReader::vtkSQLGraphReader()
diff --git a/Infovis/vtkSQLGraphReader.h b/Infovis/vtkSQLGraphReader.h
index 8c26bbe41b31c916dda1b44cff48185642130d55..5adc3b7c9938608763a5bfd14ded01add6b6e351 100644
--- a/Infovis/vtkSQLGraphReader.h
+++ b/Infovis/vtkSQLGraphReader.h
@@ -61,7 +61,7 @@ class VTK_INFOVIS_EXPORT vtkSQLGraphReader : public vtkGraphAlgorithm
 {
 public:
   static vtkSQLGraphReader* New();
-  vtkTypeRevisionMacro(vtkSQLGraphReader,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkSQLGraphReader,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSimple2DLayoutStrategy.cxx b/Infovis/vtkSimple2DLayoutStrategy.cxx
index 92e47d0676f14d807abca7c002ca065de29ffd1d..ab0644bd3b9fe0e22c4223be8cc98fd7b4bebaf3 100644
--- a/Infovis/vtkSimple2DLayoutStrategy.cxx
+++ b/Infovis/vtkSimple2DLayoutStrategy.cxx
@@ -37,7 +37,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkSimple2DLayoutStrategy, "1.29");
 vtkStandardNewMacro(vtkSimple2DLayoutStrategy);
 
 #ifndef MIN
diff --git a/Infovis/vtkSimple2DLayoutStrategy.h b/Infovis/vtkSimple2DLayoutStrategy.h
index b2d513fb4ae64b4d36323b8f0623770c657e0efc..cfc5081f43e8f5c7ab84c8fc9ecd026b306857cb 100644
--- a/Infovis/vtkSimple2DLayoutStrategy.h
+++ b/Infovis/vtkSimple2DLayoutStrategy.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkSimple2DLayoutStrategy : public vtkGraphLayoutStrate
 public:
   static vtkSimple2DLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkSimple2DLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkSimple2DLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSimple3DCirclesStrategy.cxx b/Infovis/vtkSimple3DCirclesStrategy.cxx
index e990a448a4a9aebeb94819ff6dd823c4d43155d8..e7e34d62e594e47020e13ba6b65a8030d5fb41b6 100644
--- a/Infovis/vtkSimple3DCirclesStrategy.cxx
+++ b/Infovis/vtkSimple3DCirclesStrategy.cxx
@@ -82,7 +82,6 @@ private:
   };
 
 vtkStandardNewMacro(vtkSimple3DCirclesStrategy);
-vtkCxxRevisionMacro(vtkSimple3DCirclesStrategy, "1.6" );
 
 void vtkSimple3DCirclesStrategy::PrintSelf( ostream &os, vtkIndent indent )
   {
diff --git a/Infovis/vtkSimple3DCirclesStrategy.h b/Infovis/vtkSimple3DCirclesStrategy.h
index 3b23d74168cff8c739106f9db9abe50f7525d18e..9afaa26309eea26531294c8d7fa5226cd366eaeb 100644
--- a/Infovis/vtkSimple3DCirclesStrategy.h
+++ b/Infovis/vtkSimple3DCirclesStrategy.h
@@ -47,7 +47,7 @@ class VTK_INFOVIS_EXPORT vtkSimple3DCirclesStrategy : public vtkGraphLayoutStrat
   {
 public:
   static vtkSimple3DCirclesStrategy * New();
-  vtkTypeRevisionMacro(vtkSimple3DCirclesStrategy,vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkSimple3DCirclesStrategy,vtkGraphLayoutStrategy);
   void PrintSelf( ostream& os, vtkIndent indent );
 
 //BTX
diff --git a/Infovis/vtkSliceAndDiceLayoutStrategy.cxx b/Infovis/vtkSliceAndDiceLayoutStrategy.cxx
index 44ebae1fa5d205a810a173cee84d12d2442ea262..68a13954ca86270a9a9a1145bf27f2c401821ae2 100644
--- a/Infovis/vtkSliceAndDiceLayoutStrategy.cxx
+++ b/Infovis/vtkSliceAndDiceLayoutStrategy.cxx
@@ -35,7 +35,6 @@
 #include "vtkTree.h"
 #include "vtkTreeDFSIterator.h"
 
-vtkCxxRevisionMacro(vtkSliceAndDiceLayoutStrategy, "1.9");
 vtkStandardNewMacro(vtkSliceAndDiceLayoutStrategy);
 
 vtkSliceAndDiceLayoutStrategy::vtkSliceAndDiceLayoutStrategy()
diff --git a/Infovis/vtkSliceAndDiceLayoutStrategy.h b/Infovis/vtkSliceAndDiceLayoutStrategy.h
index b687ad895528ff4e5190b6995a9ae786071126a8..b56a1c0482b56490040d3ebccbab8a41290d80be 100644
--- a/Infovis/vtkSliceAndDiceLayoutStrategy.h
+++ b/Infovis/vtkSliceAndDiceLayoutStrategy.h
@@ -38,7 +38,7 @@ class VTK_INFOVIS_EXPORT vtkSliceAndDiceLayoutStrategy : public vtkTreeMapLayout
 public:
   static vtkSliceAndDiceLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkSliceAndDiceLayoutStrategy,vtkTreeMapLayoutStrategy);
+  vtkTypeMacro(vtkSliceAndDiceLayoutStrategy,vtkTreeMapLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSpanTreeLayoutStrategy.cxx b/Infovis/vtkSpanTreeLayoutStrategy.cxx
index 34a09b23cafcd5b1c85733a9f0f1b217dbe387a8..15091d236c5bc431618886e904e06d3f12017e6a 100644
--- a/Infovis/vtkSpanTreeLayoutStrategy.cxx
+++ b/Infovis/vtkSpanTreeLayoutStrategy.cxx
@@ -42,7 +42,6 @@ PURPOSE.  See the above copyright notice for more information.
 //--------------------------------------------------------------------------
 
 vtkStandardNewMacro(vtkSpanTreeLayoutStrategy);
-vtkCxxRevisionMacro(vtkSpanTreeLayoutStrategy, "1.0");
 
 vtkSpanTreeLayoutStrategy::vtkSpanTreeLayoutStrategy()
 {
diff --git a/Infovis/vtkSpanTreeLayoutStrategy.h b/Infovis/vtkSpanTreeLayoutStrategy.h
index 82ef6d6bd25611303b9402d63623f3eb48919b6d..a47cdeba099a5cba3dd8e77baec4e6524b29c664 100644
--- a/Infovis/vtkSpanTreeLayoutStrategy.h
+++ b/Infovis/vtkSpanTreeLayoutStrategy.h
@@ -68,7 +68,7 @@ class VTK_INFOVIS_EXPORT vtkSpanTreeLayoutStrategy : public vtkGraphLayoutStrate
 public:
   static vtkSpanTreeLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkSpanTreeLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkSpanTreeLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSparseArrayToTable.cxx b/Infovis/vtkSparseArrayToTable.cxx
index cf32aae3abb3388ab2caad9eef52946d6b7efb15..7cea543adf059596ad9cc9d6c6033a238f5a6b9f 100644
--- a/Infovis/vtkSparseArrayToTable.cxx
+++ b/Infovis/vtkSparseArrayToTable.cxx
@@ -73,7 +73,6 @@ static bool Convert(vtkArray* Array, const char* ValueColumn, vtkTable* Table)
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkSparseArrayToTable, "1.2");
 vtkStandardNewMacro(vtkSparseArrayToTable);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkSparseArrayToTable.h b/Infovis/vtkSparseArrayToTable.h
index 26d11b764cfafbf2b9e20072ee51e56762c8dbf5..9096e2afa5c7407a2d505e0f948dc843f9493dad 100644
--- a/Infovis/vtkSparseArrayToTable.h
+++ b/Infovis/vtkSparseArrayToTable.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkSparseArrayToTable : public vtkTableAlgorithm
 {
 public:
   static vtkSparseArrayToTable* New();
-  vtkTypeRevisionMacro(vtkSparseArrayToTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkSparseArrayToTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSplineGraphEdges.cxx b/Infovis/vtkSplineGraphEdges.cxx
index 364211579b897423725055596d6b670b7ddd64e4..ac82e1458edae7b139945d2d1a09fb2c6c010517 100644
--- a/Infovis/vtkSplineGraphEdges.cxx
+++ b/Infovis/vtkSplineGraphEdges.cxx
@@ -27,7 +27,6 @@
 #include "vtkMath.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkSplineGraphEdges, "1.6");
 vtkStandardNewMacro(vtkSplineGraphEdges);
 vtkCxxSetObjectMacro(vtkSplineGraphEdges, Spline, vtkSpline);
 
diff --git a/Infovis/vtkSplineGraphEdges.h b/Infovis/vtkSplineGraphEdges.h
index c12a60dd2c18b35d62c11a742d68f341ffd80f12..69ee65e214487b664e559b07af1b628d6be3fe14 100644
--- a/Infovis/vtkSplineGraphEdges.h
+++ b/Infovis/vtkSplineGraphEdges.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkSplineGraphEdges : public vtkGraphAlgorithm
 {
 public:
   static vtkSplineGraphEdges *New();
-  vtkTypeRevisionMacro(vtkSplineGraphEdges,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkSplineGraphEdges,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSplitColumnComponents.cxx b/Infovis/vtkSplitColumnComponents.cxx
index ce9480176862cf2baf0d9517d6204140fdd9d6e2..32cd24ff1f7a4473379d072398fbe5dd36a6b30b 100644
--- a/Infovis/vtkSplitColumnComponents.cxx
+++ b/Infovis/vtkSplitColumnComponents.cxx
@@ -24,7 +24,6 @@
 #include "vtksys/ios/sstream"
 #include "math.h"
 
-vtkCxxRevisionMacro(vtkSplitColumnComponents, "1.5");
 vtkStandardNewMacro(vtkSplitColumnComponents);
 //---------------------------------------------------------------------------
 vtkSplitColumnComponents::vtkSplitColumnComponents()
diff --git a/Infovis/vtkSplitColumnComponents.h b/Infovis/vtkSplitColumnComponents.h
index 3964ee42b7d99cc094927557590456468fc08f01..9b82834323f1dcdc1dffa1a10e45dc63e200fa06 100644
--- a/Infovis/vtkSplitColumnComponents.h
+++ b/Infovis/vtkSplitColumnComponents.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkSplitColumnComponents : public vtkTableAlgorithm
 {
 public:
   static vtkSplitColumnComponents* New();
-  vtkTypeRevisionMacro(vtkSplitColumnComponents,vtkTableAlgorithm);
+  vtkTypeMacro(vtkSplitColumnComponents,vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkSquarifyLayoutStrategy.cxx b/Infovis/vtkSquarifyLayoutStrategy.cxx
index ea9ab95a75ed9d67335bac808dc2212410c65e11..ba9fc40b3eee3546d9cfad30a2b248d0fd30aace 100644
--- a/Infovis/vtkSquarifyLayoutStrategy.cxx
+++ b/Infovis/vtkSquarifyLayoutStrategy.cxx
@@ -26,7 +26,6 @@
 #include "vtkPoints.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkSquarifyLayoutStrategy, "1.9");
 vtkStandardNewMacro(vtkSquarifyLayoutStrategy);
 
 vtkSquarifyLayoutStrategy::vtkSquarifyLayoutStrategy()
diff --git a/Infovis/vtkSquarifyLayoutStrategy.h b/Infovis/vtkSquarifyLayoutStrategy.h
index 5b869b4b8b942e395f0d9cdde724605a801c7a6c..56c1422962c7a635084b3f1bc0b45e62f92db0e5 100644
--- a/Infovis/vtkSquarifyLayoutStrategy.h
+++ b/Infovis/vtkSquarifyLayoutStrategy.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkSquarifyLayoutStrategy : public vtkTreeMapLayoutStra
 {
 public:
   static vtkSquarifyLayoutStrategy *New();
-  vtkTypeRevisionMacro(vtkSquarifyLayoutStrategy,vtkTreeMapLayoutStrategy);
+  vtkTypeMacro(vtkSquarifyLayoutStrategy,vtkTreeMapLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkStackedTreeLayoutStrategy.cxx b/Infovis/vtkStackedTreeLayoutStrategy.cxx
index ea8d8b2093adcc3def61cb3df4f1cb05d1de6dab..1ce607c8c797ff0a7973d516a8297efb1a6b5e01 100644
--- a/Infovis/vtkStackedTreeLayoutStrategy.cxx
+++ b/Infovis/vtkStackedTreeLayoutStrategy.cxx
@@ -40,7 +40,6 @@
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkStackedTreeLayoutStrategy, "1.7");
 vtkStandardNewMacro(vtkStackedTreeLayoutStrategy);
 
 vtkStackedTreeLayoutStrategy::vtkStackedTreeLayoutStrategy()
diff --git a/Infovis/vtkStackedTreeLayoutStrategy.h b/Infovis/vtkStackedTreeLayoutStrategy.h
index 2ac8758644d7cfac3563d5c62991c6eb58146be7..561911b6ccb4efd3e0aec4cb0c9b95f64bcb26bd 100644
--- a/Infovis/vtkStackedTreeLayoutStrategy.h
+++ b/Infovis/vtkStackedTreeLayoutStrategy.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkStackedTreeLayoutStrategy :
 {
 public:
   static vtkStackedTreeLayoutStrategy* New();
-  vtkTypeRevisionMacro(vtkStackedTreeLayoutStrategy,vtkAreaLayoutStrategy);
+  vtkTypeMacro(vtkStackedTreeLayoutStrategy,vtkAreaLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkStatisticsAlgorithm.cxx b/Infovis/vtkStatisticsAlgorithm.cxx
index 0883f60c2fd2e8472db84efa8e6859c86d3722a3..31a79071a9de50072f707158000f6310c869a8e7 100644
--- a/Infovis/vtkStatisticsAlgorithm.cxx
+++ b/Infovis/vtkStatisticsAlgorithm.cxx
@@ -30,7 +30,6 @@
 #include "vtkStringArray.h"
 #include "vtkTable.h"
 
-vtkCxxRevisionMacro(vtkStatisticsAlgorithm, "1.49");
 vtkCxxSetObjectMacro(vtkStatisticsAlgorithm,AssessParameters,vtkStringArray);
 vtkCxxSetObjectMacro(vtkStatisticsAlgorithm,AssessNames,vtkStringArray);
 
diff --git a/Infovis/vtkStatisticsAlgorithm.h b/Infovis/vtkStatisticsAlgorithm.h
index a854d6addb011d7da9a5873125a6ae493069ef81..2089d837104a54f170d681cfefe468c32bc87849 100644
--- a/Infovis/vtkStatisticsAlgorithm.h
+++ b/Infovis/vtkStatisticsAlgorithm.h
@@ -65,7 +65,7 @@ class vtkStatisticsAlgorithmPrivate;
 class VTK_INFOVIS_EXPORT vtkStatisticsAlgorithm : public vtkTableAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkStatisticsAlgorithm, vtkTableAlgorithm);
+  vtkTypeMacro(vtkStatisticsAlgorithm, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 //BTX
diff --git a/Infovis/vtkStrahlerMetric.cxx b/Infovis/vtkStrahlerMetric.cxx
index 1192796dd8cfd0944b57a9ad46e3691b0e570abf..da449be8a3553ff65832b04329ba1cb9904d0c57 100644
--- a/Infovis/vtkStrahlerMetric.cxx
+++ b/Infovis/vtkStrahlerMetric.cxx
@@ -32,7 +32,6 @@ the U.S. Government retains certain rights in this software.
 //--------------------------------------------------------------------------
 
 vtkStandardNewMacro(vtkStrahlerMetric);
-vtkCxxRevisionMacro(vtkStrahlerMetric,"1.00");
 
 vtkStrahlerMetric::vtkStrahlerMetric()
 {
diff --git a/Infovis/vtkStrahlerMetric.h b/Infovis/vtkStrahlerMetric.h
index fc0d8729cef478f49d81b26f1c8c32ec2b909809..eed918dea2aff139a21fc456755e27da488cf200 100644
--- a/Infovis/vtkStrahlerMetric.h
+++ b/Infovis/vtkStrahlerMetric.h
@@ -49,7 +49,7 @@ class VTK_INFOVIS_EXPORT vtkStrahlerMetric : public vtkTreeAlgorithm
 {
 public:
   static vtkStrahlerMetric *New();
-  vtkTypeRevisionMacro(vtkStrahlerMetric,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkStrahlerMetric,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkStreamGraph.cxx b/Infovis/vtkStreamGraph.cxx
index 777e89c31cef0fc978623b79d13fea161d616d0c..1d8735dbeae03878d301736c13ebeba0cf99827a 100644
--- a/Infovis/vtkStreamGraph.cxx
+++ b/Infovis/vtkStreamGraph.cxx
@@ -35,7 +35,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkStreamGraph, "1.4");
 vtkStandardNewMacro(vtkStreamGraph);
 //---------------------------------------------------------------------------
 vtkStreamGraph::vtkStreamGraph()
diff --git a/Infovis/vtkStreamGraph.h b/Infovis/vtkStreamGraph.h
index 5fb9092b610bae004fa43f1bdf0657309cae243a..c8d6cba645fe798c55262625775076d9a855a47a 100644
--- a/Infovis/vtkStreamGraph.h
+++ b/Infovis/vtkStreamGraph.h
@@ -46,7 +46,7 @@ class VTK_INFOVIS_EXPORT vtkStreamGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkStreamGraph* New();
-  vtkTypeRevisionMacro(vtkStreamGraph,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkStreamGraph,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkStringToCategory.cxx b/Infovis/vtkStringToCategory.cxx
index 451cf467069aef9d6ceb66ca7920491493527419..691973432d7326a9190a4e413ed59fdd68b9dcca 100644
--- a/Infovis/vtkStringToCategory.cxx
+++ b/Infovis/vtkStringToCategory.cxx
@@ -37,7 +37,6 @@
 
 #include <vtksys/stl/set>
 
-vtkCxxRevisionMacro(vtkStringToCategory, "1.7");
 vtkStandardNewMacro(vtkStringToCategory);
 
 vtkStringToCategory::vtkStringToCategory()
diff --git a/Infovis/vtkStringToCategory.h b/Infovis/vtkStringToCategory.h
index 279a2ef3b9412359edfc507a70acbf7d61ba5583..a4963d82ffe33e63bd591ccf757b178710558db0 100644
--- a/Infovis/vtkStringToCategory.h
+++ b/Infovis/vtkStringToCategory.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkStringToCategory : public vtkDataObjectAlgorithm
 {
 public:
   static vtkStringToCategory* New();
-  vtkTypeRevisionMacro(vtkStringToCategory,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkStringToCategory,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkStringToNumeric.cxx b/Infovis/vtkStringToNumeric.cxx
index 211b863d1b9af97e3d2ac3fcdb04d75c54dccf26..caf12b48e2b5238c214825d8befef35569d0d6ff 100644
--- a/Infovis/vtkStringToNumeric.cxx
+++ b/Infovis/vtkStringToNumeric.cxx
@@ -36,7 +36,6 @@
 #include "vtkUnicodeStringArray.h"
 #include "vtkVariant.h"
 
-vtkCxxRevisionMacro(vtkStringToNumeric, "1.9");
 vtkStandardNewMacro(vtkStringToNumeric);
 
 vtkStringToNumeric::vtkStringToNumeric()
diff --git a/Infovis/vtkStringToNumeric.h b/Infovis/vtkStringToNumeric.h
index 367111262d22eb86881653cb79dee9f1bea65374..bde0fdc6e33f6e137b5c7fc4ce074843a1bd683f 100644
--- a/Infovis/vtkStringToNumeric.h
+++ b/Infovis/vtkStringToNumeric.h
@@ -32,7 +32,7 @@ class VTK_INFOVIS_EXPORT vtkStringToNumeric : public vtkDataObjectAlgorithm
 {
 public:
   static vtkStringToNumeric* New();
-  vtkTypeRevisionMacro(vtkStringToNumeric,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkStringToNumeric,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkStringToTimePoint.cxx b/Infovis/vtkStringToTimePoint.cxx
index 20e4b0376463df5c1fb7477a803d8b1782d67d2d..3a297a1cd51357a8c66747260914fcc63bac0200 100644
--- a/Infovis/vtkStringToTimePoint.cxx
+++ b/Infovis/vtkStringToTimePoint.cxx
@@ -34,7 +34,6 @@
 #include "vtkTimePointUtility.h"
 #include "vtkTypeUInt64Array.h"
 
-vtkCxxRevisionMacro(vtkStringToTimePoint, "1.5");
 vtkStandardNewMacro(vtkStringToTimePoint);
 
 vtkStringToTimePoint::vtkStringToTimePoint()
diff --git a/Infovis/vtkStringToTimePoint.h b/Infovis/vtkStringToTimePoint.h
index 64a46c78c0b9c94322ff7766408c954700d8d076..415523a97b01ebdf9d4c42cabccb53a88f080993 100644
--- a/Infovis/vtkStringToTimePoint.h
+++ b/Infovis/vtkStringToTimePoint.h
@@ -40,7 +40,7 @@ class VTK_INFOVIS_EXPORT vtkStringToTimePoint : public vtkDataObjectAlgorithm
 {
 public:
   static vtkStringToTimePoint* New();
-  vtkTypeRevisionMacro(vtkStringToTimePoint,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkStringToTimePoint,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTableToArray.cxx b/Infovis/vtkTableToArray.cxx
index e4a41f040cb227ae4d374bce6d534e530efc5c83..12884c7d284475adf6038beec36f5bbed505c228 100644
--- a/Infovis/vtkTableToArray.cxx
+++ b/Infovis/vtkTableToArray.cxx
@@ -38,7 +38,6 @@ public:
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkTableToArray, "1.1");
 vtkStandardNewMacro(vtkTableToArray);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkTableToArray.h b/Infovis/vtkTableToArray.h
index b7287eb3355869f07096e7f54d95b9078d97ca37..24b44e43e5e973a5d665bd6dae0c068c3ac2d6dc 100644
--- a/Infovis/vtkTableToArray.h
+++ b/Infovis/vtkTableToArray.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkTableToArray : public vtkArrayDataAlgorithm
 {
 public:
   static vtkTableToArray* New();
-  vtkTypeRevisionMacro(vtkTableToArray, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkTableToArray, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTableToGraph.cxx b/Infovis/vtkTableToGraph.cxx
index 78a57af8742151c11d6afffd7aa55d281e6a3eb6..cf89dcc9e1655d6f89418e2ad1f9fefdfe66fac6 100644
--- a/Infovis/vtkTableToGraph.cxx
+++ b/Infovis/vtkTableToGraph.cxx
@@ -52,7 +52,6 @@
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkTableToGraph, "1.23");
 vtkStandardNewMacro(vtkTableToGraph);
 vtkCxxSetObjectMacro(vtkTableToGraph, LinkGraph, vtkMutableDirectedGraph);
 //---------------------------------------------------------------------------
diff --git a/Infovis/vtkTableToGraph.h b/Infovis/vtkTableToGraph.h
index ff549a7b4c5ef059ed7cd558dffa978909de1b94..90b8c658d72d77bc7b9fcee691a67492c029df88 100644
--- a/Infovis/vtkTableToGraph.h
+++ b/Infovis/vtkTableToGraph.h
@@ -74,7 +74,7 @@ class VTK_INFOVIS_EXPORT vtkTableToGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkTableToGraph* New();
-  vtkTypeRevisionMacro(vtkTableToGraph,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkTableToGraph,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkTableToSparseArray.cxx b/Infovis/vtkTableToSparseArray.cxx
index 2c3300fdf53712c1ed4bf14b299e9d2e22b99ecd..4a55d1781201fc65cfcb36a8d6dae22b63be4f29 100644
--- a/Infovis/vtkTableToSparseArray.cxx
+++ b/Infovis/vtkTableToSparseArray.cxx
@@ -43,7 +43,6 @@ public:
 
 // ----------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkTableToSparseArray, "1.6");
 vtkStandardNewMacro(vtkTableToSparseArray);
 
 // ----------------------------------------------------------------------
diff --git a/Infovis/vtkTableToSparseArray.h b/Infovis/vtkTableToSparseArray.h
index 485c460ccac27a58577b3eb3de6939ae3eba4690..9b4ce6e9c705a839ddec1f33beafad8fd2eac367 100644
--- a/Infovis/vtkTableToSparseArray.h
+++ b/Infovis/vtkTableToSparseArray.h
@@ -45,7 +45,7 @@ class VTK_INFOVIS_EXPORT vtkTableToSparseArray : public vtkArrayDataAlgorithm
 {
 public:
   static vtkTableToSparseArray* New();
-  vtkTypeRevisionMacro(vtkTableToSparseArray, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkTableToSparseArray, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTableToTreeFilter.cxx b/Infovis/vtkTableToTreeFilter.cxx
index c56b111b82fd9081f7b4963b2d82f075f776a485..468cc220248c899d1d7aea6cd235cd12205dc1af 100644
--- a/Infovis/vtkTableToTreeFilter.cxx
+++ b/Infovis/vtkTableToTreeFilter.cxx
@@ -36,7 +36,6 @@
 #include <vtkstd/vector>
 #include <vtkstd/string>
 
-vtkCxxRevisionMacro(vtkTableToTreeFilter, "1.10");
 vtkStandardNewMacro(vtkTableToTreeFilter);
 
 
diff --git a/Infovis/vtkTableToTreeFilter.h b/Infovis/vtkTableToTreeFilter.h
index ccb2598547607f8be24cbdeee26937824461b0f0..98d972c803e6b9f54e1babff69776b6e7e775a9a 100644
--- a/Infovis/vtkTableToTreeFilter.h
+++ b/Infovis/vtkTableToTreeFilter.h
@@ -35,7 +35,7 @@ class VTK_INFOVIS_EXPORT vtkTableToTreeFilter : public vtkTreeAlgorithm
 {
 public:
   static vtkTableToTreeFilter* New();
-  vtkTypeRevisionMacro(vtkTableToTreeFilter,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkTableToTreeFilter,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkThresholdTable.cxx b/Infovis/vtkThresholdTable.cxx
index e8bf7f271596cd27c7bff24f7c4c9c0671d37461..3e9a9261091bd861684c09eabbdafd319d76472f 100644
--- a/Infovis/vtkThresholdTable.cxx
+++ b/Infovis/vtkThresholdTable.cxx
@@ -29,7 +29,6 @@
 #include "vtkVariant.h"
 #include "vtkVariantArray.h"
 
-vtkCxxRevisionMacro(vtkThresholdTable, "1.8");
 vtkStandardNewMacro(vtkThresholdTable);
 
 vtkThresholdTable::vtkThresholdTable() : MinValue(0), MaxValue(VTK_INT_MAX), Mode(0)
diff --git a/Infovis/vtkThresholdTable.h b/Infovis/vtkThresholdTable.h
index ff48cbf8288075ad20e7f6fd6fe06a2f75c28fb7..72fcc216d9b5166fa6af19a70965077a07716a98 100644
--- a/Infovis/vtkThresholdTable.h
+++ b/Infovis/vtkThresholdTable.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkThresholdTable : public vtkTableAlgorithm
 {
 public:
   static vtkThresholdTable* New();
-  vtkTypeRevisionMacro(vtkThresholdTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkThresholdTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Infovis/vtkTimePointToString.cxx b/Infovis/vtkTimePointToString.cxx
index a181188be50ac40121b8f4d1193a145fe3acf8a4..3b32a91b49ddba2f5ca11a94a2dfb7ac95561174 100644
--- a/Infovis/vtkTimePointToString.cxx
+++ b/Infovis/vtkTimePointToString.cxx
@@ -35,7 +35,6 @@
 #include "vtkTimePointUtility.h"
 #include "vtkTypeUInt64Array.h"
 
-vtkCxxRevisionMacro(vtkTimePointToString, "1.7");
 vtkStandardNewMacro(vtkTimePointToString);
 
 vtkTimePointToString::vtkTimePointToString()
diff --git a/Infovis/vtkTimePointToString.h b/Infovis/vtkTimePointToString.h
index 385584e0e45437307b5f85feff68587b223f89c8..b222de7c398b290da1062fd24b49bca3378bc1a2 100644
--- a/Infovis/vtkTimePointToString.h
+++ b/Infovis/vtkTimePointToString.h
@@ -41,7 +41,7 @@ class VTK_INFOVIS_EXPORT vtkTimePointToString : public vtkDataObjectAlgorithm
 {
 public:
   static vtkTimePointToString* New();
-  vtkTypeRevisionMacro(vtkTimePointToString,vtkDataObjectAlgorithm);
+  vtkTypeMacro(vtkTimePointToString,vtkDataObjectAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTransferAttributes.cxx b/Infovis/vtkTransferAttributes.cxx
index 1faa0fc115591816c3c5405992f5a67f48963c27..6c1718c990e0e98d69cac2a40c43c57ae6254a7a 100644
--- a/Infovis/vtkTransferAttributes.cxx
+++ b/Infovis/vtkTransferAttributes.cxx
@@ -61,7 +61,6 @@ static vtkVariant vtkGetVariantValue(vtkAbstractArray* arr, vtkIdType i)
   return val;
 }
 
-vtkCxxRevisionMacro(vtkTransferAttributes, "1.8");
 vtkStandardNewMacro(vtkTransferAttributes);
 
 vtkTransferAttributes::vtkTransferAttributes()
diff --git a/Infovis/vtkTransferAttributes.h b/Infovis/vtkTransferAttributes.h
index febb7c9e2ee141323a2730e48f227a90f36d6ce9..961bab61025b616d10f693604c9c49ee15768aeb 100644
--- a/Infovis/vtkTransferAttributes.h
+++ b/Infovis/vtkTransferAttributes.h
@@ -50,7 +50,7 @@ public:
   // TargetFieldType=vtkDataObject::FIELD_ASSOCIATION_POINTS
   static vtkTransferAttributes *New();
   
-  vtkTypeRevisionMacro(vtkTransferAttributes,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkTransferAttributes,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkTransposeMatrix.cxx b/Infovis/vtkTransposeMatrix.cxx
index 5d86f78470ff7a99f88987e579a09ddf28fe4359..a1b935366522d8fa878eb4f78cfeb0a06fe4596a 100644
--- a/Infovis/vtkTransposeMatrix.cxx
+++ b/Infovis/vtkTransposeMatrix.cxx
@@ -31,7 +31,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkTransposeMatrix
 
-vtkCxxRevisionMacro(vtkTransposeMatrix, "1.5");
 vtkStandardNewMacro(vtkTransposeMatrix);
 
 vtkTransposeMatrix::vtkTransposeMatrix()
diff --git a/Infovis/vtkTransposeMatrix.h b/Infovis/vtkTransposeMatrix.h
index ff4ee3c28711fc4e06ad8df3e6a3ab2630efbae4..5c89ae88d503e51f48ecb8a185815c2d8b7fffad 100644
--- a/Infovis/vtkTransposeMatrix.h
+++ b/Infovis/vtkTransposeMatrix.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkTransposeMatrix : public vtkArrayDataAlgorithm
 {
 public:
   static vtkTransposeMatrix* New();
-  vtkTypeRevisionMacro(vtkTransposeMatrix, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkTransposeMatrix, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkTreeFieldAggregator.cxx b/Infovis/vtkTreeFieldAggregator.cxx
index a22fab125e346b6d5700bb00ce3f0b425af19897..6fe5881f606ae7db3a9108c2d28479d96a16f2f2 100644
--- a/Infovis/vtkTreeFieldAggregator.cxx
+++ b/Infovis/vtkTreeFieldAggregator.cxx
@@ -39,7 +39,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkTreeFieldAggregator, "1.11");
 vtkStandardNewMacro(vtkTreeFieldAggregator);
 
 vtkTreeFieldAggregator::vtkTreeFieldAggregator()
diff --git a/Infovis/vtkTreeFieldAggregator.h b/Infovis/vtkTreeFieldAggregator.h
index d87b7655a2c0b42876446f42e287ecd056e995f9..0d09af09ef556dd6171453cba63aa7d9ed9986af 100644
--- a/Infovis/vtkTreeFieldAggregator.h
+++ b/Infovis/vtkTreeFieldAggregator.h
@@ -42,7 +42,7 @@ class VTK_INFOVIS_EXPORT vtkTreeFieldAggregator : public vtkTreeAlgorithm
 public:
   static vtkTreeFieldAggregator *New();
 
-  vtkTypeRevisionMacro(vtkTreeFieldAggregator,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkTreeFieldAggregator,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeLayoutStrategy.cxx b/Infovis/vtkTreeLayoutStrategy.cxx
index d1a0aac25738756147ee886c048b4280eca628f0..208b6cb9219814770cfc0ba071858099fd764af4 100644
--- a/Infovis/vtkTreeLayoutStrategy.cxx
+++ b/Infovis/vtkTreeLayoutStrategy.cxx
@@ -37,7 +37,6 @@
 #include "vtkTree.h"
 #include "vtkTreeDFSIterator.h"
 
-vtkCxxRevisionMacro(vtkTreeLayoutStrategy, "1.16");
 vtkStandardNewMacro(vtkTreeLayoutStrategy);
 
 vtkTreeLayoutStrategy::vtkTreeLayoutStrategy()
diff --git a/Infovis/vtkTreeLayoutStrategy.h b/Infovis/vtkTreeLayoutStrategy.h
index 2c3a437dcabd8e7d828a181376c691141a904ad3..b8bebaadf769fbde200ad7cc55bbaac4f8177a68 100644
--- a/Infovis/vtkTreeLayoutStrategy.h
+++ b/Infovis/vtkTreeLayoutStrategy.h
@@ -44,7 +44,7 @@ class VTK_INFOVIS_EXPORT vtkTreeLayoutStrategy : public vtkGraphLayoutStrategy
 public:
   static vtkTreeLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkTreeLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkTreeLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeLevelsFilter.cxx b/Infovis/vtkTreeLevelsFilter.cxx
index 8a5bdea63a6c342255d2c93131ea25dd58dab246..70f0bb4996df9807b1cae2c835dd51c6b9419648 100644
--- a/Infovis/vtkTreeLevelsFilter.cxx
+++ b/Infovis/vtkTreeLevelsFilter.cxx
@@ -33,7 +33,6 @@
 #include "vtkTree.h"
 #include "vtkGraph.h"
 
-vtkCxxRevisionMacro(vtkTreeLevelsFilter, "1.4");
 vtkStandardNewMacro(vtkTreeLevelsFilter);
 
 vtkTreeLevelsFilter::vtkTreeLevelsFilter()
diff --git a/Infovis/vtkTreeLevelsFilter.h b/Infovis/vtkTreeLevelsFilter.h
index 17ed6a361ac10c2a02135cfffc90b65a7566d1c1..cd69353104fb3071a9967157314fcd7ad6f89903 100644
--- a/Infovis/vtkTreeLevelsFilter.h
+++ b/Infovis/vtkTreeLevelsFilter.h
@@ -38,7 +38,7 @@ class VTK_INFOVIS_EXPORT vtkTreeLevelsFilter : public vtkTreeAlgorithm
 {
 public:
   static vtkTreeLevelsFilter *New();
-  vtkTypeRevisionMacro(vtkTreeLevelsFilter,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkTreeLevelsFilter,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Infovis/vtkTreeMapLayout.cxx b/Infovis/vtkTreeMapLayout.cxx
index 9e0c197306f6b8d668092f4ecdab2105ede45901..d5b9293def8107ede61e0892ccf0c6c418336714 100644
--- a/Infovis/vtkTreeMapLayout.cxx
+++ b/Infovis/vtkTreeMapLayout.cxx
@@ -33,7 +33,6 @@
 #include "vtkTree.h"
 #include "vtkTreeMapLayoutStrategy.h"
 
-vtkCxxRevisionMacro(vtkTreeMapLayout, "1.10");
 vtkStandardNewMacro(vtkTreeMapLayout);
 
 vtkTreeMapLayout::vtkTreeMapLayout()
diff --git a/Infovis/vtkTreeMapLayout.h b/Infovis/vtkTreeMapLayout.h
index d56721762ca0c0ea2fb2f98057473136e1ed01d4..d3e71591843f35418b2056d194a6288583b62dbe 100644
--- a/Infovis/vtkTreeMapLayout.h
+++ b/Infovis/vtkTreeMapLayout.h
@@ -48,7 +48,7 @@ class VTK_INFOVIS_EXPORT vtkTreeMapLayout : public vtkTreeAlgorithm
 public:
   static vtkTreeMapLayout *New();
 
-  vtkTypeRevisionMacro(vtkTreeMapLayout,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkTreeMapLayout,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeMapLayoutStrategy.cxx b/Infovis/vtkTreeMapLayoutStrategy.cxx
index 0b7cd2922c34b4918571467ce3285276b3c246d3..6fe772f9c24063ba2838624a13689cfc70483521 100644
--- a/Infovis/vtkTreeMapLayoutStrategy.cxx
+++ b/Infovis/vtkTreeMapLayoutStrategy.cxx
@@ -24,7 +24,6 @@
 #include "vtkFloatArray.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkTreeMapLayoutStrategy, "1.5");
 
 vtkTreeMapLayoutStrategy::vtkTreeMapLayoutStrategy()
 {
diff --git a/Infovis/vtkTreeMapLayoutStrategy.h b/Infovis/vtkTreeMapLayoutStrategy.h
index ac196a69678e03c0fa7ca950169ef0b5b78ce82c..028edd93301a4b5b5f66da9bd8383a4d41c64523 100644
--- a/Infovis/vtkTreeMapLayoutStrategy.h
+++ b/Infovis/vtkTreeMapLayoutStrategy.h
@@ -44,7 +44,7 @@ class vtkDataArray;
 class VTK_INFOVIS_EXPORT vtkTreeMapLayoutStrategy : public vtkAreaLayoutStrategy
 {
 public:
-  vtkTypeRevisionMacro(vtkTreeMapLayoutStrategy, vtkAreaLayoutStrategy);
+  vtkTypeMacro(vtkTreeMapLayoutStrategy, vtkAreaLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeMapToPolyData.cxx b/Infovis/vtkTreeMapToPolyData.cxx
index 6ab2a9dda847c7115d7aa4fa5882563fbba56480..2480f6689f326acbc6bf9d0e352aa517a4809fd0 100644
--- a/Infovis/vtkTreeMapToPolyData.cxx
+++ b/Infovis/vtkTreeMapToPolyData.cxx
@@ -30,7 +30,6 @@
 #include "vtkPointData.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkTreeMapToPolyData, "1.10");
 vtkStandardNewMacro(vtkTreeMapToPolyData);
 
 vtkTreeMapToPolyData::vtkTreeMapToPolyData()
diff --git a/Infovis/vtkTreeMapToPolyData.h b/Infovis/vtkTreeMapToPolyData.h
index bf5e0a8a615b7ab74ebb48994ed73c0da2f8192e..0c65817d12de0eb893024635ed8e3033f9d1b33e 100644
--- a/Infovis/vtkTreeMapToPolyData.h
+++ b/Infovis/vtkTreeMapToPolyData.h
@@ -33,7 +33,7 @@ class VTK_INFOVIS_EXPORT vtkTreeMapToPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTreeMapToPolyData *New();
-  vtkTypeRevisionMacro(vtkTreeMapToPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTreeMapToPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeOrbitLayoutStrategy.cxx b/Infovis/vtkTreeOrbitLayoutStrategy.cxx
index 60b8bb5f5b683754c3395607d2b5c2287abb7822..0b5af3e49c3090982744276cd4da7656dc894330 100644
--- a/Infovis/vtkTreeOrbitLayoutStrategy.cxx
+++ b/Infovis/vtkTreeOrbitLayoutStrategy.cxx
@@ -35,7 +35,6 @@
 #include "vtkTree.h"
 #include "vtkTreeDFSIterator.h"
 
-vtkCxxRevisionMacro(vtkTreeOrbitLayoutStrategy, "1.4");
 vtkStandardNewMacro(vtkTreeOrbitLayoutStrategy);
 
 vtkTreeOrbitLayoutStrategy::vtkTreeOrbitLayoutStrategy()
diff --git a/Infovis/vtkTreeOrbitLayoutStrategy.h b/Infovis/vtkTreeOrbitLayoutStrategy.h
index a1318197d01b18a1aadac236ed9bc64635569c6a..67c9b714793787e95e066a856b2baf1fda0d119c 100644
--- a/Infovis/vtkTreeOrbitLayoutStrategy.h
+++ b/Infovis/vtkTreeOrbitLayoutStrategy.h
@@ -31,7 +31,7 @@ class VTK_INFOVIS_EXPORT vtkTreeOrbitLayoutStrategy : public vtkGraphLayoutStrat
 public:
   static vtkTreeOrbitLayoutStrategy *New();
 
-  vtkTypeRevisionMacro(vtkTreeOrbitLayoutStrategy, vtkGraphLayoutStrategy);
+  vtkTypeMacro(vtkTreeOrbitLayoutStrategy, vtkGraphLayoutStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkTreeRingToPolyData.cxx b/Infovis/vtkTreeRingToPolyData.cxx
index ac6393f051ac6375d4c67f933ecca695ad694fc9..87dfd9140a7e1adfd6aec85638da1e11c4db3cfc 100644
--- a/Infovis/vtkTreeRingToPolyData.cxx
+++ b/Infovis/vtkTreeRingToPolyData.cxx
@@ -39,7 +39,6 @@
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkTreeRingToPolyData, "1.12");
 vtkStandardNewMacro(vtkTreeRingToPolyData);
 
 vtkTreeRingToPolyData::vtkTreeRingToPolyData()
diff --git a/Infovis/vtkTreeRingToPolyData.h b/Infovis/vtkTreeRingToPolyData.h
index fcac6567c2f9a763a54781e2b36081fe5dda57b4..c4708908cbd1d7d2f53424ce5791ee561de90ba6 100644
--- a/Infovis/vtkTreeRingToPolyData.h
+++ b/Infovis/vtkTreeRingToPolyData.h
@@ -36,7 +36,7 @@ class VTK_INFOVIS_EXPORT vtkTreeRingToPolyData : public vtkPolyDataAlgorithm
 public:
   static vtkTreeRingToPolyData *New();
   
-  vtkTypeRevisionMacro(vtkTreeRingToPolyData,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTreeRingToPolyData,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Infovis/vtkTulipReader.cxx b/Infovis/vtkTulipReader.cxx
index 3e10dd5e85173ec59364590dcfaa55caa359b28e..52fb35ae4bf12c9665bacf606e60d34d475f2015 100644
--- a/Infovis/vtkTulipReader.cxx
+++ b/Infovis/vtkTulipReader.cxx
@@ -45,7 +45,6 @@
 // so it would be nice to put this in a common file.
 static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
 
-vtkCxxRevisionMacro(vtkTulipReader, "1.5");
 vtkStandardNewMacro(vtkTulipReader);
 
 vtkTulipReader::vtkTulipReader()
diff --git a/Infovis/vtkTulipReader.h b/Infovis/vtkTulipReader.h
index 119ebbf2d7f18c9f531828771e4dc765da889c7f..42af443046db1362deeee4e53647ade5c265a019 100644
--- a/Infovis/vtkTulipReader.h
+++ b/Infovis/vtkTulipReader.h
@@ -55,7 +55,7 @@ class VTK_INFOVIS_EXPORT vtkTulipReader : public vtkUndirectedGraphAlgorithm
 {
 public:
   static vtkTulipReader *New();
-  vtkTypeRevisionMacro(vtkTulipReader, vtkUndirectedGraphAlgorithm);
+  vtkTypeMacro(vtkTulipReader, vtkUndirectedGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkUnivariateStatisticsAlgorithm.cxx b/Infovis/vtkUnivariateStatisticsAlgorithm.cxx
index 9325aa2ee073a6cc4db6bccc4338b4f93b176943..8d80b912540c53adf3e645fcbab1fa1308b98f3f 100644
--- a/Infovis/vtkUnivariateStatisticsAlgorithm.cxx
+++ b/Infovis/vtkUnivariateStatisticsAlgorithm.cxx
@@ -35,7 +35,6 @@
 
 #define VTK_STATISTICS_NUMBER_OF_VARIABLES 1
 
-vtkCxxRevisionMacro(vtkUnivariateStatisticsAlgorithm, "1.35");
 
 // ----------------------------------------------------------------------
 vtkUnivariateStatisticsAlgorithm::vtkUnivariateStatisticsAlgorithm()
diff --git a/Infovis/vtkUnivariateStatisticsAlgorithm.h b/Infovis/vtkUnivariateStatisticsAlgorithm.h
index 963f328dc54c891d79f5352bb164cd8192473db9..243232627c0e0efbeaeafefd75e902711da73bf6 100644
--- a/Infovis/vtkUnivariateStatisticsAlgorithm.h
+++ b/Infovis/vtkUnivariateStatisticsAlgorithm.h
@@ -48,7 +48,7 @@ class vtkTable;
 class VTK_INFOVIS_EXPORT vtkUnivariateStatisticsAlgorithm : public vtkStatisticsAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkUnivariateStatisticsAlgorithm, vtkStatisticsAlgorithm);
+  vtkTypeMacro(vtkUnivariateStatisticsAlgorithm, vtkStatisticsAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkVertexDegree.cxx b/Infovis/vtkVertexDegree.cxx
index 42b11b768d8bb291824949155900ad4a4a3cefb6..ce966556108dd06be178a34bd4e3bee104c1fbd7 100644
--- a/Infovis/vtkVertexDegree.cxx
+++ b/Infovis/vtkVertexDegree.cxx
@@ -28,7 +28,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkVertexDegree, "1.6");
 vtkStandardNewMacro(vtkVertexDegree);
 
 vtkVertexDegree::vtkVertexDegree()
diff --git a/Infovis/vtkVertexDegree.h b/Infovis/vtkVertexDegree.h
index f45c6dd0bb2fd9f4a73fb0182a3dae4c065c6a56..60cca65b8d41c8138fd0b51b66d9af1aea704e57 100644
--- a/Infovis/vtkVertexDegree.h
+++ b/Infovis/vtkVertexDegree.h
@@ -34,7 +34,7 @@ class VTK_INFOVIS_EXPORT vtkVertexDegree : public vtkGraphAlgorithm
 public:
   static vtkVertexDegree *New();
 
-  vtkTypeRevisionMacro(vtkVertexDegree, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkVertexDegree, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkXGMLReader.cxx b/Infovis/vtkXGMLReader.cxx
index 50bb537a80f60f92200971b24960c3d8022f5056..736c9fb34acd3a47e781dd4b745db2d4743a965f 100644
--- a/Infovis/vtkXGMLReader.cxx
+++ b/Infovis/vtkXGMLReader.cxx
@@ -47,7 +47,6 @@ PURPOSE.  See the above copyright notice for more information.
 // Copied from vtkTulipReader.cxx ..
 static int my_getline(vtksys_ios::istream& stream, vtkStdString &output, char delim='\n');
 
-vtkCxxRevisionMacro(vtkXGMLReader, "1.5");
 vtkStandardNewMacro(vtkXGMLReader);
 
 vtkXGMLReader::vtkXGMLReader()
diff --git a/Infovis/vtkXGMLReader.h b/Infovis/vtkXGMLReader.h
index 2403d54d9c3d122d9277ce87f821b394b495e34f..e4474a283e7a5f9272db4759a05f910257cddc8d 100644
--- a/Infovis/vtkXGMLReader.h
+++ b/Infovis/vtkXGMLReader.h
@@ -37,7 +37,7 @@ class VTK_INFOVIS_EXPORT vtkXGMLReader : public vtkUndirectedGraphAlgorithm
 {
 public:
   static vtkXGMLReader *New();
-  vtkTypeRevisionMacro(vtkXGMLReader, vtkUndirectedGraphAlgorithm);
+  vtkTypeMacro(vtkXGMLReader, vtkUndirectedGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Infovis/vtkXMLTreeReader.cxx b/Infovis/vtkXMLTreeReader.cxx
index 58d6b9c57f4031b3091f274b2840d7cfcb3c6071..f258eaad95e26431b0850a7a53df7186f76a4652 100644
--- a/Infovis/vtkXMLTreeReader.cxx
+++ b/Infovis/vtkXMLTreeReader.cxx
@@ -34,7 +34,6 @@
 #include VTKLIBXML2_HEADER(parser.h)
 #include VTKLIBXML2_HEADER(tree.h)
 
-vtkCxxRevisionMacro(vtkXMLTreeReader, "1.10");
 vtkStandardNewMacro(vtkXMLTreeReader);
 
 const char * vtkXMLTreeReader::TagNameField = ".tagname";
diff --git a/Infovis/vtkXMLTreeReader.h b/Infovis/vtkXMLTreeReader.h
index 058c6a7af26ad89bfb49e44a47ffa1931fd23f4d..1f9facd8734998ae0c71043574ecf1c48c6f55c2 100644
--- a/Infovis/vtkXMLTreeReader.h
+++ b/Infovis/vtkXMLTreeReader.h
@@ -92,7 +92,7 @@ class VTK_INFOVIS_EXPORT vtkXMLTreeReader : public vtkTreeAlgorithm
 {
 public:
   static vtkXMLTreeReader* New();
-  vtkTypeRevisionMacro(vtkXMLTreeReader,vtkTreeAlgorithm);
+  vtkTypeMacro(vtkXMLTreeReader,vtkTreeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/Testing/Cxx/DistributedData.cxx b/Parallel/Testing/Cxx/DistributedData.cxx
index eb808af4b71d465832beaea76b638d69da02fe64..f3c68db053cf3fde7d68eecee3a6aaf7c15fa2bb 100644
--- a/Parallel/Testing/Cxx/DistributedData.cxx
+++ b/Parallel/Testing/Cxx/DistributedData.cxx
@@ -50,7 +50,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -64,7 +64,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.12");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx b/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx
index ba17cb0ea1a4a82ffd41014cff954f1bf7507938..da5d15a0a7091867bd2cf1bf1897706361c399ca 100644
--- a/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx
+++ b/Parallel/Testing/Cxx/DistributedDataRenderPass.cxx
@@ -64,7 +64,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -78,7 +78,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.2");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/PrmMagnify.cxx b/Parallel/Testing/Cxx/PrmMagnify.cxx
index f6924142689ae9ee5d9271b86e6c76c42ad0d74b..b2f47a99d1fef9c9a6a353c70b2f6cd0ef9a258a 100644
--- a/Parallel/Testing/Cxx/PrmMagnify.cxx
+++ b/Parallel/Testing/Cxx/PrmMagnify.cxx
@@ -50,7 +50,7 @@
 class vtkTestMagnifyRenderManager : public vtkParallelRenderManager
 {
 public:
-  vtkTypeRevisionMacro(vtkTestMagnifyRenderManager, vtkParallelRenderManager);
+  vtkTypeMacro(vtkTestMagnifyRenderManager, vtkParallelRenderManager);
   static vtkTestMagnifyRenderManager *New();
 
 protected:
@@ -69,7 +69,6 @@ private:
   void operator=(const vtkTestMagnifyRenderManager &);  // Not implemented.
 };
 
-vtkCxxRevisionMacro(vtkTestMagnifyRenderManager, "1.4");
 vtkStandardNewMacro(vtkTestMagnifyRenderManager);
 
 vtkTestMagnifyRenderManager::vtkTestMagnifyRenderManager()
diff --git a/Parallel/Testing/Cxx/TestDistributedDataCompositeZPass.cxx b/Parallel/Testing/Cxx/TestDistributedDataCompositeZPass.cxx
index f5cac49d3dc2224f18d11a158bc8cf34fea409f4..24761e15a1911bbd064527a8389d6f5364c6d818 100644
--- a/Parallel/Testing/Cxx/TestDistributedDataCompositeZPass.cxx
+++ b/Parallel/Testing/Cxx/TestDistributedDataCompositeZPass.cxx
@@ -94,7 +94,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
 
   virtual void Execute();
 
@@ -112,7 +112,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.1");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx b/Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx
index 459873f006b08ea949a9913fa2247717f9b0247b..917a89574edbc2e16b6e832e0d8ce0196f0a0d5d 100644
--- a/Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx
+++ b/Parallel/Testing/Cxx/TestDistributedDataShadowMapPass.cxx
@@ -89,7 +89,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
 
   virtual void Execute();
 
@@ -107,7 +107,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.2");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TestPCompositeZPass.cxx b/Parallel/Testing/Cxx/TestPCompositeZPass.cxx
index 0312feffd536781bb67d3eabb36a9023ca61a0e3..2ac7f9ed54075c784e10b9042d5595c6e24bdda3 100644
--- a/Parallel/Testing/Cxx/TestPCompositeZPass.cxx
+++ b/Parallel/Testing/Cxx/TestPCompositeZPass.cxx
@@ -94,7 +94,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -112,7 +112,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.4");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TestPShadowMapPass.cxx b/Parallel/Testing/Cxx/TestPShadowMapPass.cxx
index 5ae955ff28df0118cbac4833e9aa2542d6ae3c31..635af29d86400ef96b0693cca5af1a8cc2892b53 100644
--- a/Parallel/Testing/Cxx/TestPShadowMapPass.cxx
+++ b/Parallel/Testing/Cxx/TestPShadowMapPass.cxx
@@ -86,7 +86,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -104,7 +104,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.5");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TestProcess.cxx b/Parallel/Testing/Cxx/TestProcess.cxx
index f7344cb4fe64f0f73ef8bd06519d08bc9839f0f6..8b59c67a4239a7f8d5726a3e7bfc479b85ff9f94 100644
--- a/Parallel/Testing/Cxx/TestProcess.cxx
+++ b/Parallel/Testing/Cxx/TestProcess.cxx
@@ -24,7 +24,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -38,7 +38,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.1");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx b/Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx
index a6fc5d091e2f03ca9e35c76ae423560446010fe6..40d4b0adff226f01f580f5cfc3b6fbec81a94b4f 100644
--- a/Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx
+++ b/Parallel/Testing/Cxx/TestTemporalCacheSimple.cxx
@@ -48,7 +48,7 @@ class vtkTemporalSphereSource : public vtkSphereSource {
 
 public:
   static vtkTemporalSphereSource *New();
-  vtkTypeRevisionMacro(vtkTemporalSphereSource, vtkSphereSource);
+  vtkTypeMacro(vtkTemporalSphereSource, vtkSphereSource);
 
   // Description:
   // Set/Get the time value at which to get the value.
@@ -84,7 +84,6 @@ public:
   vtkstd::vector<double> TimeStepValues;
 };
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkTemporalSphereSource, "1.5");
 vtkStandardNewMacro(vtkTemporalSphereSource);
 //----------------------------------------------------------------------------
 vtkTemporalSphereSource::vtkTemporalSphereSource()
diff --git a/Parallel/Testing/Cxx/TransmitImageData.cxx b/Parallel/Testing/Cxx/TransmitImageData.cxx
index d360bef5e3be5b177930926bdd17a7fd053c0060..8df91a5c4d8abc3cec490d3bbebf96e03835d109 100644
--- a/Parallel/Testing/Cxx/TransmitImageData.cxx
+++ b/Parallel/Testing/Cxx/TransmitImageData.cxx
@@ -49,7 +49,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -63,7 +63,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.8");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx b/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx
index 76de5f903a72a6d11f9720a9c32c675f2b601ba9..761ae6679f85270d955fb2f4130bdd95d9937a1a 100644
--- a/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx
+++ b/Parallel/Testing/Cxx/TransmitImageDataRenderPass.cxx
@@ -59,7 +59,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -73,7 +73,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.1");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx b/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx
index f652cbb9a5b646d63808a6663509f58e886bcea3..f7aa2b24908e90767ac8f5f2036d2bf575987e43 100644
--- a/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx
+++ b/Parallel/Testing/Cxx/TransmitRectilinearGrid.cxx
@@ -47,7 +47,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -61,7 +61,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.8");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx b/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx
index 0bc9e1f2ef4bc16a0f9d315f4d37379da1584e91..dd4f94dada1be112343cd030252588f18f20ab4e 100644
--- a/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx
+++ b/Parallel/Testing/Cxx/TransmitStructuredGrid.cxx
@@ -47,7 +47,7 @@ class MyProcess : public vtkProcess
 {
 public:
   static MyProcess *New();
-  vtkTypeRevisionMacro(MyProcess, vtkProcess);
+  vtkTypeMacro(MyProcess, vtkProcess);
   
   virtual void Execute();
 
@@ -61,7 +61,6 @@ protected:
   char **Argv;
 };
 
-vtkCxxRevisionMacro(MyProcess, "1.8");
 vtkStandardNewMacro(MyProcess);
 
 MyProcess::MyProcess()
diff --git a/Parallel/vtkBranchExtentTranslator.cxx b/Parallel/vtkBranchExtentTranslator.cxx
index fda7e91e447988e53bb04f99b8c393348eeeb9bf..a12512f947fb287f08334ea8ae6be4ab806d8076 100644
--- a/Parallel/vtkBranchExtentTranslator.cxx
+++ b/Parallel/vtkBranchExtentTranslator.cxx
@@ -18,7 +18,6 @@
 #include "vtkSource.h"
 #include "vtkImageData.h"
 
-vtkCxxRevisionMacro(vtkBranchExtentTranslator, "1.15");
 vtkStandardNewMacro(vtkBranchExtentTranslator);
 
 vtkCxxSetObjectMacro(vtkBranchExtentTranslator,OriginalSource,vtkImageData);
diff --git a/Parallel/vtkBranchExtentTranslator.h b/Parallel/vtkBranchExtentTranslator.h
index 6cf881778f33039392498d2ee7eacf9120bcdcd4..a5699c7e49284610496e0de1e2f92c7cbd631cb1 100644
--- a/Parallel/vtkBranchExtentTranslator.h
+++ b/Parallel/vtkBranchExtentTranslator.h
@@ -36,7 +36,7 @@ class VTK_PARALLEL_EXPORT vtkBranchExtentTranslator : public vtkExtentTranslator
 public:
   static vtkBranchExtentTranslator *New();
 
-  vtkTypeRevisionMacro(vtkBranchExtentTranslator,vtkExtentTranslator);
+  vtkTypeMacro(vtkBranchExtentTranslator,vtkExtentTranslator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCachingInterpolatedVelocityField.cxx b/Parallel/vtkCachingInterpolatedVelocityField.cxx
index df1fa9268665f089d465fdc64243167c180d3dd7..30bc151f77ffd04db6032a3bbdbb3f2fdd7160ee 100644
--- a/Parallel/vtkCachingInterpolatedVelocityField.cxx
+++ b/Parallel/vtkCachingInterpolatedVelocityField.cxx
@@ -35,7 +35,6 @@
  #define Custom_TreeType vtkModifiedBSPTree
 #endif
 //---------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkCachingInterpolatedVelocityField, "1.3");
 vtkStandardNewMacro(vtkCachingInterpolatedVelocityField);
 //---------------------------------------------------------------------------
 const double IVFDataSetInfo::TOLERANCE_SCALE = 1.0E-8;
diff --git a/Parallel/vtkCachingInterpolatedVelocityField.h b/Parallel/vtkCachingInterpolatedVelocityField.h
index ff6cace2fa042ea92d5ba09b4d56a3e01ed3a768..9806906b077f6a05bc8c9804b5caa007cef26703 100644
--- a/Parallel/vtkCachingInterpolatedVelocityField.h
+++ b/Parallel/vtkCachingInterpolatedVelocityField.h
@@ -62,7 +62,7 @@ class IVFCacheList : public vtkstd::vector< IVFDataSetInfo > {};
 class VTK_PARALLEL_EXPORT vtkCachingInterpolatedVelocityField : public vtkFunctionSet
 {
 public:
-  vtkTypeRevisionMacro(vtkCachingInterpolatedVelocityField,vtkFunctionSet);
+  vtkTypeMacro(vtkCachingInterpolatedVelocityField,vtkFunctionSet);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCollectGraph.cxx b/Parallel/vtkCollectGraph.cxx
index a6159fa40e4a0ff54f33b98d3ba68af11c246bac..1ced321db3711b5a035330c0ed37c2706aa4b43d 100644
--- a/Parallel/vtkCollectGraph.cxx
+++ b/Parallel/vtkCollectGraph.cxx
@@ -45,7 +45,6 @@ using vtksys_stl::map;
 using vtksys_stl::pair;
 using vtksys_stl::vector;
 
-vtkCxxRevisionMacro(vtkCollectGraph, "1.7");
 vtkStandardNewMacro(vtkCollectGraph);
 
 vtkCxxSetObjectMacro(vtkCollectGraph,Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkCollectGraph.h b/Parallel/vtkCollectGraph.h
index 3b3bccdede4c9a2ff5524ff252b6f2853df69613..a8339c07cd820112c5a7f48a00e13432983460f7 100644
--- a/Parallel/vtkCollectGraph.h
+++ b/Parallel/vtkCollectGraph.h
@@ -34,7 +34,7 @@ class VTK_PARALLEL_EXPORT vtkCollectGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkCollectGraph *New();
-  vtkTypeRevisionMacro(vtkCollectGraph, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkCollectGraph, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkCollectPolyData.cxx b/Parallel/vtkCollectPolyData.cxx
index ed72ceb7dace002df241cf39038cf74620af2f38..a216a9015d0975cbfa386f6b50f4bda8b2b66bfb 100644
--- a/Parallel/vtkCollectPolyData.cxx
+++ b/Parallel/vtkCollectPolyData.cxx
@@ -25,7 +25,6 @@
 #include "vtkSocketController.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkCollectPolyData, "1.18");
 vtkStandardNewMacro(vtkCollectPolyData);
 
 vtkCxxSetObjectMacro(vtkCollectPolyData,Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkCollectPolyData.h b/Parallel/vtkCollectPolyData.h
index ba4591a8ec4d4033a83cb213d41ce129e5c01d92..c644064bb64e30602f3101276cbc0da33f84449c 100644
--- a/Parallel/vtkCollectPolyData.h
+++ b/Parallel/vtkCollectPolyData.h
@@ -30,7 +30,7 @@ class VTK_PARALLEL_EXPORT vtkCollectPolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkCollectPolyData *New();
-  vtkTypeRevisionMacro(vtkCollectPolyData, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCollectPolyData, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkCollectTable.cxx b/Parallel/vtkCollectTable.cxx
index 5d26586ffa921ff27c104a89c51548d650357b47..f9c61c0760b0d4a4ee5d70ffcc9225a7e7f1620a 100644
--- a/Parallel/vtkCollectTable.cxx
+++ b/Parallel/vtkCollectTable.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkVariant.h"
 
-vtkCxxRevisionMacro(vtkCollectTable, "1.3");
 vtkStandardNewMacro(vtkCollectTable);
 
 vtkCxxSetObjectMacro(vtkCollectTable,Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkCollectTable.h b/Parallel/vtkCollectTable.h
index d99fc210f5d839ad18743b49a94f2b7a84870951..844d45f27ffe9ad0baaeb1ed58edad016b8cb947 100644
--- a/Parallel/vtkCollectTable.h
+++ b/Parallel/vtkCollectTable.h
@@ -34,7 +34,7 @@ class VTK_PARALLEL_EXPORT vtkCollectTable : public vtkTableAlgorithm
 {
 public:
   static vtkCollectTable *New();
-  vtkTypeRevisionMacro(vtkCollectTable, vtkTableAlgorithm);
+  vtkTypeMacro(vtkCollectTable, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkCommunicator.cxx b/Parallel/vtkCommunicator.cxx
index fa3754156a1d7826ebae64cf8914e87e1fdd2516..cb0d88e2d25d8fbe1d2307015cbee9114dc6873a 100644
--- a/Parallel/vtkCommunicator.cxx
+++ b/Parallel/vtkCommunicator.cxx
@@ -47,7 +47,6 @@
 
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkCommunicator, "1.61");
 
 #define EXTENT_HEADER_SIZE      128
 
diff --git a/Parallel/vtkCommunicator.h b/Parallel/vtkCommunicator.h
index cf4eb69d07c124c3eb04bd82e9ee79a112c47176..cac595ea00f75fde656e781909a46848822e6a01 100644
--- a/Parallel/vtkCommunicator.h
+++ b/Parallel/vtkCommunicator.h
@@ -46,7 +46,7 @@ class VTK_PARALLEL_EXPORT vtkCommunicator : public vtkObject
 
 public:
 
-  vtkTypeRevisionMacro(vtkCommunicator, vtkObject);
+  vtkTypeMacro(vtkCommunicator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCompositeRGBAPass.cxx b/Parallel/vtkCompositeRGBAPass.cxx
index dc3eecc6236542352b8bc448c0ca3b8bae8b18b4..c3630b7fe35eab2e3703911757b5aa29fc3e4219 100644
--- a/Parallel/vtkCompositeRGBAPass.cxx
+++ b/Parallel/vtkCompositeRGBAPass.cxx
@@ -54,7 +54,6 @@
 #include <sys/types.h> // Linux specific gettid()
 #endif
 
-vtkCxxRevisionMacro(vtkCompositeRGBAPass, "1.8");
 vtkStandardNewMacro(vtkCompositeRGBAPass);
 vtkCxxSetObjectMacro(vtkCompositeRGBAPass,Controller,vtkMultiProcessController);
 vtkCxxSetObjectMacro(vtkCompositeRGBAPass,Kdtree,vtkPKdTree);
diff --git a/Parallel/vtkCompositeRGBAPass.h b/Parallel/vtkCompositeRGBAPass.h
index 0e14e4e403574816950049e1a39c0178d240f3d6..92f972a4cf2ecf502134a4b6091248db08d4f51c 100644
--- a/Parallel/vtkCompositeRGBAPass.h
+++ b/Parallel/vtkCompositeRGBAPass.h
@@ -41,7 +41,7 @@ class VTK_PARALLEL_EXPORT vtkCompositeRGBAPass : public vtkRenderPass
 {
 public:
   static vtkCompositeRGBAPass *New();
-  vtkTypeRevisionMacro(vtkCompositeRGBAPass,vtkRenderPass);
+  vtkTypeMacro(vtkCompositeRGBAPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCompositeRenderManager.cxx b/Parallel/vtkCompositeRenderManager.cxx
index 0ded0f851c8a8bbdcfb60d90e7a008f59153b2ce..12c2c89ccd6996523505275dcfbbf03d9313dd8b 100644
--- a/Parallel/vtkCompositeRenderManager.cxx
+++ b/Parallel/vtkCompositeRenderManager.cxx
@@ -23,7 +23,6 @@
 #include "vtkTimerLog.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkCompositeRenderManager, "1.11");
 vtkStandardNewMacro(vtkCompositeRenderManager);
 
 vtkCxxSetObjectMacro(vtkCompositeRenderManager, Compositer, vtkCompositer);
diff --git a/Parallel/vtkCompositeRenderManager.h b/Parallel/vtkCompositeRenderManager.h
index 16349d7ee9a70fa2939c38c0a4435416872300cd..a29f9ca3740f5364ba17c3876c6b6e81d37352dd 100644
--- a/Parallel/vtkCompositeRenderManager.h
+++ b/Parallel/vtkCompositeRenderManager.h
@@ -32,7 +32,7 @@ class vtkFloatArray;
 class VTK_PARALLEL_EXPORT vtkCompositeRenderManager : public vtkParallelRenderManager
 {
 public:
-  vtkTypeRevisionMacro(vtkCompositeRenderManager, vtkParallelRenderManager);
+  vtkTypeMacro(vtkCompositeRenderManager, vtkParallelRenderManager);
   static vtkCompositeRenderManager *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkCompositeZPass.cxx b/Parallel/vtkCompositeZPass.cxx
index 0f80ebcf5b98fd73b40a5a00418aac3b701586b6..8dde711fed80162f506198cef11d49c2d2960f68 100644
--- a/Parallel/vtkCompositeZPass.cxx
+++ b/Parallel/vtkCompositeZPass.cxx
@@ -51,7 +51,6 @@
 #include <sys/types.h> // Linux specific gettid()
 #endif
 
-vtkCxxRevisionMacro(vtkCompositeZPass, "1.7");
 vtkStandardNewMacro(vtkCompositeZPass);
 vtkCxxSetObjectMacro(vtkCompositeZPass,Controller,vtkMultiProcessController);
 
diff --git a/Parallel/vtkCompositeZPass.h b/Parallel/vtkCompositeZPass.h
index e7067760c341ab111a87600f09ee43ad00d88b3b..8be4941969cd9cdc80b389b5e32449167d04aec1 100644
--- a/Parallel/vtkCompositeZPass.h
+++ b/Parallel/vtkCompositeZPass.h
@@ -41,7 +41,7 @@ class VTK_PARALLEL_EXPORT vtkCompositeZPass : public vtkRenderPass
 {
 public:
   static vtkCompositeZPass *New();
-  vtkTypeRevisionMacro(vtkCompositeZPass,vtkRenderPass);
+  vtkTypeMacro(vtkCompositeZPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCompositer.cxx b/Parallel/vtkCompositer.cxx
index c1b117539e10c64b640ae5a2f23e9a83a0e6cefb..67d4645b727a0068b65be51559376545da3a749d 100644
--- a/Parallel/vtkCompositer.cxx
+++ b/Parallel/vtkCompositer.cxx
@@ -25,7 +25,6 @@
  #include <mpi.h>
 #endif
 
-vtkCxxRevisionMacro(vtkCompositer, "1.10");
 vtkStandardNewMacro(vtkCompositer);
 
 //-------------------------------------------------------------------------
diff --git a/Parallel/vtkCompositer.h b/Parallel/vtkCompositer.h
index fc2028e24b45fe1d51d6d5939ebf0a511452a3d6..e7e38eeca8e8bab5de9b56c9a438b582f6b0160e 100644
--- a/Parallel/vtkCompositer.h
+++ b/Parallel/vtkCompositer.h
@@ -38,7 +38,7 @@ class VTK_PARALLEL_EXPORT vtkCompositer : public vtkObject
 {
 public:
   static vtkCompositer *New();
-  vtkTypeRevisionMacro(vtkCompositer,vtkObject);
+  vtkTypeMacro(vtkCompositer,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkCompressCompositer.cxx b/Parallel/vtkCompressCompositer.cxx
index e99bda0c06df0d82d3c189acded3e7680c715363..da760f9ce22928f9eaa4d5fdde1353c0e48020da 100644
--- a/Parallel/vtkCompressCompositer.cxx
+++ b/Parallel/vtkCompressCompositer.cxx
@@ -52,7 +52,6 @@
 
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkCompressCompositer, "1.14");
 vtkStandardNewMacro(vtkCompressCompositer);
 
 
diff --git a/Parallel/vtkCompressCompositer.h b/Parallel/vtkCompressCompositer.h
index fcc82727c3b511a9443491a558980e6da8110c07..b2c02cda729eceaefaa48ea1eee21bf7fb0e1868 100644
--- a/Parallel/vtkCompressCompositer.h
+++ b/Parallel/vtkCompressCompositer.h
@@ -37,7 +37,7 @@ class VTK_PARALLEL_EXPORT vtkCompressCompositer : public vtkCompositer
 {
 public:
   static vtkCompressCompositer *New();
-  vtkTypeRevisionMacro(vtkCompressCompositer,vtkCompositer);
+  vtkTypeMacro(vtkCompressCompositer,vtkCompositer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void CompositeBuffer(vtkDataArray *pBuf, vtkFloatArray *zBuf,
diff --git a/Parallel/vtkCutMaterial.cxx b/Parallel/vtkCutMaterial.cxx
index ee2a140c0c636e248c62ec0913cf62b37aa46929..4eeedd53148fb0c07fb39819163610af7c714c60 100644
--- a/Parallel/vtkCutMaterial.cxx
+++ b/Parallel/vtkCutMaterial.cxx
@@ -27,7 +27,6 @@
 #include "vtkThreshold.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkCutMaterial, "1.19");
 vtkStandardNewMacro(vtkCutMaterial);
 
 // Instantiate object with no input and no defined output.
diff --git a/Parallel/vtkCutMaterial.h b/Parallel/vtkCutMaterial.h
index 30dafd4c1cc84c8b171f213801d75803d4513d21..46cc601b9228399dde17de87279c8859853d5946 100644
--- a/Parallel/vtkCutMaterial.h
+++ b/Parallel/vtkCutMaterial.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkCutMaterial : public vtkPolyDataAlgorithm
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkCutMaterial,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkCutMaterial,vtkPolyDataAlgorithm);
   static vtkCutMaterial *New();
 
   // Description:
diff --git a/Parallel/vtkDistributedDataFilter.cxx b/Parallel/vtkDistributedDataFilter.cxx
index 14fdaebe252e68fed237c373ce57446fb80743b0..956256e5ff6dd43daa62525128a7b5f83d2b05ba 100644
--- a/Parallel/vtkDistributedDataFilter.cxx
+++ b/Parallel/vtkDistributedDataFilter.cxx
@@ -60,7 +60,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkDistributedDataFilter, "1.55")
 
 vtkStandardNewMacro(vtkDistributedDataFilter)
 
diff --git a/Parallel/vtkDistributedDataFilter.h b/Parallel/vtkDistributedDataFilter.h
index 71f1da2e8a82eeb4dca4a2f85a96a9effae61cf9..49d2fb2e92bde6354e3a036e4b10ba32a28079f0 100644
--- a/Parallel/vtkDistributedDataFilter.h
+++ b/Parallel/vtkDistributedDataFilter.h
@@ -102,7 +102,7 @@ class vtkUnstructuredGrid;
 
 class VTK_PARALLEL_EXPORT vtkDistributedDataFilter: public vtkDataObjectAlgorithm
 {
-  vtkTypeRevisionMacro(vtkDistributedDataFilter, 
+  vtkTypeMacro(vtkDistributedDataFilter,
     vtkDataObjectAlgorithm);
 
 public:
diff --git a/Parallel/vtkDistributedStreamTracer.cxx b/Parallel/vtkDistributedStreamTracer.cxx
index b077dc87a3cf18fa490dc3820c1780b3a9953ac0..c5d063507674cba5c8b8a1e2ce4718324299e5cf 100644
--- a/Parallel/vtkDistributedStreamTracer.cxx
+++ b/Parallel/vtkDistributedStreamTracer.cxx
@@ -31,7 +31,6 @@
 #include "vtkRungeKutta2.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkDistributedStreamTracer, "1.12");
 vtkStandardNewMacro(vtkDistributedStreamTracer);
 
 vtkDistributedStreamTracer::vtkDistributedStreamTracer()
diff --git a/Parallel/vtkDistributedStreamTracer.h b/Parallel/vtkDistributedStreamTracer.h
index 5007ecb899ac29bf544b4a37e18330bc23ca95bd..e26a30146168376bb81eb2724783506bdb5a36bc 100644
--- a/Parallel/vtkDistributedStreamTracer.h
+++ b/Parallel/vtkDistributedStreamTracer.h
@@ -30,7 +30,7 @@
 class VTK_PARALLEL_EXPORT vtkDistributedStreamTracer : public vtkPStreamTracer
 {
 public:
-  vtkTypeRevisionMacro(vtkDistributedStreamTracer,vtkPStreamTracer);
+  vtkTypeMacro(vtkDistributedStreamTracer,vtkPStreamTracer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkDistributedStreamTracer *New();
diff --git a/Parallel/vtkDummyCommunicator.cxx b/Parallel/vtkDummyCommunicator.cxx
index 88f766ac56751414c7656f0fcb78a1789b9d85bc..2eb5535057a831eb5b7d0740f39471ccb7620a40 100644
--- a/Parallel/vtkDummyCommunicator.cxx
+++ b/Parallel/vtkDummyCommunicator.cxx
@@ -16,7 +16,6 @@
 #include "vtkDummyCommunicator.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDummyCommunicator, "1.1");
 vtkStandardNewMacro(vtkDummyCommunicator);
 
 //-----------------------------------------------------------------------------
diff --git a/Parallel/vtkDummyCommunicator.h b/Parallel/vtkDummyCommunicator.h
index b50c83d4e10beef83f7f511ca5d5ff4277d30727..64dc16dbc8c3d57d22dc6b9286fbe592ed1f6a5e 100644
--- a/Parallel/vtkDummyCommunicator.h
+++ b/Parallel/vtkDummyCommunicator.h
@@ -30,7 +30,7 @@
 class VTK_PARALLEL_EXPORT vtkDummyCommunicator : public vtkCommunicator
 {
 public:
-  vtkTypeRevisionMacro(vtkDummyCommunicator, vtkCommunicator);
+  vtkTypeMacro(vtkDummyCommunicator, vtkCommunicator);
   static vtkDummyCommunicator *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkDummyController.cxx b/Parallel/vtkDummyController.cxx
index cf8722c10ff65d4205a683570a5703a3936aa6e3..6f3b1e1d375a4d9bfa9fff4ed66035197b12cc7f 100644
--- a/Parallel/vtkDummyController.cxx
+++ b/Parallel/vtkDummyController.cxx
@@ -16,7 +16,6 @@
 #include "vtkDummyController.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkDummyController, "1.7");
 vtkStandardNewMacro(vtkDummyController);
 
 vtkCxxSetObjectMacro(vtkDummyController, Communicator, vtkCommunicator);
diff --git a/Parallel/vtkDummyController.h b/Parallel/vtkDummyController.h
index 8b5b7df1df60f7f1a4b03cc05ee1316565b15567..2a8b515715f2f83f5cfe373ce79aaaf4faa9d029 100644
--- a/Parallel/vtkDummyController.h
+++ b/Parallel/vtkDummyController.h
@@ -29,7 +29,7 @@ class VTK_PARALLEL_EXPORT vtkDummyController : public vtkMultiProcessController
 {
 public:
   static vtkDummyController *New();
-  vtkTypeRevisionMacro(vtkDummyController,vtkMultiProcessController);
+  vtkTypeMacro(vtkDummyController,vtkMultiProcessController);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkDuplicatePolyData.cxx b/Parallel/vtkDuplicatePolyData.cxx
index 94620a1e624fb97b82e2273849ebabf39ecb7b2f..fb201a238fc23e0653454007ab01d135faef39cd 100644
--- a/Parallel/vtkDuplicatePolyData.cxx
+++ b/Parallel/vtkDuplicatePolyData.cxx
@@ -25,7 +25,6 @@
 #include "vtkSocketController.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkDuplicatePolyData, "1.5");
 vtkStandardNewMacro(vtkDuplicatePolyData);
 
 vtkCxxSetObjectMacro(vtkDuplicatePolyData,Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkDuplicatePolyData.h b/Parallel/vtkDuplicatePolyData.h
index ebcdf8ba5dafa84c743042449e2a6156f8936a95..a302723c98334b1e3038168c4800c046addd43a9 100644
--- a/Parallel/vtkDuplicatePolyData.h
+++ b/Parallel/vtkDuplicatePolyData.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkDuplicatePolyData : public vtkPolyDataAlgorithm
 {
 public:
   static vtkDuplicatePolyData *New();
-  vtkTypeRevisionMacro(vtkDuplicatePolyData, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDuplicatePolyData, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkEnSightWriter.cxx b/Parallel/vtkEnSightWriter.cxx
index fa7f846c0d52ab6f673ad770894ce02c2be72fe6..35ef22dbcaa945c6080682e4756eb5e73037951e 100644
--- a/Parallel/vtkEnSightWriter.cxx
+++ b/Parallel/vtkEnSightWriter.cxx
@@ -86,7 +86,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkEnSightWriter);
-vtkCxxRevisionMacro(vtkEnSightWriter, "1.7");
 
 vtkCxxSetObjectMacro(vtkEnSightWriter, ModelMetadata, vtkModelMetadata);
 
diff --git a/Parallel/vtkEnSightWriter.h b/Parallel/vtkEnSightWriter.h
index 616dbce98cc56113249c21b53b2fbb521f43d5a1..3c4816cfe7e68e190c0da1ffc25d53d16c1d115c 100644
--- a/Parallel/vtkEnSightWriter.h
+++ b/Parallel/vtkEnSightWriter.h
@@ -39,7 +39,7 @@ class VTK_PARALLEL_EXPORT vtkEnSightWriter : public vtkWriter
 {
 
 public:
-  vtkTypeRevisionMacro(vtkEnSightWriter,vtkWriter);
+  vtkTypeMacro(vtkEnSightWriter,vtkWriter);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkExodusIIWriter.cxx b/Parallel/vtkExodusIIWriter.cxx
index f78ff657959347f0f3a2448213a961a814660192..651f6a4b5c917ab6ce9315dcbeca79eb7649815f 100644
--- a/Parallel/vtkExodusIIWriter.cxx
+++ b/Parallel/vtkExodusIIWriter.cxx
@@ -48,7 +48,6 @@
 #include <time.h>
 #include <ctype.h>
 
-vtkCxxRevisionMacro (vtkExodusIIWriter, "1.44");
 vtkStandardNewMacro (vtkExodusIIWriter);
 vtkCxxSetObjectMacro (vtkExodusIIWriter, ModelMetadata, vtkModelMetadata);
 
diff --git a/Parallel/vtkExodusIIWriter.h b/Parallel/vtkExodusIIWriter.h
index 923abd30aa8409d6f112599739f29c0ac96ea3c6..8078f8452e9ecefafa164087f7525db37c42ad00 100644
--- a/Parallel/vtkExodusIIWriter.h
+++ b/Parallel/vtkExodusIIWriter.h
@@ -80,7 +80,7 @@ class VTK_PARALLEL_EXPORT vtkExodusIIWriter : public vtkWriter
 {
 public:
   static vtkExodusIIWriter *New ();
-  vtkTypeRevisionMacro (vtkExodusIIWriter, vtkWriter);
+  vtkTypeMacro(vtkExodusIIWriter,vtkWriter);
   void PrintSelf (ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkExtractCTHPart.cxx b/Parallel/vtkExtractCTHPart.cxx
index 37d1a3ffcd7d24e044e3674e50a184c61f8b110c..9481ffcddacbbb96add8c74446c0b7b271b873ac 100644
--- a/Parallel/vtkExtractCTHPart.cxx
+++ b/Parallel/vtkExtractCTHPart.cxx
@@ -50,7 +50,6 @@
 #include <vtkstd/vector>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkExtractCTHPart, "1.29");
 vtkStandardNewMacro(vtkExtractCTHPart);
 vtkCxxSetObjectMacro(vtkExtractCTHPart,ClipPlane,vtkPlane);
 vtkCxxSetObjectMacro(vtkExtractCTHPart,Controller,vtkMultiProcessController);
diff --git a/Parallel/vtkExtractCTHPart.h b/Parallel/vtkExtractCTHPart.h
index 22ec7bb199f68ff6924a9620a9192a6e7fffe154..0fe919968992a10f50ec14d26c516a2b90409693 100644
--- a/Parallel/vtkExtractCTHPart.h
+++ b/Parallel/vtkExtractCTHPart.h
@@ -50,7 +50,7 @@ class vtkUnsignedCharArray;
 class VTK_PARALLEL_EXPORT vtkExtractCTHPart : public vtkMultiBlockDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractCTHPart,vtkMultiBlockDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractCTHPart,vtkMultiBlockDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkExtractPiece.cxx b/Parallel/vtkExtractPiece.cxx
index f0f47cf186502223bc6349dfc3cf68a8183a2568..8aa7c9ae948642ba7d8bac70cba8261940f1c749 100644
--- a/Parallel/vtkExtractPiece.cxx
+++ b/Parallel/vtkExtractPiece.cxx
@@ -32,7 +32,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractPiece, "1.3");
 vtkStandardNewMacro(vtkExtractPiece);
 
 //=============================================================================
diff --git a/Parallel/vtkExtractPiece.h b/Parallel/vtkExtractPiece.h
index b6a6f78d927dac26de400ff8b81fd33d8eca6ba4..19ac39c6021c3fcb6345499e50a579edca5e150b 100644
--- a/Parallel/vtkExtractPiece.h
+++ b/Parallel/vtkExtractPiece.h
@@ -36,7 +36,7 @@ class VTK_PARALLEL_EXPORT vtkExtractPiece : public vtkCompositeDataSetAlgorithm
 {
 public:
   static vtkExtractPiece* New();
-  vtkTypeRevisionMacro(vtkExtractPiece, vtkCompositeDataSetAlgorithm);
+  vtkTypeMacro(vtkExtractPiece, vtkCompositeDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/Parallel/vtkExtractPolyDataPiece.cxx b/Parallel/vtkExtractPolyDataPiece.cxx
index 8aade89bc0ff3229fa8b284f23f5d7622e88f538..4d50fa5750623c1045e1d851509aacddd3576163 100644
--- a/Parallel/vtkExtractPolyDataPiece.cxx
+++ b/Parallel/vtkExtractPolyDataPiece.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkExtractPolyDataPiece, "1.21");
 vtkStandardNewMacro(vtkExtractPolyDataPiece);
 
 //=============================================================================
diff --git a/Parallel/vtkExtractPolyDataPiece.h b/Parallel/vtkExtractPolyDataPiece.h
index e6fc42e9c08f31415a405dd82ca55906f540c991..69599d97d411ff9af1b8ac8ca929d4c4b125f3f6 100644
--- a/Parallel/vtkExtractPolyDataPiece.h
+++ b/Parallel/vtkExtractPolyDataPiece.h
@@ -27,7 +27,7 @@ class VTK_PARALLEL_EXPORT vtkExtractPolyDataPiece : public vtkPolyDataAlgorithm
 {
 public:
   static vtkExtractPolyDataPiece *New();
-  vtkTypeRevisionMacro(vtkExtractPolyDataPiece, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkExtractPolyDataPiece, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkExtractUnstructuredGridPiece.cxx b/Parallel/vtkExtractUnstructuredGridPiece.cxx
index 9bf28302c13b3a864d65d92c9c777f5dc11f4333..aab1bcedf4fa708bb98ab95c332151dc9da40856 100644
--- a/Parallel/vtkExtractUnstructuredGridPiece.cxx
+++ b/Parallel/vtkExtractUnstructuredGridPiece.cxx
@@ -28,7 +28,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkExtractUnstructuredGridPiece, "1.20");
 vtkStandardNewMacro(vtkExtractUnstructuredGridPiece);
 
 vtkExtractUnstructuredGridPiece::vtkExtractUnstructuredGridPiece()
diff --git a/Parallel/vtkExtractUnstructuredGridPiece.h b/Parallel/vtkExtractUnstructuredGridPiece.h
index 821914a5a464e5f713675e076dbfde267371b3b6..d8258afa8ed3b8d1e07124463fc9c1e7f060f9c5 100644
--- a/Parallel/vtkExtractUnstructuredGridPiece.h
+++ b/Parallel/vtkExtractUnstructuredGridPiece.h
@@ -27,7 +27,7 @@ class VTK_PARALLEL_EXPORT vtkExtractUnstructuredGridPiece : public vtkUnstructur
 {
 public:
   static vtkExtractUnstructuredGridPiece *New();
-  vtkTypeRevisionMacro(vtkExtractUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkExtractUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkExtractUserDefinedPiece.cxx b/Parallel/vtkExtractUserDefinedPiece.cxx
index 77cdc8640cedfcb7ce2fc0b3fa2bac9b8d11b7ab..3644aed4f5029568abeec9a28a89f84b88fcb284 100644
--- a/Parallel/vtkExtractUserDefinedPiece.cxx
+++ b/Parallel/vtkExtractUserDefinedPiece.cxx
@@ -32,7 +32,6 @@
 #include "vtkInformationVector.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkExtractUserDefinedPiece, "1.5");
 vtkStandardNewMacro(vtkExtractUserDefinedPiece);
 
 vtkExtractUserDefinedPiece::vtkExtractUserDefinedPiece()
diff --git a/Parallel/vtkExtractUserDefinedPiece.h b/Parallel/vtkExtractUserDefinedPiece.h
index 5894536dbf604e9da5adfd1bcbd23b563a14682c..805121ce031829872a82dcb262ea2c01eedc450e 100644
--- a/Parallel/vtkExtractUserDefinedPiece.h
+++ b/Parallel/vtkExtractUserDefinedPiece.h
@@ -38,7 +38,7 @@
 class VTK_PARALLEL_EXPORT vtkExtractUserDefinedPiece : public vtkExtractUnstructuredGridPiece
 {
 public:
-  vtkTypeRevisionMacro(vtkExtractUserDefinedPiece, vtkExtractUnstructuredGridPiece);
+  vtkTypeMacro(vtkExtractUserDefinedPiece, vtkExtractUnstructuredGridPiece);
   static vtkExtractUserDefinedPiece *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Parallel/vtkImageRenderManager.cxx b/Parallel/vtkImageRenderManager.cxx
index 308d12ca10e8d2dee13586aa2cbbab63c5b4037d..89f1f64c30f18d0758f24ff22e989d3faa3d6162 100644
--- a/Parallel/vtkImageRenderManager.cxx
+++ b/Parallel/vtkImageRenderManager.cxx
@@ -22,7 +22,6 @@
 #include "vtkTimerLog.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkImageRenderManager, "1.1");
 vtkStandardNewMacro(vtkImageRenderManager);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkImageRenderManager.h b/Parallel/vtkImageRenderManager.h
index a304c26c6466cf9157b8524fd382e706ba507c42..e97ed6c2061f9b779a5e4095c2be74e8aed04d52 100644
--- a/Parallel/vtkImageRenderManager.h
+++ b/Parallel/vtkImageRenderManager.h
@@ -32,7 +32,7 @@
 class VTK_PARALLEL_EXPORT vtkImageRenderManager : public vtkParallelRenderManager
 {
 public:
-  vtkTypeRevisionMacro(vtkImageRenderManager, vtkParallelRenderManager);
+  vtkTypeMacro(vtkImageRenderManager, vtkParallelRenderManager);
   static vtkImageRenderManager *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkMPICommunicator.cxx b/Parallel/vtkMPICommunicator.cxx
index 7a53a274fd675f4e246adafb40666cbca20883c6..2c6b2529379fdbf0a15574246b96358241a9af2c 100644
--- a/Parallel/vtkMPICommunicator.cxx
+++ b/Parallel/vtkMPICommunicator.cxx
@@ -30,7 +30,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkMPICommunicator, "1.58");
 vtkStandardNewMacro(vtkMPICommunicator);
 
 vtkMPICommunicator* vtkMPICommunicator::WorldCommunicator = 0;
diff --git a/Parallel/vtkMPICommunicator.h b/Parallel/vtkMPICommunicator.h
index 0a35848c64724bd3741c363761126ca39c56bdda..f372f4ddc074d98737dbe979e62761c6b21b89cd 100644
--- a/Parallel/vtkMPICommunicator.h
+++ b/Parallel/vtkMPICommunicator.h
@@ -62,7 +62,7 @@ public:
 
 //ETX
 
-  vtkTypeRevisionMacro( vtkMPICommunicator,vtkCommunicator);
+  vtkTypeMacro( vtkMPICommunicator,vtkCommunicator);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkMPIController.cxx b/Parallel/vtkMPIController.cxx
index 832f892e9490a91cabc2d73a541dd961b09e162c..ccc64293b78fff63522ed085c514e8d32a3231c2 100644
--- a/Parallel/vtkMPIController.cxx
+++ b/Parallel/vtkMPIController.cxx
@@ -32,7 +32,7 @@ int vtkMPIController::UseSsendForRMI = 0;
 class VTK_PARALLEL_EXPORT vtkMPIOutputWindow : public vtkOutputWindow
 {
 public:
-  vtkTypeRevisionMacro(vtkMPIOutputWindow,vtkOutputWindow);
+  vtkTypeMacro(vtkMPIOutputWindow,vtkOutputWindow);
 
   void DisplayText(const char* t)
     {
@@ -70,9 +70,7 @@ void vtkMPIController::CreateOutputWindow()
   vtkOutputWindow::SetInstance(this->OutputWindow);
 }
 
-vtkCxxRevisionMacro(vtkMPIOutputWindow, "1.29");
 
-vtkCxxRevisionMacro(vtkMPIController, "1.29");
 vtkStandardNewMacro(vtkMPIController);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkMPIController.h b/Parallel/vtkMPIController.h
index a3e138a22af100c23325b3f47e1ec0298ec412aa..28e7426c65376862b42b5d9fdf8c23d8b5cd144f 100644
--- a/Parallel/vtkMPIController.h
+++ b/Parallel/vtkMPIController.h
@@ -52,7 +52,7 @@ class VTK_PARALLEL_EXPORT vtkMPIController : public vtkMultiProcessController
 public:
 
   static vtkMPIController *New();
-  vtkTypeRevisionMacro(vtkMPIController,vtkMultiProcessController);
+  vtkTypeMacro(vtkMPIController,vtkMultiProcessController);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkMPIEventLog.cxx b/Parallel/vtkMPIEventLog.cxx
index 56f205cf45472db047803ab01c361c8e7853ebd4..4375fe45e5886b109a5d8100e84e96531796967f 100644
--- a/Parallel/vtkMPIEventLog.cxx
+++ b/Parallel/vtkMPIEventLog.cxx
@@ -21,7 +21,6 @@
 
 int vtkMPIEventLog::LastEventId = 0;
 
-vtkCxxRevisionMacro(vtkMPIEventLog, "1.8");
 vtkStandardNewMacro(vtkMPIEventLog);
 
 void vtkMPIEventLog::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Parallel/vtkMPIEventLog.h b/Parallel/vtkMPIEventLog.h
index faf6c5f27f0854d9a24d06219656bf7d5feaddef..882e9c5e6afede7827b99109a19038342d481cb9 100644
--- a/Parallel/vtkMPIEventLog.h
+++ b/Parallel/vtkMPIEventLog.h
@@ -35,7 +35,7 @@
 class VTK_PARALLEL_EXPORT vtkMPIEventLog : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkMPIEventLog,vtkObject);
+  vtkTypeMacro(vtkMPIEventLog,vtkObject);
   
   // Description:
   // Construct a vtkMPIEventLog with the following initial state:
diff --git a/Parallel/vtkMPIGroup.cxx b/Parallel/vtkMPIGroup.cxx
index e66c6d9f93b09537770bcfbdffc2ac07528cb520..830417f3967044ffc166eafa943c946ed24bc6fc 100644
--- a/Parallel/vtkMPIGroup.cxx
+++ b/Parallel/vtkMPIGroup.cxx
@@ -20,7 +20,6 @@
 
 #ifndef VTK_REMOVE_LEGACY_CODE
 
-vtkCxxRevisionMacro(vtkMPIGroup, "1.6");
 vtkStandardNewMacro(vtkMPIGroup);
 
 void vtkMPIGroup::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Parallel/vtkMPIGroup.h b/Parallel/vtkMPIGroup.h
index 3df3d8e6c10bf998984e0e7a8b131733a054ffb8..ffe2e863eee1eeee65da9f757d24981304c33eab 100644
--- a/Parallel/vtkMPIGroup.h
+++ b/Parallel/vtkMPIGroup.h
@@ -35,7 +35,7 @@ class VTK_PARALLEL_EXPORT vtkMPIGroup : public vtkObject
 
 public:
 
-  vtkTypeRevisionMacro( vtkMPIGroup,vtkObject);
+  vtkTypeMacro( vtkMPIGroup,vtkObject);
   
   // Description:
   // Construct a vtkMPIGroup with the following initial state:
diff --git a/Parallel/vtkMPIImageReader.cxx b/Parallel/vtkMPIImageReader.cxx
index 437c868b5fcf37dd395a46e9f7bdf7826419b950..414dd6b9e1e3ed02e7acedac79c3a74a7e5e2e26 100644
--- a/Parallel/vtkMPIImageReader.cxx
+++ b/Parallel/vtkMPIImageReader.cxx
@@ -77,7 +77,6 @@
 #endif // VTK_USE_MPI_IO
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkMPIImageReader, "1.2");
 vtkStandardNewMacro(vtkMPIImageReader);
 
 vtkCxxSetObjectMacro(vtkMPIImageReader, Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkMPIImageReader.h b/Parallel/vtkMPIImageReader.h
index 22f1c1a3ef51352b447d176256de5b68b8259bc4..54512ca50024ccc1bbf2c7de47557cebe4224395 100644
--- a/Parallel/vtkMPIImageReader.h
+++ b/Parallel/vtkMPIImageReader.h
@@ -54,7 +54,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkMPIImageReader : public vtkImageReader
 {
 public:
-  vtkTypeRevisionMacro(vtkMPIImageReader, vtkImageReader);
+  vtkTypeMacro(vtkMPIImageReader, vtkImageReader);
   static vtkMPIImageReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkMemoryLimitImageDataStreamer.cxx b/Parallel/vtkMemoryLimitImageDataStreamer.cxx
index 32da0f9123c27e0dc5ec6498e69360750abf5430..2bf05c0e17e5e88307d4d721108cc6c3b92d9068 100644
--- a/Parallel/vtkMemoryLimitImageDataStreamer.cxx
+++ b/Parallel/vtkMemoryLimitImageDataStreamer.cxx
@@ -24,7 +24,6 @@
 #include "vtkPipelineSize.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkMemoryLimitImageDataStreamer, "1.12");
 vtkStandardNewMacro(vtkMemoryLimitImageDataStreamer);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkMemoryLimitImageDataStreamer.h b/Parallel/vtkMemoryLimitImageDataStreamer.h
index 607a30e9c13b057aa219f491dec4b4a57eb9d818..37c8969edf9870e6fd29cb2b8eb24d06920e18e2 100644
--- a/Parallel/vtkMemoryLimitImageDataStreamer.h
+++ b/Parallel/vtkMemoryLimitImageDataStreamer.h
@@ -28,7 +28,7 @@ class VTK_PARALLEL_EXPORT vtkMemoryLimitImageDataStreamer : public vtkImageDataS
 {
 public:
   static vtkMemoryLimitImageDataStreamer *New();
-  vtkTypeRevisionMacro(vtkMemoryLimitImageDataStreamer,vtkImageDataStreamer);
+  vtkTypeMacro(vtkMemoryLimitImageDataStreamer,vtkImageDataStreamer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkMultiProcessController.cxx b/Parallel/vtkMultiProcessController.cxx
index 2764e3fb7f7447140206ecb9c29558abc15148de..f3e196da4f47df19c923bd4d295db5c3c44f1c28 100644
--- a/Parallel/vtkMultiProcessController.cxx
+++ b/Parallel/vtkMultiProcessController.cxx
@@ -58,7 +58,7 @@ class VTK_PARALLEL_EXPORT vtkMultiProcessControllerRMI : public vtkObject
 {
 public:
   static vtkMultiProcessControllerRMI *New(); 
-  vtkTypeRevisionMacro(vtkMultiProcessControllerRMI, vtkObject);
+  vtkTypeMacro(vtkMultiProcessControllerRMI, vtkObject);
   
   int Tag;
   vtkRMIFunctionType Function;
@@ -72,10 +72,8 @@ protected:
   void operator=(const vtkMultiProcessControllerRMI&);
 };
 
-vtkCxxRevisionMacro(vtkMultiProcessControllerRMI, "1.39");
 vtkStandardNewMacro(vtkMultiProcessControllerRMI);
 
-vtkCxxRevisionMacro(vtkMultiProcessController, "1.39");
 
 //----------------------------------------------------------------------------
 // An RMI function that will break the "ProcessRMIs" loop.
diff --git a/Parallel/vtkMultiProcessController.h b/Parallel/vtkMultiProcessController.h
index 67de53704575b6274f43844535db97efbc562f42..3c95ecfd218012996541c33ff9f2b91ad93c2bf3 100644
--- a/Parallel/vtkMultiProcessController.h
+++ b/Parallel/vtkMultiProcessController.h
@@ -61,7 +61,7 @@ typedef void (*vtkRMIFunctionType)(void *localArg,
 class VTK_PARALLEL_EXPORT vtkMultiProcessController : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkMultiProcessController,vtkObject);
+  vtkTypeMacro(vtkMultiProcessController,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPBGLBreadthFirstSearch.cxx b/Parallel/vtkPBGLBreadthFirstSearch.cxx
index 24c26c26d8cc3a850c6c48f00f7b9d7aca32fb1d..82f84e305b873539b2b6ebae6720a44a937e224d 100644
--- a/Parallel/vtkPBGLBreadthFirstSearch.cxx
+++ b/Parallel/vtkPBGLBreadthFirstSearch.cxx
@@ -59,7 +59,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLBreadthFirstSearch, "1.5");
 vtkStandardNewMacro(vtkPBGLBreadthFirstSearch);
 
 // Redefine the bfs visitor, the only visitor we
diff --git a/Parallel/vtkPBGLBreadthFirstSearch.h b/Parallel/vtkPBGLBreadthFirstSearch.h
index 2948449dd79a3bc56f8cc585e4f816fa4edb3524..5835de8fb3a4967e8c142f2d48ce5a63fe1fe2d4 100644
--- a/Parallel/vtkPBGLBreadthFirstSearch.h
+++ b/Parallel/vtkPBGLBreadthFirstSearch.h
@@ -43,7 +43,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLBreadthFirstSearch : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLBreadthFirstSearch *New();
-  vtkTypeRevisionMacro(vtkPBGLBreadthFirstSearch, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLBreadthFirstSearch, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPBGLCollapseGraph.cxx b/Parallel/vtkPBGLCollapseGraph.cxx
index 52c975affbd7517c58bad8358034416f3977e77d..8d7bef163d173b9745fb1e3a7958fbdbacfe381c 100644
--- a/Parallel/vtkPBGLCollapseGraph.cxx
+++ b/Parallel/vtkPBGLCollapseGraph.cxx
@@ -37,7 +37,6 @@
 
 #include <boost/graph/use_mpi.hpp>   // must precede all pbgl includes
 
-vtkCxxRevisionMacro(vtkPBGLCollapseGraph, "1.5");
 vtkStandardNewMacro(vtkPBGLCollapseGraph);
 
 vtkPBGLCollapseGraph::vtkPBGLCollapseGraph()
diff --git a/Parallel/vtkPBGLCollapseGraph.h b/Parallel/vtkPBGLCollapseGraph.h
index 0b7ab9a63437da8623a2e784d38423bcc8139680..9c5f948ad15076f0f8333ad4c95d274794c1ceff 100644
--- a/Parallel/vtkPBGLCollapseGraph.h
+++ b/Parallel/vtkPBGLCollapseGraph.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLCollapseGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLCollapseGraph* New();
-  vtkTypeRevisionMacro(vtkPBGLCollapseGraph,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLCollapseGraph,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Parallel/vtkPBGLCollapseParallelEdges.cxx b/Parallel/vtkPBGLCollapseParallelEdges.cxx
index 8271075a3c2d916bb51c535b37cf111c1a0b38e9..1724b0f32db417c773bfe41db11d99ab40fdbdca 100644
--- a/Parallel/vtkPBGLCollapseParallelEdges.cxx
+++ b/Parallel/vtkPBGLCollapseParallelEdges.cxx
@@ -39,7 +39,6 @@
 #include <vtksys/stl/map>
 #include <vtksys/stl/utility> // for pair
 
-vtkCxxRevisionMacro(vtkPBGLCollapseParallelEdges, "1.1");
 vtkStandardNewMacro(vtkPBGLCollapseParallelEdges);
 
 vtkPBGLCollapseParallelEdges::vtkPBGLCollapseParallelEdges()
diff --git a/Parallel/vtkPBGLCollapseParallelEdges.h b/Parallel/vtkPBGLCollapseParallelEdges.h
index 7e65ed6bb9288f7bccbe70c7973abeb00b116f57..46413e274dd2fba977940c929ee0ce34f0693339 100644
--- a/Parallel/vtkPBGLCollapseParallelEdges.h
+++ b/Parallel/vtkPBGLCollapseParallelEdges.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLCollapseParallelEdges : public vtkGraphAlgorith
 {
 public:
   static vtkPBGLCollapseParallelEdges* New();
-  vtkTypeRevisionMacro(vtkPBGLCollapseParallelEdges,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLCollapseParallelEdges,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Parallel/vtkPBGLCollectGraph.cxx b/Parallel/vtkPBGLCollectGraph.cxx
index 878e7ece04202a0bbb5959f5f409d2e985884791..4574c4dd4c790ba9a8795368c646dc9a239fac31 100644
--- a/Parallel/vtkPBGLCollectGraph.cxx
+++ b/Parallel/vtkPBGLCollectGraph.cxx
@@ -56,7 +56,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLCollectGraph, "1.8");
 vtkStandardNewMacro(vtkPBGLCollectGraph);
 
 
diff --git a/Parallel/vtkPBGLCollectGraph.h b/Parallel/vtkPBGLCollectGraph.h
index 146f6b068c748cd8b4d41aa719e6eb0dfde05b23..2bc2631add2cc22a15c5ef068c2c22cb3a7eb32d 100644
--- a/Parallel/vtkPBGLCollectGraph.h
+++ b/Parallel/vtkPBGLCollectGraph.h
@@ -57,7 +57,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLCollectGraph : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLCollectGraph *New();
-  vtkTypeRevisionMacro(vtkPBGLCollectGraph, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLCollectGraph, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPBGLConnectedComponents.cxx b/Parallel/vtkPBGLConnectedComponents.cxx
index d13727f9b29377f7f798d05fcd241a9f25f5325b..a69680f6e31e9e7ea04a181beb34da5a18a6c7a9 100644
--- a/Parallel/vtkPBGLConnectedComponents.cxx
+++ b/Parallel/vtkPBGLConnectedComponents.cxx
@@ -56,7 +56,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLConnectedComponents, "1.3");
 vtkStandardNewMacro(vtkPBGLConnectedComponents);
 
 // Constructor/Destructor
diff --git a/Parallel/vtkPBGLConnectedComponents.h b/Parallel/vtkPBGLConnectedComponents.h
index d47e3cb51340fc653825310a5be28aab50641a58..1eae9e487f7028f62218be8c76948eb814df738d 100644
--- a/Parallel/vtkPBGLConnectedComponents.h
+++ b/Parallel/vtkPBGLConnectedComponents.h
@@ -40,7 +40,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLConnectedComponents : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLConnectedComponents *New();
-  vtkTypeRevisionMacro(vtkPBGLConnectedComponents, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLConnectedComponents, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPBGLDistributedGraphHelper.cxx b/Parallel/vtkPBGLDistributedGraphHelper.cxx
index c09a0bd6da4c66df5259b0693d1e43e64506256c..8c88bfda3cec79595f0e11988ef13742ef2fa1d8 100644
--- a/Parallel/vtkPBGLDistributedGraphHelper.cxx
+++ b/Parallel/vtkPBGLDistributedGraphHelper.cxx
@@ -154,7 +154,7 @@ class vtkPBGLDistributedGraphHelperInternals : public vtkObject
 {
 public:
   static vtkPBGLDistributedGraphHelperInternals *New();
-  vtkTypeRevisionMacro(vtkPBGLDistributedGraphHelperInternals, vtkObject);
+  vtkTypeMacro(vtkPBGLDistributedGraphHelperInternals, vtkObject);
 
   // Description:
   // Handle a FIND_VERTEX_TAG message.
@@ -238,12 +238,10 @@ boost::graph::distributed::mpi_process_group *
 vtkPBGLDistributedGraphHelperInternals::root_process_group;
 
 vtkStandardNewMacro(vtkPBGLDistributedGraphHelperInternals);
-vtkCxxRevisionMacro(vtkPBGLDistributedGraphHelperInternals, "1.15");
 
 //----------------------------------------------------------------------------
 // class vtkPBGLDistributedGraphHelper
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkPBGLDistributedGraphHelper, "1.15");
 vtkStandardNewMacro(vtkPBGLDistributedGraphHelper);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPBGLDistributedGraphHelper.h b/Parallel/vtkPBGLDistributedGraphHelper.h
index 3eeb705e1a464c16f1a087f913c88090c4e52ced..9096f28a3a02eb86f8711a7482332ac5dc9c4830 100644
--- a/Parallel/vtkPBGLDistributedGraphHelper.h
+++ b/Parallel/vtkPBGLDistributedGraphHelper.h
@@ -48,8 +48,7 @@ namespace boost { namespace graph { namespace distributed {
 class VTK_PARALLEL_EXPORT vtkPBGLDistributedGraphHelper : public vtkDistributedGraphHelper
 {
  public:
-  vtkTypeRevisionMacro (vtkPBGLDistributedGraphHelper,
-                        vtkDistributedGraphHelper);
+  vtkTypeMacro(vtkPBGLDistributedGraphHelper,vtkDistributedGraphHelper);
 
   // Description:
   // Creates an empty Parallel BGL distributed graph helper
diff --git a/Parallel/vtkPBGLGraphSQLReader.cxx b/Parallel/vtkPBGLGraphSQLReader.cxx
index 811d49c3ab7cd8920e35e0fcc9492cec940be1f2..ca95490d2a1ec6b2c461633a9bdd0fca3752e65a 100644
--- a/Parallel/vtkPBGLGraphSQLReader.cxx
+++ b/Parallel/vtkPBGLGraphSQLReader.cxx
@@ -38,7 +38,6 @@
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkPBGLGraphSQLReader, "1.9");
 vtkStandardNewMacro(vtkPBGLGraphSQLReader);
 
 
diff --git a/Parallel/vtkPBGLGraphSQLReader.h b/Parallel/vtkPBGLGraphSQLReader.h
index de5ad0935a1c6c83ba7ce95741196ec5d0118519..22556d74cb20d7c040953cc9b5cc79131eb11148 100644
--- a/Parallel/vtkPBGLGraphSQLReader.h
+++ b/Parallel/vtkPBGLGraphSQLReader.h
@@ -44,7 +44,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLGraphSQLReader : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLGraphSQLReader* New();
-  vtkTypeRevisionMacro(vtkPBGLGraphSQLReader,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLGraphSQLReader,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPBGLMinimumSpanningTree.cxx b/Parallel/vtkPBGLMinimumSpanningTree.cxx
index 63e98758301286673abd2b354e1325d780e45d5a..0054bb1d2dd0155d795ad2f64297a3ecf1e5fc28 100644
--- a/Parallel/vtkPBGLMinimumSpanningTree.cxx
+++ b/Parallel/vtkPBGLMinimumSpanningTree.cxx
@@ -59,7 +59,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLMinimumSpanningTree, "1.5");
 vtkStandardNewMacro(vtkPBGLMinimumSpanningTree);
 
 // Constructor/Destructor
diff --git a/Parallel/vtkPBGLMinimumSpanningTree.h b/Parallel/vtkPBGLMinimumSpanningTree.h
index b1ed2854be2001650beac1f47a113050a35ecb0d..040fd23defcb07666fd392943ec56d4c9423dfe6 100644
--- a/Parallel/vtkPBGLMinimumSpanningTree.h
+++ b/Parallel/vtkPBGLMinimumSpanningTree.h
@@ -42,7 +42,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLMinimumSpanningTree : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLMinimumSpanningTree *New();
-  vtkTypeRevisionMacro(vtkPBGLMinimumSpanningTree, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLMinimumSpanningTree, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPBGLRMATGraphSource.cxx b/Parallel/vtkPBGLRMATGraphSource.cxx
index b8c8c29e8d8ac7f59429733faa02aa72a12b5509..d0377fc7c3e18599ba15b731dc196fef071bffc6 100644
--- a/Parallel/vtkPBGLRMATGraphSource.cxx
+++ b/Parallel/vtkPBGLRMATGraphSource.cxx
@@ -47,7 +47,6 @@
 #include <boost/mpi/communicator.hpp>
 #include <boost/mpi/collectives/scan.hpp>
 
-vtkCxxRevisionMacro(vtkPBGLRMATGraphSource, "1.3");
 vtkStandardNewMacro(vtkPBGLRMATGraphSource);
 
 // ----------------------------------------------------------------------
diff --git a/Parallel/vtkPBGLRMATGraphSource.h b/Parallel/vtkPBGLRMATGraphSource.h
index b773a492300e74ce1c1073c326e0624c9ef32750..49a8a8dcf69392743243f73cf17936b2af58e585 100644
--- a/Parallel/vtkPBGLRMATGraphSource.h
+++ b/Parallel/vtkPBGLRMATGraphSource.h
@@ -70,7 +70,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLRMATGraphSource : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLRMATGraphSource* New();
-  vtkTypeRevisionMacro(vtkPBGLRMATGraphSource,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLRMATGraphSource,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPBGLRandomGraphSource.cxx b/Parallel/vtkPBGLRandomGraphSource.cxx
index 6998c0861341ce208eb8ecf9dea46cf9d5e4e09e..a73a63fbb125b01493c473366ed6efe371faa609 100644
--- a/Parallel/vtkPBGLRandomGraphSource.cxx
+++ b/Parallel/vtkPBGLRandomGraphSource.cxx
@@ -42,7 +42,6 @@
 #include <boost/mpi/communicator.hpp>
 #include <boost/mpi/collectives/scan.hpp>
 
-vtkCxxRevisionMacro(vtkPBGLRandomGraphSource, "1.1");
 vtkStandardNewMacro(vtkPBGLRandomGraphSource);
 
 // ----------------------------------------------------------------------
diff --git a/Parallel/vtkPBGLRandomGraphSource.h b/Parallel/vtkPBGLRandomGraphSource.h
index b75b0a79e5ebced10d78e15bff06560273ca95e6..7035bb1e99b340439d76206cc57dd92534db6ba9 100644
--- a/Parallel/vtkPBGLRandomGraphSource.h
+++ b/Parallel/vtkPBGLRandomGraphSource.h
@@ -41,7 +41,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLRandomGraphSource : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLRandomGraphSource* New();
-  vtkTypeRevisionMacro(vtkPBGLRandomGraphSource,vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLRandomGraphSource,vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPBGLShortestPaths.cxx b/Parallel/vtkPBGLShortestPaths.cxx
index e839487a2a52ae936f8240ebf5f118016107be53..b9e7a34a274f6fe04212c90e5b433bc63bfc3d37 100644
--- a/Parallel/vtkPBGLShortestPaths.cxx
+++ b/Parallel/vtkPBGLShortestPaths.cxx
@@ -58,7 +58,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLShortestPaths, "1.9");
 vtkStandardNewMacro(vtkPBGLShortestPaths);
 
 // Function object used to reduce (vertex, distance) pairs to find
diff --git a/Parallel/vtkPBGLShortestPaths.h b/Parallel/vtkPBGLShortestPaths.h
index 677f7db8898a31490521bdd0bdb5ecaab99530ea..079baa9da0c226dc63ba93cb43e96a5cd64fc9cd 100644
--- a/Parallel/vtkPBGLShortestPaths.h
+++ b/Parallel/vtkPBGLShortestPaths.h
@@ -43,7 +43,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLShortestPaths : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLShortestPaths *New();
-  vtkTypeRevisionMacro(vtkPBGLShortestPaths, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLShortestPaths, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPBGLVertexColoring.cxx b/Parallel/vtkPBGLVertexColoring.cxx
index 9074f4a82b4d3a6f45bc0ebb192a57f48d161dfe..b3a6cc0f4d9cca7676eef1b42cfa9fbcc7073057 100644
--- a/Parallel/vtkPBGLVertexColoring.cxx
+++ b/Parallel/vtkPBGLVertexColoring.cxx
@@ -55,7 +55,6 @@
 
 using namespace boost;
 
-vtkCxxRevisionMacro(vtkPBGLVertexColoring, "1.4");
 vtkStandardNewMacro(vtkPBGLVertexColoring);
 
 // Constructor/Destructor
diff --git a/Parallel/vtkPBGLVertexColoring.h b/Parallel/vtkPBGLVertexColoring.h
index bcfda34ac3780e0dd18fc3c9ae3d237579aaf2b7..3106ae156e65f1a8d35f6a31847644fe4121083c 100644
--- a/Parallel/vtkPBGLVertexColoring.h
+++ b/Parallel/vtkPBGLVertexColoring.h
@@ -39,7 +39,7 @@ class VTK_PARALLEL_EXPORT vtkPBGLVertexColoring : public vtkGraphAlgorithm
 {
 public:
   static vtkPBGLVertexColoring *New();
-  vtkTypeRevisionMacro(vtkPBGLVertexColoring, vtkGraphAlgorithm);
+  vtkTypeMacro(vtkPBGLVertexColoring, vtkGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPCellDataToPointData.cxx b/Parallel/vtkPCellDataToPointData.cxx
index e5f2199530e48bcff9cf8b8783a5b49550c501a9..e8af5ac73bf94da48e56fb67b62e6ed1d1f19399 100644
--- a/Parallel/vtkPCellDataToPointData.cxx
+++ b/Parallel/vtkPCellDataToPointData.cxx
@@ -20,7 +20,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPCellDataToPointData, "1.9");
 vtkStandardNewMacro(vtkPCellDataToPointData);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPCellDataToPointData.h b/Parallel/vtkPCellDataToPointData.h
index a0ffcfce6c044ac885f575a95e2a748ebe3e8e39..6f1e36848ee3b057faf2ac9c2230baa0bf8365bf 100644
--- a/Parallel/vtkPCellDataToPointData.h
+++ b/Parallel/vtkPCellDataToPointData.h
@@ -28,7 +28,7 @@
 class VTK_PARALLEL_EXPORT vtkPCellDataToPointData : public vtkCellDataToPointData
 {
 public:
-  vtkTypeRevisionMacro(vtkPCellDataToPointData,vtkCellDataToPointData);
+  vtkTypeMacro(vtkPCellDataToPointData,vtkCellDataToPointData);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkPCellDataToPointData *New();
diff --git a/Parallel/vtkPChacoReader.cxx b/Parallel/vtkPChacoReader.cxx
index 0d3eb0177e31379771b76d0790a8123a292397cd..bb75f71a6bf571291ce004ce006c1cee3bdeabd1 100644
--- a/Parallel/vtkPChacoReader.cxx
+++ b/Parallel/vtkPChacoReader.cxx
@@ -38,7 +38,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkProcessGroup.h"
 
-vtkCxxRevisionMacro(vtkPChacoReader, "1.10");
 vtkStandardNewMacro(vtkPChacoReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPChacoReader.h b/Parallel/vtkPChacoReader.h
index 9ef04fcf922fb378691a105359f1abbdd444c9ff..64a46d0c94b547c330e908434d37f5c115b20ab3 100644
--- a/Parallel/vtkPChacoReader.h
+++ b/Parallel/vtkPChacoReader.h
@@ -36,7 +36,7 @@ class VTK_PARALLEL_EXPORT vtkPChacoReader : public vtkChacoReader
 {
 public:
   static vtkPChacoReader *New();
-  vtkTypeRevisionMacro(vtkPChacoReader,vtkChacoReader);
+  vtkTypeMacro(vtkPChacoReader,vtkChacoReader);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPCosmoHaloFinder.cxx b/Parallel/vtkPCosmoHaloFinder.cxx
index 7a46de46b1aca1aa77abaecc5a4943f3a56883ee..64c1ede5c240ba23e6e526fa76031d82680d1b9c 100644
--- a/Parallel/vtkPCosmoHaloFinder.cxx
+++ b/Parallel/vtkPCosmoHaloFinder.cxx
@@ -81,7 +81,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "FOFHaloProperties.h"
 #include "Partition.h"
 
-vtkCxxRevisionMacro(vtkPCosmoHaloFinder, "1.5");
 vtkStandardNewMacro(vtkPCosmoHaloFinder);
 
 /****************************************************************************/
diff --git a/Parallel/vtkPCosmoHaloFinder.h b/Parallel/vtkPCosmoHaloFinder.h
index 4dfc6893c2c231fecf3ae5894467ba1c0dd54bfa..7d8d3031d11810aa205954863a620a68b58ca714 100644
--- a/Parallel/vtkPCosmoHaloFinder.h
+++ b/Parallel/vtkPCosmoHaloFinder.h
@@ -76,7 +76,7 @@ class VTK_PARALLEL_EXPORT vtkPCosmoHaloFinder : public vtkUnstructuredGridAlgori
  public:
   static vtkPCosmoHaloFinder *New();
 
-  vtkTypeRevisionMacro(vtkPCosmoHaloFinder,vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkPCosmoHaloFinder,vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPCosmoReader.cxx b/Parallel/vtkPCosmoReader.cxx
index 635a6a6c5e715bde14196ad68b006cea21995995..9d23cf8becb24b3ee3d05b8bd1eec40f0215bd39 100644
--- a/Parallel/vtkPCosmoReader.cxx
+++ b/Parallel/vtkPCosmoReader.cxx
@@ -86,7 +86,6 @@ using namespace vtkstd;
 #include "ParticleExchange.h"
 #include "ParticleDistribute.h"
 
-vtkCxxRevisionMacro(vtkPCosmoReader, "1.12");
 vtkStandardNewMacro(vtkPCosmoReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPCosmoReader.h b/Parallel/vtkPCosmoReader.h
index 3b41e3b1eeb48cd6f382ba0a52e0b61bac2b0bd8..8a1d0d6e147675a20bcf2e967c09bab8202101a9 100644
--- a/Parallel/vtkPCosmoReader.h
+++ b/Parallel/vtkPCosmoReader.h
@@ -86,7 +86,7 @@ class VTK_PARALLEL_EXPORT vtkPCosmoReader : public vtkUnstructuredGridAlgorithm
 {
 public:
   static vtkPCosmoReader *New();
-  vtkTypeRevisionMacro(vtkPCosmoReader, vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkPCosmoReader, vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPDataSetReader.cxx b/Parallel/vtkPDataSetReader.cxx
index f89d13fd376c7ccc5ec78a5829dbf876d96748ab..a07799b22f793d96edce174926e62e699fc730b1 100644
--- a/Parallel/vtkPDataSetReader.cxx
+++ b/Parallel/vtkPDataSetReader.cxx
@@ -34,7 +34,6 @@
 #include "vtkUnstructuredGrid.h"
 #include "vtkExtentTranslator.h"
 
-vtkCxxRevisionMacro(vtkPDataSetReader, "1.40");
 vtkStandardNewMacro(vtkPDataSetReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPDataSetReader.h b/Parallel/vtkPDataSetReader.h
index cd32e9848d38c1d9898de80b534fbd42dd2314d6..614448c812ba34eb106d26e903bf7190babcbe94 100644
--- a/Parallel/vtkPDataSetReader.h
+++ b/Parallel/vtkPDataSetReader.h
@@ -29,7 +29,7 @@ class VTK_PARALLEL_EXPORT vtkPDataSetReader : public vtkDataSetAlgorithm
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkPDataSetReader,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkPDataSetReader,vtkDataSetAlgorithm);
   static vtkPDataSetReader *New();
 
   // Description:
diff --git a/Parallel/vtkPDataSetWriter.cxx b/Parallel/vtkPDataSetWriter.cxx
index caea6aa57122bad595e634e7441ddb2d1c71fab8..313dbfd696e18d61e02abda56b46f74b694e996e 100644
--- a/Parallel/vtkPDataSetWriter.cxx
+++ b/Parallel/vtkPDataSetWriter.cxx
@@ -22,7 +22,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkErrorCode.h"
 
-vtkCxxRevisionMacro(vtkPDataSetWriter, "1.16");
 vtkStandardNewMacro(vtkPDataSetWriter);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPDataSetWriter.h b/Parallel/vtkPDataSetWriter.h
index ac9fa98c178ba9401fe11373912e9782742e7f7a..4b87b0a5836f7940e41fa7923db54e782be217a9 100644
--- a/Parallel/vtkPDataSetWriter.h
+++ b/Parallel/vtkPDataSetWriter.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkPDataSetWriter : public vtkDataSetWriter
 {
 public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkPDataSetWriter,vtkDataSetWriter);
+  vtkTypeMacro(vtkPDataSetWriter,vtkDataSetWriter);
   static vtkPDataSetWriter *New();
 
   // Description:
diff --git a/Parallel/vtkPExtractArraysOverTime.cxx b/Parallel/vtkPExtractArraysOverTime.cxx
index 5370f0251088ae60656cd6b5c2e618b346566929..6b76c8343be32070dbf513a1dde6f475c1bb71f9 100644
--- a/Parallel/vtkPExtractArraysOverTime.cxx
+++ b/Parallel/vtkPExtractArraysOverTime.cxx
@@ -29,7 +29,6 @@
 #include <assert.h>
 
 vtkStandardNewMacro(vtkPExtractArraysOverTime);
-vtkCxxRevisionMacro(vtkPExtractArraysOverTime, "1.12");
 vtkCxxSetObjectMacro(vtkPExtractArraysOverTime, Controller, vtkMultiProcessController);
 //----------------------------------------------------------------------------
 vtkPExtractArraysOverTime::vtkPExtractArraysOverTime()
diff --git a/Parallel/vtkPExtractArraysOverTime.h b/Parallel/vtkPExtractArraysOverTime.h
index 1855b2b439bd614c0592150a31fb9f81379e7012..0e1500c0a04834c8f8c1bf4d7e88352b25e1267e 100644
--- a/Parallel/vtkPExtractArraysOverTime.h
+++ b/Parallel/vtkPExtractArraysOverTime.h
@@ -41,7 +41,7 @@ class VTK_PARALLEL_EXPORT vtkPExtractArraysOverTime : public vtkExtractArraysOve
 {
 public:
   static vtkPExtractArraysOverTime *New();
-  vtkTypeRevisionMacro(vtkPExtractArraysOverTime,vtkExtractArraysOverTime);
+  vtkTypeMacro(vtkPExtractArraysOverTime,vtkExtractArraysOverTime);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPImageWriter.cxx b/Parallel/vtkPImageWriter.cxx
index 77d98b14ba573704cdf580d007080f77728a01c6..9b48aec3c1feb56dd5d7abec57e391dd0a1d9136 100644
--- a/Parallel/vtkPImageWriter.cxx
+++ b/Parallel/vtkPImageWriter.cxx
@@ -27,7 +27,6 @@
       file = NULL; \
       } \
 
-vtkCxxRevisionMacro(vtkPImageWriter, "1.8");
 vtkStandardNewMacro(vtkPImageWriter);
 
 #ifdef write
diff --git a/Parallel/vtkPImageWriter.h b/Parallel/vtkPImageWriter.h
index 920d4927c3aa0f0d4d144851e1201e3ebb03d59c..a8df05387404da685abe3badb597b10f5307571c 100644
--- a/Parallel/vtkPImageWriter.h
+++ b/Parallel/vtkPImageWriter.h
@@ -30,7 +30,7 @@ class VTK_PARALLEL_EXPORT vtkPImageWriter : public vtkImageWriter
 {
 public:
   static vtkPImageWriter *New();
-  vtkTypeRevisionMacro(vtkPImageWriter,vtkImageWriter);
+  vtkTypeMacro(vtkPImageWriter,vtkImageWriter);
   void PrintSelf(ostream& os, vtkIndent indent);  
 
   // Description:
diff --git a/Parallel/vtkPKdTree.cxx b/Parallel/vtkPKdTree.cxx
index c59435d9463f51f93585f36ee73fc2a2eb0edfaf..8bfbc2401d419e1ebb59d2b16a57f8595760af2a 100644
--- a/Parallel/vtkPKdTree.cxx
+++ b/Parallel/vtkPKdTree.cxx
@@ -79,7 +79,6 @@ static char * makeEntry(const char *s)
 
 // Timing data ---------------------------------------------
 
-vtkCxxRevisionMacro(vtkPKdTree, "1.43");
 vtkStandardNewMacro(vtkPKdTree);
 
 const int vtkPKdTree::NoRegionAssignment = 0;   // default
diff --git a/Parallel/vtkPKdTree.h b/Parallel/vtkPKdTree.h
index 8904473cdd9d9eb462bf04884c70aaa7d8915795..b40bebe8176b8d83691b0178d4c103d724aeeff0 100644
--- a/Parallel/vtkPKdTree.h
+++ b/Parallel/vtkPKdTree.h
@@ -51,7 +51,7 @@ class vtkKdNode;
 class VTK_PARALLEL_EXPORT vtkPKdTree : public vtkKdTree
 {
 public:
-  vtkTypeRevisionMacro(vtkPKdTree, vtkKdTree);
+  vtkTypeMacro(vtkPKdTree, vtkKdTree);
 
 
   void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Parallel/vtkPLinearExtrusionFilter.cxx b/Parallel/vtkPLinearExtrusionFilter.cxx
index 4acb796c03eddbbd01a5a854b278f55e7a5beea0..33cca0fc354d83839940e7a72e8806b07c95477c 100644
--- a/Parallel/vtkPLinearExtrusionFilter.cxx
+++ b/Parallel/vtkPLinearExtrusionFilter.cxx
@@ -20,7 +20,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPLinearExtrusionFilter, "1.6");
 vtkStandardNewMacro(vtkPLinearExtrusionFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPLinearExtrusionFilter.h b/Parallel/vtkPLinearExtrusionFilter.h
index f94f1e697694676a1ad0c8eb5f78f8fab7127113..d77678d333465c080f52a61c71ed352e525b91b3 100644
--- a/Parallel/vtkPLinearExtrusionFilter.h
+++ b/Parallel/vtkPLinearExtrusionFilter.h
@@ -27,7 +27,7 @@
 class VTK_PARALLEL_EXPORT vtkPLinearExtrusionFilter : public vtkLinearExtrusionFilter 
 {
 public:
-  vtkTypeRevisionMacro(vtkPLinearExtrusionFilter,vtkLinearExtrusionFilter);
+  vtkTypeMacro(vtkPLinearExtrusionFilter,vtkLinearExtrusionFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPNrrdReader.cxx b/Parallel/vtkPNrrdReader.cxx
index b456666cbaf2316dad6daf156b0e501d1d600481..72bd8003dda3796a657b3dfbf60a5fb00fb7e81b 100644
--- a/Parallel/vtkPNrrdReader.cxx
+++ b/Parallel/vtkPNrrdReader.cxx
@@ -195,7 +195,6 @@ static int NrrdType2VTKType(vtkstd::string nrrdType)
 }
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkPNrrdReader, "1.3");
 vtkStandardNewMacro(vtkPNrrdReader);
 
 //-----------------------------------------------------------------------------
diff --git a/Parallel/vtkPNrrdReader.h b/Parallel/vtkPNrrdReader.h
index e17a591e0d1d401cb0567bb76ab81bd60fbe7ce6..0f3c64259de90645e5b0a48f8f0f81cce65dea70 100644
--- a/Parallel/vtkPNrrdReader.h
+++ b/Parallel/vtkPNrrdReader.h
@@ -44,7 +44,7 @@ class vtkCharArray;
 class VTK_PARALLEL_EXPORT vtkPNrrdReader : public vtkMPIImageReader
 {
 public:
-  vtkTypeRevisionMacro(vtkPNrrdReader, vtkMPIImageReader);
+  vtkTypeMacro(vtkPNrrdReader, vtkMPIImageReader);
   static vtkPNrrdReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkPOPReader.cxx b/Parallel/vtkPOPReader.cxx
index 05d1662480b4f00d809ec02287f6087704aba2f2..710e2fcc5c7ee4f8c8a4f5126af30ca645582af6 100644
--- a/Parallel/vtkPOPReader.cxx
+++ b/Parallel/vtkPOPReader.cxx
@@ -31,7 +31,6 @@
 #include <ctype.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkPOPReader, "1.21");
 vtkStandardNewMacro(vtkPOPReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPOPReader.h b/Parallel/vtkPOPReader.h
index 764da9f62ce35fbf680d627c8cf4f9680579da36..3b631761cf02004642483d082dc45c674f03b614 100644
--- a/Parallel/vtkPOPReader.h
+++ b/Parallel/vtkPOPReader.h
@@ -30,7 +30,7 @@ class VTK_PARALLEL_EXPORT vtkPOPReader : public vtkStructuredGridAlgorithm
 {
 public:
   static vtkPOPReader *New();
-  vtkTypeRevisionMacro(vtkPOPReader,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkPOPReader,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkPOpenFOAMReader.cxx b/Parallel/vtkPOpenFOAMReader.cxx
index f4c64d5e9640126eae49e0366c93f70e7d1f6bc7..0c6188a388977e811b73f9dab51d5e3721e4685a 100644
--- a/Parallel/vtkPOpenFOAMReader.cxx
+++ b/Parallel/vtkPOpenFOAMReader.cxx
@@ -35,7 +35,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkStringArray.h"
 
-vtkCxxRevisionMacro(vtkPOpenFOAMReader, "1.2");
 vtkStandardNewMacro(vtkPOpenFOAMReader);
 vtkCxxSetObjectMacro(vtkPOpenFOAMReader, Controller, vtkMultiProcessController);
 
diff --git a/Parallel/vtkPOpenFOAMReader.h b/Parallel/vtkPOpenFOAMReader.h
index d2e3c65399b7c12103882d56ec7373c4dd48879b..fa70f5014bfce4dd45480c61f382c948a1eeea4a 100644
--- a/Parallel/vtkPOpenFOAMReader.h
+++ b/Parallel/vtkPOpenFOAMReader.h
@@ -39,7 +39,7 @@ public:
   enum caseType { DECOMPOSED_CASE = 0, RECONSTRUCTED_CASE = 1 };
   //ETX
   static vtkPOpenFOAMReader *New();
-  vtkTypeRevisionMacro(vtkPOpenFOAMReader, vtkOpenFOAMReader);
+  vtkTypeMacro(vtkPOpenFOAMReader, vtkOpenFOAMReader);
 
   void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkPOutlineCornerFilter.cxx b/Parallel/vtkPOutlineCornerFilter.cxx
index 8a55b1f63a85999b76ac76afb5f919daed0cea38..884c1a31858ee96f07395e10d73a4c7ee6492fca 100644
--- a/Parallel/vtkPOutlineCornerFilter.cxx
+++ b/Parallel/vtkPOutlineCornerFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPOutlineCornerFilter, "1.10");
 vtkStandardNewMacro(vtkPOutlineCornerFilter);
 vtkCxxSetObjectMacro(vtkPOutlineCornerFilter, Controller, vtkMultiProcessController);
 
diff --git a/Parallel/vtkPOutlineCornerFilter.h b/Parallel/vtkPOutlineCornerFilter.h
index fd1f7ef0034f9602c732b8848af50687322f3b07..f6b9657009e1a98b0e1784dc38ddeb4481fe1546 100644
--- a/Parallel/vtkPOutlineCornerFilter.h
+++ b/Parallel/vtkPOutlineCornerFilter.h
@@ -31,7 +31,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkPOutlineCornerFilter : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkPOutlineCornerFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPOutlineCornerFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPOutlineFilter.cxx b/Parallel/vtkPOutlineFilter.cxx
index aeeb0c572e55fb1d0f09b0adaab4e9d12db1d264..185c3b90bfc1fbfe2de42f0bc5c5a9c0da4bfe8e 100644
--- a/Parallel/vtkPOutlineFilter.cxx
+++ b/Parallel/vtkPOutlineFilter.cxx
@@ -25,7 +25,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPOutlineFilter, "1.11");
 vtkStandardNewMacro(vtkPOutlineFilter);
 vtkCxxSetObjectMacro(vtkPOutlineFilter, Controller, vtkMultiProcessController);
 
diff --git a/Parallel/vtkPOutlineFilter.h b/Parallel/vtkPOutlineFilter.h
index e51e1ffaa668f93a09653a95ffb943128b5deb10..bbf20ebdd7d4c810aafa1a343d6ce2844dca1bef 100644
--- a/Parallel/vtkPOutlineFilter.h
+++ b/Parallel/vtkPOutlineFilter.h
@@ -29,7 +29,7 @@ class VTK_PARALLEL_EXPORT vtkPOutlineFilter : public vtkPolyDataAlgorithm
 {
 public:
   static vtkPOutlineFilter *New();
-  vtkTypeRevisionMacro(vtkPOutlineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkPOutlineFilter,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPPolyDataNormals.cxx b/Parallel/vtkPPolyDataNormals.cxx
index 423c2d37f42bfcdfbad72e4fdffd1beb4d306a6a..86ab6961ced0f60b2e656b36e20ea598753d0676 100644
--- a/Parallel/vtkPPolyDataNormals.cxx
+++ b/Parallel/vtkPPolyDataNormals.cxx
@@ -20,7 +20,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPPolyDataNormals, "1.12");
 vtkStandardNewMacro(vtkPPolyDataNormals);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPPolyDataNormals.h b/Parallel/vtkPPolyDataNormals.h
index 4ef4d3d803d8c09b44412188224584ee0d43dd2f..252e16836d86bd0b05f87c0d2940ec653fd08a1e 100644
--- a/Parallel/vtkPPolyDataNormals.h
+++ b/Parallel/vtkPPolyDataNormals.h
@@ -23,7 +23,7 @@
 class VTK_PARALLEL_EXPORT vtkPPolyDataNormals : public vtkPolyDataNormals
 {
 public:
-  vtkTypeRevisionMacro(vtkPPolyDataNormals,vtkPolyDataNormals);
+  vtkTypeMacro(vtkPPolyDataNormals,vtkPolyDataNormals);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkPPolyDataNormals *New();
diff --git a/Parallel/vtkPProbeFilter.cxx b/Parallel/vtkPProbeFilter.cxx
index 2a3b3a2e3d9380334d1d3a075fba459180fd668d..f6450d02bf6cf7b01de6117ebd2abeeafeb4a6ed 100644
--- a/Parallel/vtkPProbeFilter.cxx
+++ b/Parallel/vtkPProbeFilter.cxx
@@ -26,7 +26,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPProbeFilter, "1.23");
 vtkStandardNewMacro(vtkPProbeFilter);
 
 vtkCxxSetObjectMacro(vtkPProbeFilter, Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkPProbeFilter.h b/Parallel/vtkPProbeFilter.h
index dae3989183740a5e8beeaefe966a38526101f6c9..27b26d5fd123c8407a6306bd33cf951ea6d0628e 100644
--- a/Parallel/vtkPProbeFilter.h
+++ b/Parallel/vtkPProbeFilter.h
@@ -25,7 +25,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkPProbeFilter : public vtkCompositeDataProbeFilter
 {
 public:
-  vtkTypeRevisionMacro(vtkPProbeFilter,vtkCompositeDataProbeFilter);
+  vtkTypeMacro(vtkPProbeFilter,vtkCompositeDataProbeFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkPProbeFilter *New();
diff --git a/Parallel/vtkPReflectionFilter.cxx b/Parallel/vtkPReflectionFilter.cxx
index bb8391ac8c088d81fc18eafab4fe261201b87706..c6631802c71db549d8736f06389587341d1c340e 100644
--- a/Parallel/vtkPReflectionFilter.cxx
+++ b/Parallel/vtkPReflectionFilter.cxx
@@ -19,7 +19,6 @@
 #include "vtkMultiProcessController.h"
 
 vtkStandardNewMacro(vtkPReflectionFilter);
-vtkCxxRevisionMacro(vtkPReflectionFilter, "1.2");
 vtkCxxSetObjectMacro(vtkPReflectionFilter, Controller, vtkMultiProcessController);
 //----------------------------------------------------------------------------
 vtkPReflectionFilter::vtkPReflectionFilter()
diff --git a/Parallel/vtkPReflectionFilter.h b/Parallel/vtkPReflectionFilter.h
index 07fe751284ac79e6135c41c4640b0be136dd5931..c09d5d158ba0eaf7186b0532cc144e48d1cdc0f9 100644
--- a/Parallel/vtkPReflectionFilter.h
+++ b/Parallel/vtkPReflectionFilter.h
@@ -27,7 +27,7 @@ class VTK_PARALLEL_EXPORT vtkPReflectionFilter : public vtkReflectionFilter
 {
 public:
   static vtkPReflectionFilter* New();
-  vtkTypeRevisionMacro(vtkPReflectionFilter, vtkReflectionFilter);
+  vtkTypeMacro(vtkPReflectionFilter, vtkReflectionFilter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPSLACReader.cxx b/Parallel/vtkPSLACReader.cxx
index 749d921f82645bc58f4699632d3d7e4a5455a726..bfb48f045ac8574d1ef6320caef10f7877c44dc7 100644
--- a/Parallel/vtkPSLACReader.cxx
+++ b/Parallel/vtkPSLACReader.cxx
@@ -322,7 +322,6 @@ struct vtkPSLACReaderIdTypeHash {
 };
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkPSLACReader, "1.12");
 vtkStandardNewMacro(vtkPSLACReader);
 
 vtkCxxSetObjectMacro(vtkPSLACReader, Controller, vtkMultiProcessController);
diff --git a/Parallel/vtkPSLACReader.h b/Parallel/vtkPSLACReader.h
index c2a1d64c22a1774bb5c2ac77f7e6f964cc3462c3..3a0a53ed8c8c04dc19fa4a3b2582b1a47477ec6f 100644
--- a/Parallel/vtkPSLACReader.h
+++ b/Parallel/vtkPSLACReader.h
@@ -40,7 +40,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkPSLACReader : public vtkSLACReader
 {
 public:
-  vtkTypeRevisionMacro(vtkPSLACReader, vtkSLACReader);
+  vtkTypeMacro(vtkPSLACReader, vtkSLACReader);
   static vtkPSLACReader *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkPSphereSource.cxx b/Parallel/vtkPSphereSource.cxx
index add00f26268f8a1747f7121d93c54aa40d26231f..2ca87aa6d11e490d4f8b474d7b2ec50d2a4fed21 100644
--- a/Parallel/vtkPSphereSource.cxx
+++ b/Parallel/vtkPSphereSource.cxx
@@ -28,7 +28,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkPSphereSource, "1.13");
 vtkStandardNewMacro(vtkPSphereSource);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPSphereSource.h b/Parallel/vtkPSphereSource.h
index 740f933b9f0bd1ac84ea75436069da62b1b85ca3..137bd238c2cdf3f5100775ece261ea9d4f4ed5df 100644
--- a/Parallel/vtkPSphereSource.h
+++ b/Parallel/vtkPSphereSource.h
@@ -22,7 +22,7 @@
 class VTK_PARALLEL_EXPORT vtkPSphereSource : public vtkSphereSource
 {
 public:
-  vtkTypeRevisionMacro(vtkPSphereSource,vtkSphereSource);
+  vtkTypeMacro(vtkPSphereSource,vtkSphereSource);
 
   // Description:
   // Construct sphere with radius=0.5 and default resolution 8 in both Phi
diff --git a/Parallel/vtkPStreamTracer.cxx b/Parallel/vtkPStreamTracer.cxx
index da2c995ee22a5f12dbdad55f716d376607ab7560..435535a3b8f5d9d3467d1880d33d8dfa0e349d7c 100644
--- a/Parallel/vtkPStreamTracer.cxx
+++ b/Parallel/vtkPStreamTracer.cxx
@@ -29,7 +29,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPStreamTracer, "1.24");
 
 vtkCxxSetObjectMacro(vtkPStreamTracer, Controller, vtkMultiProcessController);
 vtkCxxSetObjectMacro(vtkPStreamTracer, 
diff --git a/Parallel/vtkPStreamTracer.h b/Parallel/vtkPStreamTracer.h
index 7861c59f0a7ea70fd19e3f3250a32e2b8c52d6e4..ec2fd5f529260b25895250378ab32b4d14c26124 100644
--- a/Parallel/vtkPStreamTracer.h
+++ b/Parallel/vtkPStreamTracer.h
@@ -35,7 +35,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkPStreamTracer : public vtkStreamTracer
 {
 public:
-  vtkTypeRevisionMacro(vtkPStreamTracer,vtkStreamTracer);
+  vtkTypeMacro(vtkPStreamTracer,vtkStreamTracer);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPTableToStructuredGrid.cxx b/Parallel/vtkPTableToStructuredGrid.cxx
index e41317b7acf22088d0bc31321a2162072ca7666f..1c009bfb57ead2656b2c5ebaccf264d99cd328f0 100644
--- a/Parallel/vtkPTableToStructuredGrid.cxx
+++ b/Parallel/vtkPTableToStructuredGrid.cxx
@@ -66,7 +66,6 @@ static void CopyStructuredData(vtkDataSetAttributes* out, int outExtent[6],
 
 
 vtkStandardNewMacro(vtkPTableToStructuredGrid);
-vtkCxxRevisionMacro(vtkPTableToStructuredGrid, "1.2");
 vtkCxxSetObjectMacro(vtkPTableToStructuredGrid, Controller,
   vtkMultiProcessController);
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPTableToStructuredGrid.h b/Parallel/vtkPTableToStructuredGrid.h
index 61949f3db429590e16699c43c1e5502f7565ff9d..2ca43bb939d3b9e8f3b5af71fd22c2265cf17cca 100644
--- a/Parallel/vtkPTableToStructuredGrid.h
+++ b/Parallel/vtkPTableToStructuredGrid.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkPTableToStructuredGrid : public vtkTableToStructure
 {
 public:
   static vtkPTableToStructuredGrid* New();
-  vtkTypeRevisionMacro(vtkPTableToStructuredGrid, vtkTableToStructuredGrid);
+  vtkTypeMacro(vtkPTableToStructuredGrid, vtkTableToStructuredGrid);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkParallelFactory.cxx b/Parallel/vtkParallelFactory.cxx
index 86fa5ba44c4cb364dc88ead89fdae17e2d8e868d..2d0935daefc84acd49778e5872243989569de628 100644
--- a/Parallel/vtkParallelFactory.cxx
+++ b/Parallel/vtkParallelFactory.cxx
@@ -26,7 +26,6 @@
 #  include "vtkPImageWriter.h"
 #endif // VTK_USE_RENDERING
 
-vtkCxxRevisionMacro(vtkParallelFactory, "1.11");
 vtkStandardNewMacro(vtkParallelFactory);
 
 void vtkParallelFactory::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Parallel/vtkParallelFactory.h b/Parallel/vtkParallelFactory.h
index c074086f89089b528c027aeefe24fd6c9caddf18..fc652e389c73d60d83154decc7f7b02519db4a1b 100644
--- a/Parallel/vtkParallelFactory.h
+++ b/Parallel/vtkParallelFactory.h
@@ -24,7 +24,7 @@ class VTK_PARALLEL_EXPORT vtkParallelFactory : public vtkObjectFactory
 {
 public: 
 // Methods from vtkObject
-  vtkTypeRevisionMacro(vtkParallelFactory,vtkObjectFactory);
+  vtkTypeMacro(vtkParallelFactory,vtkObjectFactory);
   static vtkParallelFactory *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   virtual const char* GetVTKSourceVersion();
diff --git a/Parallel/vtkParallelRenderManager.cxx b/Parallel/vtkParallelRenderManager.cxx
index 24d8d9d28e07b4fe612c5834eff21f3575247f9a..d6dc00586386cb5fceb8c9bb5304147b9a181723 100644
--- a/Parallel/vtkParallelRenderManager.cxx
+++ b/Parallel/vtkParallelRenderManager.cxx
@@ -58,7 +58,6 @@ static void RenderRMI(void *arg, void *, int, int);
 static void ComputeVisiblePropBoundsRMI(void *arg, void *, int, int);
 bool vtkParallelRenderManager::DefaultRenderEventPropagation = true;
 
-vtkCxxRevisionMacro(vtkParallelRenderManager, "1.83");
 
 //----------------------------------------------------------------------------
 vtkParallelRenderManager::vtkParallelRenderManager()
diff --git a/Parallel/vtkParallelRenderManager.h b/Parallel/vtkParallelRenderManager.h
index 4a8f1b1f90f909249713ff8deedfc4c7decf059d..ea919c536d7e705624cd592a8bb259e07364f910 100644
--- a/Parallel/vtkParallelRenderManager.h
+++ b/Parallel/vtkParallelRenderManager.h
@@ -54,7 +54,7 @@ class vtkUnsignedCharArray;
 class VTK_PARALLEL_EXPORT vtkParallelRenderManager : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkParallelRenderManager, vtkObject);
+  vtkTypeMacro(vtkParallelRenderManager, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPassThroughFilter.cxx b/Parallel/vtkPassThroughFilter.cxx
index b82a71935b6dfb787bddc6d27b31d86299b76133..6071321114018d46e4fb0888554ae2d930168f94 100644
--- a/Parallel/vtkPassThroughFilter.cxx
+++ b/Parallel/vtkPassThroughFilter.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkPassThroughFilter, "1.6");
 vtkStandardNewMacro(vtkPassThroughFilter);
 
 int vtkPassThroughFilter::RequestData(
diff --git a/Parallel/vtkPassThroughFilter.h b/Parallel/vtkPassThroughFilter.h
index d2151438b411d22a6e4bfc3aaa6d775c6a72cfeb..645e8ade7173c13417fcf0ab0a4f5f9a8cc9812f 100644
--- a/Parallel/vtkPassThroughFilter.h
+++ b/Parallel/vtkPassThroughFilter.h
@@ -28,7 +28,7 @@ class vtkFieldData;
 class VTK_PARALLEL_EXPORT vtkPassThroughFilter : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkPassThroughFilter,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkPassThroughFilter,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPieceRequestFilter.cxx b/Parallel/vtkPieceRequestFilter.cxx
index 77259717a265e6950816db8f78116522053c6618..b79ad966f67313680fba6aad7f74839d72027b35 100644
--- a/Parallel/vtkPieceRequestFilter.cxx
+++ b/Parallel/vtkPieceRequestFilter.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPieceRequestFilter, "1.3");
 vtkStandardNewMacro(vtkPieceRequestFilter);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPieceRequestFilter.h b/Parallel/vtkPieceRequestFilter.h
index 14f60652ae45bd3b4329120cdf1e17de92798a7a..199f49b241125a9bda15e5104d49c21ea72c0bd7 100644
--- a/Parallel/vtkPieceRequestFilter.h
+++ b/Parallel/vtkPieceRequestFilter.h
@@ -28,7 +28,7 @@ class VTK_PARALLEL_EXPORT vtkPieceRequestFilter : public vtkAlgorithm
 {
 public:
   static vtkPieceRequestFilter *New();
-  vtkTypeRevisionMacro(vtkPieceRequestFilter,vtkAlgorithm);
+  vtkTypeMacro(vtkPieceRequestFilter,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPieceScalars.cxx b/Parallel/vtkPieceScalars.cxx
index cfcb5b058e88e2096892076b2f7528495175abbd..af2d3ca90eba61624a4481bd0984c865d4d2cdf8 100644
--- a/Parallel/vtkPieceScalars.cxx
+++ b/Parallel/vtkPieceScalars.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPieceScalars, "1.17");
 vtkStandardNewMacro(vtkPieceScalars);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkPieceScalars.h b/Parallel/vtkPieceScalars.h
index 78e235f44fd02830aff111726e8d93701e605c4c..66465da58e30b871261d6c2c2ac6705198c1a308 100644
--- a/Parallel/vtkPieceScalars.h
+++ b/Parallel/vtkPieceScalars.h
@@ -35,7 +35,7 @@ class VTK_PARALLEL_EXPORT vtkPieceScalars : public vtkDataSetAlgorithm
 public:
   static vtkPieceScalars *New();
 
-  vtkTypeRevisionMacro(vtkPieceScalars,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkPieceScalars,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkPipelineSize.cxx b/Parallel/vtkPipelineSize.cxx
index 703de7b59c3b9f3508f8b1bed37097e9447bb499..4496e130cecd83e31ef6367d602ce7983f3da894 100644
--- a/Parallel/vtkPipelineSize.cxx
+++ b/Parallel/vtkPipelineSize.cxx
@@ -29,7 +29,6 @@
 #include "vtkDataSetAttributes.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkPipelineSize, "1.15");
 vtkStandardNewMacro(vtkPipelineSize);
 
 unsigned long 
diff --git a/Parallel/vtkPipelineSize.h b/Parallel/vtkPipelineSize.h
index 78f53f91cc1e212d21ef60515ecd9b3eb4470482..458aad4021e3f720db46fe5fe2ba7fcb58f7ab49 100644
--- a/Parallel/vtkPipelineSize.h
+++ b/Parallel/vtkPipelineSize.h
@@ -26,7 +26,7 @@ class VTK_PARALLEL_EXPORT vtkPipelineSize : public vtkObject
 {
 public:
   static vtkPipelineSize* New();
-  vtkTypeRevisionMacro(vtkPipelineSize,vtkObject);
+  vtkTypeMacro(vtkPipelineSize,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkProcess.cxx b/Parallel/vtkProcess.cxx
index 0b06fe2a8338dd3b3a339524aeb7a5d2ce5cf0dd..180ec763669548d76b5ee2d1ce3fbb59d74fd8f5 100644
--- a/Parallel/vtkProcess.cxx
+++ b/Parallel/vtkProcess.cxx
@@ -15,7 +15,6 @@
 #include "vtkProcess.h"
 #include "vtkMultiProcessController.h"
 
-vtkCxxRevisionMacro(vtkProcess, "1.1");
 
 // ----------------------------------------------------------------------------
 vtkProcess::vtkProcess()
diff --git a/Parallel/vtkProcess.h b/Parallel/vtkProcess.h
index ad96e64bc8e0f1dc6a08aa44114c586acf21a010..39685f124bdec60ca1468c8ab5ed539cca2e0706 100644
--- a/Parallel/vtkProcess.h
+++ b/Parallel/vtkProcess.h
@@ -42,7 +42,7 @@ class vtkMultiProcessController;
 class VTK_PARALLEL_EXPORT vtkProcess : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkProcess,vtkObject);
+  vtkTypeMacro(vtkProcess,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description
diff --git a/Parallel/vtkProcessGroup.cxx b/Parallel/vtkProcessGroup.cxx
index 2b70cbe9313a438264bb7855089cc17b3c2a9eba..583d2ef03740025eb63656a8bea97dafd694d0cd 100644
--- a/Parallel/vtkProcessGroup.cxx
+++ b/Parallel/vtkProcessGroup.cxx
@@ -28,7 +28,6 @@
 #include <vtkstd/algorithm>
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkProcessGroup, "1.2");
 vtkStandardNewMacro(vtkProcessGroup);
 
 //-----------------------------------------------------------------------------
diff --git a/Parallel/vtkProcessGroup.h b/Parallel/vtkProcessGroup.h
index 2d7d92d76b628c44ab0df6ddaeda65dc6a5c9760..16d310de316aa7a4fb016b2c2dc7f2e32d562366 100644
--- a/Parallel/vtkProcessGroup.h
+++ b/Parallel/vtkProcessGroup.h
@@ -50,7 +50,7 @@ class vtkCommunicator;
 class VTK_PARALLEL_EXPORT vtkProcessGroup : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkProcessGroup, vtkObject);
+  vtkTypeMacro(vtkProcessGroup, vtkObject);
   static vtkProcessGroup *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkProcessIdScalars.cxx b/Parallel/vtkProcessIdScalars.cxx
index da4a4b91aa05e545d28b0d2c2bb087d6f3793fdb..095612e1ead36014800ebacc33246983066f7340 100644
--- a/Parallel/vtkProcessIdScalars.cxx
+++ b/Parallel/vtkProcessIdScalars.cxx
@@ -26,7 +26,6 @@
 #include "vtkPointData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkProcessIdScalars, "1.3");
 vtkStandardNewMacro(vtkProcessIdScalars);
 
 vtkCxxSetObjectMacro(vtkProcessIdScalars,Controller,
diff --git a/Parallel/vtkProcessIdScalars.h b/Parallel/vtkProcessIdScalars.h
index e1831253d28d00d2b9490340e00e6c8351e06d5b..c23490c40eee15f9b294438c9567c7491e225562 100644
--- a/Parallel/vtkProcessIdScalars.h
+++ b/Parallel/vtkProcessIdScalars.h
@@ -36,7 +36,7 @@ class VTK_PARALLEL_EXPORT vtkProcessIdScalars : public vtkDataSetAlgorithm
 public:
   static vtkProcessIdScalars *New();
 
-  vtkTypeRevisionMacro(vtkProcessIdScalars,vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkProcessIdScalars,vtkDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkRectilinearGridOutlineFilter.cxx b/Parallel/vtkRectilinearGridOutlineFilter.cxx
index 6eb15c2971e43a757f18ec712090032daf9f1376..60888b5f7c99fa39bef6d112ee724f6947b9f552 100644
--- a/Parallel/vtkRectilinearGridOutlineFilter.cxx
+++ b/Parallel/vtkRectilinearGridOutlineFilter.cxx
@@ -22,7 +22,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkRectilinearGridOutlineFilter, "1.11");
 vtkStandardNewMacro(vtkRectilinearGridOutlineFilter);
 
 
diff --git a/Parallel/vtkRectilinearGridOutlineFilter.h b/Parallel/vtkRectilinearGridOutlineFilter.h
index 232c8f35956e18d92cf82b064df832f0a9051835..90f490478f130c1f30c38ebbe02fad045903f3b2 100644
--- a/Parallel/vtkRectilinearGridOutlineFilter.h
+++ b/Parallel/vtkRectilinearGridOutlineFilter.h
@@ -28,7 +28,7 @@ class VTK_PARALLEL_EXPORT vtkRectilinearGridOutlineFilter : public vtkPolyDataAl
 {
 public:
   static vtkRectilinearGridOutlineFilter *New();
-  vtkTypeRevisionMacro(vtkRectilinearGridOutlineFilter,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkRectilinearGridOutlineFilter,vtkPolyDataAlgorithm);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Parallel/vtkSocketCommunicator.cxx b/Parallel/vtkSocketCommunicator.cxx
index c8be9768a03bd63e590a5ab40404b694d2fc7495..58c116fa6e797da0f348fb89e7d2f1b533ca117a 100644
--- a/Parallel/vtkSocketCommunicator.cxx
+++ b/Parallel/vtkSocketCommunicator.cxx
@@ -35,7 +35,6 @@
 #include "Parallel/vtkSocketCommunicatorHash.h"
 
 vtkStandardNewMacro(vtkSocketCommunicator);
-vtkCxxRevisionMacro(vtkSocketCommunicator, "1.78");
 vtkCxxSetObjectMacro(vtkSocketCommunicator, Socket, vtkClientSocket);
 //----------------------------------------------------------------------------
 vtkSocketCommunicator::vtkSocketCommunicator()
diff --git a/Parallel/vtkSocketCommunicator.h b/Parallel/vtkSocketCommunicator.h
index c5ae0fba11dced40b9de5982c5df0a4c68d270ba..8d1503ae308d439cbe228d24cd5af9f9721f1974 100644
--- a/Parallel/vtkSocketCommunicator.h
+++ b/Parallel/vtkSocketCommunicator.h
@@ -54,7 +54,7 @@ class VTK_PARALLEL_EXPORT vtkSocketCommunicator : public vtkCommunicator
 {
 public:
   static vtkSocketCommunicator *New();
-  vtkTypeRevisionMacro(vtkSocketCommunicator,vtkCommunicator);
+  vtkTypeMacro(vtkSocketCommunicator,vtkCommunicator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkSocketController.cxx b/Parallel/vtkSocketController.cxx
index df2be797e050589d1cb607deaba628dc2a45158e..7480f100012be41cf439fdf7698f381be4c38d21 100644
--- a/Parallel/vtkSocketController.cxx
+++ b/Parallel/vtkSocketController.cxx
@@ -26,7 +26,6 @@
 
 int vtkSocketController::Initialized = 0;
 
-vtkCxxRevisionMacro(vtkSocketController, "1.15");
 vtkStandardNewMacro(vtkSocketController);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkSocketController.h b/Parallel/vtkSocketController.h
index 6a66c2b511339ce7475490f1d7c1b06d9aec2a98..aed78e160d4519768c056b658131e539d5e3b5c3 100644
--- a/Parallel/vtkSocketController.h
+++ b/Parallel/vtkSocketController.h
@@ -46,7 +46,7 @@ class VTK_PARALLEL_EXPORT vtkSocketController : public vtkMultiProcessController
 {
 public:
   static vtkSocketController *New();
-  vtkTypeRevisionMacro(vtkSocketController,vtkMultiProcessController);
+  vtkTypeMacro(vtkSocketController,vtkMultiProcessController);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkSubCommunicator.cxx b/Parallel/vtkSubCommunicator.cxx
index b7f48afc70a9c663909f0563a0d59c2adde8b322..c6fdc510460f2b3da6c30e590828779ef1358461 100644
--- a/Parallel/vtkSubCommunicator.cxx
+++ b/Parallel/vtkSubCommunicator.cxx
@@ -25,7 +25,6 @@
 #include "vtkProcessGroup.h"
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkSubCommunicator, "1.1");
 vtkStandardNewMacro(vtkSubCommunicator);
 
 //-----------------------------------------------------------------------------
diff --git a/Parallel/vtkSubCommunicator.h b/Parallel/vtkSubCommunicator.h
index 9882bb0878ad569440b9d63c9bdc615ec917539f..c02cdffc2fc0145f9b4515845955ecb9f2e01c73 100644
--- a/Parallel/vtkSubCommunicator.h
+++ b/Parallel/vtkSubCommunicator.h
@@ -50,7 +50,7 @@ class vtkProcessGroup;
 class VTK_PARALLEL_EXPORT vtkSubCommunicator : public vtkCommunicator
 {
 public:
-  vtkTypeRevisionMacro(vtkSubCommunicator, vtkCommunicator);
+  vtkTypeMacro(vtkSubCommunicator, vtkCommunicator);
   static vtkSubCommunicator *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Parallel/vtkSubGroup.cxx b/Parallel/vtkSubGroup.cxx
index 58072428c783f35b9ce6a3668598277486fbd283..8d94fb33b87575711f4c1318f127c66c8af0f1af 100644
--- a/Parallel/vtkSubGroup.cxx
+++ b/Parallel/vtkSubGroup.cxx
@@ -26,7 +26,6 @@
 #endif
 #include <vtkstd/algorithm>
 
-vtkCxxRevisionMacro(vtkSubGroup, "1.13");
 vtkStandardNewMacro(vtkSubGroup);
 
 vtkSubGroup::vtkSubGroup()
diff --git a/Parallel/vtkSubGroup.h b/Parallel/vtkSubGroup.h
index 5de7e98723308bcf0dd9ba929e90cf7873f7b3d3..a8a4d78548978a01a3440f7d729f529505cf5cc8 100644
--- a/Parallel/vtkSubGroup.h
+++ b/Parallel/vtkSubGroup.h
@@ -47,7 +47,7 @@ class vtkCommunicator;
 class VTK_PARALLEL_EXPORT vtkSubGroup : public vtkObject 
 {
 public:
-  vtkTypeRevisionMacro(vtkSubGroup, vtkObject);
+  vtkTypeMacro(vtkSubGroup, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkSubGroup *New();
 
diff --git a/Parallel/vtkTemporalFractal.cxx b/Parallel/vtkTemporalFractal.cxx
index 8e4c3166c364d8be9eeb7f5895d5b9672a861027..daf810f181e935535734e03660929289d2def026 100644
--- a/Parallel/vtkTemporalFractal.cxx
+++ b/Parallel/vtkTemporalFractal.cxx
@@ -37,7 +37,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkTemporalFractal, "1.10");
 vtkStandardNewMacro(vtkTemporalFractal);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkTemporalFractal.h b/Parallel/vtkTemporalFractal.h
index b318708e9e8ab8a20b6115405493856bcf0f8f6c..0d3950318695374bd09f49bd43216259b12dd50c 100644
--- a/Parallel/vtkTemporalFractal.h
+++ b/Parallel/vtkTemporalFractal.h
@@ -38,7 +38,7 @@ class VTK_PARALLEL_EXPORT vtkTemporalFractal : public vtkTemporalDataSetAlgorith
 {
 public:
   static vtkTemporalFractal *New();
-  vtkTypeRevisionMacro(vtkTemporalFractal,vtkTemporalDataSetAlgorithm);
+  vtkTypeMacro(vtkTemporalFractal,vtkTemporalDataSetAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkTemporalInterpolatedVelocityField.cxx b/Parallel/vtkTemporalInterpolatedVelocityField.cxx
index 5ac0fad8136afd692ac696150fbc04c026244837..3f5f0ef81b2cffa738199bf7d5b549481aac5c77 100644
--- a/Parallel/vtkTemporalInterpolatedVelocityField.cxx
+++ b/Parallel/vtkTemporalInterpolatedVelocityField.cxx
@@ -25,7 +25,6 @@
 
 #include <vtkstd/vector>
 //---------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkTemporalInterpolatedVelocityField, "1.9");
 vtkStandardNewMacro(vtkTemporalInterpolatedVelocityField);
 //---------------------------------------------------------------------------
 vtkTemporalInterpolatedVelocityField::vtkTemporalInterpolatedVelocityField()
diff --git a/Parallel/vtkTemporalInterpolatedVelocityField.h b/Parallel/vtkTemporalInterpolatedVelocityField.h
index 8071d4ccf74c2f9b486415c228567b7181511545..df20cdbc3ef9faf600cdbe5160c4a56a74b9f4e1 100644
--- a/Parallel/vtkTemporalInterpolatedVelocityField.h
+++ b/Parallel/vtkTemporalInterpolatedVelocityField.h
@@ -64,7 +64,7 @@ class vtkCachingInterpolatedVelocityField;
 class VTK_PARALLEL_EXPORT vtkTemporalInterpolatedVelocityField : public vtkFunctionSet
 {
 public:
-  vtkTypeRevisionMacro(vtkTemporalInterpolatedVelocityField,vtkFunctionSet);
+  vtkTypeMacro(vtkTemporalInterpolatedVelocityField,vtkFunctionSet);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkTemporalStreamTracer.cxx b/Parallel/vtkTemporalStreamTracer.cxx
index b9077a9087cad0f9f7000f197c986e10e3d4aa3f..101cbbb30cee904d2360b1544ea99239e77c18f8 100644
--- a/Parallel/vtkTemporalStreamTracer.cxx
+++ b/Parallel/vtkTemporalStreamTracer.cxx
@@ -68,7 +68,6 @@ PURPOSE.  See the above copyright notice for more information.
 using namespace vtkTemporalStreamTracerNamespace;
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkTemporalStreamTracer, "1.32");
 //----------------------------------------------------------------------------
 //#define JB_DEBUG__
 #if defined JB_DEBUG__
diff --git a/Parallel/vtkTemporalStreamTracer.h b/Parallel/vtkTemporalStreamTracer.h
index 30533ecd930e9581312c9ff8b917ea04918ea7a8..65d309377c57f34d151a241bcdb5751599517eaa 100644
--- a/Parallel/vtkTemporalStreamTracer.h
+++ b/Parallel/vtkTemporalStreamTracer.h
@@ -86,7 +86,7 @@ class VTK_PARALLEL_EXPORT vtkTemporalStreamTracer : public vtkStreamTracer
 {
 public:
 
-    vtkTypeRevisionMacro(vtkTemporalStreamTracer,vtkStreamTracer);
+    vtkTypeMacro(vtkTemporalStreamTracer,vtkStreamTracer);
     void PrintSelf(ostream& os, vtkIndent indent);
 
     // Description:
diff --git a/Parallel/vtkTransmitImageDataPiece.cxx b/Parallel/vtkTransmitImageDataPiece.cxx
index d2c6c3fa844cca13e8eff780d0f4d9014bf40e54..9fef4d9fc4c8247ecf38be4438b91920ee192b7a 100644
--- a/Parallel/vtkTransmitImageDataPiece.cxx
+++ b/Parallel/vtkTransmitImageDataPiece.cxx
@@ -25,7 +25,6 @@
 #include "vtkImageData.h"
 #include "vtkDoubleArray.h"
 
-vtkCxxRevisionMacro(vtkTransmitImageDataPiece, "1.4");
 vtkStandardNewMacro(vtkTransmitImageDataPiece);
 
 vtkCxxSetObjectMacro(vtkTransmitImageDataPiece,Controller,
diff --git a/Parallel/vtkTransmitImageDataPiece.h b/Parallel/vtkTransmitImageDataPiece.h
index fc6c59bc7ab03a7069b202736d4d7efd9cb06280..eee75354da84eaf2d6e07320ea8696ed64cf3a68 100644
--- a/Parallel/vtkTransmitImageDataPiece.h
+++ b/Parallel/vtkTransmitImageDataPiece.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkTransmitImageDataPiece : public vtkImageAlgorithm
 {
 public:
   static vtkTransmitImageDataPiece *New();
-  vtkTypeRevisionMacro(vtkTransmitImageDataPiece, vtkImageAlgorithm);
+  vtkTypeMacro(vtkTransmitImageDataPiece, vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkTransmitPolyDataPiece.cxx b/Parallel/vtkTransmitPolyDataPiece.cxx
index 58be88d61f08c7bc8b9587ed4fb80773dcde8dbd..3b88e9e5ce2cb21ba9227ab554a30aae917b681f 100644
--- a/Parallel/vtkTransmitPolyDataPiece.cxx
+++ b/Parallel/vtkTransmitPolyDataPiece.cxx
@@ -24,7 +24,6 @@
 #include "vtkPolyData.h"
 #include "vtkStreamingDemandDrivenPipeline.h"
 
-vtkCxxRevisionMacro(vtkTransmitPolyDataPiece, "1.23");
 vtkStandardNewMacro(vtkTransmitPolyDataPiece);
 
 vtkCxxSetObjectMacro(vtkTransmitPolyDataPiece,Controller,
diff --git a/Parallel/vtkTransmitPolyDataPiece.h b/Parallel/vtkTransmitPolyDataPiece.h
index 70f7b73e071d5adeac1d80b1131c7752acfbcfe8..b267fbf30668a1c54298466e9c1f3694d443d395 100644
--- a/Parallel/vtkTransmitPolyDataPiece.h
+++ b/Parallel/vtkTransmitPolyDataPiece.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkTransmitPolyDataPiece : public vtkPolyDataAlgorithm
 {
 public:
   static vtkTransmitPolyDataPiece *New();
-  vtkTypeRevisionMacro(vtkTransmitPolyDataPiece, vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkTransmitPolyDataPiece, vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkTransmitRectilinearGridPiece.cxx b/Parallel/vtkTransmitRectilinearGridPiece.cxx
index 56499d7fd1c0fa1f05dfbf90e0716935c9f9df87..85fda636f4437dd9f767aa62e6383d0c5669dabc 100644
--- a/Parallel/vtkTransmitRectilinearGridPiece.cxx
+++ b/Parallel/vtkTransmitRectilinearGridPiece.cxx
@@ -25,7 +25,6 @@
 #include "vtkRectilinearGrid.h"
 #include "vtkDoubleArray.h"
 
-vtkCxxRevisionMacro(vtkTransmitRectilinearGridPiece, "1.4");
 vtkStandardNewMacro(vtkTransmitRectilinearGridPiece);
 
 vtkCxxSetObjectMacro(vtkTransmitRectilinearGridPiece,Controller,
diff --git a/Parallel/vtkTransmitRectilinearGridPiece.h b/Parallel/vtkTransmitRectilinearGridPiece.h
index c1136464f7679299efc63bb1c9294199340bbb67..5ec6f4938574028d034fea8a3045e918c1966135 100644
--- a/Parallel/vtkTransmitRectilinearGridPiece.h
+++ b/Parallel/vtkTransmitRectilinearGridPiece.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkTransmitRectilinearGridPiece : public vtkRectilinea
 {
 public:
   static vtkTransmitRectilinearGridPiece *New();
-  vtkTypeRevisionMacro(vtkTransmitRectilinearGridPiece, vtkRectilinearGridAlgorithm);
+  vtkTypeMacro(vtkTransmitRectilinearGridPiece, vtkRectilinearGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkTransmitStructuredGridPiece.cxx b/Parallel/vtkTransmitStructuredGridPiece.cxx
index 912daa911f2d3ea544d381912dfa3d325855585a..89ac1253efa30d471da388268f05dabddb3d28a2 100644
--- a/Parallel/vtkTransmitStructuredGridPiece.cxx
+++ b/Parallel/vtkTransmitStructuredGridPiece.cxx
@@ -25,7 +25,6 @@
 #include "vtkStructuredGrid.h"
 #include "vtkDoubleArray.h"
 
-vtkCxxRevisionMacro(vtkTransmitStructuredGridPiece, "1.7");
 vtkStandardNewMacro(vtkTransmitStructuredGridPiece);
 
 vtkCxxSetObjectMacro(vtkTransmitStructuredGridPiece,Controller,
diff --git a/Parallel/vtkTransmitStructuredGridPiece.h b/Parallel/vtkTransmitStructuredGridPiece.h
index 576cf43c6a475b64b52b45f41e29b12feeae0ebf..846ac07d5337018fa717c425dedad5d4cc18f2ab 100644
--- a/Parallel/vtkTransmitStructuredGridPiece.h
+++ b/Parallel/vtkTransmitStructuredGridPiece.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkTransmitStructuredGridPiece : public vtkStructuredG
 {
 public:
   static vtkTransmitStructuredGridPiece *New();
-  vtkTypeRevisionMacro(vtkTransmitStructuredGridPiece, vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkTransmitStructuredGridPiece, vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkTransmitUnstructuredGridPiece.cxx b/Parallel/vtkTransmitUnstructuredGridPiece.cxx
index 83dcb4e76ed7629706953f440433832b72ab98ba..2958241a008098c444bd4fed33537c014e556699 100644
--- a/Parallel/vtkTransmitUnstructuredGridPiece.cxx
+++ b/Parallel/vtkTransmitUnstructuredGridPiece.cxx
@@ -24,7 +24,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkTransmitUnstructuredGridPiece, "1.21");
 vtkStandardNewMacro(vtkTransmitUnstructuredGridPiece);
 
 vtkCxxSetObjectMacro(vtkTransmitUnstructuredGridPiece,Controller,
diff --git a/Parallel/vtkTransmitUnstructuredGridPiece.h b/Parallel/vtkTransmitUnstructuredGridPiece.h
index ec2b7b026c2662f99c6e940f7e4a8d7737680ff4..6b717cacc90d5fdbe9c6faffe8146475a541cad0 100644
--- a/Parallel/vtkTransmitUnstructuredGridPiece.h
+++ b/Parallel/vtkTransmitUnstructuredGridPiece.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkTransmitUnstructuredGridPiece : public vtkUnstructu
 {
 public:
   static vtkTransmitUnstructuredGridPiece *New();
-  vtkTypeRevisionMacro(vtkTransmitUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
+  vtkTypeMacro(vtkTransmitUnstructuredGridPiece, vtkUnstructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Parallel/vtkTreeCompositer.cxx b/Parallel/vtkTreeCompositer.cxx
index e8045d051a5f6315083f981a39dce67ff03acc66..b21575f20a6de04c492545809771c1a0d0ad69be 100644
--- a/Parallel/vtkTreeCompositer.cxx
+++ b/Parallel/vtkTreeCompositer.cxx
@@ -46,7 +46,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtkMultiProcessController.h"
 
-vtkCxxRevisionMacro(vtkTreeCompositer, "1.6");
 vtkStandardNewMacro(vtkTreeCompositer);
 
 #ifdef VTK_USE_MPI
diff --git a/Parallel/vtkTreeCompositer.h b/Parallel/vtkTreeCompositer.h
index 4939d111d8437bacfc6fd606b430acbe7ffc7a1d..33990c4281817e23a654f782d14676e4f4e87311 100644
--- a/Parallel/vtkTreeCompositer.h
+++ b/Parallel/vtkTreeCompositer.h
@@ -61,7 +61,7 @@ class VTK_PARALLEL_EXPORT vtkTreeCompositer : public vtkCompositer
 {
 public:
   static vtkTreeCompositer *New();
-  vtkTypeRevisionMacro(vtkTreeCompositer,vtkCompositer);
+  vtkTypeMacro(vtkTreeCompositer,vtkCompositer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void CompositeBuffer(vtkDataArray *pBuf, vtkFloatArray *zBuf,
diff --git a/Parallel/vtkVPICReader.cxx b/Parallel/vtkVPICReader.cxx
index 06ebacdb87f3dade278c206097fa251449318ce5..b10235dd4e855a77290fdc7286b2d9680be6d827 100644
--- a/Parallel/vtkVPICReader.cxx
+++ b/Parallel/vtkVPICReader.cxx
@@ -34,7 +34,6 @@
 #include "VPICDataSet.h"
 #include "VPICView.h"
 
-vtkCxxRevisionMacro(vtkVPICReader, "1.10");
 vtkStandardNewMacro(vtkVPICReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkVPICReader.h b/Parallel/vtkVPICReader.h
index 9bb57f4ad60d2d2df289e801313ad0e68aaa5068..4de953cf0b78e64b2d282b3d7fc86c214532ed78 100644
--- a/Parallel/vtkVPICReader.h
+++ b/Parallel/vtkVPICReader.h
@@ -42,7 +42,7 @@ class VTK_PARALLEL_EXPORT vtkVPICReader : public vtkImageAlgorithm
 {
 public:
   static vtkVPICReader *New();
-  vtkTypeRevisionMacro(vtkVPICReader,vtkImageAlgorithm);
+  vtkTypeMacro(vtkVPICReader,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkWindBladeReader.cxx b/Parallel/vtkWindBladeReader.cxx
index e416b3a393914c85cf0e2aeebc8474e42b571a05..1938e695269396248c9702bc4e7db74c4d1664fd 100644
--- a/Parallel/vtkWindBladeReader.cxx
+++ b/Parallel/vtkWindBladeReader.cxx
@@ -50,7 +50,6 @@ static const char * Slash = "\\";
 static const char * Slash = "/";
 #endif
 
-vtkCxxRevisionMacro(vtkWindBladeReader, "1.8");
 vtkStandardNewMacro(vtkWindBladeReader);
 
 //----------------------------------------------------------------------------
diff --git a/Parallel/vtkWindBladeReader.h b/Parallel/vtkWindBladeReader.h
index f3d543834478b5b1bf592d964dd58446ba97f010..1c8ae77a146e84ccff5a6d6adf926f77d931144f 100644
--- a/Parallel/vtkWindBladeReader.h
+++ b/Parallel/vtkWindBladeReader.h
@@ -57,7 +57,7 @@ class VTK_PARALLEL_EXPORT vtkWindBladeReader : public vtkStructuredGridAlgorithm
 {
 public:
   static vtkWindBladeReader *New();
-  vtkTypeRevisionMacro(vtkWindBladeReader,vtkStructuredGridAlgorithm);
+  vtkTypeMacro(vtkWindBladeReader,vtkStructuredGridAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   vtkSetStringMacro(Filename);
diff --git a/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx b/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx
index d059271b4b912f3422b7726ef8ca300f9ac82de9..ad44029ce707cc17dc50985234f98bed4b2fd802 100644
--- a/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx
+++ b/Parallel/vtkXMLPHierarchicalBoxDataWriter.cxx
@@ -20,7 +20,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkXMLPHierarchicalBoxDataWriter);
-vtkCxxRevisionMacro(vtkXMLPHierarchicalBoxDataWriter, "1.5");
 
 vtkCxxSetObjectMacro(vtkXMLPHierarchicalBoxDataWriter, 
                      Controller,
diff --git a/Parallel/vtkXMLPHierarchicalBoxDataWriter.h b/Parallel/vtkXMLPHierarchicalBoxDataWriter.h
index d953f080c41886a268ce10431432b0bcdaf4b3fc..8b6bb146d19e3981b24a397c933e37028afe194c 100644
--- a/Parallel/vtkXMLPHierarchicalBoxDataWriter.h
+++ b/Parallel/vtkXMLPHierarchicalBoxDataWriter.h
@@ -31,7 +31,7 @@ class VTK_PARALLEL_EXPORT vtkXMLPHierarchicalBoxDataWriter : public vtkXMLHierar
 {
 public:
   static vtkXMLPHierarchicalBoxDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPHierarchicalBoxDataWriter, vtkXMLHierarchicalBoxDataWriter);
+  vtkTypeMacro(vtkXMLPHierarchicalBoxDataWriter, vtkXMLHierarchicalBoxDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Parallel/vtkXMLPMultiBlockDataWriter.cxx b/Parallel/vtkXMLPMultiBlockDataWriter.cxx
index c24b1765b072d06a9f97b1c1c4e4a57dcc4c7368..bc9fea19b7389cf3e5093e3826c9e0712e065b70 100644
--- a/Parallel/vtkXMLPMultiBlockDataWriter.cxx
+++ b/Parallel/vtkXMLPMultiBlockDataWriter.cxx
@@ -26,7 +26,6 @@
 
 //----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkXMLPMultiBlockDataWriter);
-vtkCxxRevisionMacro(vtkXMLPMultiBlockDataWriter, "1.10");
 
 vtkCxxSetObjectMacro(vtkXMLPMultiBlockDataWriter, 
                      Controller,
diff --git a/Parallel/vtkXMLPMultiBlockDataWriter.h b/Parallel/vtkXMLPMultiBlockDataWriter.h
index 4e8eaba5eaa827ae837d838f1b3158d2015b711c..d5fba57bc85eded763107dcadedf6ac82531b4d3 100644
--- a/Parallel/vtkXMLPMultiBlockDataWriter.h
+++ b/Parallel/vtkXMLPMultiBlockDataWriter.h
@@ -32,7 +32,7 @@ class VTK_PARALLEL_EXPORT vtkXMLPMultiBlockDataWriter : public vtkXMLMultiBlockD
 {
 public:
   static vtkXMLPMultiBlockDataWriter* New();
-  vtkTypeRevisionMacro(vtkXMLPMultiBlockDataWriter, vtkXMLMultiBlockDataWriter);
+  vtkTypeMacro(vtkXMLPMultiBlockDataWriter, vtkXMLMultiBlockDataWriter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAbstractMapper3D.cxx b/Rendering/vtkAbstractMapper3D.cxx
index dd20f6247b0d37576853b61f078f69c0c1788db9..c7ed18b51cbb4be7fcc11f98c919c9c142052f79 100644
--- a/Rendering/vtkAbstractMapper3D.cxx
+++ b/Rendering/vtkAbstractMapper3D.cxx
@@ -16,7 +16,6 @@
 #include "vtkDataSet.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkAbstractMapper3D, "1.19");
 
 // Construct with initial range (0,1).
 vtkAbstractMapper3D::vtkAbstractMapper3D()
diff --git a/Rendering/vtkAbstractMapper3D.h b/Rendering/vtkAbstractMapper3D.h
index 5c33859491c73ca29c1b81913a9e26873292009a..a3691f5afe9103fd6b3d13aea782491c0c99d445 100644
--- a/Rendering/vtkAbstractMapper3D.h
+++ b/Rendering/vtkAbstractMapper3D.h
@@ -37,7 +37,7 @@ class vtkDataSet;
 class VTK_RENDERING_EXPORT vtkAbstractMapper3D : public vtkAbstractMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractMapper3D,vtkAbstractMapper);
+  vtkTypeMacro(vtkAbstractMapper3D,vtkAbstractMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAbstractPicker.cxx b/Rendering/vtkAbstractPicker.cxx
index 3a6bd8e04c1cb2ca9cf52c65f6d9b09c20c642bd..97faa576be0c7fc6e77bb37baa4cdc5859a13d13 100644
--- a/Rendering/vtkAbstractPicker.cxx
+++ b/Rendering/vtkAbstractPicker.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkAbstractPicker, "1.11");
 
 // Construct object with initial tolerance of 1/40th of window. There are no
 // pick methods and picking is performed from the renderer's actors.
diff --git a/Rendering/vtkAbstractPicker.h b/Rendering/vtkAbstractPicker.h
index 50c50c740505af6b5ad8f6be3ae4f675d77c90a2..1a32319c078cae59916a5c48107ffecc33593ef1 100644
--- a/Rendering/vtkAbstractPicker.h
+++ b/Rendering/vtkAbstractPicker.h
@@ -63,7 +63,7 @@ class vtkPropCollection;
 class VTK_RENDERING_EXPORT vtkAbstractPicker : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractPicker,vtkObject);
+  vtkTypeMacro(vtkAbstractPicker,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAbstractPropPicker.cxx b/Rendering/vtkAbstractPropPicker.cxx
index b525d4b5c597189e71a9bf7bb7f5b09ab4704647..e31c2bd5e54e2c26a0407f144b0d326158d591ae 100644
--- a/Rendering/vtkAbstractPropPicker.cxx
+++ b/Rendering/vtkAbstractPropPicker.cxx
@@ -23,7 +23,6 @@
 #include "vtkPropAssembly.h"
 #include "vtkVolume.h"
 
-vtkCxxRevisionMacro(vtkAbstractPropPicker, "1.12");
 
 vtkCxxSetObjectMacro(vtkAbstractPropPicker,Path,vtkAssemblyPath);
 
diff --git a/Rendering/vtkAbstractPropPicker.h b/Rendering/vtkAbstractPropPicker.h
index 690813506fc0d15d732425b72e469f1e3d6be23c..67f2424e83231c36e3f9b02115b4cde17224efe3 100644
--- a/Rendering/vtkAbstractPropPicker.h
+++ b/Rendering/vtkAbstractPropPicker.h
@@ -73,7 +73,7 @@ class vtkActor2D;
 class VTK_RENDERING_EXPORT vtkAbstractPropPicker : public vtkAbstractPicker
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractPropPicker,vtkAbstractPicker);
+  vtkTypeMacro(vtkAbstractPropPicker,vtkAbstractPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAbstractVolumeMapper.cxx b/Rendering/vtkAbstractVolumeMapper.cxx
index 557f9bb7e4df230510e253dc5e70612080ec218f..d8d89efea57b794fd785dbf234713b11d82057ef 100644
--- a/Rendering/vtkAbstractVolumeMapper.cxx
+++ b/Rendering/vtkAbstractVolumeMapper.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformation.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkAbstractVolumeMapper, "1.12");
 
 // Construct a vtkAbstractVolumeMapper 
 vtkAbstractVolumeMapper::vtkAbstractVolumeMapper()
diff --git a/Rendering/vtkAbstractVolumeMapper.h b/Rendering/vtkAbstractVolumeMapper.h
index c6d8fb59f0a964b86b9c1bfebdc6b251a6af2bf8..1e2691493ca1acc3c15195a541b8b03418b61ad8 100644
--- a/Rendering/vtkAbstractVolumeMapper.h
+++ b/Rendering/vtkAbstractVolumeMapper.h
@@ -34,7 +34,7 @@ class vtkDataSet;
 class VTK_RENDERING_EXPORT vtkAbstractVolumeMapper : public vtkAbstractMapper3D
 {
 public:
-  vtkTypeRevisionMacro(vtkAbstractVolumeMapper,vtkAbstractMapper3D);
+  vtkTypeMacro(vtkAbstractVolumeMapper,vtkAbstractMapper3D);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Rendering/vtkActor.cxx b/Rendering/vtkActor.cxx
index b2f3791c8d40e5e33cce9330163beca8c3e721f6..f5a2a141128c292a40ebff9abdc56b437bd54d7d 100644
--- a/Rendering/vtkActor.cxx
+++ b/Rendering/vtkActor.cxx
@@ -31,7 +31,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkActor, "1.144");
 
 vtkCxxSetObjectMacro(vtkActor,Texture,vtkTexture);
 vtkCxxSetObjectMacro(vtkActor,Mapper,vtkMapper);
diff --git a/Rendering/vtkActor.h b/Rendering/vtkActor.h
index 9d7174b1c1e5b1b513a4c095a2ad2e9a66f16106..19b523c675da0360432339237bf0a9a4f829a3aa 100644
--- a/Rendering/vtkActor.h
+++ b/Rendering/vtkActor.h
@@ -41,7 +41,7 @@ class vtkProperty;
 class VTK_RENDERING_EXPORT vtkActor : public vtkProp3D
 {
 public:
-  vtkTypeRevisionMacro(vtkActor,vtkProp3D);
+  vtkTypeMacro(vtkActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkActorCollection.cxx b/Rendering/vtkActorCollection.cxx
index d73ec64044dbcba43b3162cfac3249717d5eb4a2..4adb8a486305349a5a1201d37f9ec0518094eeef 100644
--- a/Rendering/vtkActorCollection.cxx
+++ b/Rendering/vtkActorCollection.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkProperty.h"
 
-vtkCxxRevisionMacro(vtkActorCollection, "1.12");
 vtkStandardNewMacro(vtkActorCollection);
 
 void vtkActorCollection::ApplyProperties(vtkProperty *p)
diff --git a/Rendering/vtkActorCollection.h b/Rendering/vtkActorCollection.h
index fc1b0bfa8ceddf6134793255a7f79cd2ca2686e0..eb86f803e178e45517d66ef2ca56226aacddc203 100644
--- a/Rendering/vtkActorCollection.h
+++ b/Rendering/vtkActorCollection.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkActorCollection : public vtkPropCollection
 {
 public:
   static vtkActorCollection *New();
-  vtkTypeRevisionMacro(vtkActorCollection,vtkPropCollection);
+  vtkTypeMacro(vtkActorCollection,vtkPropCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAreaPicker.cxx b/Rendering/vtkAreaPicker.cxx
index 73319dc0a4335644f620cef39c4d3048d637847b..c600272684d3603385442c787903d22be924762c 100644
--- a/Rendering/vtkAreaPicker.cxx
+++ b/Rendering/vtkAreaPicker.cxx
@@ -35,7 +35,6 @@
 #include "vtkPoints.h"
 #include "vtkExtractSelectedFrustum.h"
 
-vtkCxxRevisionMacro(vtkAreaPicker, "1.19");
 vtkStandardNewMacro(vtkAreaPicker);
 
 //--------------------------------------------------------------------------
diff --git a/Rendering/vtkAreaPicker.h b/Rendering/vtkAreaPicker.h
index 1e98819cb69bc64c70b075dc9897bfdc2019299a..0ac8308b6046ed23383130473256f15cd8a56e2f 100644
--- a/Rendering/vtkAreaPicker.h
+++ b/Rendering/vtkAreaPicker.h
@@ -57,7 +57,7 @@ class VTK_RENDERING_EXPORT vtkAreaPicker : public vtkAbstractPropPicker
 {
 public:
   static vtkAreaPicker *New();
-  vtkTypeRevisionMacro(vtkAreaPicker,vtkAbstractPropPicker);
+  vtkTypeMacro(vtkAreaPicker,vtkAbstractPropPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAssembly.cxx b/Rendering/vtkAssembly.cxx
index 43eb258a700539ae0add55f525b54610599d6b97..914b52048df1db6232f7e2bcd8aa1afdb67cd2d2 100644
--- a/Rendering/vtkAssembly.cxx
+++ b/Rendering/vtkAssembly.cxx
@@ -22,7 +22,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkVolume.h"
 
-vtkCxxRevisionMacro(vtkAssembly, "1.60");
 vtkStandardNewMacro(vtkAssembly);
 
 // Construct object with no children.
diff --git a/Rendering/vtkAssembly.h b/Rendering/vtkAssembly.h
index 9cce4bb55999b93f08914b0fa635123a1fc946aa..505011a88cec4d0f2b1d68df35068509cc671064 100644
--- a/Rendering/vtkAssembly.h
+++ b/Rendering/vtkAssembly.h
@@ -65,7 +65,7 @@ class VTK_RENDERING_EXPORT vtkAssembly : public vtkProp3D
 public:
   static vtkAssembly *New();
 
-  vtkTypeRevisionMacro(vtkAssembly,vtkProp3D);
+  vtkTypeMacro(vtkAssembly,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkAxisActor2D.cxx b/Rendering/vtkAxisActor2D.cxx
index 87b488ccdc4890a4f64cd41fa46a006fafd3368b..9ab58b0945bc074baa26a8a40c544c600f78efe8 100644
--- a/Rendering/vtkAxisActor2D.cxx
+++ b/Rendering/vtkAxisActor2D.cxx
@@ -24,7 +24,6 @@
 #include "vtkWindow.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkAxisActor2D, "1.51");
 vtkStandardNewMacro(vtkAxisActor2D);
 
 vtkCxxSetObjectMacro(vtkAxisActor2D,LabelTextProperty,vtkTextProperty);
diff --git a/Rendering/vtkAxisActor2D.h b/Rendering/vtkAxisActor2D.h
index 8affb698e1664004842576dccf984f2c98f9bec7..3bcc02af3a1e9420eed2f6824be6be433591aca0 100644
--- a/Rendering/vtkAxisActor2D.h
+++ b/Rendering/vtkAxisActor2D.h
@@ -66,7 +66,7 @@ class vtkTextProperty;
 class VTK_RENDERING_EXPORT vtkAxisActor2D : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkAxisActor2D,vtkActor2D);
+  vtkTypeMacro(vtkAxisActor2D,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCamera.cxx b/Rendering/vtkCamera.cxx
index c475ed898c049df9adab0abeffc0ed922cee447c..7a47aae7b1875f62307c5b9db001671eaca9a5e2 100644
--- a/Rendering/vtkCamera.cxx
+++ b/Rendering/vtkCamera.cxx
@@ -23,7 +23,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkCamera, "1.120");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkCamera.h b/Rendering/vtkCamera.h
index 3a6df052769c93b10eb50e300edddb9e3ef45140..490a3b665bd52e626a914ac033f6eea0824d4a77 100644
--- a/Rendering/vtkCamera.h
+++ b/Rendering/vtkCamera.h
@@ -40,7 +40,7 @@ class VTK_RENDERING_EXPORT vtkCamera : public vtkObject
 {
  public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkCamera,vtkObject);
+  vtkTypeMacro(vtkCamera,vtkObject);
 
   // Description:
   // Construct camera instance with its focal point at the origin, 
diff --git a/Rendering/vtkCameraActor.cxx b/Rendering/vtkCameraActor.cxx
index a8ea0d0ba13bebb66d2b05b5e8a033faefe250b0..63bb3987d5eebff4cb7e8e6f2e559d169e1ef61f 100644
--- a/Rendering/vtkCameraActor.cxx
+++ b/Rendering/vtkCameraActor.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkCameraActor, "1.5");
 vtkStandardNewMacro(vtkCameraActor);
 vtkCxxSetObjectMacro(vtkCameraActor, Camera, vtkCamera);
 
diff --git a/Rendering/vtkCameraActor.h b/Rendering/vtkCameraActor.h
index eaa026a847adef469d9e4d71c07216e6ddc90abb..76e61695039fed367e51bc30c521f6f4be77b882 100644
--- a/Rendering/vtkCameraActor.h
+++ b/Rendering/vtkCameraActor.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkCameraActor : public vtkProp3D
 {
 public:
   static vtkCameraActor *New();
-  vtkTypeRevisionMacro(vtkCameraActor,vtkProp3D);
+  vtkTypeMacro(vtkCameraActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCameraInterpolator.cxx b/Rendering/vtkCameraInterpolator.cxx
index cc6f282d114f9e4b7a31864368c2c64f4cd9efe8..c96fbe9ea3da5b485ba3857d1a9fe1f5ecb84a56 100644
--- a/Rendering/vtkCameraInterpolator.cxx
+++ b/Rendering/vtkCameraInterpolator.cxx
@@ -19,7 +19,6 @@
 #include "vtkTupleInterpolator.h"
 #include <vtkstd/list>
 
-vtkCxxRevisionMacro(vtkCameraInterpolator, "1.6");
 vtkStandardNewMacro(vtkCameraInterpolator);
 
 // PIMPL STL encapsulation for list of cameras. This just keeps track of all
diff --git a/Rendering/vtkCameraInterpolator.h b/Rendering/vtkCameraInterpolator.h
index 9244c0671bcd54ea60ff3def6442d8f34a9e7a0c..4ab7509753e213b8dc57597b1c5e9bde4b6d0f11 100644
--- a/Rendering/vtkCameraInterpolator.h
+++ b/Rendering/vtkCameraInterpolator.h
@@ -57,7 +57,7 @@ class vtkCameraList;
 class VTK_RENDERING_EXPORT vtkCameraInterpolator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCameraInterpolator, vtkObject);
+  vtkTypeMacro(vtkCameraInterpolator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCameraPass.cxx b/Rendering/vtkCameraPass.cxx
index a3713228d0487cc8b52347cb2368bcec39dcecfc..ea2c331d32e66d6547ae363a39e1dd2560033d7d 100644
--- a/Rendering/vtkCameraPass.cxx
+++ b/Rendering/vtkCameraPass.cxx
@@ -25,7 +25,6 @@
 #include "vtkCamera.h"
 #include "vtkFrameBufferObject.h"
 
-vtkCxxRevisionMacro(vtkCameraPass, "1.5");
 vtkStandardNewMacro(vtkCameraPass);
 vtkCxxSetObjectMacro(vtkCameraPass,DelegatePass,vtkRenderPass);
 
diff --git a/Rendering/vtkCameraPass.h b/Rendering/vtkCameraPass.h
index e8ccb36f7ceb47142159801928b50a9d650aa832..a0fee307087ac6f1787a0e8b5e9a9564f2399d8f 100644
--- a/Rendering/vtkCameraPass.h
+++ b/Rendering/vtkCameraPass.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkCameraPass : public vtkRenderPass
 {
 public:
   static vtkCameraPass *New();
-  vtkTypeRevisionMacro(vtkCameraPass,vtkRenderPass);
+  vtkTypeMacro(vtkCameraPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkCarbonRenderWindow.cxx b/Rendering/vtkCarbonRenderWindow.cxx
index 38c566e6da857df4a89e937129ca0ef243d4ffca..365c4c43c734b834bc7f85bc336fb982b2cee902 100644
--- a/Rendering/vtkCarbonRenderWindow.cxx
+++ b/Rendering/vtkCarbonRenderWindow.cxx
@@ -29,7 +29,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <math.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkCarbonRenderWindow, "1.79");
 vtkStandardNewMacro(vtkCarbonRenderWindow);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkCarbonRenderWindow.h b/Rendering/vtkCarbonRenderWindow.h
index ec2f418c87df0b1084cb7f279e0ee134b00dea83..299038a4186b1cd33d5af3880c29b31400c184e7 100644
--- a/Rendering/vtkCarbonRenderWindow.h
+++ b/Rendering/vtkCarbonRenderWindow.h
@@ -56,7 +56,7 @@ class VTK_RENDERING_EXPORT vtkCarbonRenderWindow : public vtkOpenGLRenderWindow
 {
 public:
   static vtkCarbonRenderWindow *New();
-  vtkTypeRevisionMacro(vtkCarbonRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkCarbonRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCarbonRenderWindowInteractor.cxx b/Rendering/vtkCarbonRenderWindowInteractor.cxx
index 4b0f0d2d613b69abf0d56db8baf2b03178817d65..6a2ae86a60472b167147eed91c8d360877686c66 100644
--- a/Rendering/vtkCarbonRenderWindowInteractor.cxx
+++ b/Rendering/vtkCarbonRenderWindowInteractor.cxx
@@ -28,7 +28,6 @@
 #include "vtkTDxMacDevice.h"
 #endif
 
-vtkCxxRevisionMacro(vtkCarbonRenderWindowInteractor, "1.31");
 vtkStandardNewMacro(vtkCarbonRenderWindowInteractor);
 
 void (*vtkCarbonRenderWindowInteractor::ClassExitMethod)(void *) 
diff --git a/Rendering/vtkCarbonRenderWindowInteractor.h b/Rendering/vtkCarbonRenderWindowInteractor.h
index 678dac423a5cceb3d9459346154fa027c0feee22..fa7652fbd171ef3a6868b2a7be2526475b571c7f 100644
--- a/Rendering/vtkCarbonRenderWindowInteractor.h
+++ b/Rendering/vtkCarbonRenderWindowInteractor.h
@@ -47,7 +47,7 @@ public:
   // Construct object so that light follows camera motion.
   static vtkCarbonRenderWindowInteractor *New();
 
-  vtkTypeRevisionMacro(vtkCarbonRenderWindowInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkCarbonRenderWindowInteractor,vtkRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCellCenterDepthSort.cxx b/Rendering/vtkCellCenterDepthSort.cxx
index 45a2c2e9c069d6d9c38d328611be9d5cfd482910..9c4b47d7d2815811d919fcc352b9e2ad57beede6 100644
--- a/Rendering/vtkCellCenterDepthSort.cxx
+++ b/Rendering/vtkCellCenterDepthSort.cxx
@@ -49,7 +49,6 @@ public:
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkCellCenterDepthSort, "1.4");
 vtkStandardNewMacro(vtkCellCenterDepthSort);
 
 vtkCellCenterDepthSort::vtkCellCenterDepthSort()
diff --git a/Rendering/vtkCellCenterDepthSort.h b/Rendering/vtkCellCenterDepthSort.h
index 4f46fc9e393349776249ecaaeff5be9e59762add..24e01ba6efbedc847b6784075c8847d7f9d7b4fa 100644
--- a/Rendering/vtkCellCenterDepthSort.h
+++ b/Rendering/vtkCellCenterDepthSort.h
@@ -45,7 +45,7 @@ class vtkCellCenterDepthSortStack;
 class VTK_RENDERING_EXPORT vtkCellCenterDepthSort : public vtkVisibilitySort
 {
 public:
-  vtkTypeRevisionMacro(vtkCellCenterDepthSort, vtkVisibilitySort);
+  vtkTypeMacro(vtkCellCenterDepthSort, vtkVisibilitySort);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkCellCenterDepthSort *New();
 
diff --git a/Rendering/vtkCellPicker.cxx b/Rendering/vtkCellPicker.cxx
index aa37d149b348ea953f81825e062e8fe33262a906..70733f9484263c43a6633b5ef54b719c01e48576 100644
--- a/Rendering/vtkCellPicker.cxx
+++ b/Rendering/vtkCellPicker.cxx
@@ -40,7 +40,6 @@
 #include "vtkCamera.h"
 #include "vtkAbstractCellLocator.h"
 
-vtkCxxRevisionMacro(vtkCellPicker, "1.51");
 vtkStandardNewMacro(vtkCellPicker);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkCellPicker.h b/Rendering/vtkCellPicker.h
index ff82c797c6215aa6e0007b95382727f9871e7c38..d17b8ab66588a736543fe2bafda1a297f1824c56 100644
--- a/Rendering/vtkCellPicker.h
+++ b/Rendering/vtkCellPicker.h
@@ -59,7 +59,7 @@ class VTK_RENDERING_EXPORT vtkCellPicker : public vtkPicker
 {
 public:
   static vtkCellPicker *New();
-  vtkTypeRevisionMacro(vtkCellPicker, vtkPicker);
+  vtkTypeMacro(vtkCellPicker, vtkPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCgShader.cxx b/Rendering/vtkCgShader.cxx
index 3f5b65a0f61391cf6657ca74c27aa75e4379a33d..4633686c7a79007cb79c2327ea846cc0919ba7dd 100644
--- a/Rendering/vtkCgShader.cxx
+++ b/Rendering/vtkCgShader.cxx
@@ -155,7 +155,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkCgShader, "1.9");
 vtkStandardNewMacro(vtkCgShader);
 
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkCgShader.h b/Rendering/vtkCgShader.h
index 982998ee398e95aa71b0c4cea6b1cb79f537d250..4c8cb6fd6a847d57455497048cb22436d6dbd39b 100644
--- a/Rendering/vtkCgShader.h
+++ b/Rendering/vtkCgShader.h
@@ -98,7 +98,7 @@ class VTK_RENDERING_EXPORT vtkCgShader : public vtkShader
 {
 public:
   static vtkCgShader *New();
-  vtkTypeRevisionMacro(vtkCgShader, vtkShader);
+  vtkTypeMacro(vtkCgShader, vtkShader);
   void PrintSelf(ostream &os, vtkIndent indent);
  
   // Called to compile the shader code.
diff --git a/Rendering/vtkCgShaderDeviceAdapter.cxx b/Rendering/vtkCgShaderDeviceAdapter.cxx
index 3231d297ee56f407b9ff1c1918668664584e68ec..1d7abd3aec71ab22db9967087975862a75872d56 100644
--- a/Rendering/vtkCgShaderDeviceAdapter.cxx
+++ b/Rendering/vtkCgShaderDeviceAdapter.cxx
@@ -28,7 +28,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkCgShaderDeviceAdapter);
-vtkCxxRevisionMacro(vtkCgShaderDeviceAdapter, "1.1");
 //----------------------------------------------------------------------------
 vtkCgShaderDeviceAdapter::vtkCgShaderDeviceAdapter()
 {
diff --git a/Rendering/vtkCgShaderDeviceAdapter.h b/Rendering/vtkCgShaderDeviceAdapter.h
index ca5b803c7520fc7fd6149acb552d27196343bd67..0f5917fe1c9022a2e7d05aaca64ce84283b0eae1 100644
--- a/Rendering/vtkCgShaderDeviceAdapter.h
+++ b/Rendering/vtkCgShaderDeviceAdapter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkCgShaderDeviceAdapter : public vtkShaderDeviceAdap
 {
 public:
   static vtkCgShaderDeviceAdapter* New();
-  vtkTypeRevisionMacro(vtkCgShaderDeviceAdapter, vtkShaderDeviceAdapter);
+  vtkTypeMacro(vtkCgShaderDeviceAdapter, vtkShaderDeviceAdapter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descrition:
diff --git a/Rendering/vtkCgShaderProgram.cxx b/Rendering/vtkCgShaderProgram.cxx
index 7c1ad07587be92cf58a1b5a9f125475d702b6fe2..661e016d9ba7403380e3119bf2eeca78b0f48bc9 100644
--- a/Rendering/vtkCgShaderProgram.cxx
+++ b/Rendering/vtkCgShaderProgram.cxx
@@ -32,7 +32,6 @@
 #include "vtkXMLMaterialReader.h"
 
 
-vtkCxxRevisionMacro(vtkCgShaderProgram, "1.5");
 vtkStandardNewMacro(vtkCgShaderProgram);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkCgShaderProgram.h b/Rendering/vtkCgShaderProgram.h
index c7019f2f0e8024a65f7033ea0fb709c056596681..e02514f04313cd642f06cc5cc34a9522ec88902f 100644
--- a/Rendering/vtkCgShaderProgram.h
+++ b/Rendering/vtkCgShaderProgram.h
@@ -50,7 +50,7 @@ class vtkRenderer;
 class VTK_RENDERING_EXPORT vtkCgShaderProgram : public vtkShaderProgram
 {
 public:
-  vtkTypeRevisionMacro(vtkCgShaderProgram, vtkShaderProgram);
+  vtkTypeMacro(vtkCgShaderProgram, vtkShaderProgram);
   static vtkCgShaderProgram *New();
   void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkChooserPainter.cxx b/Rendering/vtkChooserPainter.cxx
index a215b0f81b83a1dfb3e97ef02b6feaa059d02241..7bedf0100c45be98687436cfa36cb7514fe978b5 100644
--- a/Rendering/vtkChooserPainter.cxx
+++ b/Rendering/vtkChooserPainter.cxx
@@ -28,7 +28,6 @@
 #include "vtkStandardPolyDataPainter.h"
 #include "vtkTStripsPainter.h"
 
-vtkCxxRevisionMacro(vtkChooserPainter, "1.9");
 vtkStandardNewMacro(vtkChooserPainter);
 
 vtkCxxSetObjectMacro(vtkChooserPainter, VertPainter, vtkPolyDataPainter);
diff --git a/Rendering/vtkChooserPainter.h b/Rendering/vtkChooserPainter.h
index 540b6316708ab8ec983eb61e87928d8441940f64..f30fc62d4427841b59c3a119116cb0220bbe6694 100644
--- a/Rendering/vtkChooserPainter.h
+++ b/Rendering/vtkChooserPainter.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkChooserPainter : public vtkPolyDataPainter
 {
 public:
   static vtkChooserPainter *New();
-  vtkTypeRevisionMacro(vtkChooserPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkChooserPainter, vtkPolyDataPainter);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   void SetVertPainter(vtkPolyDataPainter*);
diff --git a/Rendering/vtkClearZPass.cxx b/Rendering/vtkClearZPass.cxx
index 09bd9315a119bb9e63baa05d5c46b1b21ea546e4..c20f16a099f0030e66979610608c476082e60433 100644
--- a/Rendering/vtkClearZPass.cxx
+++ b/Rendering/vtkClearZPass.cxx
@@ -20,7 +20,6 @@
 #include "vtkRenderer.h"
 #include "vtkgl.h"
 
-vtkCxxRevisionMacro(vtkClearZPass, "1.2");
 vtkStandardNewMacro(vtkClearZPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkClearZPass.h b/Rendering/vtkClearZPass.h
index f1eac5d4b3150cdce5edeea8f05173e557ade76a..3efa6ed2a6616cf0f90723afe06c1d7b644e1c0f 100644
--- a/Rendering/vtkClearZPass.h
+++ b/Rendering/vtkClearZPass.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkClearZPass : public vtkRenderPass
 {
 public:
   static vtkClearZPass *New();
-  vtkTypeRevisionMacro(vtkClearZPass,vtkRenderPass);
+  vtkTypeMacro(vtkClearZPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkClipPlanesPainter.cxx b/Rendering/vtkClipPlanesPainter.cxx
index b279350ecf9140bd2033de494063e3752ca10917..b76508a21601a7fb2824702c1984e483c506466d 100644
--- a/Rendering/vtkClipPlanesPainter.cxx
+++ b/Rendering/vtkClipPlanesPainter.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPlaneCollection.h"
 
-vtkCxxRevisionMacro(vtkClipPlanesPainter, "1.3");
 vtkCxxSetObjectMacro(vtkClipPlanesPainter, ClippingPlanes, vtkPlaneCollection);
 
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkClipPlanesPainter.h b/Rendering/vtkClipPlanesPainter.h
index fb6282542a967f060a9f85c36ff85bcb5880a213..519d37d34b0c36887117c71936230ee8dbe9d774 100644
--- a/Rendering/vtkClipPlanesPainter.h
+++ b/Rendering/vtkClipPlanesPainter.h
@@ -27,7 +27,7 @@ class VTK_RENDERING_EXPORT vtkClipPlanesPainter : public vtkPainter
 {
 public:
   static vtkClipPlanesPainter* New();
-  vtkTypeRevisionMacro(vtkClipPlanesPainter, vtkPainter);
+  vtkTypeMacro(vtkClipPlanesPainter, vtkPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCocoaRenderWindow.h b/Rendering/vtkCocoaRenderWindow.h
index c0992ce87ff5a3d581f5dc25447519766237dc0a..e5d149233303ada14e3641d0fd817b7e40d20b5d 100644
--- a/Rendering/vtkCocoaRenderWindow.h
+++ b/Rendering/vtkCocoaRenderWindow.h
@@ -45,7 +45,7 @@ class VTK_RENDERING_EXPORT vtkCocoaRenderWindow : public vtkOpenGLRenderWindow
 {
 public:
   static vtkCocoaRenderWindow *New();
-  vtkTypeRevisionMacro(vtkCocoaRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkCocoaRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCocoaRenderWindow.mm b/Rendering/vtkCocoaRenderWindow.mm
index d39176a8fcb360d437475bf814d5474b176e24e5..2e95d66a6b5516baca8cf4f213ef95685b3f8c1b 100644
--- a/Rendering/vtkCocoaRenderWindow.mm
+++ b/Rendering/vtkCocoaRenderWindow.mm
@@ -23,7 +23,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #import <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkCocoaRenderWindow, "1.72");
 vtkStandardNewMacro(vtkCocoaRenderWindow);
 
 
diff --git a/Rendering/vtkCocoaRenderWindowInteractor.h b/Rendering/vtkCocoaRenderWindowInteractor.h
index 2dada3e6ce55b47736bc49fc61abcfa981a1f4d8..be1a8e65f8f08df068e8e258cc061ec8c07f4b06 100644
--- a/Rendering/vtkCocoaRenderWindowInteractor.h
+++ b/Rendering/vtkCocoaRenderWindowInteractor.h
@@ -39,7 +39,7 @@ public:
   // Construct object so that light follows camera motion.
   static vtkCocoaRenderWindowInteractor *New();
 
-  vtkTypeRevisionMacro(vtkCocoaRenderWindowInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkCocoaRenderWindowInteractor,vtkRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCocoaRenderWindowInteractor.mm b/Rendering/vtkCocoaRenderWindowInteractor.mm
index bb6b27a1312759c257718c0c4a709f52fda6e43d..a89c272ab6a5410554b4ab0fd53911f37582091c 100644
--- a/Rendering/vtkCocoaRenderWindowInteractor.mm
+++ b/Rendering/vtkCocoaRenderWindowInteractor.mm
@@ -25,7 +25,6 @@
 #import <OpenGL/gl.h>
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkCocoaRenderWindowInteractor, "1.30");
 vtkStandardNewMacro(vtkCocoaRenderWindowInteractor);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkCocoaTkUtilities.h b/Rendering/vtkCocoaTkUtilities.h
index f7858e708483ff5e707dc5cfc7a8b2d834e45a6c..ddc761b657663807df27c31987e99f1378d85ab9 100644
--- a/Rendering/vtkCocoaTkUtilities.h
+++ b/Rendering/vtkCocoaTkUtilities.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkCocoaTkUtilities : public vtkObject
 {
 public:
   static vtkCocoaTkUtilities *New();
-  vtkTypeRevisionMacro(vtkCocoaTkUtilities,vtkObject);
+  vtkTypeMacro(vtkCocoaTkUtilities,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCocoaTkUtilities.mm b/Rendering/vtkCocoaTkUtilities.mm
index 56d1eb9e9774ae7add87f3c195e415a6ecb72ee4..a1530da23306639e97448d749d677d8528274954 100644
--- a/Rendering/vtkCocoaTkUtilities.mm
+++ b/Rendering/vtkCocoaTkUtilities.mm
@@ -24,7 +24,6 @@
 #include "vtkCocoaTkUtilities.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCocoaTkUtilities, "1.2");
 vtkStandardNewMacro(vtkCocoaTkUtilities);
 
 void vtkCocoaTkUtilities::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Rendering/vtkCoincidentTopologyResolutionPainter.cxx b/Rendering/vtkCoincidentTopologyResolutionPainter.cxx
index f884b3ff1aa8eef21efd1d6925934e87a2d4b1e2..7b6c979b3527637e63973e382aa236c17e58f61b 100644
--- a/Rendering/vtkCoincidentTopologyResolutionPainter.cxx
+++ b/Rendering/vtkCoincidentTopologyResolutionPainter.cxx
@@ -25,7 +25,6 @@
 
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkCoincidentTopologyResolutionPainter);
-vtkCxxRevisionMacro(vtkCoincidentTopologyResolutionPainter, "1.4");
 vtkInformationKeyMacro(vtkCoincidentTopologyResolutionPainter, 
   RESOLVE_COINCIDENT_TOPOLOGY, Integer);
 vtkInformationKeyMacro(vtkCoincidentTopologyResolutionPainter, Z_SHIFT, Double);
diff --git a/Rendering/vtkCoincidentTopologyResolutionPainter.h b/Rendering/vtkCoincidentTopologyResolutionPainter.h
index 59565f5fe078bf62751362ccab1117e7a88c30ee..b4b35db3b7e355e2081f83f294e8d0b75a447460 100644
--- a/Rendering/vtkCoincidentTopologyResolutionPainter.h
+++ b/Rendering/vtkCoincidentTopologyResolutionPainter.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkCoincidentTopologyResolutionPainter :
 {
 public:
   static vtkCoincidentTopologyResolutionPainter* New();
-  vtkTypeRevisionMacro(vtkCoincidentTopologyResolutionPainter, 
+  vtkTypeMacro(vtkCoincidentTopologyResolutionPainter,
     vtkPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Rendering/vtkColorMaterialHelper.cxx b/Rendering/vtkColorMaterialHelper.cxx
index 97c758d110a5fd5d7f70e0d623d84393a5de7256..2ad96d38ee91411be52824a685ccf77c0c4a29b3 100644
--- a/Rendering/vtkColorMaterialHelper.cxx
+++ b/Rendering/vtkColorMaterialHelper.cxx
@@ -24,7 +24,6 @@
 extern const char * vtkColorMaterialHelper_vs;
 
 vtkStandardNewMacro(vtkColorMaterialHelper);
-vtkCxxRevisionMacro(vtkColorMaterialHelper, "1.1");
 vtkCxxSetObjectMacro(vtkColorMaterialHelper, Shader, vtkShaderProgram2);
 //----------------------------------------------------------------------------
 vtkColorMaterialHelper::vtkColorMaterialHelper()
diff --git a/Rendering/vtkColorMaterialHelper.h b/Rendering/vtkColorMaterialHelper.h
index 569b8795311f399d4c2cd675bfcc36653ed5efd8..ca6188246a7c7020b41f191ac89df8cf79ef6b61 100644
--- a/Rendering/vtkColorMaterialHelper.h
+++ b/Rendering/vtkColorMaterialHelper.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkColorMaterialHelper : public vtkObject
 {
 public:
   static vtkColorMaterialHelper* New();
-  vtkTypeRevisionMacro(vtkColorMaterialHelper, vtkObject);
+  vtkTypeMacro(vtkColorMaterialHelper, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkCompositePainter.cxx b/Rendering/vtkCompositePainter.cxx
index 0d46ce7f184b8b6a02b64d81eefd6b7175ea8285..b92f01ce69216b06c7b5e1e24d759e9e9f5af5ea 100644
--- a/Rendering/vtkCompositePainter.cxx
+++ b/Rendering/vtkCompositePainter.cxx
@@ -29,7 +29,6 @@
 # include "vtkOpenGL.h"
 #endif
 vtkStandardNewMacro(vtkCompositePainter);
-vtkCxxRevisionMacro(vtkCompositePainter, "1.2");
 vtkInformationKeyMacro(vtkCompositePainter, COLOR_LEAVES, Integer);
 //----------------------------------------------------------------------------
 vtkCompositePainter::vtkCompositePainter()
diff --git a/Rendering/vtkCompositePainter.h b/Rendering/vtkCompositePainter.h
index b741f5b6ef5e7c71f2d92bdeed37c5061ca0af5c..5885ed06984e7f10c863d7a69d2f7e6f9a94a23e 100644
--- a/Rendering/vtkCompositePainter.h
+++ b/Rendering/vtkCompositePainter.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkCompositePainter : public vtkPainter
 {
 public:
   static vtkCompositePainter* New();
-  vtkTypeRevisionMacro(vtkCompositePainter, vtkPainter);
+  vtkTypeMacro(vtkCompositePainter, vtkPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCompositePolyDataMapper.cxx b/Rendering/vtkCompositePolyDataMapper.cxx
index 53ec1fac39770a548c062be6397c69c4768252af..db382e37e64f96d8ef8b32411b0d387b9ac4869f 100644
--- a/Rendering/vtkCompositePolyDataMapper.cxx
+++ b/Rendering/vtkCompositePolyDataMapper.cxx
@@ -28,7 +28,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkCompositePolyDataMapper, "1.3");
 vtkStandardNewMacro(vtkCompositePolyDataMapper);
 
 class vtkCompositePolyDataMapperInternals
diff --git a/Rendering/vtkCompositePolyDataMapper.h b/Rendering/vtkCompositePolyDataMapper.h
index eff334769685514490de30bafeea049d8d2f6bf1..6a476c4630b907ad48ab8dbd1eea197b27659404 100644
--- a/Rendering/vtkCompositePolyDataMapper.h
+++ b/Rendering/vtkCompositePolyDataMapper.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkCompositePolyDataMapper : public vtkMapper
 
 public:
   static vtkCompositePolyDataMapper *New();
-  vtkTypeRevisionMacro(vtkCompositePolyDataMapper, vtkMapper);
+  vtkTypeMacro(vtkCompositePolyDataMapper, vtkMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCompositePolyDataMapper2.cxx b/Rendering/vtkCompositePolyDataMapper2.cxx
index ff219352058c833fbfda2e1c959b2a158b27a38c..6d6319fefb59b3e37a93a8302092d436d295714c 100644
--- a/Rendering/vtkCompositePolyDataMapper2.cxx
+++ b/Rendering/vtkCompositePolyDataMapper2.cxx
@@ -31,7 +31,6 @@
 #include "vtkDefaultPainter.h"
 
 vtkStandardNewMacro(vtkCompositePolyDataMapper2);
-vtkCxxRevisionMacro(vtkCompositePolyDataMapper2, "1.5");
 //----------------------------------------------------------------------------
 vtkCompositePolyDataMapper2::vtkCompositePolyDataMapper2()
 {
diff --git a/Rendering/vtkCompositePolyDataMapper2.h b/Rendering/vtkCompositePolyDataMapper2.h
index f21f662ecbbab35cd96b65cd21964c4762c21438..5b9a91c018d0fc5c569a87a6f6ed001c951a7ab6 100644
--- a/Rendering/vtkCompositePolyDataMapper2.h
+++ b/Rendering/vtkCompositePolyDataMapper2.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkCompositePolyDataMapper2 : public vtkPainterPolyDa
 {
 public:
   static vtkCompositePolyDataMapper2* New();
-  vtkTypeRevisionMacro(vtkCompositePolyDataMapper2, vtkPainterPolyDataMapper);
+  vtkTypeMacro(vtkCompositePolyDataMapper2, vtkPainterPolyDataMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCoreGraphicsGPUInfoList.cxx b/Rendering/vtkCoreGraphicsGPUInfoList.cxx
index 23dc6f655c53eb3c24fd387fc302f722f0b5f695..41c6f69d0faa1e2cef06287afa3a88b74c231220 100644
--- a/Rendering/vtkCoreGraphicsGPUInfoList.cxx
+++ b/Rendering/vtkCoreGraphicsGPUInfoList.cxx
@@ -20,7 +20,6 @@
 #include <assert.h>
 #include <ApplicationServices/ApplicationServices.h>
 
-vtkCxxRevisionMacro(vtkCoreGraphicsGPUInfoList, "1.2");
 vtkStandardNewMacro(vtkCoreGraphicsGPUInfoList);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkCoreGraphicsGPUInfoList.h b/Rendering/vtkCoreGraphicsGPUInfoList.h
index 79e2cd31e69d512b36a6642504c3a47a5a11ad61..d748d0736b60b96bec209f5331135360752845b3 100644
--- a/Rendering/vtkCoreGraphicsGPUInfoList.h
+++ b/Rendering/vtkCoreGraphicsGPUInfoList.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkCoreGraphicsGPUInfoList : public vtkGPUInfoList
 {
 public:
   static vtkCoreGraphicsGPUInfoList* New();
-  vtkTypeRevisionMacro(vtkCoreGraphicsGPUInfoList, vtkGPUInfoList);
+  vtkTypeMacro(vtkCoreGraphicsGPUInfoList, vtkGPUInfoList);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkCuller.cxx b/Rendering/vtkCuller.cxx
index 85c28953fef2d0f0122ab534fb8fa158d9021739..9248b18752c9173f00ec8a0348041ac219d27895 100644
--- a/Rendering/vtkCuller.cxx
+++ b/Rendering/vtkCuller.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkCuller.h"
 
-vtkCxxRevisionMacro(vtkCuller, "1.4");
 
 vtkCuller::vtkCuller()
 {
diff --git a/Rendering/vtkCuller.h b/Rendering/vtkCuller.h
index 23800c38f70ef98c7ab7fe63d8dd02f0cd4855ae..d5a9ce25584bdb66c2d75af5cc4e3a34d625c8e5 100644
--- a/Rendering/vtkCuller.h
+++ b/Rendering/vtkCuller.h
@@ -33,7 +33,7 @@ class vtkRenderer;
 class VTK_RENDERING_EXPORT vtkCuller : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkCuller,vtkObject);
+  vtkTypeMacro(vtkCuller,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkCullerCollection.cxx b/Rendering/vtkCullerCollection.cxx
index e81439bbbce264d3ffd010d95dd76e0ccf95aa88..debf690547437ebc4467cae7d0584a1417919dc5 100644
--- a/Rendering/vtkCullerCollection.cxx
+++ b/Rendering/vtkCullerCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkCullerCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCullerCollection, "1.8");
 vtkStandardNewMacro(vtkCullerCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkCullerCollection.h b/Rendering/vtkCullerCollection.h
index 0d434774c89fa79d5db6791cc604c66c180a408e..c79d37cd10bc3086033ed156d78d0efef7fb651a 100644
--- a/Rendering/vtkCullerCollection.h
+++ b/Rendering/vtkCullerCollection.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkCullerCollection : public vtkCollection
 {
  public:
   static vtkCullerCollection *New();
-  vtkTypeRevisionMacro(vtkCullerCollection,vtkCollection);
+  vtkTypeMacro(vtkCullerCollection,vtkCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkDataSetMapper.cxx b/Rendering/vtkDataSetMapper.cxx
index b1fd9fed5a12c1447421dacecced003b8642cd60..4146eb6af3a3ffbc26342575b0b61c161e26361a 100644
--- a/Rendering/vtkDataSetMapper.cxx
+++ b/Rendering/vtkDataSetMapper.cxx
@@ -23,7 +23,6 @@
 #include "vtkPolyData.h"
 #include "vtkPolyDataMapper.h"
 
-vtkCxxRevisionMacro(vtkDataSetMapper, "1.70");
 vtkStandardNewMacro(vtkDataSetMapper);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkDataSetMapper.h b/Rendering/vtkDataSetMapper.h
index 06f139e7747268ae6bbbc773e85ae66ee29192af..6ad8179262ff617d590b8425c2477a1be3fddfab 100644
--- a/Rendering/vtkDataSetMapper.h
+++ b/Rendering/vtkDataSetMapper.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkDataSetMapper : public vtkMapper
 {
 public:
   static vtkDataSetMapper *New();
-  vtkTypeRevisionMacro(vtkDataSetMapper,vtkMapper);
+  vtkTypeMacro(vtkDataSetMapper,vtkMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
   void Render(vtkRenderer *ren, vtkActor *act);
 
diff --git a/Rendering/vtkDataTransferHelper.cxx b/Rendering/vtkDataTransferHelper.cxx
index e91041c7c194c2dc7f44adce7bfc895e30b47110..4ede84d4b6c2299efcc1c8e1e7d14ca6a96e224d 100644
--- a/Rendering/vtkDataTransferHelper.cxx
+++ b/Rendering/vtkDataTransferHelper.cxx
@@ -32,7 +32,6 @@ static void vtkGetDimensions(int extents[6], int dims[3])
 }
 
 vtkStandardNewMacro(vtkDataTransferHelper);
-vtkCxxRevisionMacro(vtkDataTransferHelper, "1.3");
 vtkCxxSetObjectMacro(vtkDataTransferHelper, Texture, vtkTextureObject);
 vtkCxxSetObjectMacro(vtkDataTransferHelper, Array, vtkDataArray);
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkDataTransferHelper.h b/Rendering/vtkDataTransferHelper.h
index 396cc51dda0393548a438c82e81c74c6944bbae9..ff33a2fa9e33829afb0167d32b634854ed2cc819 100644
--- a/Rendering/vtkDataTransferHelper.h
+++ b/Rendering/vtkDataTransferHelper.h
@@ -42,7 +42,7 @@ class VTK_RENDERING_EXPORT vtkDataTransferHelper : public vtkObject
 {
 public:
   static vtkDataTransferHelper* New();
-  vtkTypeRevisionMacro(vtkDataTransferHelper, vtkObject);
+  vtkTypeMacro(vtkDataTransferHelper, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkDefaultPainter.cxx b/Rendering/vtkDefaultPainter.cxx
index 201c4bf2436ee47a005cc0f005c37a7229dabe90..b2fb820c061241b80bb6915e71fd1ae003465b44 100644
--- a/Rendering/vtkDefaultPainter.cxx
+++ b/Rendering/vtkDefaultPainter.cxx
@@ -28,7 +28,6 @@
 #include "vtkScalarsToColorsPainter.h"
 
 vtkStandardNewMacro(vtkDefaultPainter);
-vtkCxxRevisionMacro(vtkDefaultPainter, "1.12");
 vtkCxxSetObjectMacro(vtkDefaultPainter, DefaultPainterDelegate, vtkPainter);
 vtkCxxSetObjectMacro(vtkDefaultPainter, ScalarsToColorsPainter, 
   vtkScalarsToColorsPainter);
diff --git a/Rendering/vtkDefaultPainter.h b/Rendering/vtkDefaultPainter.h
index 85dd78db51bace4900350bc6ef307346e2607dce..668fcbbda3040436edb412cafe8214f4d1a4b80d 100644
--- a/Rendering/vtkDefaultPainter.h
+++ b/Rendering/vtkDefaultPainter.h
@@ -44,7 +44,7 @@ class VTK_RENDERING_EXPORT vtkDefaultPainter : public vtkPainter
 {
 public:
   static vtkDefaultPainter *New();
-  vtkTypeRevisionMacro(vtkDefaultPainter, vtkPainter);
+  vtkTypeMacro(vtkDefaultPainter, vtkPainter);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkDefaultPass.cxx b/Rendering/vtkDefaultPass.cxx
index bed6198e864ff36e3bd3bdfe2971da7ad883f7f1..d8dcc70087413fa082aed11bf52884ac557d3478 100644
--- a/Rendering/vtkDefaultPass.cxx
+++ b/Rendering/vtkDefaultPass.cxx
@@ -20,7 +20,6 @@
 #include "vtkProp.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkDefaultPass, "1.1");
 vtkStandardNewMacro(vtkDefaultPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkDefaultPass.h b/Rendering/vtkDefaultPass.h
index 646fccf81ebaeb99d6d87ed68cdab6e4896d6c98..6de440d055a446c7f9c3c699e8b136694225e40c 100644
--- a/Rendering/vtkDefaultPass.h
+++ b/Rendering/vtkDefaultPass.h
@@ -40,7 +40,7 @@ class VTK_RENDERING_EXPORT vtkDefaultPass : public vtkRenderPass
 {
 public:
   static vtkDefaultPass *New();
-  vtkTypeRevisionMacro(vtkDefaultPass,vtkRenderPass);
+  vtkTypeMacro(vtkDefaultPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkDepthPeelingPass.cxx b/Rendering/vtkDepthPeelingPass.cxx
index a067a70bd02d7b4e0382482d3fd5383b5abd9c52..fa9ac53301a7f9e3c9f35b43937bab7b5484c4c4 100644
--- a/Rendering/vtkDepthPeelingPass.cxx
+++ b/Rendering/vtkDepthPeelingPass.cxx
@@ -30,7 +30,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkUniformVariables.h"
 #include "vtkTextureUnitManager.h"
 
-vtkCxxRevisionMacro(vtkDepthPeelingPass, "1.8");
 vtkStandardNewMacro(vtkDepthPeelingPass);
 vtkCxxSetObjectMacro(vtkDepthPeelingPass,TranslucentPass,vtkRenderPass);
 
diff --git a/Rendering/vtkDepthPeelingPass.h b/Rendering/vtkDepthPeelingPass.h
index 0d803f383471357bc7d439a398c7f52765d0e1e9..88350af9f6fe6db736b2d4d188352deff5430db2 100644
--- a/Rendering/vtkDepthPeelingPass.h
+++ b/Rendering/vtkDepthPeelingPass.h
@@ -47,7 +47,7 @@ class VTK_RENDERING_EXPORT vtkDepthPeelingPass : public vtkRenderPass
 {
 public:
   static vtkDepthPeelingPass *New();
-  vtkTypeRevisionMacro(vtkDepthPeelingPass,vtkRenderPass);
+  vtkTypeMacro(vtkDepthPeelingPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkDirectXGPUInfoList.cxx b/Rendering/vtkDirectXGPUInfoList.cxx
index d30ab2553ff173cbe4a46b89354caf8afc73d88e..d98e0e5fe0d12cdaaef0b906d0d0b4433afc8ce9 100644
--- a/Rendering/vtkDirectXGPUInfoList.cxx
+++ b/Rendering/vtkDirectXGPUInfoList.cxx
@@ -28,7 +28,6 @@
 
 #include <ddraw.h> // for LPDIRECTDRAWENUMERATEEXA
 
-vtkCxxRevisionMacro(vtkDirectXGPUInfoList, "1.2");
 vtkStandardNewMacro(vtkDirectXGPUInfoList);
 
 // Used by ProbeInfoWithDXGI.
diff --git a/Rendering/vtkDirectXGPUInfoList.h b/Rendering/vtkDirectXGPUInfoList.h
index 229fc449b5c189aefe5d72a2058d366a7cfbed1c..e4490c3f548fa02d49e2154e0c235944d9f05469 100644
--- a/Rendering/vtkDirectXGPUInfoList.h
+++ b/Rendering/vtkDirectXGPUInfoList.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkDirectXGPUInfoList : public vtkGPUInfoList
 {
 public:
   static vtkDirectXGPUInfoList* New();
-  vtkTypeRevisionMacro(vtkDirectXGPUInfoList, vtkGPUInfoList);
+  vtkTypeMacro(vtkDirectXGPUInfoList, vtkGPUInfoList);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkDisplayListPainter.cxx b/Rendering/vtkDisplayListPainter.cxx
index 8be284b5feeb54647f964306800027421b4f95e6..47994d13bd46e28e8a28d4ed4d5aa4c64efc15d6 100644
--- a/Rendering/vtkDisplayListPainter.cxx
+++ b/Rendering/vtkDisplayListPainter.cxx
@@ -22,7 +22,6 @@
 
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkDisplayListPainter);
-vtkCxxRevisionMacro(vtkDisplayListPainter, "1.4");
 vtkInformationKeyMacro(vtkDisplayListPainter, IMMEDIATE_MODE_RENDERING, Integer);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkDisplayListPainter.h b/Rendering/vtkDisplayListPainter.h
index 8dad1d6809570dc02f54cb825cf35390292e7714..931b963a855ad5ad488b7667c9c34f8ef1b47c35 100644
--- a/Rendering/vtkDisplayListPainter.h
+++ b/Rendering/vtkDisplayListPainter.h
@@ -26,7 +26,7 @@ class VTK_RENDERING_EXPORT vtkDisplayListPainter : public vtkPainter
 {
 public:
   static vtkDisplayListPainter* New();
-  vtkTypeRevisionMacro(vtkDisplayListPainter, vtkPainter);
+  vtkTypeMacro(vtkDisplayListPainter, vtkPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkDistanceToCamera.cxx b/Rendering/vtkDistanceToCamera.cxx
index 61735f303e7edd2e58ab0c937c99708f530650b8..19a9b2dbe1b3926c9795d1ff97fc68021078e8ec 100644
--- a/Rendering/vtkDistanceToCamera.cxx
+++ b/Rendering/vtkDistanceToCamera.cxx
@@ -31,7 +31,6 @@
 #include "vtkRenderer.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkDistanceToCamera, "1.2");
 vtkStandardNewMacro(vtkDistanceToCamera);
 
 vtkDistanceToCamera::vtkDistanceToCamera()
diff --git a/Rendering/vtkDistanceToCamera.h b/Rendering/vtkDistanceToCamera.h
index 7cc059b38d661f4df13ba859cf9438486c425b37..900fefa803fa365f3e230b00f6b5898bfbb65ff2 100644
--- a/Rendering/vtkDistanceToCamera.h
+++ b/Rendering/vtkDistanceToCamera.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkDistanceToCamera : public vtkPolyDataAlgorithm
 {
 public:
   static vtkDistanceToCamera *New();
-  vtkTypeRevisionMacro(vtkDistanceToCamera,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkDistanceToCamera,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkDummyGPUInfoList.cxx b/Rendering/vtkDummyGPUInfoList.cxx
index bf4197ca57178cbf8112cd695aca8ec1fa517f68..71c1f2062b170c5338b0a899056fd36e782ffc3d 100644
--- a/Rendering/vtkDummyGPUInfoList.cxx
+++ b/Rendering/vtkDummyGPUInfoList.cxx
@@ -20,7 +20,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkDummyGPUInfoList, "1.2");
 vtkStandardNewMacro(vtkDummyGPUInfoList);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkDummyGPUInfoList.h b/Rendering/vtkDummyGPUInfoList.h
index cd9c08d91c8cbf0769128d94757d08a307fac805..b7f2e79dca7a647850f31aaccc196b1df6f4e839 100644
--- a/Rendering/vtkDummyGPUInfoList.h
+++ b/Rendering/vtkDummyGPUInfoList.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkDummyGPUInfoList : public vtkGPUInfoList
 {
 public:
   static vtkDummyGPUInfoList* New();
-  vtkTypeRevisionMacro(vtkDummyGPUInfoList, vtkGPUInfoList);
+  vtkTypeMacro(vtkDummyGPUInfoList, vtkGPUInfoList);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkDynamic2DLabelMapper.cxx b/Rendering/vtkDynamic2DLabelMapper.cxx
index 4641170714f7ea6f05ead0e2a559282e30edd308..dc2a74cc442b963047486ca7c4f0eac46dd1b420 100644
--- a/Rendering/vtkDynamic2DLabelMapper.cxx
+++ b/Rendering/vtkDynamic2DLabelMapper.cxx
@@ -55,7 +55,6 @@ using vtksys_ios::ofstream;
 # define SNPRINTF snprintf
 #endif
 
-vtkCxxRevisionMacro(vtkDynamic2DLabelMapper, "1.17");
 vtkStandardNewMacro(vtkDynamic2DLabelMapper);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkDynamic2DLabelMapper.h b/Rendering/vtkDynamic2DLabelMapper.h
index 5bc4ea397932dafbd998dcb5487b56be3c109b04..eb9def16f837d6ea91c3dab51a5c2c7fe4d081ad 100644
--- a/Rendering/vtkDynamic2DLabelMapper.h
+++ b/Rendering/vtkDynamic2DLabelMapper.h
@@ -59,7 +59,7 @@ public:
   // Instantiate object with %%-#6.3g label format. By default, point ids
   // are labeled.
   static vtkDynamic2DLabelMapper *New();
-  vtkTypeRevisionMacro(vtkDynamic2DLabelMapper, vtkLabeledDataMapper);
+  vtkTypeMacro(vtkDynamic2DLabelMapper, vtkLabeledDataMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkExporter.cxx b/Rendering/vtkExporter.cxx
index d82b9b47affd6c06bafb91fa461080d500f5a7cd..19998f2ff6146338a994b0f604ef527b1f1832f2 100644
--- a/Rendering/vtkExporter.cxx
+++ b/Rendering/vtkExporter.cxx
@@ -16,7 +16,6 @@
 
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkExporter, "1.20");
 
 vtkCxxSetObjectMacro(vtkExporter,RenderWindow,vtkRenderWindow);
 
diff --git a/Rendering/vtkExporter.h b/Rendering/vtkExporter.h
index a4b07cf966104850e59ad1b03c41e23a6f0a2a5a..72fcffcc282d0b4ad0f4f156dd45a39a2e9fbcea 100644
--- a/Rendering/vtkExporter.h
+++ b/Rendering/vtkExporter.h
@@ -42,7 +42,7 @@ class vtkRenderWindow;
 class VTK_RENDERING_EXPORT vtkExporter : public vtkObject 
 {
 public:
-  vtkTypeRevisionMacro(vtkExporter,vtkObject);
+  vtkTypeMacro(vtkExporter,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkFollower.cxx b/Rendering/vtkFollower.cxx
index 9fd5468287418b9d35d42daa416266fb6d9cd38e..48ca3ab6bbe7f550665a2f72a5157a01d618ccd9 100644
--- a/Rendering/vtkFollower.cxx
+++ b/Rendering/vtkFollower.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFollower, "1.46");
 vtkStandardNewMacro(vtkFollower);
 
 vtkCxxSetObjectMacro(vtkFollower,Camera,vtkCamera);
diff --git a/Rendering/vtkFollower.h b/Rendering/vtkFollower.h
index f6a5f85287b18015261f71339ed71c1356cf9fcd..fedf05ce01319614bb6fee0c80182ddadba19f28 100644
--- a/Rendering/vtkFollower.h
+++ b/Rendering/vtkFollower.h
@@ -36,7 +36,7 @@ class vtkCamera;
 class VTK_RENDERING_EXPORT vtkFollower : public vtkActor
 {
  public:
-  vtkTypeRevisionMacro(vtkFollower,vtkActor);
+  vtkTypeMacro(vtkFollower,vtkActor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkFrameBufferObject.cxx b/Rendering/vtkFrameBufferObject.cxx
index 3862e71e4059e97b2fd7e6e06fb3b43aae949a25..c330f704f1d57375a751665e51c73e86c75758f3 100644
--- a/Rendering/vtkFrameBufferObject.cxx
+++ b/Rendering/vtkFrameBufferObject.cxx
@@ -25,7 +25,6 @@
 // #define VTK_FBO_DEBUG // display info on RenderQuad()
 
 vtkStandardNewMacro(vtkFrameBufferObject);
-vtkCxxRevisionMacro(vtkFrameBufferObject, "1.6");
 //----------------------------------------------------------------------------
 vtkFrameBufferObject::vtkFrameBufferObject()
 {
diff --git a/Rendering/vtkFrameBufferObject.h b/Rendering/vtkFrameBufferObject.h
index a247aa557c7513edeaaa95db7e9d9859f8dcf891..7e5e5dcef02da491aa6edf587bf4e3e616e6f0be 100644
--- a/Rendering/vtkFrameBufferObject.h
+++ b/Rendering/vtkFrameBufferObject.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkFrameBufferObject : public vtkObject
 {
 public:
   static vtkFrameBufferObject* New();
-  vtkTypeRevisionMacro(vtkFrameBufferObject, vtkObject);
+  vtkTypeMacro(vtkFrameBufferObject, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkFreeTypeLabelRenderStrategy.cxx b/Rendering/vtkFreeTypeLabelRenderStrategy.cxx
index 9ba296e2a7c28201009568bf6fc556aa07b3f09f..49496dc1d77d25b1038d870d7b9c3ae8bd370117 100644
--- a/Rendering/vtkFreeTypeLabelRenderStrategy.cxx
+++ b/Rendering/vtkFreeTypeLabelRenderStrategy.cxx
@@ -23,7 +23,6 @@
 #include "vtkTextProperty.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkFreeTypeLabelRenderStrategy, "1.3");
 vtkStandardNewMacro(vtkFreeTypeLabelRenderStrategy);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkFreeTypeLabelRenderStrategy.h b/Rendering/vtkFreeTypeLabelRenderStrategy.h
index 8590e103380d75a1edc847a70267d77885fa79d1..01eb5546182c0ffdfae0a4cae620421d56906958 100644
--- a/Rendering/vtkFreeTypeLabelRenderStrategy.h
+++ b/Rendering/vtkFreeTypeLabelRenderStrategy.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkFreeTypeLabelRenderStrategy : public vtkLabelRende
 {
  public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkFreeTypeLabelRenderStrategy, vtkLabelRenderStrategy);
+  vtkTypeMacro(vtkFreeTypeLabelRenderStrategy, vtkLabelRenderStrategy);
   static vtkFreeTypeLabelRenderStrategy* New();
 
   // Description:
diff --git a/Rendering/vtkFreeTypeUtilities.cxx b/Rendering/vtkFreeTypeUtilities.cxx
index 3308dd1f3da59c4f9d0a8775a197bc88e00e3db4..a92f1963359db8ed137976c00dfa35c7cf243800 100644
--- a/Rendering/vtkFreeTypeUtilities.cxx
+++ b/Rendering/vtkFreeTypeUtilities.cxx
@@ -39,7 +39,6 @@
 #define VTK_FTFC_DEBUG_CD 0
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkFreeTypeUtilities, "1.31");
 vtkInstantiatorNewMacro(vtkFreeTypeUtilities);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkFreeTypeUtilities.h b/Rendering/vtkFreeTypeUtilities.h
index f38bc8c687d2cf79eda6fdcce01716d9c55184de..a2d39ade8fd7f71cae17fa0c1eb607bd01e479f8 100644
--- a/Rendering/vtkFreeTypeUtilities.h
+++ b/Rendering/vtkFreeTypeUtilities.h
@@ -60,7 +60,7 @@ public:
 class VTK_RENDERING_EXPORT vtkFreeTypeUtilities : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkFreeTypeUtilities, vtkObject);
+  vtkTypeMacro(vtkFreeTypeUtilities, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkFrustumCoverageCuller.cxx b/Rendering/vtkFrustumCoverageCuller.cxx
index 52e65b487a68771bffacea515384f9c691cc0500..9107fbd6c09fe57bd4659df1e9e1ca441fa2f80a 100644
--- a/Rendering/vtkFrustumCoverageCuller.cxx
+++ b/Rendering/vtkFrustumCoverageCuller.cxx
@@ -20,7 +20,6 @@
 #include "vtkProp.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkFrustumCoverageCuller, "1.34");
 vtkStandardNewMacro(vtkFrustumCoverageCuller);
 
 // Create a frustum coverage culler with default values
diff --git a/Rendering/vtkFrustumCoverageCuller.h b/Rendering/vtkFrustumCoverageCuller.h
index 8c902939be5c5458bbd71f38f0f6dfb68a52f682..f8f9109e2f680e508d6b3ea8dabb5aa1f6728863 100644
--- a/Rendering/vtkFrustumCoverageCuller.h
+++ b/Rendering/vtkFrustumCoverageCuller.h
@@ -46,7 +46,7 @@ class VTK_RENDERING_EXPORT vtkFrustumCoverageCuller : public vtkCuller
 {
 public:
   static vtkFrustumCoverageCuller *New();
-  vtkTypeRevisionMacro(vtkFrustumCoverageCuller,vtkCuller);
+  vtkTypeMacro(vtkFrustumCoverageCuller,vtkCuller);
   void PrintSelf(ostream& os,vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkGL2PSExporter.cxx b/Rendering/vtkGL2PSExporter.cxx
index d0afeb54ee4d344cfbda47cd5ccb213875f352da..e0c17e06034a5567a5b5158ea2051c0839712c4b 100644
--- a/Rendering/vtkGL2PSExporter.cxx
+++ b/Rendering/vtkGL2PSExporter.cxx
@@ -167,7 +167,6 @@ void _Turn2DPropsOn(vtkRendererCollection *renCol, vtkIntArray *act2dVis)
     }
 }
 
-vtkCxxRevisionMacro(vtkGL2PSExporter, "1.15");
 vtkStandardNewMacro(vtkGL2PSExporter);
 
 static float vtkGL2PSExporterGlobalPointSizeFactor = 5.0/7.0;
diff --git a/Rendering/vtkGL2PSExporter.h b/Rendering/vtkGL2PSExporter.h
index 790d1f4b7bdaef552d14f17648c2decfe9651e1d..2288598dd8263090354c609778cc412556ebb079 100644
--- a/Rendering/vtkGL2PSExporter.h
+++ b/Rendering/vtkGL2PSExporter.h
@@ -87,7 +87,7 @@ class VTK_RENDERING_EXPORT vtkGL2PSExporter : public vtkExporter
 {
 public:
   static vtkGL2PSExporter *New();
-  vtkTypeRevisionMacro(vtkGL2PSExporter,vtkExporter);
+  vtkTypeMacro(vtkGL2PSExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkGLSLShader.cxx b/Rendering/vtkGLSLShader.cxx
index 17aebbb221bf44d7db4e062d87c9d5005ce44048..fcad9ad53976b4276f74e9c76a51218c66e3a3f7 100644
--- a/Rendering/vtkGLSLShader.cxx
+++ b/Rendering/vtkGLSLShader.cxx
@@ -170,7 +170,6 @@ static void printAttributeInfo(GLuint program,
 
 //-----------------------------------------------------------------------------
 vtkStandardNewMacro(vtkGLSLShader);
-vtkCxxRevisionMacro(vtkGLSLShader, "1.13");
 
 //-----------------------------------------------------------------------------
 vtkGLSLShader::vtkGLSLShader()
diff --git a/Rendering/vtkGLSLShader.h b/Rendering/vtkGLSLShader.h
index 4042051d6951ec3d49542875c253f4d4341a9dc7..2ff9a031428d776a18b26b86995049b8c4f98130 100644
--- a/Rendering/vtkGLSLShader.h
+++ b/Rendering/vtkGLSLShader.h
@@ -82,7 +82,7 @@ class VTK_RENDERING_EXPORT vtkGLSLShader : public vtkShader
 {
 public:
   static vtkGLSLShader *New();
-  vtkTypeRevisionMacro(vtkGLSLShader, vtkShader);
+  vtkTypeMacro(vtkGLSLShader, vtkShader);
   void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkGLSLShaderDeviceAdapter.cxx b/Rendering/vtkGLSLShaderDeviceAdapter.cxx
index 2e14320933f224795eac2f00559399cf7ff667fd..faba71c8a05f849ccb3e1d0e6f05571db57ab4aa 100644
--- a/Rendering/vtkGLSLShaderDeviceAdapter.cxx
+++ b/Rendering/vtkGLSLShaderDeviceAdapter.cxx
@@ -33,7 +33,6 @@ public:
   MapOfStringToInt AttributeIndicesCache;
 };
 
-vtkCxxRevisionMacro(vtkGLSLShaderDeviceAdapter, "1.5");
 vtkStandardNewMacro(vtkGLSLShaderDeviceAdapter);
 
 #define GLSL_SHADER_DEVICE_ADAPTER(msg) \
diff --git a/Rendering/vtkGLSLShaderDeviceAdapter.h b/Rendering/vtkGLSLShaderDeviceAdapter.h
index ea83deee870bb7c7c54cc3dcd9e224752be6117c..5302296ef47d40c16e0080dfabb4b1f2b48a2f81 100644
--- a/Rendering/vtkGLSLShaderDeviceAdapter.h
+++ b/Rendering/vtkGLSLShaderDeviceAdapter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkGLSLShaderDeviceAdapter :
   public vtkShaderDeviceAdapter
 {
 public:
-  vtkTypeRevisionMacro(vtkGLSLShaderDeviceAdapter, vtkShaderDeviceAdapter);
+  vtkTypeMacro(vtkGLSLShaderDeviceAdapter, vtkShaderDeviceAdapter);
   static vtkGLSLShaderDeviceAdapter *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkGLSLShaderDeviceAdapter2.cxx b/Rendering/vtkGLSLShaderDeviceAdapter2.cxx
index aeb15371a54347ee5417b26c7c157c7f6721b286..eb4c47a4664b2c9eedd2754fadae283b3864e17e 100644
--- a/Rendering/vtkGLSLShaderDeviceAdapter2.cxx
+++ b/Rendering/vtkGLSLShaderDeviceAdapter2.cxx
@@ -33,7 +33,6 @@ public:
   MapOfStringToInt AttributeIndicesCache;
 };
 
-vtkCxxRevisionMacro(vtkGLSLShaderDeviceAdapter2, "1.1");
 vtkStandardNewMacro(vtkGLSLShaderDeviceAdapter2);
 
 #define GLSL_SHADER_DEVICE_ADAPTER(msg) \
diff --git a/Rendering/vtkGLSLShaderDeviceAdapter2.h b/Rendering/vtkGLSLShaderDeviceAdapter2.h
index 68890fd454279fa99277fdadc3df9c52ba49e417..28d209ec9e1a6a29082ee10f69092e735f25d8ee 100644
--- a/Rendering/vtkGLSLShaderDeviceAdapter2.h
+++ b/Rendering/vtkGLSLShaderDeviceAdapter2.h
@@ -27,7 +27,7 @@ class vtkShaderProgram2;
 class VTK_RENDERING_EXPORT vtkGLSLShaderDeviceAdapter2 :  public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkGLSLShaderDeviceAdapter2, vtkObject);
+  vtkTypeMacro(vtkGLSLShaderDeviceAdapter2, vtkObject);
   static vtkGLSLShaderDeviceAdapter2 *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkGLSLShaderProgram.cxx b/Rendering/vtkGLSLShaderProgram.cxx
index a57a649fc1cd75a2447b88b6d6364dc064691b3f..128b01f9e8c97ef9b948e185a1dd290c86f102cc 100644
--- a/Rendering/vtkGLSLShaderProgram.cxx
+++ b/Rendering/vtkGLSLShaderProgram.cxx
@@ -65,7 +65,6 @@ int printOglError(char *vtkNotUsed(file), int vtkNotUsed(line))
 #endif
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkGLSLShaderProgram, "1.20");
 vtkStandardNewMacro(vtkGLSLShaderProgram);
 
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkGLSLShaderProgram.h b/Rendering/vtkGLSLShaderProgram.h
index 9206869dd407a8f03818e55884934651edebbdf8..0894a0d1211fb1ebc354f452e56a686f2b311670 100644
--- a/Rendering/vtkGLSLShaderProgram.h
+++ b/Rendering/vtkGLSLShaderProgram.h
@@ -45,7 +45,7 @@ class vtkRenderWindow;
 class VTK_RENDERING_EXPORT vtkGLSLShaderProgram : public vtkShaderProgram
 {
 public:
-  vtkTypeRevisionMacro(vtkGLSLShaderProgram, vtkShaderProgram);
+  vtkTypeMacro(vtkGLSLShaderProgram, vtkShaderProgram);
   static vtkGLSLShaderProgram *New();
   void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkGPUInfo.cxx b/Rendering/vtkGPUInfo.cxx
index 5e7512cf090f4b0c25938c111400a30081c95bd9..5e23d432b725270645f208e7db5f35d30bfce169 100644
--- a/Rendering/vtkGPUInfo.cxx
+++ b/Rendering/vtkGPUInfo.cxx
@@ -16,7 +16,6 @@
 #include "vtkGPUInfo.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkGPUInfo, "1.1");
 vtkStandardNewMacro(vtkGPUInfo);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkGPUInfo.h b/Rendering/vtkGPUInfo.h
index 522addc15a17976956802cc67c1d58cad34c5e50..5b425de2ffd281df9d0730dca248b8e681022c6a 100644
--- a/Rendering/vtkGPUInfo.h
+++ b/Rendering/vtkGPUInfo.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkGPUInfo : public vtkObject
 {
 public:
   static vtkGPUInfo* New();
-  vtkTypeRevisionMacro(vtkGPUInfo, vtkObject);
+  vtkTypeMacro(vtkGPUInfo, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkGPUInfoList.cxx b/Rendering/vtkGPUInfoList.cxx
index e3b6fa73b9859ec4e6c4227157c8126ca2e8bae2..02d9ef07709bbf1eec7ba41e955cda08eb2a06af 100644
--- a/Rendering/vtkGPUInfoList.cxx
+++ b/Rendering/vtkGPUInfoList.cxx
@@ -22,7 +22,6 @@
 #include <vtkstd/vector>
 #include "vtkGPUInfoListArray.h"
 
-vtkCxxRevisionMacro(vtkGPUInfoList, "1.2");
 
 // ----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkGPUInfoList.h b/Rendering/vtkGPUInfoList.h
index 2215b5a30d86f23f5981c4cd7a095d7575e264bf..5069c0c4df0dd7b56f5b5d93655fd71fe5cb5e16 100644
--- a/Rendering/vtkGPUInfoList.h
+++ b/Rendering/vtkGPUInfoList.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkGPUInfoList : public vtkObject
 {
 public:
   static vtkGPUInfoList *New();
-  vtkTypeRevisionMacro(vtkGPUInfoList, vtkObject);
+  vtkTypeMacro(vtkGPUInfoList, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkGaussianBlurPass.cxx b/Rendering/vtkGaussianBlurPass.cxx
index 04e5ea91929154a4619ec831e1b699011a50a6e3..1114d54b5142ec36f0226c804254d6bda20d0bcb 100644
--- a/Rendering/vtkGaussianBlurPass.cxx
+++ b/Rendering/vtkGaussianBlurPass.cxx
@@ -40,7 +40,6 @@
 #include "vtkCamera.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkGaussianBlurPass, "1.9");
 vtkStandardNewMacro(vtkGaussianBlurPass);
 
 extern const char *vtkGaussianBlurPassShader_fs;
diff --git a/Rendering/vtkGaussianBlurPass.h b/Rendering/vtkGaussianBlurPass.h
index adf534f25955cdf1f9efb79df568c30b604dbffe..800753fe7eec9b0e4af6daa12e7c9197faf54945 100644
--- a/Rendering/vtkGaussianBlurPass.h
+++ b/Rendering/vtkGaussianBlurPass.h
@@ -59,7 +59,7 @@ class VTK_RENDERING_EXPORT vtkGaussianBlurPass : public vtkImageProcessingPass
 {
 public:
   static vtkGaussianBlurPass *New();
-  vtkTypeRevisionMacro(vtkGaussianBlurPass,vtkImageProcessingPass);
+  vtkTypeMacro(vtkGaussianBlurPass,vtkImageProcessingPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkGenericRenderWindowInteractor.cxx b/Rendering/vtkGenericRenderWindowInteractor.cxx
index 90b39a6eef274055d2dd258ab5bd6f170972993a..5fa133837f1835d92965af6d4c38920297c9425f 100644
--- a/Rendering/vtkGenericRenderWindowInteractor.cxx
+++ b/Rendering/vtkGenericRenderWindowInteractor.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkGenericRenderWindowInteractor, "1.11");
 vtkStandardNewMacro(vtkGenericRenderWindowInteractor);
 
 //------------------------------------------------------------------
diff --git a/Rendering/vtkGenericRenderWindowInteractor.h b/Rendering/vtkGenericRenderWindowInteractor.h
index ca27daa2869f588d22b2cc16f49fd359ca55a07b..ff5a871dd55bc152fe657bb686afc30322275726 100644
--- a/Rendering/vtkGenericRenderWindowInteractor.h
+++ b/Rendering/vtkGenericRenderWindowInteractor.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkGenericRenderWindowInteractor : public vtkRenderWi
 {
 public:
   static vtkGenericRenderWindowInteractor *New();
-  vtkTypeRevisionMacro(vtkGenericRenderWindowInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkGenericRenderWindowInteractor,vtkRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkGenericVertexAttributeMapping.cxx b/Rendering/vtkGenericVertexAttributeMapping.cxx
index f62ed04a660fd5d49342988dbf810a5a4a6f7a3a..b01ca24bbd7a395497605c14bdf3058c49370c69 100644
--- a/Rendering/vtkGenericVertexAttributeMapping.cxx
+++ b/Rendering/vtkGenericVertexAttributeMapping.cxx
@@ -37,7 +37,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkGenericVertexAttributeMapping);
-vtkCxxRevisionMacro(vtkGenericVertexAttributeMapping, "1.3");
 //----------------------------------------------------------------------------
 vtkGenericVertexAttributeMapping::vtkGenericVertexAttributeMapping()
 {
diff --git a/Rendering/vtkGenericVertexAttributeMapping.h b/Rendering/vtkGenericVertexAttributeMapping.h
index 9337b350a961059be63d5ae80c92814514f5078d..cb0fad60028f0ddfbdbaa03d9006d7deb23dad63 100644
--- a/Rendering/vtkGenericVertexAttributeMapping.h
+++ b/Rendering/vtkGenericVertexAttributeMapping.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkGenericVertexAttributeMapping : public vtkObject
 {
 public:
   static vtkGenericVertexAttributeMapping* New();
-  vtkTypeRevisionMacro(vtkGenericVertexAttributeMapping, vtkObject);
+  vtkTypeMacro(vtkGenericVertexAttributeMapping, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkGraphMapper.cxx b/Rendering/vtkGraphMapper.cxx
index e36aed33921680fb53ee4b67bd61027ddf2dd029..b66e16b63c01db06fed52d90058ace50257f27bb 100644
--- a/Rendering/vtkGraphMapper.cxx
+++ b/Rendering/vtkGraphMapper.cxx
@@ -52,7 +52,6 @@
 #include "vtkVertexGlyphFilter.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkGraphMapper, "1.4");
 vtkStandardNewMacro(vtkGraphMapper);
 
 #define VTK_CREATE(type,name) \
diff --git a/Rendering/vtkGraphMapper.h b/Rendering/vtkGraphMapper.h
index af1fbf09ecf99cf33916d272786bc03ff27ffd7c..cca22c68539932e24ae7bfef44a9a5f37c222d4f 100644
--- a/Rendering/vtkGraphMapper.h
+++ b/Rendering/vtkGraphMapper.h
@@ -56,7 +56,7 @@ class VTK_RENDERING_EXPORT vtkGraphMapper : public vtkMapper
 {
 public:
   static vtkGraphMapper *New();
-  vtkTypeRevisionMacro(vtkGraphMapper,vtkMapper);
+  vtkTypeMacro(vtkGraphMapper,vtkMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
   void Render(vtkRenderer *ren, vtkActor *act);
   
diff --git a/Rendering/vtkGraphToGlyphs.cxx b/Rendering/vtkGraphToGlyphs.cxx
index a49ef67ab8e1a1304a27d57108e34845e99407e8..0e9beb4401e154276f8bf0e2eae839b5518f0dc1 100644
--- a/Rendering/vtkGraphToGlyphs.cxx
+++ b/Rendering/vtkGraphToGlyphs.cxx
@@ -36,7 +36,6 @@
 #include "vtkTable.h"
 #include "vtkUndirectedGraph.h"
 
-vtkCxxRevisionMacro(vtkGraphToGlyphs, "1.3");
 vtkStandardNewMacro(vtkGraphToGlyphs);
 
 vtkGraphToGlyphs::vtkGraphToGlyphs()
diff --git a/Rendering/vtkGraphToGlyphs.h b/Rendering/vtkGraphToGlyphs.h
index 83b73be486a25c759a7592cf08ad22d706a5dc81..72d3d2f3ee333dfb3164ac26d8bd9a08045ca30c 100644
--- a/Rendering/vtkGraphToGlyphs.h
+++ b/Rendering/vtkGraphToGlyphs.h
@@ -44,7 +44,7 @@ class VTK_RENDERING_EXPORT vtkGraphToGlyphs : public vtkPolyDataAlgorithm
 {
 public:
   static vtkGraphToGlyphs *New();
-  vtkTypeRevisionMacro(vtkGraphToGlyphs,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkGraphToGlyphs,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkGraphicsFactory.cxx b/Rendering/vtkGraphicsFactory.cxx
index fbd331c25b2f1a22659304d33af4999f659d0a1f..5775e1e06aa78bbdf50244f57be4d426aa6f1822 100644
--- a/Rendering/vtkGraphicsFactory.cxx
+++ b/Rendering/vtkGraphicsFactory.cxx
@@ -119,7 +119,6 @@ int vtkGraphicsFactory::OffScreenOnlyMode = 1;
 int vtkGraphicsFactory::OffScreenOnlyMode = 0;
 #endif
 
-vtkCxxRevisionMacro(vtkGraphicsFactory, "1.43");
 vtkStandardNewMacro(vtkGraphicsFactory);
 
 const char *vtkGraphicsFactory::GetRenderLibrary()
diff --git a/Rendering/vtkGraphicsFactory.h b/Rendering/vtkGraphicsFactory.h
index edd0080c8e87f975720f778a2d3d8ebe37e86843..368898a63d755efa703dd077a0018a681f45a668 100644
--- a/Rendering/vtkGraphicsFactory.h
+++ b/Rendering/vtkGraphicsFactory.h
@@ -24,7 +24,7 @@ class VTK_RENDERING_EXPORT vtkGraphicsFactory : public vtkObject
 {
 public:
   static vtkGraphicsFactory *New();
-  vtkTypeRevisionMacro(vtkGraphicsFactory,vtkObject);
+  vtkTypeMacro(vtkGraphicsFactory,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkHardwareSelectionPolyDataPainter.cxx b/Rendering/vtkHardwareSelectionPolyDataPainter.cxx
index dfbb9f28290e880de98e5b9a84e1ab5f7750a84e..1f24f7e2e703afffae21d0b23b017ff1c12fa013 100644
--- a/Rendering/vtkHardwareSelectionPolyDataPainter.cxx
+++ b/Rendering/vtkHardwareSelectionPolyDataPainter.cxx
@@ -27,7 +27,6 @@
 #include "vtkPointData.h"
 
 vtkStandardNewMacro(vtkHardwareSelectionPolyDataPainter);
-vtkCxxRevisionMacro(vtkHardwareSelectionPolyDataPainter, "1.2");
 //-----------------------------------------------------------------------------
 static inline int vtkHardwareSelectionPolyDataPainterGetTotalCells(vtkPolyData* pd,
   unsigned long typeflags)
diff --git a/Rendering/vtkHardwareSelectionPolyDataPainter.h b/Rendering/vtkHardwareSelectionPolyDataPainter.h
index a388329c97fa59f779e7ad6eac66d24d8871cd21..a677c12a31f30a369d74d853097f14cb9ee1fa4d 100644
--- a/Rendering/vtkHardwareSelectionPolyDataPainter.h
+++ b/Rendering/vtkHardwareSelectionPolyDataPainter.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkHardwareSelectionPolyDataPainter :
 {
 public:
   static vtkHardwareSelectionPolyDataPainter* New();
-  vtkTypeRevisionMacro(vtkHardwareSelectionPolyDataPainter, vtkStandardPolyDataPainter);
+  vtkTypeMacro(vtkHardwareSelectionPolyDataPainter, vtkStandardPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkHardwareSelector.cxx b/Rendering/vtkHardwareSelector.cxx
index 622ea108219284d782d7b1859a5dd57e0eddada4..5f743ca2118aaeb343006bd4d977840c444bdb6d 100644
--- a/Rendering/vtkHardwareSelector.cxx
+++ b/Rendering/vtkHardwareSelector.cxx
@@ -48,7 +48,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkHardwareSelector);
-vtkCxxRevisionMacro(vtkHardwareSelector, "1.8");
 vtkCxxSetObjectMacro(vtkHardwareSelector, Renderer, vtkRenderer);
 //----------------------------------------------------------------------------
 vtkHardwareSelector::vtkHardwareSelector()
diff --git a/Rendering/vtkHardwareSelector.h b/Rendering/vtkHardwareSelector.h
index d0bc8947f20ab54863dcfca0259e6263e6cd00e7..7f283952bdab0d67a79562014477dc46ef15f196 100644
--- a/Rendering/vtkHardwareSelector.h
+++ b/Rendering/vtkHardwareSelector.h
@@ -68,7 +68,7 @@ class VTK_RENDERING_EXPORT vtkHardwareSelector : public vtkObject
 {
 public:
   static vtkHardwareSelector* New();
-  vtkTypeRevisionMacro(vtkHardwareSelector, vtkObject);
+  vtkTypeMacro(vtkHardwareSelector, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkHierarchicalPolyDataMapper.cxx b/Rendering/vtkHierarchicalPolyDataMapper.cxx
index 4890038e9013dde6d6741e378a62735e849f657c..4cc98c23c7f05bc48691d062698eb3c062728966 100644
--- a/Rendering/vtkHierarchicalPolyDataMapper.cxx
+++ b/Rendering/vtkHierarchicalPolyDataMapper.cxx
@@ -17,7 +17,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalPolyDataMapper, "1.7");
 vtkStandardNewMacro(vtkHierarchicalPolyDataMapper);
 
 vtkHierarchicalPolyDataMapper::vtkHierarchicalPolyDataMapper()
diff --git a/Rendering/vtkHierarchicalPolyDataMapper.h b/Rendering/vtkHierarchicalPolyDataMapper.h
index f3dda656a7b088c082a35b6fec8d559ae9959a93..22c0dabb538d8e95d4bbc0def2c51e133213ab52 100644
--- a/Rendering/vtkHierarchicalPolyDataMapper.h
+++ b/Rendering/vtkHierarchicalPolyDataMapper.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkHierarchicalPolyDataMapper : public vtkCompositePo
 
 public:
   static vtkHierarchicalPolyDataMapper *New();
-  vtkTypeRevisionMacro(vtkHierarchicalPolyDataMapper, vtkCompositePolyDataMapper);
+  vtkTypeMacro(vtkHierarchicalPolyDataMapper, vtkCompositePolyDataMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkIVExporter.cxx b/Rendering/vtkIVExporter.cxx
index a34a92dd85fe3f633e741f5a9537e84e97f95106..c0b97f6b71fa736d36167a18ce478aab2c67adb2 100644
--- a/Rendering/vtkIVExporter.cxx
+++ b/Rendering/vtkIVExporter.cxx
@@ -34,7 +34,6 @@
 #include "vtkTransform.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkIVExporter, "1.63");
 vtkStandardNewMacro(vtkIVExporter);
 
 vtkIVExporter::vtkIVExporter()
diff --git a/Rendering/vtkIVExporter.h b/Rendering/vtkIVExporter.h
index cf695057a5189ffb9a222240da93fd428ed8ef1f..ad342d0171056be652cde7121dfedc3aa11e3312 100644
--- a/Rendering/vtkIVExporter.h
+++ b/Rendering/vtkIVExporter.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkIVExporter : public vtkExporter
 {
 public:
   static vtkIVExporter *New();
-  vtkTypeRevisionMacro(vtkIVExporter,vtkExporter);
+  vtkTypeMacro(vtkIVExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkIdentColoredPainter.cxx b/Rendering/vtkIdentColoredPainter.cxx
index 51e588c3917cea9efecce87bf6f1effeb9d2d4ad..571eca5ae5c0017ca89ca0ebd76dc2b94d7aaedc 100644
--- a/Rendering/vtkIdentColoredPainter.cxx
+++ b/Rendering/vtkIdentColoredPainter.cxx
@@ -42,7 +42,6 @@
 #endif
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkIdentColoredPainter, "1.27");
 vtkStandardNewMacro(vtkIdentColoredPainter);
 
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkIdentColoredPainter.h b/Rendering/vtkIdentColoredPainter.h
index 870c6f1bac70ddf360a412987f9a101781abe1dc..239fae6884f5aa884a73de6ce0a04bdd26e0d7e2 100644
--- a/Rendering/vtkIdentColoredPainter.h
+++ b/Rendering/vtkIdentColoredPainter.h
@@ -52,7 +52,7 @@ class vtkProp;
 class VTK_RENDERING_EXPORT vtkIdentColoredPainter : public vtkPolyDataPainter
 {
 public:
-  vtkTypeRevisionMacro(vtkIdentColoredPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkIdentColoredPainter, vtkPolyDataPainter);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkIdentColoredPainter *New();
 
diff --git a/Rendering/vtkImageActor.cxx b/Rendering/vtkImageActor.cxx
index 2dfdc55c0b55b7ea5c1044c157729cf7fc81257c..8d99994ee229433c946c7b74628cba312de32562 100644
--- a/Rendering/vtkImageActor.cxx
+++ b/Rendering/vtkImageActor.cxx
@@ -20,7 +20,6 @@
 #include "vtkRenderer.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkImageActor, "1.24");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkImageActor.h b/Rendering/vtkImageActor.h
index 5449b936a02d1b385b1b32be3c34ac5109fce77a..587834b976badeb5563f90fe078cbb3b32c9c9de 100644
--- a/Rendering/vtkImageActor.h
+++ b/Rendering/vtkImageActor.h
@@ -41,7 +41,7 @@ class vtkImageData;
 class VTK_RENDERING_EXPORT vtkImageActor : public vtkProp3D
 {
 public:
-  vtkTypeRevisionMacro(vtkImageActor,vtkProp3D);
+  vtkTypeMacro(vtkImageActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkImageMapper.cxx b/Rendering/vtkImageMapper.cxx
index b146c8052e3aaf62a0d5630fc489598fbccf8c9d..d58e8253e548f0f9ce7a0b0b3ebf4823fb52e758 100644
--- a/Rendering/vtkImageMapper.cxx
+++ b/Rendering/vtkImageMapper.cxx
@@ -24,7 +24,6 @@
 #include "vtkWindow.h"
 
 
-vtkCxxRevisionMacro(vtkImageMapper, "1.54");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkImageMapper.h b/Rendering/vtkImageMapper.h
index 05aa4a2a3f99056b20e4351d62f69b969a17d1c9..4df44a66fee78732a95a66fc746688f9d1f9c503 100644
--- a/Rendering/vtkImageMapper.h
+++ b/Rendering/vtkImageMapper.h
@@ -34,7 +34,7 @@ class vtkImageData;
 class VTK_RENDERING_EXPORT vtkImageMapper : public vtkMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkImageMapper,vtkMapper2D);
+  vtkTypeMacro(vtkImageMapper,vtkMapper2D);
   static vtkImageMapper *New();
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkImageProcessingPass.cxx b/Rendering/vtkImageProcessingPass.cxx
index 2919d9d1630df51034004db10e5c2284cb96a36b..52df9d40ba661a0900f74429521d6cf1376770bf 100644
--- a/Rendering/vtkImageProcessingPass.cxx
+++ b/Rendering/vtkImageProcessingPass.cxx
@@ -38,7 +38,6 @@
 #include "vtkCamera.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkImageProcessingPass, "1.2");
 vtkCxxSetObjectMacro(vtkImageProcessingPass,DelegatePass,vtkRenderPass);
 
 
diff --git a/Rendering/vtkImageProcessingPass.h b/Rendering/vtkImageProcessingPass.h
index ca532803c766d59c214bd0c8fcdc5a40cccbcdb5..315584cf4fbd1c6d4a331f24e2643fbe5c464c81 100644
--- a/Rendering/vtkImageProcessingPass.h
+++ b/Rendering/vtkImageProcessingPass.h
@@ -37,7 +37,7 @@ class vtkTextureObject;
 class VTK_RENDERING_EXPORT vtkImageProcessingPass : public vtkRenderPass
 {
 public:
-  vtkTypeRevisionMacro(vtkImageProcessingPass,vtkRenderPass);
+  vtkTypeMacro(vtkImageProcessingPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkImageViewer.cxx b/Rendering/vtkImageViewer.cxx
index e7348a2cd921116f86eaba2dc4bcc27b84e56027..4a0d3b2cc1e4906468f8b280c22a8abaa8d48006 100644
--- a/Rendering/vtkImageViewer.cxx
+++ b/Rendering/vtkImageViewer.cxx
@@ -22,7 +22,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkImageViewer, "1.53");
 vtkStandardNewMacro(vtkImageViewer);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkImageViewer.h b/Rendering/vtkImageViewer.h
index 91208ca708a791a68c330a5448f053abcae1026c..2b84a167e7fadd2b5039ffa3a1a547dae20acfdb 100644
--- a/Rendering/vtkImageViewer.h
+++ b/Rendering/vtkImageViewer.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkImageViewer : public vtkObject
 public:
   static vtkImageViewer *New();
   
-  vtkTypeRevisionMacro(vtkImageViewer,vtkObject);
+  vtkTypeMacro(vtkImageViewer,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkImageViewer2.cxx b/Rendering/vtkImageViewer2.cxx
index 12962a5b63a227426bfb93698e64f1878649b87e..f46fa18aad9ddcd59bf576210e3b5e2fdb3edd18 100644
--- a/Rendering/vtkImageViewer2.cxx
+++ b/Rendering/vtkImageViewer2.cxx
@@ -26,7 +26,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkImageViewer2, "1.40");
 vtkStandardNewMacro(vtkImageViewer2);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkImageViewer2.h b/Rendering/vtkImageViewer2.h
index f8c4b35ee33ca02b5533252bbaeed17a20a1237d..2732d6f642fba0969cb5919d8cdbfb1e5dcbe245 100644
--- a/Rendering/vtkImageViewer2.h
+++ b/Rendering/vtkImageViewer2.h
@@ -69,7 +69,7 @@ class VTK_RENDERING_EXPORT vtkImageViewer2 : public vtkObject
 {
 public:
   static vtkImageViewer2 *New();
-  vtkTypeRevisionMacro(vtkImageViewer2,vtkObject);
+  vtkTypeMacro(vtkImageViewer2,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkImagingFactory.cxx b/Rendering/vtkImagingFactory.cxx
index ba4abe304d3daee1909b724a5db5e56b1e893bc0..c648b073baaca7260a3d8cbef84c5ae2cb64b71d 100644
--- a/Rendering/vtkImagingFactory.cxx
+++ b/Rendering/vtkImagingFactory.cxx
@@ -59,7 +59,6 @@
 static vtkSimpleCriticalSection vtkUseMesaClassesCriticalSection;
 int vtkImagingFactory::UseMesaClasses = 0;
 
-vtkCxxRevisionMacro(vtkImagingFactory, "1.31");
 vtkStandardNewMacro(vtkImagingFactory);
 
 const char *vtkImagingFactoryGetRenderLibrary()
diff --git a/Rendering/vtkImagingFactory.h b/Rendering/vtkImagingFactory.h
index d34f68eb38279d3e0b7a3f5d87eedc97ca13a9c2..9b424de0b1ff70d82f8886686e329c81867d46e8 100644
--- a/Rendering/vtkImagingFactory.h
+++ b/Rendering/vtkImagingFactory.h
@@ -24,7 +24,7 @@ class VTK_RENDERING_EXPORT vtkImagingFactory : public vtkObject
 {
 public:
   static vtkImagingFactory *New();
-  vtkTypeRevisionMacro(vtkImagingFactory,vtkObject);
+  vtkTypeMacro(vtkImagingFactory,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkImporter.cxx b/Rendering/vtkImporter.cxx
index f662bce9c3dbe4ffcfdd7d85f3f111e166b74fa9..67d725f37c5657ed981917bfda28021f114e398e 100644
--- a/Rendering/vtkImporter.cxx
+++ b/Rendering/vtkImporter.cxx
@@ -16,7 +16,6 @@
 #include "vtkRendererCollection.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkImporter, "1.23");
 
 vtkCxxSetObjectMacro(vtkImporter,RenderWindow,vtkRenderWindow);
 
diff --git a/Rendering/vtkImporter.h b/Rendering/vtkImporter.h
index ffbeb2ef175a4a5bcd090178a1218518630039a2..d0731b4cda83480ea66d2df20e38dbcc7ef4cae5 100644
--- a/Rendering/vtkImporter.h
+++ b/Rendering/vtkImporter.h
@@ -50,7 +50,7 @@ class vtkRenderer;
 class VTK_RENDERING_EXPORT vtkImporter : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkImporter,vtkObject);
+  vtkTypeMacro(vtkImporter,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Rendering/vtkInteractorEventRecorder.cxx b/Rendering/vtkInteractorEventRecorder.cxx
index 7f1ce5511746a4b596a06a62b3fe5a9aa410194f..00ae5278f652851942172b34873015295702c601 100644
--- a/Rendering/vtkInteractorEventRecorder.cxx
+++ b/Rendering/vtkInteractorEventRecorder.cxx
@@ -21,7 +21,6 @@
 #include <locale>
 #include <vtksys/SystemTools.hxx>
 
-vtkCxxRevisionMacro(vtkInteractorEventRecorder, "1.18");
 vtkStandardNewMacro(vtkInteractorEventRecorder);
 
 float vtkInteractorEventRecorder::StreamVersion = 1.0f;
diff --git a/Rendering/vtkInteractorEventRecorder.h b/Rendering/vtkInteractorEventRecorder.h
index de23846f6896aae291b81ff6ddad9d955b1033b8..535ae55400031d4ea3675bf95e7c4f07151c36fd 100644
--- a/Rendering/vtkInteractorEventRecorder.h
+++ b/Rendering/vtkInteractorEventRecorder.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkInteractorEventRecorder : public vtkInteractorObse
 {
 public:
   static vtkInteractorEventRecorder *New();
-  vtkTypeRevisionMacro(vtkInteractorEventRecorder,vtkInteractorObserver);
+  vtkTypeMacro(vtkInteractorEventRecorder,vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Satisfy the superclass API. Enable/disable listening for events.
diff --git a/Rendering/vtkInteractorObserver.cxx b/Rendering/vtkInteractorObserver.cxx
index 975eed157b037f5777689e1bd022036f3728af67..3b1f8609e8efc29dfed212872f7242c218d3e738 100644
--- a/Rendering/vtkInteractorObserver.cxx
+++ b/Rendering/vtkInteractorObserver.cxx
@@ -21,7 +21,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkObserverMediator.h" 
 
-vtkCxxRevisionMacro(vtkInteractorObserver, "1.38");
 
 vtkCxxSetObjectMacro(vtkInteractorObserver,DefaultRenderer,vtkRenderer);
 
diff --git a/Rendering/vtkInteractorObserver.h b/Rendering/vtkInteractorObserver.h
index 252884eb505ce5821783812ca8fc252d04ed2c3c..e102da27ab8786b3478c0b4060fddc1a44e65fe9 100644
--- a/Rendering/vtkInteractorObserver.h
+++ b/Rendering/vtkInteractorObserver.h
@@ -53,7 +53,7 @@ class vtkObserverMediator;
 class VTK_RENDERING_EXPORT vtkInteractorObserver : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkInteractorObserver,vtkObject);
+  vtkTypeMacro(vtkInteractorObserver,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyle.cxx b/Rendering/vtkInteractorStyle.cxx
index f7d903aa04cfddbc1d35979fc93999bf8f41c976..e07e520fe138bd1392add9f06801c7b567461ce8 100644
--- a/Rendering/vtkInteractorStyle.cxx
+++ b/Rendering/vtkInteractorStyle.cxx
@@ -34,7 +34,6 @@
 #include "vtkEventForwarderCommand.h"
 #include "vtkTDxInteractorStyleCamera.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyle, "1.106");
 vtkStandardNewMacro(vtkInteractorStyle);
 vtkCxxSetObjectMacro(vtkInteractorStyle,TDxStyle,vtkTDxInteractorStyle);
 
diff --git a/Rendering/vtkInteractorStyle.h b/Rendering/vtkInteractorStyle.h
index f5957512e40995b301d2abea2c2bafd8210b991f..1799845e7d8ae6581b91b2ec97860865e761ea6f 100644
--- a/Rendering/vtkInteractorStyle.h
+++ b/Rendering/vtkInteractorStyle.h
@@ -129,7 +129,7 @@ public:
   // programmers.
   static vtkInteractorStyle *New();
 
-  vtkTypeRevisionMacro(vtkInteractorStyle,vtkInteractorObserver);
+  vtkTypeMacro(vtkInteractorStyle,vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleFlight.cxx b/Rendering/vtkInteractorStyleFlight.cxx
index 8d592113508cc7ccfd5c2f8677b904bb621c34c8..e2f11b1248b93fa55c6859181720161eb269b59d 100644
--- a/Rendering/vtkInteractorStyleFlight.cxx
+++ b/Rendering/vtkInteractorStyleFlight.cxx
@@ -23,7 +23,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkWindows.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleFlight, "1.34");
 vtkStandardNewMacro(vtkInteractorStyleFlight);
 
 class CPIDControl
diff --git a/Rendering/vtkInteractorStyleFlight.h b/Rendering/vtkInteractorStyleFlight.h
index b0bf5af80d08afa3df603ba773637172821c95e6..758088111c9c1494ad0ce3b2269d699f5c4bf699 100644
--- a/Rendering/vtkInteractorStyleFlight.h
+++ b/Rendering/vtkInteractorStyleFlight.h
@@ -44,7 +44,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleFlight : public vtkInteractorStyle
 {
 public:
   static vtkInteractorStyleFlight *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleFlight,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleFlight,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleImage.cxx b/Rendering/vtkInteractorStyleImage.cxx
index e15c1fd694363f5f4e11f11227b0e96fa2a51393..2c4672066fce42862d5db2b9b09ed5ccfe62738e 100644
--- a/Rendering/vtkInteractorStyleImage.cxx
+++ b/Rendering/vtkInteractorStyleImage.cxx
@@ -21,7 +21,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindowInteractor.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleImage, "1.27");
 vtkStandardNewMacro(vtkInteractorStyleImage);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleImage.h b/Rendering/vtkInteractorStyleImage.h
index cada838cfa6c884e0117ca8027dcea801ebd808e..2d0574baba1d2d812bb87d11a1a3a189df274f91 100644
--- a/Rendering/vtkInteractorStyleImage.h
+++ b/Rendering/vtkInteractorStyleImage.h
@@ -49,7 +49,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleImage : public vtkInteractorStyleTr
 {
 public:
   static vtkInteractorStyleImage *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleImage, vtkInteractorStyleTrackballCamera);
+  vtkTypeMacro(vtkInteractorStyleImage, vtkInteractorStyleTrackballCamera);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleJoystickActor.cxx b/Rendering/vtkInteractorStyleJoystickActor.cxx
index 36dc8ba9c263b53cb608a06ca35851859c05c6e8..7564196aff6959952e0fe4b5fc236ff885a16819 100644
--- a/Rendering/vtkInteractorStyleJoystickActor.cxx
+++ b/Rendering/vtkInteractorStyleJoystickActor.cxx
@@ -25,7 +25,6 @@
 #include "vtkTransform.h"
 #include "vtkMatrix4x4.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleJoystickActor, "1.35");
 vtkStandardNewMacro(vtkInteractorStyleJoystickActor);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleJoystickActor.h b/Rendering/vtkInteractorStyleJoystickActor.h
index 69acf7b8fe8bef79c8ffa67e619c09cbf3be97aa..2d4dc73f57b00605d4faf6ea91355c4ce87f36e6 100644
--- a/Rendering/vtkInteractorStyleJoystickActor.h
+++ b/Rendering/vtkInteractorStyleJoystickActor.h
@@ -42,7 +42,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleJoystickActor : public vtkInteracto
 public:
   static vtkInteractorStyleJoystickActor *New();
 
-  vtkTypeRevisionMacro(vtkInteractorStyleJoystickActor,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleJoystickActor,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleJoystickCamera.cxx b/Rendering/vtkInteractorStyleJoystickCamera.cxx
index 9565d69051605eaeff3390378ec632ab16d2a7f0..d7851fd3607f9cf94f36e19102a54aa69bd630eb 100644
--- a/Rendering/vtkInteractorStyleJoystickCamera.cxx
+++ b/Rendering/vtkInteractorStyleJoystickCamera.cxx
@@ -21,7 +21,6 @@
 #include "vtkRenderer.h"
 #include "vtkRenderWindowInteractor.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleJoystickCamera, "1.34");
 vtkStandardNewMacro(vtkInteractorStyleJoystickCamera);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleJoystickCamera.h b/Rendering/vtkInteractorStyleJoystickCamera.h
index 7b2f71d2cbfed0881b38791de87ca01fc379336b..2935f691878df04332bae0e8811006b4e0fc8827 100644
--- a/Rendering/vtkInteractorStyleJoystickCamera.h
+++ b/Rendering/vtkInteractorStyleJoystickCamera.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleJoystickCamera : public vtkInteract
 {
 public:
   static vtkInteractorStyleJoystickCamera *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleJoystickCamera,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleJoystickCamera,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleRubberBand2D.cxx b/Rendering/vtkInteractorStyleRubberBand2D.cxx
index 467d95ccbdddf74e78bb85e32e1f40095a7ef272..5e9dc6a4852e637da88e187af9a10f16df1f655a 100644
--- a/Rendering/vtkInteractorStyleRubberBand2D.cxx
+++ b/Rendering/vtkInteractorStyleRubberBand2D.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleRubberBand2D, "1.11");
 vtkStandardNewMacro(vtkInteractorStyleRubberBand2D);
 
 //--------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleRubberBand2D.h b/Rendering/vtkInteractorStyleRubberBand2D.h
index 0c3c5e5ce80dff13a8ab28419e450072e6637fb2..dcdb74b8549cc6d8a0dc31c282204c7498403815 100644
--- a/Rendering/vtkInteractorStyleRubberBand2D.h
+++ b/Rendering/vtkInteractorStyleRubberBand2D.h
@@ -45,7 +45,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleRubberBand2D : public vtkInteractor
 {
 public:
   static vtkInteractorStyleRubberBand2D *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleRubberBand2D, vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleRubberBand2D, vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void OnLeftButtonDown();
diff --git a/Rendering/vtkInteractorStyleRubberBand3D.cxx b/Rendering/vtkInteractorStyleRubberBand3D.cxx
index 307128c1818cfb2b9eb94057090849b132b0b8ce..319090373bbcce54ea00c2c1355ec1ba67c33d47 100644
--- a/Rendering/vtkInteractorStyleRubberBand3D.cxx
+++ b/Rendering/vtkInteractorStyleRubberBand3D.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleRubberBand3D, "1.9");
 vtkStandardNewMacro(vtkInteractorStyleRubberBand3D);
 
 //--------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleRubberBand3D.h b/Rendering/vtkInteractorStyleRubberBand3D.h
index 14d47e3570203197f0188860037ffcdf3e821ee8..1fb84ffe5825b68ba31d72819798caceb6ad5de4 100644
--- a/Rendering/vtkInteractorStyleRubberBand3D.h
+++ b/Rendering/vtkInteractorStyleRubberBand3D.h
@@ -43,7 +43,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleRubberBand3D : public vtkInteractor
 {
 public:
   static vtkInteractorStyleRubberBand3D *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleRubberBand3D, vtkInteractorStyleTrackballCamera);
+  vtkTypeMacro(vtkInteractorStyleRubberBand3D, vtkInteractorStyleTrackballCamera);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void OnLeftButtonDown();
diff --git a/Rendering/vtkInteractorStyleRubberBandPick.cxx b/Rendering/vtkInteractorStyleRubberBandPick.cxx
index fce74914b1372f1fe5391a8063f882eb698ea3e0..21bf7a9c9f682371245e849a4a21e040bbc0df95 100644
--- a/Rendering/vtkInteractorStyleRubberBandPick.cxx
+++ b/Rendering/vtkInteractorStyleRubberBandPick.cxx
@@ -23,7 +23,6 @@
 #include "vtkAssemblyPath.h"
 #include "vtkAreaPicker.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleRubberBandPick, "1.11");
 vtkStandardNewMacro(vtkInteractorStyleRubberBandPick);
 
 #define VTKISRBP_ORIENT 0
diff --git a/Rendering/vtkInteractorStyleRubberBandPick.h b/Rendering/vtkInteractorStyleRubberBandPick.h
index de587317c43721648b5ebe3b21c83e465005f624..d1921e4e827779c9b24fa56a7a9a55cc93cf3cfc 100644
--- a/Rendering/vtkInteractorStyleRubberBandPick.h
+++ b/Rendering/vtkInteractorStyleRubberBandPick.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleRubberBandPick : public vtkInteract
 {
 public:
   static vtkInteractorStyleRubberBandPick *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleRubberBandPick, vtkInteractorStyleTrackballCamera);
+  vtkTypeMacro(vtkInteractorStyleRubberBandPick, vtkInteractorStyleTrackballCamera);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void StartSelect();
diff --git a/Rendering/vtkInteractorStyleRubberBandZoom.cxx b/Rendering/vtkInteractorStyleRubberBandZoom.cxx
index 0fe81a374bcd6e3fb474c90459e0c7d31a1e75a8..1d9dbbf2a88acc79f4e8c2dc82b2af612b8d1276 100644
--- a/Rendering/vtkInteractorStyleRubberBandZoom.cxx
+++ b/Rendering/vtkInteractorStyleRubberBandZoom.cxx
@@ -21,7 +21,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleRubberBandZoom, "1.11");
 vtkStandardNewMacro(vtkInteractorStyleRubberBandZoom);
 
 vtkInteractorStyleRubberBandZoom::vtkInteractorStyleRubberBandZoom()
diff --git a/Rendering/vtkInteractorStyleRubberBandZoom.h b/Rendering/vtkInteractorStyleRubberBandZoom.h
index 3c4af29792e864e28b1c3c364247a145fa89f699..3b47322b96bc9375a5af74c0951562130138d22a 100644
--- a/Rendering/vtkInteractorStyleRubberBandZoom.h
+++ b/Rendering/vtkInteractorStyleRubberBandZoom.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleRubberBandZoom : public vtkInteract
 {
 public:
   static vtkInteractorStyleRubberBandZoom *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleRubberBandZoom, vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleRubberBandZoom, vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkInteractorStyleSwitch.cxx b/Rendering/vtkInteractorStyleSwitch.cxx
index bb31dbb4456dd22df0227d1e2d71edf0446696c6..7ac6d6b24458a57f91f32a2979d7d628db035ce1 100644
--- a/Rendering/vtkInteractorStyleSwitch.cxx
+++ b/Rendering/vtkInteractorStyleSwitch.cxx
@@ -23,7 +23,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderWindowInteractor.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleSwitch, "1.26");
 vtkStandardNewMacro(vtkInteractorStyleSwitch);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleSwitch.h b/Rendering/vtkInteractorStyleSwitch.h
index e7bcdcee81cabbf9c2c4703d3415c82bb73e471a..7529832665edf062e0ce061a7eb3d2b13cfc147f 100644
--- a/Rendering/vtkInteractorStyleSwitch.h
+++ b/Rendering/vtkInteractorStyleSwitch.h
@@ -43,7 +43,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleSwitch : public vtkInteractorStyle
 {
 public:
   static vtkInteractorStyleSwitch *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleSwitch, vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleSwitch, vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleTerrain.cxx b/Rendering/vtkInteractorStyleTerrain.cxx
index e081c763a4617c4f04a287bf608987a284677204..fb25305ec877b3922006799ab3a3ce524627d843 100644
--- a/Rendering/vtkInteractorStyleTerrain.cxx
+++ b/Rendering/vtkInteractorStyleTerrain.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderer.h"
 #include "vtkSphereSource.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleTerrain, "1.14");
 vtkStandardNewMacro(vtkInteractorStyleTerrain);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleTerrain.h b/Rendering/vtkInteractorStyleTerrain.h
index d6740c88c58afb59fb04cc4d3572173154fd364e..6dd55b6034a8020c76730f1724718b20e9405e96 100644
--- a/Rendering/vtkInteractorStyleTerrain.h
+++ b/Rendering/vtkInteractorStyleTerrain.h
@@ -59,7 +59,7 @@ public:
   // Instantiate the object.
   static vtkInteractorStyleTerrain *New();
 
-  vtkTypeRevisionMacro(vtkInteractorStyleTerrain,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleTerrain,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleTrackball.cxx b/Rendering/vtkInteractorStyleTrackball.cxx
index f24d64344e42c4ea8e6b5592963592a443a3da7f..5c86d6ae939b61848fc702d9f90135109b24aaa5 100644
--- a/Rendering/vtkInteractorStyleTrackball.cxx
+++ b/Rendering/vtkInteractorStyleTrackball.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleTrackball, "1.27");
 vtkStandardNewMacro(vtkInteractorStyleTrackball);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleTrackball.h b/Rendering/vtkInteractorStyleTrackball.h
index c134bdb5849dcd6fcdf1f3c8071a03abc8cc5d3a..2a2e8ff760a0f1545c95213e2d058486ee94f9cc 100644
--- a/Rendering/vtkInteractorStyleTrackball.h
+++ b/Rendering/vtkInteractorStyleTrackball.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleTrackball : public vtkInteractorSty
 {
 public:
   static vtkInteractorStyleTrackball *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleTrackball,vtkInteractorStyleSwitch);
+  vtkTypeMacro(vtkInteractorStyleTrackball,vtkInteractorStyleSwitch);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkInteractorStyleTrackballActor.cxx b/Rendering/vtkInteractorStyleTrackballActor.cxx
index d8fd179f5b3ed391157ede22b605d4aa16426d1f..3a31985e404abf9f54a6a3b06574dc2e763826ce 100644
--- a/Rendering/vtkInteractorStyleTrackballActor.cxx
+++ b/Rendering/vtkInteractorStyleTrackballActor.cxx
@@ -25,7 +25,6 @@
 #include "vtkRenderer.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleTrackballActor, "1.37");
 vtkStandardNewMacro(vtkInteractorStyleTrackballActor);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleTrackballActor.h b/Rendering/vtkInteractorStyleTrackballActor.h
index 5f5eb28bef268063ec2a8fa22e53ba9fa2409bce..2ff6b9eb1387c83c26e0fde0067f415835914687 100644
--- a/Rendering/vtkInteractorStyleTrackballActor.h
+++ b/Rendering/vtkInteractorStyleTrackballActor.h
@@ -42,7 +42,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleTrackballActor : public vtkInteract
 {
 public:
   static vtkInteractorStyleTrackballActor *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleTrackballActor,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleTrackballActor,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleTrackballCamera.cxx b/Rendering/vtkInteractorStyleTrackballCamera.cxx
index f9e2e3f005341050dbdfbd4a32fbef7f94e6a6e0..ee16031115d9374667efc1e42670d2d43f49a176 100644
--- a/Rendering/vtkInteractorStyleTrackballCamera.cxx
+++ b/Rendering/vtkInteractorStyleTrackballCamera.cxx
@@ -22,7 +22,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleTrackballCamera, "1.37");
 vtkStandardNewMacro(vtkInteractorStyleTrackballCamera);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleTrackballCamera.h b/Rendering/vtkInteractorStyleTrackballCamera.h
index 64701a806f82553a833681dc680a5976d91bce12..dfbbc4b0a6d0baa81286a62c715d349c2569cf54 100644
--- a/Rendering/vtkInteractorStyleTrackballCamera.h
+++ b/Rendering/vtkInteractorStyleTrackballCamera.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleTrackballCamera : public vtkInterac
 {
 public:
   static vtkInteractorStyleTrackballCamera *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleTrackballCamera,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleTrackballCamera,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkInteractorStyleUnicam.cxx b/Rendering/vtkInteractorStyleUnicam.cxx
index 4cc7022a3edbf0f9cf3b9224009f6ef3f8c813e0..94f9e2df4073431592c02667fe277d31f7550a41 100644
--- a/Rendering/vtkInteractorStyleUnicam.cxx
+++ b/Rendering/vtkInteractorStyleUnicam.cxx
@@ -36,7 +36,6 @@
 #include "vtkWorldPointPicker.h"
 #include "vtkCallbackCommand.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleUnicam, "1.40");
 vtkStandardNewMacro(vtkInteractorStyleUnicam);
 
 // define 'TheTime()' function-- returns time in elapsed seconds
diff --git a/Rendering/vtkInteractorStyleUnicam.h b/Rendering/vtkInteractorStyleUnicam.h
index 3a858efa5dded915734b74362207ad97adb2fcff..ea425f1dd5b55a9f4f5685069b27b5e44dfbb6e7 100644
--- a/Rendering/vtkInteractorStyleUnicam.h
+++ b/Rendering/vtkInteractorStyleUnicam.h
@@ -107,7 +107,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleUnicam : public vtkInteractorStyle
 {
 public:
   static vtkInteractorStyleUnicam *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleUnicam,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleUnicam,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   void SetWorldUpVector(double a[3]) {this->SetWorldUpVector(a[0],a[1],a[2]);}
diff --git a/Rendering/vtkInteractorStyleUser.cxx b/Rendering/vtkInteractorStyleUser.cxx
index 63a95bf560edcd71088ec1576c06309ffe3c8b4a..2b3b227c4519cfad370c01c96ff2290f7ecedd27 100644
--- a/Rendering/vtkInteractorStyleUser.cxx
+++ b/Rendering/vtkInteractorStyleUser.cxx
@@ -20,7 +20,6 @@
 #include "vtkCommand.h"
 
 
-vtkCxxRevisionMacro(vtkInteractorStyleUser, "1.35");
 vtkStandardNewMacro(vtkInteractorStyleUser);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkInteractorStyleUser.h b/Rendering/vtkInteractorStyleUser.h
index c50ac2528ab35247f89600343f6fe81a8b9dd1f7..45d79669f1e9957aaedebe286b07515c5ab5b646 100644
--- a/Rendering/vtkInteractorStyleUser.h
+++ b/Rendering/vtkInteractorStyleUser.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkInteractorStyleUser : public vtkInteractorStyle
 {
 public:
   static vtkInteractorStyleUser *New();
-  vtkTypeRevisionMacro(vtkInteractorStyleUser,vtkInteractorStyle);
+  vtkTypeMacro(vtkInteractorStyleUser,vtkInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkLODActor.cxx b/Rendering/vtkLODActor.cxx
index 53990b42c8c6dc9499d7df7a8056aa8765f22801..a2ab5795267bc9849a61d03dc7a242ec586a4373 100644
--- a/Rendering/vtkLODActor.cxx
+++ b/Rendering/vtkLODActor.cxx
@@ -28,7 +28,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkLODActor, "1.68");
 vtkStandardNewMacro(vtkLODActor);
 vtkCxxSetObjectMacro(vtkLODActor, LowResFilter, vtkPolyDataAlgorithm);
 vtkCxxSetObjectMacro(vtkLODActor, MediumResFilter, vtkPolyDataAlgorithm);
diff --git a/Rendering/vtkLODActor.h b/Rendering/vtkLODActor.h
index b95ba51afa66acc900ed88957e4314c65aa7c99f..1b0fc402da26421919c6a78a45fc07abdbe80aa1 100644
--- a/Rendering/vtkLODActor.h
+++ b/Rendering/vtkLODActor.h
@@ -65,7 +65,7 @@ class vtkWindow;
 class VTK_RENDERING_EXPORT vtkLODActor : public vtkActor
 {
 public:
-  vtkTypeRevisionMacro(vtkLODActor,vtkActor);
+  vtkTypeMacro(vtkLODActor,vtkActor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLODProp3D.cxx b/Rendering/vtkLODProp3D.cxx
index 5131d8eefe5b1677f84b77426b5752a60757c6a0..076912b2a710bbd97f16916852b1700850bf9c48 100644
--- a/Rendering/vtkLODProp3D.cxx
+++ b/Rendering/vtkLODProp3D.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkLODProp3D, "1.48");
 vtkStandardNewMacro(vtkLODProp3D);
 
 #define VTK_INDEX_NOT_IN_USE    -1
diff --git a/Rendering/vtkLODProp3D.h b/Rendering/vtkLODProp3D.h
index 87d697e7902a70d354b1f35f469974954ed6241f..526f9288300885016d14b3075fec1fcd2ec3289d 100644
--- a/Rendering/vtkLODProp3D.h
+++ b/Rendering/vtkLODProp3D.h
@@ -55,7 +55,7 @@ public:
   // Create an instance of this class.
   static vtkLODProp3D *New();
 
-  vtkTypeRevisionMacro(vtkLODProp3D,vtkProp3D);
+  vtkTypeMacro(vtkLODProp3D,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLabelHierarchy.cxx b/Rendering/vtkLabelHierarchy.cxx
index f1cea0d45fef0ee7e3deab49469e8bec7c2bb44d..652de38ba78096495ba6f40424b6a6ffe380f794 100644
--- a/Rendering/vtkLabelHierarchy.cxx
+++ b/Rendering/vtkLabelHierarchy.cxx
@@ -83,7 +83,7 @@ vtkLabelHierarchy* vtkLabelHierarchy::Implementation::Current;
 class vtkLabelHierarchyFrustumIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyFrustumIterator,vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchyFrustumIterator,vtkLabelHierarchyIterator);
   static vtkLabelHierarchyFrustumIterator* New();
   void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24] );
   virtual void Begin( vtkIdTypeArray* lastPlaced );
@@ -122,7 +122,6 @@ protected:
   vtkIdType PreviousLabelIter;
 };
 
-vtkCxxRevisionMacro(vtkLabelHierarchyFrustumIterator,"1.46");
 vtkStandardNewMacro(vtkLabelHierarchyFrustumIterator);
 vtkCxxSetObjectMacro(vtkLabelHierarchyFrustumIterator, Camera, vtkCamera);
 vtkLabelHierarchyFrustumIterator::vtkLabelHierarchyFrustumIterator()
@@ -500,7 +499,7 @@ bool vtkLabelHierarchyFrustumIterator::IsCursorInFrustum()
 class vtkLabelHierarchyFullSortIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyFullSortIterator,vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchyFullSortIterator,vtkLabelHierarchyIterator);
   static vtkLabelHierarchyFullSortIterator* New();
 
   void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam,
@@ -553,7 +552,6 @@ protected:
   int NodesTraversed;
 };
 
-vtkCxxRevisionMacro(vtkLabelHierarchyFullSortIterator,"1.46");
 vtkStandardNewMacro(vtkLabelHierarchyFullSortIterator);
 vtkCxxSetObjectMacro(vtkLabelHierarchyFullSortIterator, Camera, vtkCamera);
 void vtkLabelHierarchyFullSortIterator::Prepare( vtkLabelHierarchy* hier, vtkCamera* cam,
@@ -771,7 +769,7 @@ vtkLabelHierarchyFullSortIterator::~vtkLabelHierarchyFullSortIterator()
 class vtkLabelHierarchyQuadtreeIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyQuadtreeIterator,vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchyQuadtreeIterator,vtkLabelHierarchyIterator);
   static vtkLabelHierarchyQuadtreeIterator* New();
 
   typedef vtkLabelHierarchy::Implementation::HierarchyType2::octree_node_pointer NodePointer;
@@ -811,7 +809,6 @@ protected:
   int NodesQueued;
 };
 
-vtkCxxRevisionMacro(vtkLabelHierarchyQuadtreeIterator,"1.46");
 vtkStandardNewMacro(vtkLabelHierarchyQuadtreeIterator);
 vtkCxxSetObjectMacro(vtkLabelHierarchyQuadtreeIterator,Camera,vtkCamera);
 vtkCxxSetObjectMacro(vtkLabelHierarchyQuadtreeIterator,Renderer,vtkRenderer);
@@ -1095,7 +1092,7 @@ void vtkLabelHierarchyQuadtreeIterator::QueueChildren()
 class vtkLabelHierarchyOctreeQueueIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyOctreeQueueIterator,vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchyOctreeQueueIterator,vtkLabelHierarchyIterator);
   static vtkLabelHierarchyOctreeQueueIterator* New();
 
   typedef vtkLabelHierarchy::Implementation::HierarchyType3::octree_node_pointer NodePointer;
@@ -1137,7 +1134,6 @@ protected:
   int NodesQueued;
 };
 
-vtkCxxRevisionMacro(vtkLabelHierarchyOctreeQueueIterator,"1.46");
 vtkStandardNewMacro(vtkLabelHierarchyOctreeQueueIterator);
 vtkCxxSetObjectMacro(vtkLabelHierarchyOctreeQueueIterator,Camera,vtkCamera);
 vtkCxxSetObjectMacro(vtkLabelHierarchyOctreeQueueIterator,Renderer,vtkRenderer);
@@ -1475,7 +1471,7 @@ void vtkLabelHierarchyOctreeQueueIterator::QueueChildren()
 class vtkLabelHierarchy3DepthFirstIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchy3DepthFirstIterator,vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchy3DepthFirstIterator,vtkLabelHierarchyIterator);
   static vtkLabelHierarchy3DepthFirstIterator* New();
 
   void Prepare( vtkLabelHierarchy* hier, vtkCamera* cam, double frustumPlanes[24], vtkRenderer* ren, float bucketSize[2] );
@@ -1511,7 +1507,6 @@ protected:
   int DidRoot;
 };
 
-vtkCxxRevisionMacro(vtkLabelHierarchy3DepthFirstIterator,"1.46");
 vtkStandardNewMacro(vtkLabelHierarchy3DepthFirstIterator);
 vtkCxxSetObjectMacro(vtkLabelHierarchy3DepthFirstIterator,Camera,vtkCamera);
 vtkCxxSetObjectMacro(vtkLabelHierarchy3DepthFirstIterator,Renderer,vtkRenderer);
@@ -1810,7 +1805,6 @@ void vtkLabelHierarchy3DepthFirstIterator::ReorderChildrenForView( int* order )
 // vtkLabelHierarchy
 
 vtkStandardNewMacro(vtkLabelHierarchy);
-vtkCxxRevisionMacro(vtkLabelHierarchy,"1.46");
 vtkCxxSetObjectMacro(vtkLabelHierarchy,Priorities,vtkDataArray);
 vtkCxxSetObjectMacro(vtkLabelHierarchy,Labels,vtkAbstractArray);
 vtkCxxSetObjectMacro(vtkLabelHierarchy,IconIndices,vtkIntArray);
diff --git a/Rendering/vtkLabelHierarchy.h b/Rendering/vtkLabelHierarchy.h
index 17a4bd7a5d5bf15fd0b7c825b2aa343373be9c8d..a145e30087e6f4dc51d8b1c6c50bac77bd0e1943 100644
--- a/Rendering/vtkLabelHierarchy.h
+++ b/Rendering/vtkLabelHierarchy.h
@@ -75,7 +75,7 @@ class VTK_RENDERING_EXPORT vtkLabelHierarchy : public vtkPointSet
 {
 public:
   static vtkLabelHierarchy* New();
-  vtkTypeRevisionMacro(vtkLabelHierarchy,vtkPointSet);
+  vtkTypeMacro(vtkLabelHierarchy,vtkPointSet);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Rendering/vtkLabelHierarchyAlgorithm.cxx b/Rendering/vtkLabelHierarchyAlgorithm.cxx
index 89741de5f40639a25363db8cd7eef8db9e866aef..29706cec889736113f1417d97ffbd0f5a21f54af 100644
--- a/Rendering/vtkLabelHierarchyAlgorithm.cxx
+++ b/Rendering/vtkLabelHierarchyAlgorithm.cxx
@@ -22,7 +22,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkTrivialProducer.h"
 
-vtkCxxRevisionMacro(vtkLabelHierarchyAlgorithm, "1.2");
 vtkStandardNewMacro(vtkLabelHierarchyAlgorithm);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkLabelHierarchyAlgorithm.h b/Rendering/vtkLabelHierarchyAlgorithm.h
index 25430dcc988039b8a2ae923b5712d5b342eab905..be536408fd224c07b96da9e7301ec516064fb60f 100644
--- a/Rendering/vtkLabelHierarchyAlgorithm.h
+++ b/Rendering/vtkLabelHierarchyAlgorithm.h
@@ -40,7 +40,7 @@ class VTK_RENDERING_EXPORT vtkLabelHierarchyAlgorithm : public vtkAlgorithm
 {
 public:
   static vtkLabelHierarchyAlgorithm *New();
-  vtkTypeRevisionMacro(vtkLabelHierarchyAlgorithm,vtkAlgorithm);
+  vtkTypeMacro(vtkLabelHierarchyAlgorithm,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLabelHierarchyCompositeIterator.cxx b/Rendering/vtkLabelHierarchyCompositeIterator.cxx
index 2ba74763d672eb22dea965178ccdf4612eb360c4..11f218255fa441ea5fa88c678c6b216c07c44925 100644
--- a/Rendering/vtkLabelHierarchyCompositeIterator.cxx
+++ b/Rendering/vtkLabelHierarchyCompositeIterator.cxx
@@ -26,7 +26,6 @@
 #include <vtksys/stl/utility>
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkLabelHierarchyCompositeIterator, "1.4");
 vtkStandardNewMacro(vtkLabelHierarchyCompositeIterator);
 
 class vtkLabelHierarchyCompositeIterator::Internal
diff --git a/Rendering/vtkLabelHierarchyCompositeIterator.h b/Rendering/vtkLabelHierarchyCompositeIterator.h
index c100f1cf07068f0e2368ab565aa06a1ef01f9d82..f35fdbb363533f5a316e05b5e832feda8ab9e8af 100644
--- a/Rendering/vtkLabelHierarchyCompositeIterator.h
+++ b/Rendering/vtkLabelHierarchyCompositeIterator.h
@@ -44,7 +44,7 @@ class vtkPolyData;
 class VTK_RENDERING_EXPORT vtkLabelHierarchyCompositeIterator : public vtkLabelHierarchyIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyCompositeIterator, vtkLabelHierarchyIterator);
+  vtkTypeMacro(vtkLabelHierarchyCompositeIterator, vtkLabelHierarchyIterator);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   static vtkLabelHierarchyCompositeIterator* New();
 
diff --git a/Rendering/vtkLabelHierarchyIterator.cxx b/Rendering/vtkLabelHierarchyIterator.cxx
index 5cec7f794f447ba64c47fdebd4ba5a57f53faa9e..bd4ac6626a45154d2045a6d344847afc6343985b 100644
--- a/Rendering/vtkLabelHierarchyIterator.cxx
+++ b/Rendering/vtkLabelHierarchyIterator.cxx
@@ -35,7 +35,6 @@
 #include "vtkPointData.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkLabelHierarchyIterator, "1.11");
 vtkCxxSetObjectMacro(vtkLabelHierarchyIterator,Hierarchy,vtkLabelHierarchy);
 vtkCxxSetObjectMacro(vtkLabelHierarchyIterator,TraversedBounds,vtkPolyData);
 
diff --git a/Rendering/vtkLabelHierarchyIterator.h b/Rendering/vtkLabelHierarchyIterator.h
index 4e665627284ccb910edca13deff2a3b3f7eaea69..ab63ffbd69130c7c0a0ec3d0225d4b3c81a7a316 100644
--- a/Rendering/vtkLabelHierarchyIterator.h
+++ b/Rendering/vtkLabelHierarchyIterator.h
@@ -36,7 +36,7 @@ class vtkPolyData;
 class VTK_RENDERING_EXPORT vtkLabelHierarchyIterator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkLabelHierarchyIterator,vtkObject);
+  vtkTypeMacro(vtkLabelHierarchyIterator,vtkObject);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Rendering/vtkLabelPlacementMapper.cxx b/Rendering/vtkLabelPlacementMapper.cxx
index 4bea295a8fc2fa963ec415a1318bd6657ea8c264..c345bf219655578f4d30d43b974019a8f3b84642 100644
--- a/Rendering/vtkLabelPlacementMapper.cxx
+++ b/Rendering/vtkLabelPlacementMapper.cxx
@@ -441,7 +441,6 @@ public:
     }
 };
 
-vtkCxxRevisionMacro(vtkLabelPlacementMapper, "1.6");
 vtkStandardNewMacro(vtkLabelPlacementMapper);
 vtkCxxSetObjectMacro(vtkLabelPlacementMapper, AnchorTransform, vtkCoordinate);
 vtkCxxSetObjectMacro(vtkLabelPlacementMapper, RenderStrategy, vtkLabelRenderStrategy);
diff --git a/Rendering/vtkLabelPlacementMapper.h b/Rendering/vtkLabelPlacementMapper.h
index 339105d61ff47f942fbf4593864fae1322272bf7..d1d1bdef2918f6e1b323dc814af4d6dc75c93f99 100644
--- a/Rendering/vtkLabelPlacementMapper.h
+++ b/Rendering/vtkLabelPlacementMapper.h
@@ -42,7 +42,7 @@ class VTK_RENDERING_EXPORT vtkLabelPlacementMapper : public vtkMapper2D
 {
 public:
   static vtkLabelPlacementMapper *New();
-  vtkTypeRevisionMacro(vtkLabelPlacementMapper, vtkMapper2D);
+  vtkTypeMacro(vtkLabelPlacementMapper, vtkMapper2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLabelPlacer.cxx b/Rendering/vtkLabelPlacer.cxx
index b287913218aff5c93256a620b1f31c0e6f7f4ddd..55920a9cb26ca4a5e0211eea3fbd719a6d6ec4d1 100644
--- a/Rendering/vtkLabelPlacer.cxx
+++ b/Rendering/vtkLabelPlacer.cxx
@@ -45,7 +45,6 @@
 #include <vtkstd/vector>
 
 vtkStandardNewMacro(vtkLabelPlacer);
-vtkCxxRevisionMacro(vtkLabelPlacer,"1.25");
 vtkCxxSetObjectMacro(vtkLabelPlacer,AnchorTransform,vtkCoordinate);
 
 class vtkLabelPlacer::Internal
diff --git a/Rendering/vtkLabelPlacer.h b/Rendering/vtkLabelPlacer.h
index a83a378c7b83dd9c180b0ef9eee31f876000db86..9b8783cedf08ddc44f4f30487c5bf5f9cabe43fa 100644
--- a/Rendering/vtkLabelPlacer.h
+++ b/Rendering/vtkLabelPlacer.h
@@ -49,7 +49,7 @@ class VTK_RENDERING_EXPORT vtkLabelPlacer : public vtkPolyDataAlgorithm
 {
 public:
   static vtkLabelPlacer* New();
-  vtkTypeRevisionMacro(vtkLabelPlacer,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkLabelPlacer,vtkPolyDataAlgorithm);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   vtkGetObjectMacro(Renderer,vtkRenderer);
diff --git a/Rendering/vtkLabelRenderStrategy.cxx b/Rendering/vtkLabelRenderStrategy.cxx
index 8ca7450e5b206d9326926e8e1264cffda3ced4ef..b344cdedec2a8fefeb9847a852658aab688cd4c6 100644
--- a/Rendering/vtkLabelRenderStrategy.cxx
+++ b/Rendering/vtkLabelRenderStrategy.cxx
@@ -17,7 +17,6 @@
 #include "vtkRenderer.h"
 #include "vtkTextProperty.h"
 
-vtkCxxRevisionMacro(vtkLabelRenderStrategy, "1.1");
 vtkCxxSetObjectMacro(vtkLabelRenderStrategy, Renderer, vtkRenderer);
 vtkCxxSetObjectMacro(vtkLabelRenderStrategy, DefaultTextProperty, vtkTextProperty);
 
diff --git a/Rendering/vtkLabelRenderStrategy.h b/Rendering/vtkLabelRenderStrategy.h
index a285b51832904a84e8a062607356a86ed9785521..c735e9368dd60e08926aee50ca72f857f81321b8 100644
--- a/Rendering/vtkLabelRenderStrategy.h
+++ b/Rendering/vtkLabelRenderStrategy.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkLabelRenderStrategy : public vtkObject
 {
  public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkLabelRenderStrategy, vtkObject);
+  vtkTypeMacro(vtkLabelRenderStrategy, vtkObject);
 
   // Description:
   // Whether the text rendering strategy supports rotation.
diff --git a/Rendering/vtkLabelSizeCalculator.cxx b/Rendering/vtkLabelSizeCalculator.cxx
index 543798834d0fce48bef7bce301868ae10cc418a4..b05df55a27f4e08b6c54b35ee823c3f2d112495a 100644
--- a/Rendering/vtkLabelSizeCalculator.cxx
+++ b/Rendering/vtkLabelSizeCalculator.cxx
@@ -28,7 +28,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkLabelSizeCalculator);
-vtkCxxRevisionMacro(vtkLabelSizeCalculator,"1.6");
 vtkCxxSetObjectMacro(vtkLabelSizeCalculator,FontUtil,vtkFreeTypeUtilities);
 
 vtkLabelSizeCalculator::vtkLabelSizeCalculator()
diff --git a/Rendering/vtkLabelSizeCalculator.h b/Rendering/vtkLabelSizeCalculator.h
index 418ffb2c8197d28d6b61d1755f9ef0bcd1075b31..ec98643cc40653f3135120419c14bf6286888923 100644
--- a/Rendering/vtkLabelSizeCalculator.h
+++ b/Rendering/vtkLabelSizeCalculator.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkLabelSizeCalculator : public vtkPassInputTypeAlgor
 public:
   static vtkLabelSizeCalculator* New();
   virtual void PrintSelf( ostream& os, vtkIndent indent );
-  vtkTypeRevisionMacro(vtkLabelSizeCalculator,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkLabelSizeCalculator,vtkPassInputTypeAlgorithm);
 
   // Description:
   // Get/Set the font used compute label sizes.
diff --git a/Rendering/vtkLabeledDataMapper.cxx b/Rendering/vtkLabeledDataMapper.cxx
index 21b5a235133be2e7873dce56bbefcc7c27ebc3eb..0fdd1cc39bcb8f72f1f3c1b1b7f54ac3423fcb93 100644
--- a/Rendering/vtkLabeledDataMapper.cxx
+++ b/Rendering/vtkLabeledDataMapper.cxx
@@ -42,7 +42,6 @@ public:
   vtkstd::map<int, vtkSmartPointer<vtkTextProperty> > TextProperties;
 };
 
-vtkCxxRevisionMacro(vtkLabeledDataMapper, "1.62");
 vtkStandardNewMacro(vtkLabeledDataMapper);
 
 vtkCxxSetObjectMacro(vtkLabeledDataMapper,Transform,vtkTransform);
diff --git a/Rendering/vtkLabeledDataMapper.h b/Rendering/vtkLabeledDataMapper.h
index 37a7e5399bd8e93439dc712c86efd6f71cbd2a1c..6681cfc76a05ee764ccb6d32accfa65a65dbc1cf 100644
--- a/Rendering/vtkLabeledDataMapper.h
+++ b/Rendering/vtkLabeledDataMapper.h
@@ -67,7 +67,7 @@ public:
   // are labeled.
   static vtkLabeledDataMapper *New();
 
-  vtkTypeRevisionMacro(vtkLabeledDataMapper,vtkMapper2D);
+  vtkTypeMacro(vtkLabeledDataMapper,vtkMapper2D);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkLabeledTreeMapDataMapper.cxx b/Rendering/vtkLabeledTreeMapDataMapper.cxx
index b5bc4b26a29367793002cf948930518e111c57e8..f0686bbf56d52cc14e58eb06619327f4e3d5836a 100644
--- a/Rendering/vtkLabeledTreeMapDataMapper.cxx
+++ b/Rendering/vtkLabeledTreeMapDataMapper.cxx
@@ -38,7 +38,6 @@
 #include "vtkViewport.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkLabeledTreeMapDataMapper, "1.4");
 vtkStandardNewMacro(vtkLabeledTreeMapDataMapper);
 
 vtkLabeledTreeMapDataMapper::vtkLabeledTreeMapDataMapper()
diff --git a/Rendering/vtkLabeledTreeMapDataMapper.h b/Rendering/vtkLabeledTreeMapDataMapper.h
index 09d6bf28f1924bdea447eef6780593ebb7eb5e8c..8d034eb6c9a4c9e92a2b26f9cab8d45d4c1a1bd4 100644
--- a/Rendering/vtkLabeledTreeMapDataMapper.h
+++ b/Rendering/vtkLabeledTreeMapDataMapper.h
@@ -54,7 +54,7 @@ class VTK_RENDERING_EXPORT vtkLabeledTreeMapDataMapper : public vtkLabeledDataMa
 {
 public:
   static vtkLabeledTreeMapDataMapper *New();
-  vtkTypeRevisionMacro(vtkLabeledTreeMapDataMapper,vtkLabeledDataMapper);
+  vtkTypeMacro(vtkLabeledTreeMapDataMapper,vtkLabeledDataMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLeaderActor2D.cxx b/Rendering/vtkLeaderActor2D.cxx
index f2bab862f7ac3b8e01c3495b58ca9d41ca220caf..92df5269ca126c932710f317f73d0d54d1a011c1 100644
--- a/Rendering/vtkLeaderActor2D.cxx
+++ b/Rendering/vtkLeaderActor2D.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkLeaderActor2D, "1.13");
 vtkStandardNewMacro(vtkLeaderActor2D);
 
 vtkCxxSetObjectMacro(vtkLeaderActor2D,LabelTextProperty,vtkTextProperty);
diff --git a/Rendering/vtkLeaderActor2D.h b/Rendering/vtkLeaderActor2D.h
index 73accd894e6f3495405e6781797ffdcd46f9fd00..76d68b8807ccdb0c53a6d11160290a6037598ad5 100644
--- a/Rendering/vtkLeaderActor2D.h
+++ b/Rendering/vtkLeaderActor2D.h
@@ -52,7 +52,7 @@ class vtkTextProperty;
 class VTK_RENDERING_EXPORT vtkLeaderActor2D : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkLeaderActor2D,vtkActor2D);
+  vtkTypeMacro(vtkLeaderActor2D,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLight.cxx b/Rendering/vtkLight.cxx
index a8804685916d04e813f4a4dedb42c0ec0e20b74f..266ac4bf9a3867c612fa391b8fe81b0921e6ed2b 100644
--- a/Rendering/vtkLight.cxx
+++ b/Rendering/vtkLight.cxx
@@ -18,7 +18,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkGraphicsFactory.h"
 
-vtkCxxRevisionMacro(vtkLight, "1.55");
 
 vtkCxxSetObjectMacro(vtkLight,TransformMatrix,vtkMatrix4x4);
 
diff --git a/Rendering/vtkLight.h b/Rendering/vtkLight.h
index e12e497c9158962ba89f8e59f4793b46f73bf96a..943787f47013f339436b42620beae7a76cc0d1e3 100644
--- a/Rendering/vtkLight.h
+++ b/Rendering/vtkLight.h
@@ -51,7 +51,7 @@ class vtkMatrix4x4;
 class VTK_RENDERING_EXPORT vtkLight : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkLight,vtkObject);
+  vtkTypeMacro(vtkLight,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLightActor.cxx b/Rendering/vtkLightActor.cxx
index 4d520bad5e1b2dd64eda5d06b6b774540130a05a..0de44e86e8ee3af29e5ff8cee563e717b161009d 100644
--- a/Rendering/vtkLightActor.cxx
+++ b/Rendering/vtkLightActor.cxx
@@ -25,7 +25,6 @@
 #include "vtkProperty.h"
 #include "vtkBoundingBox.h"
 
-vtkCxxRevisionMacro(vtkLightActor, "1.3");
 vtkStandardNewMacro(vtkLightActor);
 vtkCxxSetObjectMacro(vtkLightActor, Light, vtkLight);
 
diff --git a/Rendering/vtkLightActor.h b/Rendering/vtkLightActor.h
index adb3174faead004a3fd2aa354aeea1c222ae6c57..348ac0b52065320f178b6d110b9f0118bfbe3108 100644
--- a/Rendering/vtkLightActor.h
+++ b/Rendering/vtkLightActor.h
@@ -48,7 +48,7 @@ class VTK_RENDERING_EXPORT vtkLightActor : public vtkProp3D
 {
 public:
   static vtkLightActor *New();
-  vtkTypeRevisionMacro(vtkLightActor,vtkProp3D);
+  vtkTypeMacro(vtkLightActor,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLightCollection.cxx b/Rendering/vtkLightCollection.cxx
index 046ecb4047e703401050eddd3abb8b18f47e64d3..a2065256c7de0ce2ab0f8fa215688251c855ecf5 100644
--- a/Rendering/vtkLightCollection.cxx
+++ b/Rendering/vtkLightCollection.cxx
@@ -19,7 +19,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkLightCollection, "1.17");
 vtkStandardNewMacro(vtkLightCollection);
 
 // Add a light to the list.
diff --git a/Rendering/vtkLightCollection.h b/Rendering/vtkLightCollection.h
index 0a2cfbadc415f2b8cddd9ae68a3fd2703e5848dd..ca5ec031e8a088e9db7a67a4a251c4f123fefa14 100644
--- a/Rendering/vtkLightCollection.h
+++ b/Rendering/vtkLightCollection.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkLightCollection : public vtkCollection
 {
  public:
   static vtkLightCollection *New();
-  vtkTypeRevisionMacro(vtkLightCollection,vtkCollection);
+  vtkTypeMacro(vtkLightCollection,vtkCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLightKit.cxx b/Rendering/vtkLightKit.cxx
index 2754c1502f82011fd4364b24af7e12d83bce8a39..d739163cea14c6b850f51fd9d81f638d842f8ba7 100644
--- a/Rendering/vtkLightKit.cxx
+++ b/Rendering/vtkLightKit.cxx
@@ -19,7 +19,6 @@
 #include "vtkPiecewiseFunction.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkLightKit, "1.27");
 vtkStandardNewMacro(vtkLightKit);
 
 static const char *vtkLightKitTypeStrings[] = {
diff --git a/Rendering/vtkLightKit.h b/Rendering/vtkLightKit.h
index 79056e526915ecd4b09ab170ea1d03826c9404c6..543bfb821e5f6ee80476d1de8fccb86b455b62d2 100644
--- a/Rendering/vtkLightKit.h
+++ b/Rendering/vtkLightKit.h
@@ -99,7 +99,7 @@ class VTK_RENDERING_EXPORT vtkLightKit : public vtkObject
 {
 public:
   static vtkLightKit *New();
-  vtkTypeRevisionMacro(vtkLightKit, vtkObject);
+  vtkTypeMacro(vtkLightKit, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkLightingHelper.cxx b/Rendering/vtkLightingHelper.cxx
index ce70a96317dac78efe0e95137243001be83d5a6b..a7d8a8645925040664f943e0de7a91b15fd763b9 100644
--- a/Rendering/vtkLightingHelper.cxx
+++ b/Rendering/vtkLightingHelper.cxx
@@ -22,7 +22,6 @@
 extern const char * vtkLightingHelper_s;
 
 vtkStandardNewMacro(vtkLightingHelper);
-vtkCxxRevisionMacro(vtkLightingHelper, "1.1");
 vtkCxxSetObjectMacro(vtkLightingHelper, Shader, vtkShaderProgram2);
 //----------------------------------------------------------------------------
 vtkLightingHelper::vtkLightingHelper()
diff --git a/Rendering/vtkLightingHelper.h b/Rendering/vtkLightingHelper.h
index 1fbb1074540ce3746dffcdb3147afc96c4a1cb60..2675210f030054a683058c3d73fb88de3803b0cd 100644
--- a/Rendering/vtkLightingHelper.h
+++ b/Rendering/vtkLightingHelper.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkLightingHelper : public vtkObject
 {
 public:
   static vtkLightingHelper* New();
-  vtkTypeRevisionMacro(vtkLightingHelper, vtkObject);
+  vtkTypeMacro(vtkLightingHelper, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkLightingPainter.cxx b/Rendering/vtkLightingPainter.cxx
index 8b8900f53444d7906f9f2b84aa2101ce4b972fb4..e57b8f83a877a409bcddb53a1a2a0a7b23789671 100644
--- a/Rendering/vtkLightingPainter.cxx
+++ b/Rendering/vtkLightingPainter.cxx
@@ -20,7 +20,6 @@
 
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkLightingPainter);
-vtkCxxRevisionMacro(vtkLightingPainter, "1.3");
 //-----------------------------------------------------------------------------
 vtkLightingPainter::vtkLightingPainter()
 {
diff --git a/Rendering/vtkLightingPainter.h b/Rendering/vtkLightingPainter.h
index f83efe3782d2493f7457936e7ef81e0aed8998a4..509ee4035bd801caf46700d4e78e5e9104b30305 100644
--- a/Rendering/vtkLightingPainter.h
+++ b/Rendering/vtkLightingPainter.h
@@ -24,7 +24,7 @@ class VTK_RENDERING_EXPORT vtkLightingPainter : public vtkPolyDataPainter
 {
 public:
   static vtkLightingPainter* New();
-  vtkTypeRevisionMacro(vtkLightingPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkLightingPainter, vtkPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkLightsPass.cxx b/Rendering/vtkLightsPass.cxx
index 2ba9662f1f5318ce3f129c650996b029c13f9c84..7c87b147c0654c24cd9d4085050509819f410fed 100644
--- a/Rendering/vtkLightsPass.cxx
+++ b/Rendering/vtkLightsPass.cxx
@@ -20,7 +20,6 @@
 #include "vtkRenderer.h"
 #include "vtkgl.h"
 
-vtkCxxRevisionMacro(vtkLightsPass, "1.1");
 vtkStandardNewMacro(vtkLightsPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkLightsPass.h b/Rendering/vtkLightsPass.h
index 414bcc18c1e3495124f744e2eb43d706f2043093..bc9bcd17f5703d7a9b7dc2249746cbd1288162be 100644
--- a/Rendering/vtkLightsPass.h
+++ b/Rendering/vtkLightsPass.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkLightsPass : public vtkRenderPass
 {
 public:
   static vtkLightsPass *New();
-  vtkTypeRevisionMacro(vtkLightsPass,vtkRenderPass);
+  vtkTypeMacro(vtkLightsPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkLineIntegralConvolution2D.cxx b/Rendering/vtkLineIntegralConvolution2D.cxx
index e8e2ee3dcfabb5d86a8a1c00bc7e06c895e217c3..cd8c06c73aeef65b97bd51ab36ce4b4c7a3fd396 100644
--- a/Rendering/vtkLineIntegralConvolution2D.cxx
+++ b/Rendering/vtkLineIntegralConvolution2D.cxx
@@ -51,7 +51,6 @@ static const char * vtkLineIntegralConvolution2DCode =
 #endif
 
 vtkStandardNewMacro( vtkLineIntegralConvolution2D );
-vtkCxxRevisionMacro( vtkLineIntegralConvolution2D, "1.4" );
 
 // Given the coordinate range of the vector texture, that of the resulting
 // LIC texture, and the size of the output image, this function invokes the
diff --git a/Rendering/vtkLineIntegralConvolution2D.h b/Rendering/vtkLineIntegralConvolution2D.h
index e6b5b1953f75a3233709a4d81cc902af4dcd4518..90a911b7d2798f9f3ca7047489cff51520e2f55b 100644
--- a/Rendering/vtkLineIntegralConvolution2D.h
+++ b/Rendering/vtkLineIntegralConvolution2D.h
@@ -86,7 +86,7 @@ class VTK_RENDERING_EXPORT vtkLineIntegralConvolution2D : public vtkObject
 public:
 
   static vtkLineIntegralConvolution2D * New();
-  vtkTypeRevisionMacro( vtkLineIntegralConvolution2D, vtkObject );
+  vtkTypeMacro( vtkLineIntegralConvolution2D, vtkObject );
   void PrintSelf( ostream & os, vtkIndent indent );
   
   // Description:
diff --git a/Rendering/vtkLinesPainter.cxx b/Rendering/vtkLinesPainter.cxx
index ca9fc8ae418546c19321af6af9cb9a1f2f61fa6f..a4b8cf392069d6230ad8be17ee24f95a785d046e 100644
--- a/Rendering/vtkLinesPainter.cxx
+++ b/Rendering/vtkLinesPainter.cxx
@@ -27,7 +27,6 @@
 #include "vtkUnsignedCharArray.h"
 
 vtkStandardNewMacro(vtkLinesPainter);
-vtkCxxRevisionMacro(vtkLinesPainter, "1.6");
 //-----------------------------------------------------------------------------
 vtkLinesPainter::vtkLinesPainter()
 {
diff --git a/Rendering/vtkLinesPainter.h b/Rendering/vtkLinesPainter.h
index 5537be2c1fe0100a38ea02217b3bbc0a34925075..5f00d08e29de0f03b994845ce61ad9aa123a274c 100644
--- a/Rendering/vtkLinesPainter.h
+++ b/Rendering/vtkLinesPainter.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkLinesPainter : public vtkPrimitivePainter
 {
 public:
   static vtkLinesPainter* New();
-  vtkTypeRevisionMacro(vtkLinesPainter, vtkPrimitivePainter);
+  vtkTypeMacro(vtkLinesPainter, vtkPrimitivePainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 protected:
diff --git a/Rendering/vtkMapArrayValues.cxx b/Rendering/vtkMapArrayValues.cxx
index 665313d7d6d84bb61496424ea8a1787656e6ba4a..1af365a16dd6ddc93f1f754e1790e2571fecdfbf 100644
--- a/Rendering/vtkMapArrayValues.cxx
+++ b/Rendering/vtkMapArrayValues.cxx
@@ -34,7 +34,6 @@
 #include <vtkstd/map>
 #include <vtkstd/utility>
 
-vtkCxxRevisionMacro(vtkMapArrayValues, "1.2");
 vtkStandardNewMacro(vtkMapArrayValues);
 
 typedef vtkstd::map< vtkVariant, vtkVariant, vtkVariantLessThan > MapBase;
diff --git a/Rendering/vtkMapArrayValues.h b/Rendering/vtkMapArrayValues.h
index a15c4f9652b9c74a5a7f62ea0104164e63605bda..37670988a82662edf45f83ab7a040611b4099909 100644
--- a/Rendering/vtkMapArrayValues.h
+++ b/Rendering/vtkMapArrayValues.h
@@ -44,7 +44,7 @@ class vtkVariant;
 class VTK_RENDERING_EXPORT vtkMapArrayValues : public vtkPassInputTypeAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkMapArrayValues,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkMapArrayValues,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkMapArrayValues *New();
diff --git a/Rendering/vtkMapper.cxx b/Rendering/vtkMapper.cxx
index c81a7d34e4ce43ab789b1880f6c37750c9064d53..ec89e3bdeb58ca691429c69ff20987c30711b2de 100644
--- a/Rendering/vtkMapper.cxx
+++ b/Rendering/vtkMapper.cxx
@@ -22,7 +22,6 @@
 #include "vtkPointData.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkMapper, "1.127");
 
 // Initialize static member that controls global immediate mode rendering
 static int vtkMapperGlobalImmediateModeRendering = 0;
diff --git a/Rendering/vtkMapper.h b/Rendering/vtkMapper.h
index f1941a8e0865e11d8bf0947e8f0bc5b91d13d90c..584d67542f1d79678d9ae09b578f3a752688e9fe 100644
--- a/Rendering/vtkMapper.h
+++ b/Rendering/vtkMapper.h
@@ -77,7 +77,7 @@ class vtkImageData;
 class VTK_RENDERING_EXPORT vtkMapper : public vtkAbstractMapper3D
 {
 public:
-  vtkTypeRevisionMacro(vtkMapper,vtkAbstractMapper3D);
+  vtkTypeMacro(vtkMapper,vtkAbstractMapper3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMapperCollection.cxx b/Rendering/vtkMapperCollection.cxx
index 761062a6de752de5f178a42409aa5cc61b0025f5..a97feecb7e4241df8b2c88fc6dbf3b584c5f45c1 100644
--- a/Rendering/vtkMapperCollection.cxx
+++ b/Rendering/vtkMapperCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkMapperCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkMapperCollection, "1.8");
 vtkStandardNewMacro(vtkMapperCollection);
 
 void vtkMapperCollection::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Rendering/vtkMapperCollection.h b/Rendering/vtkMapperCollection.h
index 362a0b928b2da4cfe3f5f42d58dcdf6b1ef50f74..1e79a81557bb9b2ac56c8ec734e13b891fd49e24 100644
--- a/Rendering/vtkMapperCollection.h
+++ b/Rendering/vtkMapperCollection.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkMapperCollection : public vtkCollection
 {
  public:
   static vtkMapperCollection *New();
-  vtkTypeRevisionMacro(vtkMapperCollection,vtkCollection);
+  vtkTypeMacro(vtkMapperCollection,vtkCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaActor.cxx b/Rendering/vtkMesaActor.cxx
index 53efbfd94cd7398fdd3f66d8d90db7a7098e6742..e49bf6a00901e6669bfcd2cd7b4218a48e68391b 100644
--- a/Rendering/vtkMesaActor.cxx
+++ b/Rendering/vtkMesaActor.cxx
@@ -38,7 +38,6 @@
 #include "vtkOpenGLActor.cxx"
 #undef vtkOpenGLActor
 
-vtkCxxRevisionMacro(vtkMesaActor, "1.15");
 vtkStandardNewMacro(vtkMesaActor);
 
 vtkProperty* vtkMesaActor::MakeProperty()
diff --git a/Rendering/vtkMesaActor.h b/Rendering/vtkMesaActor.h
index 9b936679d0b94f1cdf6603c496d6649d41465619..a9084b4e057994b009547a662088e5b7a8ecd785 100644
--- a/Rendering/vtkMesaActor.h
+++ b/Rendering/vtkMesaActor.h
@@ -30,7 +30,7 @@ protected:
   
 public:
   static vtkMesaActor *New();
-  vtkTypeRevisionMacro(vtkMesaActor,vtkActor);
+  vtkTypeMacro(vtkMesaActor,vtkActor);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaCamera.cxx b/Rendering/vtkMesaCamera.cxx
index 21727260ce3114fbfa78ea66ea5cab29f794202e..5caf97d6305d7c3ce8e1d790d1a416d4c7de9756 100644
--- a/Rendering/vtkMesaCamera.cxx
+++ b/Rendering/vtkMesaCamera.cxx
@@ -38,5 +38,4 @@
 #include "vtkOpenGLCamera.cxx"
 #undef vtkOpenGLCamera
 
-vtkCxxRevisionMacro(vtkMesaCamera, "1.13");
 vtkStandardNewMacro(vtkMesaCamera);
diff --git a/Rendering/vtkMesaCamera.h b/Rendering/vtkMesaCamera.h
index 3a2554f6d2125f95e8dedc0cd96978f59624527e..84fac704ce7ac6f7bfa54c117c88e7118f74ce10 100644
--- a/Rendering/vtkMesaCamera.h
+++ b/Rendering/vtkMesaCamera.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkMesaCamera : public vtkCamera
 {
 public:
   static vtkMesaCamera *New();
-  vtkTypeRevisionMacro(vtkMesaCamera,vtkCamera);
+  vtkTypeMacro(vtkMesaCamera,vtkCamera);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaClipPlanesPainter.cxx b/Rendering/vtkMesaClipPlanesPainter.cxx
index 0346508a8fdf73a2694fc36432ed118e2810c2a9..e054b72fa80339ea6a2830c569015d98cd26bbf0 100644
--- a/Rendering/vtkMesaClipPlanesPainter.cxx
+++ b/Rendering/vtkMesaClipPlanesPainter.cxx
@@ -32,5 +32,4 @@
 #include "vtkOpenGLClipPlanesPainter.cxx"
 #undef vtkOpenGLClipPlanesPainter
 
-vtkCxxRevisionMacro(vtkMesaClipPlanesPainter, "1.2");
 vtkStandardNewMacro(vtkMesaClipPlanesPainter);
diff --git a/Rendering/vtkMesaClipPlanesPainter.h b/Rendering/vtkMesaClipPlanesPainter.h
index 7e082aa52cacca17ce106661aef338baaf84e6cf..c959bea9139f4a617c4da13ee195e64719eb5c99 100644
--- a/Rendering/vtkMesaClipPlanesPainter.h
+++ b/Rendering/vtkMesaClipPlanesPainter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkMesaClipPlanesPainter : public vtkClipPlanesPainte
 {
 public:
   static vtkMesaClipPlanesPainter* New();
-  vtkTypeRevisionMacro(vtkMesaClipPlanesPainter, vtkClipPlanesPainter);
+  vtkTypeMacro(vtkMesaClipPlanesPainter, vtkClipPlanesPainter);
   void PrintSelf(ostream& os ,vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkMesaCoincidentTopologyResolutionPainter.cxx b/Rendering/vtkMesaCoincidentTopologyResolutionPainter.cxx
index b2c62248bb77189ac9708dc92de425c6df9ebbdf..a9370040c2b06cf32281075599294a428ce89ad6 100644
--- a/Rendering/vtkMesaCoincidentTopologyResolutionPainter.cxx
+++ b/Rendering/vtkMesaCoincidentTopologyResolutionPainter.cxx
@@ -34,5 +34,4 @@
 #include "vtkOpenGLCoincidentTopologyResolutionPainter.cxx"
 #undef vtkOpenGLCoincidentTopologyResolutionPainter
 
-vtkCxxRevisionMacro(vtkMesaCoincidentTopologyResolutionPainter, "1.2");
 vtkStandardNewMacro(vtkMesaCoincidentTopologyResolutionPainter);
diff --git a/Rendering/vtkMesaCoincidentTopologyResolutionPainter.h b/Rendering/vtkMesaCoincidentTopologyResolutionPainter.h
index 9a4147ffcb5dcc845e53fe401e31639f20c8f8b0..5eaf152f372351ea3f2200f923d67c81ef8ca702 100644
--- a/Rendering/vtkMesaCoincidentTopologyResolutionPainter.h
+++ b/Rendering/vtkMesaCoincidentTopologyResolutionPainter.h
@@ -26,7 +26,7 @@ class VTK_RENDERING_EXPORT vtkMesaCoincidentTopologyResolutionPainter :
 {
 public:
   static vtkMesaCoincidentTopologyResolutionPainter* New();
-  vtkTypeRevisionMacro(vtkMesaCoincidentTopologyResolutionPainter,
+  vtkTypeMacro(vtkMesaCoincidentTopologyResolutionPainter,
     vtkCoincidentTopologyResolutionPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkMesaDisplayListPainter.cxx b/Rendering/vtkMesaDisplayListPainter.cxx
index 16a42ba9d7a0389a05b514e48105dce9d70c8238..b29ed7347f9abbeb0c6e2c67a455b69b31d787b9 100644
--- a/Rendering/vtkMesaDisplayListPainter.cxx
+++ b/Rendering/vtkMesaDisplayListPainter.cxx
@@ -32,5 +32,4 @@
 #include "vtkOpenGLDisplayListPainter.cxx"
 #undef vtkOpenGLDisplayListPainter
 
-vtkCxxRevisionMacro(vtkMesaDisplayListPainter, "1.2");
 vtkStandardNewMacro(vtkMesaDisplayListPainter);
diff --git a/Rendering/vtkMesaDisplayListPainter.h b/Rendering/vtkMesaDisplayListPainter.h
index 2009ff24a36e956569359ea65cc2f47e28fdf94c..c4c579c86f22d66eecb44a0552f73acd69be133a 100644
--- a/Rendering/vtkMesaDisplayListPainter.h
+++ b/Rendering/vtkMesaDisplayListPainter.h
@@ -26,7 +26,7 @@ class VTK_RENDERING_EXPORT vtkMesaDisplayListPainter : public vtkDisplayListPain
 {
 public:
   static vtkMesaDisplayListPainter* New();
-  vtkTypeRevisionMacro(vtkMesaDisplayListPainter, vtkDisplayListPainter);
+  vtkTypeMacro(vtkMesaDisplayListPainter, vtkDisplayListPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Rendering/vtkMesaFreeTypeTextMapper.cxx b/Rendering/vtkMesaFreeTypeTextMapper.cxx
index 7237a32f2cfcc495d6a0f7fd85c49977ea34c890..58f827ec12b60a9b2c74fb1e03c234e234d38c72 100644
--- a/Rendering/vtkMesaFreeTypeTextMapper.cxx
+++ b/Rendering/vtkMesaFreeTypeTextMapper.cxx
@@ -40,5 +40,4 @@
 #include "vtkOpenGLFreeTypeTextMapper.cxx"
 #undef vtkOpenGLFreeTypeTextMapper
 
-vtkCxxRevisionMacro(vtkMesaFreeTypeTextMapper, "1.2");
 vtkStandardNewMacro(vtkMesaFreeTypeTextMapper);
diff --git a/Rendering/vtkMesaFreeTypeTextMapper.h b/Rendering/vtkMesaFreeTypeTextMapper.h
index 140700a21993e64c143ab6a076a300b3bd28a4dc..a37ea1e79463ec79981ddf4c9ad4890b513da6b8 100644
--- a/Rendering/vtkMesaFreeTypeTextMapper.h
+++ b/Rendering/vtkMesaFreeTypeTextMapper.h
@@ -33,7 +33,7 @@ class FTFont;
 class VTK_RENDERING_EXPORT vtkMesaFreeTypeTextMapper : public vtkTextMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkMesaFreeTypeTextMapper,vtkTextMapper);
+  vtkTypeMacro(vtkMesaFreeTypeTextMapper,vtkTextMapper);
   static vtkMesaFreeTypeTextMapper *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkMesaImageActor.cxx b/Rendering/vtkMesaImageActor.cxx
index 113d1e559433b28e4227439dfbff151d0d52539d..914cafb68384604a2bfb56dad0eb2e2483522831 100644
--- a/Rendering/vtkMesaImageActor.cxx
+++ b/Rendering/vtkMesaImageActor.cxx
@@ -40,5 +40,4 @@
 #undef vtkOpenGLImageActor
 #undef vtkOpenGLRenderWindow
 
-vtkCxxRevisionMacro(vtkMesaImageActor, "1.11");
 vtkStandardNewMacro(vtkMesaImageActor);
diff --git a/Rendering/vtkMesaImageActor.h b/Rendering/vtkMesaImageActor.h
index 4fd90bbe74e77db3c89edca09d1b1e6283233139..ed0cc551d154d42900a5caf2040d6e3292542e6f 100644
--- a/Rendering/vtkMesaImageActor.h
+++ b/Rendering/vtkMesaImageActor.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkMesaImageActor : public vtkImageActor
 {
 public:
   static vtkMesaImageActor *New();
-  vtkTypeRevisionMacro(vtkMesaImageActor,vtkImageActor);
+  vtkTypeMacro(vtkMesaImageActor,vtkImageActor);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaImageMapper.cxx b/Rendering/vtkMesaImageMapper.cxx
index a36476bb989c4b7195a019c048be01358b1a4c71..fcffa18e2944a29f000ad3bae1bbb0ea45123d9e 100644
--- a/Rendering/vtkMesaImageMapper.cxx
+++ b/Rendering/vtkMesaImageMapper.cxx
@@ -39,5 +39,4 @@
 #include "vtkOpenGLImageMapper.cxx"
 #undef vtkOpenGLImageMapper
 
-vtkCxxRevisionMacro(vtkMesaImageMapper, "1.14");
 vtkStandardNewMacro(vtkMesaImageMapper);
diff --git a/Rendering/vtkMesaImageMapper.h b/Rendering/vtkMesaImageMapper.h
index a1ba90f7861bfe49b5abaf6d66584f1f14bf06f0..451df6820e365cbaccbf85b0fdc54295c407a08c 100644
--- a/Rendering/vtkMesaImageMapper.h
+++ b/Rendering/vtkMesaImageMapper.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkMesaImageMapper : public vtkImageMapper
 {
 public:
   static vtkMesaImageMapper *New();
-  vtkTypeRevisionMacro(vtkMesaImageMapper,vtkImageMapper);
+  vtkTypeMacro(vtkMesaImageMapper,vtkImageMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkMesaLight.cxx b/Rendering/vtkMesaLight.cxx
index 94b4e21a85f23dfdda295c9d86981839a3046648..e10fb39604b235ca04e6988223762e4533c85bab 100644
--- a/Rendering/vtkMesaLight.cxx
+++ b/Rendering/vtkMesaLight.cxx
@@ -39,5 +39,4 @@
 #include "vtkOpenGLLight.cxx"
 #undef vtkOpenGLLight
 
-vtkCxxRevisionMacro(vtkMesaLight, "1.13");
 vtkStandardNewMacro(vtkMesaLight);
diff --git a/Rendering/vtkMesaLight.h b/Rendering/vtkMesaLight.h
index 72a0c0641625e2177ddfccb79417eea4654c0bf2..046bcc8edc7c21a0ac9dbaa35d3ffc2200e77371 100644
--- a/Rendering/vtkMesaLight.h
+++ b/Rendering/vtkMesaLight.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkMesaLight : public vtkLight
 {
 public:
   static vtkMesaLight *New();
-  vtkTypeRevisionMacro(vtkMesaLight,vtkLight);
+  vtkTypeMacro(vtkMesaLight,vtkLight);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaLightingPainter.cxx b/Rendering/vtkMesaLightingPainter.cxx
index 2ac382de02023221035229cbf6da7fd02a7d0bb4..2beb17a47365a6ab9dcf3dc9235a0b8e21d76e9c 100644
--- a/Rendering/vtkMesaLightingPainter.cxx
+++ b/Rendering/vtkMesaLightingPainter.cxx
@@ -32,5 +32,4 @@
 #include "vtkOpenGLLightingPainter.cxx"
 #undef vtkOpenGLLightingPainter
 
-vtkCxxRevisionMacro(vtkMesaLightingPainter, "1.2");
 vtkStandardNewMacro(vtkMesaLightingPainter);
diff --git a/Rendering/vtkMesaLightingPainter.h b/Rendering/vtkMesaLightingPainter.h
index 688cdc0393dcfcb9081fcd534e21c9fb25cdaa0c..64adc3fdcb50412a77f886d05010c62dc70861d6 100644
--- a/Rendering/vtkMesaLightingPainter.h
+++ b/Rendering/vtkMesaLightingPainter.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkMesaLightingPainter : public vtkLightingPainter
 {
 public:
   static vtkMesaLightingPainter* New();
-  vtkTypeRevisionMacro(vtkMesaLightingPainter, vtkLightingPainter);
+  vtkTypeMacro(vtkMesaLightingPainter, vtkLightingPainter);
   void PrintSelf(ostream& os ,vtkIndent indent);
     
 protected:
diff --git a/Rendering/vtkMesaPainterDeviceAdapter.cxx b/Rendering/vtkMesaPainterDeviceAdapter.cxx
index 21c725663cab7ed666aa413161c124ce2fc0fef3..9460b115ce9ba043ba6e5b9d8e4a064bcfb50f99 100644
--- a/Rendering/vtkMesaPainterDeviceAdapter.cxx
+++ b/Rendering/vtkMesaPainterDeviceAdapter.cxx
@@ -33,5 +33,4 @@
 #include "vtkOpenGLPainterDeviceAdapter.cxx"
 #undef vtkOpenGLPainterDeviceAdapter
 
-vtkCxxRevisionMacro(vtkMesaPainterDeviceAdapter, "1.3");
 vtkStandardNewMacro(vtkMesaPainterDeviceAdapter);
diff --git a/Rendering/vtkMesaPainterDeviceAdapter.h b/Rendering/vtkMesaPainterDeviceAdapter.h
index 461eef5c841e0aeb1f2a804af3b37e29e03f3f62..c40f34b548ef351ee1fdf947d5d906c92eabf0fb 100644
--- a/Rendering/vtkMesaPainterDeviceAdapter.h
+++ b/Rendering/vtkMesaPainterDeviceAdapter.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkMesaPainterDeviceAdapter :
   public vtkPainterDeviceAdapter
 {
 public:
-  vtkTypeRevisionMacro(vtkMesaPainterDeviceAdapter, vtkPainterDeviceAdapter);
+  vtkTypeMacro(vtkMesaPainterDeviceAdapter, vtkPainterDeviceAdapter);
   static vtkMesaPainterDeviceAdapter *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkMesaPolyDataMapper.cxx b/Rendering/vtkMesaPolyDataMapper.cxx
index 60b26b157d11742b1f171f57e9e704b597cc25d0..389b00ac1cd634a59fd02bb20b984a506f1f1ca5 100644
--- a/Rendering/vtkMesaPolyDataMapper.cxx
+++ b/Rendering/vtkMesaPolyDataMapper.cxx
@@ -48,5 +48,4 @@
 #undef vtkOpenGLPolyDataMapperDrawLines
 #undef vtkOpenGLPolyDataMapper
 
-vtkCxxRevisionMacro(vtkMesaPolyDataMapper, "1.14");
 vtkStandardNewMacro(vtkMesaPolyDataMapper);
diff --git a/Rendering/vtkMesaPolyDataMapper.h b/Rendering/vtkMesaPolyDataMapper.h
index bda4d0c6802420e0c99a9cd359a6b5de1337bcb0..b10a0b67f5c330af339aaba320b5b5d45cb0c5e7 100644
--- a/Rendering/vtkMesaPolyDataMapper.h
+++ b/Rendering/vtkMesaPolyDataMapper.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkMesaPolyDataMapper : public vtkPolyDataMapper
 {
 public:
   static vtkMesaPolyDataMapper *New();
-  vtkTypeRevisionMacro(vtkMesaPolyDataMapper,vtkPolyDataMapper);
+  vtkTypeMacro(vtkMesaPolyDataMapper,vtkPolyDataMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaPolyDataMapper2D.cxx b/Rendering/vtkMesaPolyDataMapper2D.cxx
index 70ee50b152704c07097ac396a8415a0456f02ef2..0288539d4319d9f467b84f643c2fe8b06d9994a5 100644
--- a/Rendering/vtkMesaPolyDataMapper2D.cxx
+++ b/Rendering/vtkMesaPolyDataMapper2D.cxx
@@ -38,5 +38,4 @@
 #include "vtkOpenGLPolyDataMapper2D.cxx"
 #undef vtkOpenGLPolyDataMapper2D
 
-vtkCxxRevisionMacro(vtkMesaPolyDataMapper2D, "1.13");
 vtkStandardNewMacro(vtkMesaPolyDataMapper2D);
diff --git a/Rendering/vtkMesaPolyDataMapper2D.h b/Rendering/vtkMesaPolyDataMapper2D.h
index f1f8d35435c477cad2b80b10e1bf41c35f68cfb6..291f7c38cdd9df4060505f0a0629bb836c8c47d2 100644
--- a/Rendering/vtkMesaPolyDataMapper2D.h
+++ b/Rendering/vtkMesaPolyDataMapper2D.h
@@ -29,7 +29,7 @@
 class VTK_RENDERING_EXPORT vtkMesaPolyDataMapper2D : public vtkPolyDataMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkMesaPolyDataMapper2D,vtkPolyDataMapper2D);
+  vtkTypeMacro(vtkMesaPolyDataMapper2D,vtkPolyDataMapper2D);
   static vtkMesaPolyDataMapper2D *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkMesaProperty.cxx b/Rendering/vtkMesaProperty.cxx
index e4d13c611ed06faeb85078377115de71227fb598..33abe8a19e2b70c470803e12e145eebcfbdccb03 100644
--- a/Rendering/vtkMesaProperty.cxx
+++ b/Rendering/vtkMesaProperty.cxx
@@ -39,5 +39,4 @@
 #include "vtkOpenGLProperty.cxx"
 #undef vtkOpenGLProperty
 
-vtkCxxRevisionMacro(vtkMesaProperty, "1.15");
 vtkStandardNewMacro(vtkMesaProperty);
diff --git a/Rendering/vtkMesaProperty.h b/Rendering/vtkMesaProperty.h
index 31461a3f16ec8d6a9a7c9df2a92fb696c07b3a22..c6629214a8babcef9a0c346bb7e39af56df02817 100644
--- a/Rendering/vtkMesaProperty.h
+++ b/Rendering/vtkMesaProperty.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkMesaProperty : public vtkProperty
 {
 public:
   static vtkMesaProperty *New();
-  vtkTypeRevisionMacro(vtkMesaProperty,vtkProperty);
+  vtkTypeMacro(vtkMesaProperty,vtkProperty);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaRenderWindow.cxx b/Rendering/vtkMesaRenderWindow.cxx
index 16c9ad253fc62fb20a05ab4beeb38815c0889c8d..3c834edf2f7bdd44e2b8cd2c4133090617c82f0a 100644
--- a/Rendering/vtkMesaRenderWindow.cxx
+++ b/Rendering/vtkMesaRenderWindow.cxx
@@ -25,5 +25,3 @@
 #define vtkOpenGLRenderWindow vtkMesaRenderWindow
 #include "vtkOpenGLRenderWindow.cxx"
 #undef vtkOpenGLRenderWindow
-
-vtkCxxRevisionMacro(vtkMesaRenderWindow, "1.31");
diff --git a/Rendering/vtkMesaRenderWindow.h b/Rendering/vtkMesaRenderWindow.h
index e4d061be0fb4d3d01afa53f799f3c1386f4893f8..17bd437deacece94f97fecbdaf86782ca48d5647 100644
--- a/Rendering/vtkMesaRenderWindow.h
+++ b/Rendering/vtkMesaRenderWindow.h
@@ -35,7 +35,7 @@ protected:
   long OldMonitorSetting;
 
 public:
-  vtkTypeRevisionMacro(vtkMesaRenderWindow,vtkRenderWindow);
+  vtkTypeMacro(vtkMesaRenderWindow,vtkRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkMesaRenderer.cxx b/Rendering/vtkMesaRenderer.cxx
index 8ab542900bfcdd9b016b689574d75ffeefa95aa7..879b1d0808053eeef9ad70ea1036f6c72b4bba4a 100644
--- a/Rendering/vtkMesaRenderer.cxx
+++ b/Rendering/vtkMesaRenderer.cxx
@@ -39,7 +39,6 @@
 #include "vtkOpenGLRenderer.cxx"
 #undef vtkOpenGLRenderer
 
-vtkCxxRevisionMacro(vtkMesaRenderer, "1.14");
 vtkStandardNewMacro(vtkMesaRenderer);
 
 vtkCamera *vtkMesaRenderer::MakeCamera()
diff --git a/Rendering/vtkMesaRenderer.h b/Rendering/vtkMesaRenderer.h
index 7b834bb42e2c9ca8ac25e6dbb613000edd1ba3ef..e280233a6c7f1b2bf7612d1f9cd39d23d1cdda89 100644
--- a/Rendering/vtkMesaRenderer.h
+++ b/Rendering/vtkMesaRenderer.h
@@ -30,7 +30,7 @@ protected:
 
 public:
   static vtkMesaRenderer *New();
-  vtkTypeRevisionMacro(vtkMesaRenderer,vtkRenderer);
+  vtkTypeMacro(vtkMesaRenderer,vtkRenderer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkMesaRepresentationPainter.cxx b/Rendering/vtkMesaRepresentationPainter.cxx
index 046153b1e1de840d9743585228c8fcf16bbda22d..40053099dcc0b8d26c8576bbe2b99bbaa00de797 100644
--- a/Rendering/vtkMesaRepresentationPainter.cxx
+++ b/Rendering/vtkMesaRepresentationPainter.cxx
@@ -32,5 +32,4 @@
 #include "vtkOpenGLRepresentationPainter.cxx"
 #undef vtkOpenGLRepresentationPainter
 
-vtkCxxRevisionMacro(vtkMesaRepresentationPainter, "1.2");
 vtkStandardNewMacro(vtkMesaRepresentationPainter);
diff --git a/Rendering/vtkMesaRepresentationPainter.h b/Rendering/vtkMesaRepresentationPainter.h
index b8a462eea722acac81dadab2c0e636ce6e24ae94..1a505f96dd53d0dbc4f5a34b03bbe47ae0980aa8 100644
--- a/Rendering/vtkMesaRepresentationPainter.h
+++ b/Rendering/vtkMesaRepresentationPainter.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkMesaRepresentationPainter :
 {
 public:
   static vtkMesaRepresentationPainter* New();
-  vtkTypeRevisionMacro(vtkMesaRepresentationPainter, vtkRepresentationPainter);
+  vtkTypeMacro(vtkMesaRepresentationPainter, vtkRepresentationPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkMesaScalarsToColorsPainter.cxx b/Rendering/vtkMesaScalarsToColorsPainter.cxx
index 1616ccb6926acb8aa8d59794548de88c82b515fe..341c308d364522a6d8b76289a988220907905f3b 100644
--- a/Rendering/vtkMesaScalarsToColorsPainter.cxx
+++ b/Rendering/vtkMesaScalarsToColorsPainter.cxx
@@ -32,5 +32,4 @@
 #include "vtkOpenGLScalarsToColorsPainter.cxx"
 #undef vtkOpenGLScalarsToColorsPainter
 
-vtkCxxRevisionMacro(vtkMesaScalarsToColorsPainter, "1.2");
 vtkStandardNewMacro(vtkMesaScalarsToColorsPainter);
diff --git a/Rendering/vtkMesaScalarsToColorsPainter.h b/Rendering/vtkMesaScalarsToColorsPainter.h
index 80882c53f1868717318ab6bf08160faec025da3e..450a32a14ed29cad56c6eb39a06e9662e4866cfe 100644
--- a/Rendering/vtkMesaScalarsToColorsPainter.h
+++ b/Rendering/vtkMesaScalarsToColorsPainter.h
@@ -25,7 +25,7 @@ class VTK_RENDERING_EXPORT vtkMesaScalarsToColorsPainter :
 {
 public:
   static vtkMesaScalarsToColorsPainter* New();
-  vtkTypeRevisionMacro(vtkMesaScalarsToColorsPainter, 
+  vtkTypeMacro(vtkMesaScalarsToColorsPainter,
     vtkScalarsToColorsPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Rendering/vtkMesaTexture.cxx b/Rendering/vtkMesaTexture.cxx
index e4bf1ae2711296a8bb60e6d8bd678e567a3ee046..83756cb758741bcb36812ab5e133dadc16851000 100644
--- a/Rendering/vtkMesaTexture.cxx
+++ b/Rendering/vtkMesaTexture.cxx
@@ -40,5 +40,4 @@
 #undef vtkOpenGLTexture
 #undef vtkOpenGLRenderWindow
 
-vtkCxxRevisionMacro(vtkMesaTexture, "1.15");
 vtkStandardNewMacro(vtkMesaTexture);
diff --git a/Rendering/vtkMesaTexture.h b/Rendering/vtkMesaTexture.h
index 6b34c73870273b2b005a037e3c864aaac95b1d58..9865d3e656f5fe061386795e9afa66940489fa1b 100644
--- a/Rendering/vtkMesaTexture.h
+++ b/Rendering/vtkMesaTexture.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkMesaTexture : public vtkTexture
 {
 public:
   static vtkMesaTexture *New();
-  vtkTypeRevisionMacro(vtkMesaTexture,vtkTexture);
+  vtkTypeMacro(vtkMesaTexture,vtkTexture);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOBJExporter.cxx b/Rendering/vtkOBJExporter.cxx
index dcf923e549c742403f19485aad4b7684420b194b..c12a5d2faa141468bf668ee39a7bacc5f5c1d806 100644
--- a/Rendering/vtkOBJExporter.cxx
+++ b/Rendering/vtkOBJExporter.cxx
@@ -30,7 +30,6 @@
 #include "vtkRendererCollection.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkOBJExporter, "1.59");
 vtkStandardNewMacro(vtkOBJExporter);
 
 vtkOBJExporter::vtkOBJExporter()
diff --git a/Rendering/vtkOBJExporter.h b/Rendering/vtkOBJExporter.h
index be2689afb05cf12a8dbfcce17a801dd10081843e..0c491bb6d1a922df7761736ff967879f95b48c52 100644
--- a/Rendering/vtkOBJExporter.h
+++ b/Rendering/vtkOBJExporter.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkOBJExporter : public vtkExporter
 {
 public:
   static vtkOBJExporter *New();
-  vtkTypeRevisionMacro(vtkOBJExporter,vtkExporter);
+  vtkTypeMacro(vtkOBJExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOOGLExporter.cxx b/Rendering/vtkOOGLExporter.cxx
index 9c587e652ad9a21940a4848cd65fd85b59668c03..b2739c221d1e8283bac4915eb99e51948b1c14eb 100644
--- a/Rendering/vtkOOGLExporter.cxx
+++ b/Rendering/vtkOOGLExporter.cxx
@@ -33,7 +33,6 @@
 #include "vtkTexture.h"
 #include "vtkMatrix4x4.h"
 
-vtkCxxRevisionMacro(vtkOOGLExporter, "1.35");
 vtkStandardNewMacro(vtkOOGLExporter);
 
 vtkOOGLExporter::vtkOOGLExporter()
diff --git a/Rendering/vtkOOGLExporter.h b/Rendering/vtkOOGLExporter.h
index 15d8f5a82fd60d37d17a2bec37f094cafd777636..7ce77fd751d793d6041c0b0ec6dbf2124ee1cb94 100644
--- a/Rendering/vtkOOGLExporter.h
+++ b/Rendering/vtkOOGLExporter.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkOOGLExporter : public vtkExporter
 {
 public:
   static vtkOOGLExporter *New();
-  vtkTypeRevisionMacro(vtkOOGLExporter,vtkExporter);
+  vtkTypeMacro(vtkOOGLExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOSOpenGLRenderWindow.cxx b/Rendering/vtkOSOpenGLRenderWindow.cxx
index f8dc112e28d74e36c5e53d68d293d3e1d149517c..0652aa8b0ec102a1b61d90df51995a0a99eed498 100644
--- a/Rendering/vtkOSOpenGLRenderWindow.cxx
+++ b/Rendering/vtkOSOpenGLRenderWindow.cxx
@@ -76,7 +76,6 @@ vtkOSOpenGLRenderWindowInternal::vtkOSOpenGLRenderWindowInternal(
 
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOSOpenGLRenderWindow, "1.6");
 vtkStandardNewMacro(vtkOSOpenGLRenderWindow);
 #endif
 
diff --git a/Rendering/vtkOSOpenGLRenderWindow.h b/Rendering/vtkOSOpenGLRenderWindow.h
index abce3d2396c058d08ceedde81bb4907e510496d7..456f7faff13e83db7e1431f85b5a1dc5e94a3901 100644
--- a/Rendering/vtkOSOpenGLRenderWindow.h
+++ b/Rendering/vtkOSOpenGLRenderWindow.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkOSOpenGLRenderWindow : public vtkOpenGLRenderWindo
 {
 public:
   static vtkOSOpenGLRenderWindow *New();
-  vtkTypeRevisionMacro(vtkOSOpenGLRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkOSOpenGLRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkObserverMediator.cxx b/Rendering/vtkObserverMediator.cxx
index 43cedd26d4779b49099a21a1879a9357803cd1ff..d39a308dcec173ce3cf5a3311d550553c12d4af1 100644
--- a/Rendering/vtkObserverMediator.cxx
+++ b/Rendering/vtkObserverMediator.cxx
@@ -20,7 +20,6 @@
 #include "vtkInteractorObserver.h"
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkObserverMediator, "1.8");
 vtkStandardNewMacro(vtkObserverMediator);
 
 // PIMPL the map representing the observer (key) to cursor request
diff --git a/Rendering/vtkObserverMediator.h b/Rendering/vtkObserverMediator.h
index 385d5b6ace1d62ef65ca1cf11a2edaf6d2d3a737..99df38791e42c97d2fcea76b3bb5a22013659109 100644
--- a/Rendering/vtkObserverMediator.h
+++ b/Rendering/vtkObserverMediator.h
@@ -45,7 +45,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkObserverMediator,vtkObject);
+  vtkTypeMacro(vtkObserverMediator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpaquePass.cxx b/Rendering/vtkOpaquePass.cxx
index c122d7e150920fba841adf342c0350e14b0f7b6b..59401a5e81e6bd89b7933c45d91467b9a0fcb046 100644
--- a/Rendering/vtkOpaquePass.cxx
+++ b/Rendering/vtkOpaquePass.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkOpaquePass, "1.1");
 vtkStandardNewMacro(vtkOpaquePass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkOpaquePass.h b/Rendering/vtkOpaquePass.h
index 66aa8edc47c0578ca3764eb9e187d9bd797d5051..cf09d8df64d434f6cb818f6f87cc7cc31a3a9700 100644
--- a/Rendering/vtkOpaquePass.h
+++ b/Rendering/vtkOpaquePass.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkOpaquePass : public vtkDefaultPass
 {
 public:
   static vtkOpaquePass *New();
-  vtkTypeRevisionMacro(vtkOpaquePass,vtkDefaultPass);
+  vtkTypeMacro(vtkOpaquePass,vtkDefaultPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkOpenGLActor.cxx b/Rendering/vtkOpenGLActor.cxx
index 8ad6a1594887ab7380dec144cc6059326150ba6e..af78742509053f91eb6176de107be08d98f89188 100644
--- a/Rendering/vtkOpenGLActor.cxx
+++ b/Rendering/vtkOpenGLActor.cxx
@@ -24,7 +24,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLActor, "1.31");
 vtkStandardNewMacro(vtkOpenGLActor);
 #endif
 
diff --git a/Rendering/vtkOpenGLActor.h b/Rendering/vtkOpenGLActor.h
index 4411a71a8aabf4a5b049fd9db30dcf668b52c556..a4f87200be42d112770f2d2f87a0325ecad6a6d5 100644
--- a/Rendering/vtkOpenGLActor.h
+++ b/Rendering/vtkOpenGLActor.h
@@ -30,7 +30,7 @@ protected:
   
 public:
   static vtkOpenGLActor *New();
-  vtkTypeRevisionMacro(vtkOpenGLActor,vtkActor);
+  vtkTypeMacro(vtkOpenGLActor,vtkActor);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLCamera.cxx b/Rendering/vtkOpenGLCamera.cxx
index 61c39d663350a7005dc9decdccb70580dc68557e..8f4bdf85dcae5b21c6c434e2182ca98081db5025 100644
--- a/Rendering/vtkOpenGLCamera.cxx
+++ b/Rendering/vtkOpenGLCamera.cxx
@@ -26,7 +26,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLCamera, "1.70");
 vtkStandardNewMacro(vtkOpenGLCamera);
 #endif
 
diff --git a/Rendering/vtkOpenGLCamera.h b/Rendering/vtkOpenGLCamera.h
index 13cea29a28a5fc1a13e01df0ad214c7ad0ba26c3..627d1b0e65d376b0b0f3f8371a48e3b91907e779 100644
--- a/Rendering/vtkOpenGLCamera.h
+++ b/Rendering/vtkOpenGLCamera.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLCamera : public vtkCamera
 {
 public:
   static vtkOpenGLCamera *New();
-  vtkTypeRevisionMacro(vtkOpenGLCamera,vtkCamera);
+  vtkTypeMacro(vtkOpenGLCamera,vtkCamera);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLClipPlanesPainter.cxx b/Rendering/vtkOpenGLClipPlanesPainter.cxx
index ff5725139866372356707e839fadc751ce61d0fa..1ead6f54caf8b0377267c394b95946e91b75e795 100644
--- a/Rendering/vtkOpenGLClipPlanesPainter.cxx
+++ b/Rendering/vtkOpenGLClipPlanesPainter.cxx
@@ -27,7 +27,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLClipPlanesPainter);
-vtkCxxRevisionMacro(vtkOpenGLClipPlanesPainter, "1.6");
 #endif
 //-----------------------------------------------------------------------------
 vtkOpenGLClipPlanesPainter::vtkOpenGLClipPlanesPainter()
diff --git a/Rendering/vtkOpenGLClipPlanesPainter.h b/Rendering/vtkOpenGLClipPlanesPainter.h
index 614fe59159db38474f985f2dd4c270ad18297067..548ab6543af4946f706e4f10d14d80f818a65abd 100644
--- a/Rendering/vtkOpenGLClipPlanesPainter.h
+++ b/Rendering/vtkOpenGLClipPlanesPainter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLClipPlanesPainter : public vtkClipPlanesPain
 {
 public:
   static vtkOpenGLClipPlanesPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLClipPlanesPainter, vtkClipPlanesPainter);
+  vtkTypeMacro(vtkOpenGLClipPlanesPainter, vtkClipPlanesPainter);
   void PrintSelf(ostream& os ,vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.cxx b/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.cxx
index 0fa88f384b43a3892de744ad8dbd65e51039d7e6..cd586201a1af9d6628f21c12e477e1191aeff609 100644
--- a/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.cxx
+++ b/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.cxx
@@ -29,8 +29,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLCoincidentTopologyResolutionPainter);
-vtkCxxRevisionMacro(vtkOpenGLCoincidentTopologyResolutionPainter, 
-  "1.9");
 #endif
 //-----------------------------------------------------------------------------
 vtkOpenGLCoincidentTopologyResolutionPainter::
diff --git a/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.h b/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.h
index 202f9958a75c8ee8d93ec0b06bc5038b840c3ae2..d421f986301cf6af3bca2758706a5029725391b6 100644
--- a/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.h
+++ b/Rendering/vtkOpenGLCoincidentTopologyResolutionPainter.h
@@ -26,7 +26,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLCoincidentTopologyResolutionPainter :
 {
 public:
   static vtkOpenGLCoincidentTopologyResolutionPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLCoincidentTopologyResolutionPainter,
+  vtkTypeMacro(vtkOpenGLCoincidentTopologyResolutionPainter,
     vtkCoincidentTopologyResolutionPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkOpenGLDisplayListPainter.cxx b/Rendering/vtkOpenGLDisplayListPainter.cxx
index 3b35dd060e5a18b43315fb4569c94bea6d79cca0..72e592d72b452324ad224f0f9deef45cb692ba00 100644
--- a/Rendering/vtkOpenGLDisplayListPainter.cxx
+++ b/Rendering/vtkOpenGLDisplayListPainter.cxx
@@ -31,7 +31,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLDisplayListPainter);
-vtkCxxRevisionMacro(vtkOpenGLDisplayListPainter, "1.13");
 #endif
 
 class vtkOpenGLDisplayListPainter::vtkInternals
diff --git a/Rendering/vtkOpenGLDisplayListPainter.h b/Rendering/vtkOpenGLDisplayListPainter.h
index 9cd0ec4992bbaebb1bc5f2a47ad9c7e854b7cdc3..d093b30c3a1424e8e1b5e2cbb247c011f87264e2 100644
--- a/Rendering/vtkOpenGLDisplayListPainter.h
+++ b/Rendering/vtkOpenGLDisplayListPainter.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLDisplayListPainter : public vtkDisplayListPa
 {
 public:
   static vtkOpenGLDisplayListPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLDisplayListPainter, vtkDisplayListPainter);
+  vtkTypeMacro(vtkOpenGLDisplayListPainter, vtkDisplayListPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 
diff --git a/Rendering/vtkOpenGLExtensionManager.cxx b/Rendering/vtkOpenGLExtensionManager.cxx
index 6504206275680b3da61c3f8ac0445490cc3a1801..532ea04f56e755dda7887e50c0ef54552b6b7c1e 100644
--- a/Rendering/vtkOpenGLExtensionManager.cxx
+++ b/Rendering/vtkOpenGLExtensionManager.cxx
@@ -55,7 +55,6 @@ extern "C" vtkglX::__GLXextFuncPtr glXGetProcAddressARB(const GLubyte *);
 // GLU is currently not linked in VTK.  We do not support it here.
 #define GLU_SUPPORTED   0
 
-vtkCxxRevisionMacro(vtkOpenGLExtensionManager, "1.39");
 vtkStandardNewMacro(vtkOpenGLExtensionManager);
 
 namespace vtkgl
diff --git a/Rendering/vtkOpenGLExtensionManager.h b/Rendering/vtkOpenGLExtensionManager.h
index ecd75b742ab285c684c3fb5b8ba32813a6ccdea3..3dc404680c5a1a1622b4d4c1dd646716eca0d19e 100644
--- a/Rendering/vtkOpenGLExtensionManager.h
+++ b/Rendering/vtkOpenGLExtensionManager.h
@@ -140,7 +140,7 @@ extern "C" {
 class VTK_RENDERING_EXPORT vtkOpenGLExtensionManager : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLExtensionManager, vtkObject);
+  vtkTypeMacro(vtkOpenGLExtensionManager, vtkObject);
   static vtkOpenGLExtensionManager *New();
   void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkOpenGLFreeTypeTextMapper.cxx b/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
index 21b0f76431ff25d872aaefba25902ae90b1229b7..ee694743d4b9bf1e8b3fa632680a89996cc2dbb0 100644
--- a/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
+++ b/Rendering/vtkOpenGLFreeTypeTextMapper.cxx
@@ -90,7 +90,6 @@ vtkOpenGLFreeTypeTextMapper_GetGL2PSFontName(vtkTextProperty *tprop,
 
 //----------------------------------------------------------------------------
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLFreeTypeTextMapper, "1.51");
 vtkStandardNewMacro(vtkOpenGLFreeTypeTextMapper);
 #endif
 
diff --git a/Rendering/vtkOpenGLFreeTypeTextMapper.h b/Rendering/vtkOpenGLFreeTypeTextMapper.h
index bb333409d188283bcfe086aa1e83684742da6764..8360530977ded4cb142bc12d7559a7f5093049f5 100644
--- a/Rendering/vtkOpenGLFreeTypeTextMapper.h
+++ b/Rendering/vtkOpenGLFreeTypeTextMapper.h
@@ -33,7 +33,7 @@ class FTFont;
 class VTK_RENDERING_EXPORT vtkOpenGLFreeTypeTextMapper : public vtkTextMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLFreeTypeTextMapper,vtkTextMapper);
+  vtkTypeMacro(vtkOpenGLFreeTypeTextMapper,vtkTextMapper);
   static vtkOpenGLFreeTypeTextMapper *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkOpenGLHardwareSupport.cxx b/Rendering/vtkOpenGLHardwareSupport.cxx
index 642b2e4840af0e07ea2d488223ba4d04a087e144..1d9d1d1997019a3f105a074ecc8f46a3ea4430ae 100644
--- a/Rendering/vtkOpenGLHardwareSupport.cxx
+++ b/Rendering/vtkOpenGLHardwareSupport.cxx
@@ -22,7 +22,6 @@
 #include "vtkOpenGLRenderWindow.h"
 #include "vtkgl.h"
 
-vtkCxxRevisionMacro(vtkOpenGLHardwareSupport, "1.6");
 vtkStandardNewMacro(vtkOpenGLHardwareSupport);
 
 vtkCxxSetObjectMacro(vtkOpenGLHardwareSupport, ExtensionManager, vtkOpenGLExtensionManager);
diff --git a/Rendering/vtkOpenGLHardwareSupport.h b/Rendering/vtkOpenGLHardwareSupport.h
index c829ec99f553084ae89ff84d71928ddc47d5bdd6..b94409b476444f84dada03d4a3bbfad67359b1d4 100644
--- a/Rendering/vtkOpenGLHardwareSupport.h
+++ b/Rendering/vtkOpenGLHardwareSupport.h
@@ -30,7 +30,7 @@ class vtkOpenGLExtensionManager;
 class VTK_RENDERING_EXPORT vtkOpenGLHardwareSupport : public vtkObject //: public vtkHardwareSupport
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLHardwareSupport,vtkObject);
+  vtkTypeMacro(vtkOpenGLHardwareSupport,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkOpenGLHardwareSupport *New();
diff --git a/Rendering/vtkOpenGLImageActor.cxx b/Rendering/vtkOpenGLImageActor.cxx
index 172b82a574190b50a0cfebb9dce4d37eb451483f..56958f4ecf1fd5f387d0547353f2bde484855ee5 100644
--- a/Rendering/vtkOpenGLImageActor.cxx
+++ b/Rendering/vtkOpenGLImageActor.cxx
@@ -28,7 +28,6 @@
 #include "vtkgl.h" // vtkgl namespace
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLImageActor, "1.39");
 vtkStandardNewMacro(vtkOpenGLImageActor);
 #endif
 
diff --git a/Rendering/vtkOpenGLImageActor.h b/Rendering/vtkOpenGLImageActor.h
index 9161ddaa2d9ca09e9307393e1c854460ba8fc76f..fb08d7f0d18c0cd7ba77451ea1a2e712faac82b8 100644
--- a/Rendering/vtkOpenGLImageActor.h
+++ b/Rendering/vtkOpenGLImageActor.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLImageActor : public vtkImageActor
 {
 public:
   static vtkOpenGLImageActor *New();
-  vtkTypeRevisionMacro(vtkOpenGLImageActor,vtkImageActor);
+  vtkTypeMacro(vtkOpenGLImageActor,vtkImageActor);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLImageMapper.cxx b/Rendering/vtkOpenGLImageMapper.cxx
index dd608b253d76831b7e66d318a323775c61e0fe8b..24c567efb77cd2464c3f6c8dc69859dd426bfd96 100644
--- a/Rendering/vtkOpenGLImageMapper.cxx
+++ b/Rendering/vtkOpenGLImageMapper.cxx
@@ -28,7 +28,6 @@
 #include <limits.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLImageMapper, "1.66");
 vtkStandardNewMacro(vtkOpenGLImageMapper);
 #endif
 
diff --git a/Rendering/vtkOpenGLImageMapper.h b/Rendering/vtkOpenGLImageMapper.h
index 3930ec9ba8725def17d9825c6e0af1558ebb764b..7ca07e309baea0930118b7f418976ac88eaf2059 100644
--- a/Rendering/vtkOpenGLImageMapper.h
+++ b/Rendering/vtkOpenGLImageMapper.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLImageMapper : public vtkImageMapper
 {
 public:
   static vtkOpenGLImageMapper *New();
-  vtkTypeRevisionMacro(vtkOpenGLImageMapper,vtkImageMapper);
+  vtkTypeMacro(vtkOpenGLImageMapper,vtkImageMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkOpenGLLight.cxx b/Rendering/vtkOpenGLLight.cxx
index 0fde295d31e6eeb61d67f6862abbaf069f028815..884056511b37f7a42f7170e91beb5215abf83697 100644
--- a/Rendering/vtkOpenGLLight.cxx
+++ b/Rendering/vtkOpenGLLight.cxx
@@ -25,7 +25,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLLight, "1.24");
 vtkStandardNewMacro(vtkOpenGLLight);
 #endif
 
diff --git a/Rendering/vtkOpenGLLight.h b/Rendering/vtkOpenGLLight.h
index 3f03bd1339544b0343b7fbd732e93f432557bef5..b77364fe3b021e469e33b41af2c0d8c975b1151c 100644
--- a/Rendering/vtkOpenGLLight.h
+++ b/Rendering/vtkOpenGLLight.h
@@ -28,7 +28,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLLight : public vtkLight
 {
 public:
   static vtkOpenGLLight *New();
-  vtkTypeRevisionMacro(vtkOpenGLLight,vtkLight);
+  vtkTypeMacro(vtkOpenGLLight,vtkLight);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLLightingPainter.cxx b/Rendering/vtkOpenGLLightingPainter.cxx
index bd29bce40d872f423a815769b05c36b230fd73ee..686c99728c16ba4feaf2a5b3131534cf52e4e2ef 100644
--- a/Rendering/vtkOpenGLLightingPainter.cxx
+++ b/Rendering/vtkOpenGLLightingPainter.cxx
@@ -28,7 +28,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLLightingPainter);
-vtkCxxRevisionMacro(vtkOpenGLLightingPainter, "1.6");
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkOpenGLLightingPainter.h b/Rendering/vtkOpenGLLightingPainter.h
index f62fee993807f2f04b1f4eb5ca999dc48001539f..46bcd28224ac7bc4d7730785cf7f46ad3d5b7371 100644
--- a/Rendering/vtkOpenGLLightingPainter.h
+++ b/Rendering/vtkOpenGLLightingPainter.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLLightingPainter : public vtkLightingPainter
 {
 public:
   static vtkOpenGLLightingPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLLightingPainter, vtkLightingPainter);
+  vtkTypeMacro(vtkOpenGLLightingPainter, vtkLightingPainter);
   void PrintSelf(ostream& os ,vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLPainterDeviceAdapter.cxx b/Rendering/vtkOpenGLPainterDeviceAdapter.cxx
index 0c0eb91a51f86daa8b9f2da418e26210eb85c2d9..285612c31a2492927172e3bd963eb5114fe2b6c4 100644
--- a/Rendering/vtkOpenGLPainterDeviceAdapter.cxx
+++ b/Rendering/vtkOpenGLPainterDeviceAdapter.cxx
@@ -37,7 +37,6 @@
 #endif
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLPainterDeviceAdapter, "1.28");
 vtkStandardNewMacro(vtkOpenGLPainterDeviceAdapter);
 #endif
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkOpenGLPainterDeviceAdapter.h b/Rendering/vtkOpenGLPainterDeviceAdapter.h
index c6a4252ecebc08e73566006e0a6871b0645a796d..6553b6cb7d36326091e5242b2a5a35a486f0a961 100644
--- a/Rendering/vtkOpenGLPainterDeviceAdapter.h
+++ b/Rendering/vtkOpenGLPainterDeviceAdapter.h
@@ -53,7 +53,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLPainterDeviceAdapter :
   public vtkPainterDeviceAdapter
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLPainterDeviceAdapter, vtkPainterDeviceAdapter);
+  vtkTypeMacro(vtkOpenGLPainterDeviceAdapter, vtkPainterDeviceAdapter);
   static vtkOpenGLPainterDeviceAdapter *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Rendering/vtkOpenGLPolyDataMapper.cxx b/Rendering/vtkOpenGLPolyDataMapper.cxx
index 4ca2741ce147bd10d4ecc125b6cc8d0681c17618..7069108e5d75283efa27460c5b363c1b8cf6806d 100644
--- a/Rendering/vtkOpenGLPolyDataMapper.cxx
+++ b/Rendering/vtkOpenGLPolyDataMapper.cxx
@@ -41,7 +41,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLPolyDataMapper, "1.110");
 vtkStandardNewMacro(vtkOpenGLPolyDataMapper);
 #endif
 
diff --git a/Rendering/vtkOpenGLPolyDataMapper.h b/Rendering/vtkOpenGLPolyDataMapper.h
index e883922a2bbb16ac1447cf5382f7e0af5b1ddb07..1e99651005756edec43e8dd181318fe76f9bc783 100644
--- a/Rendering/vtkOpenGLPolyDataMapper.h
+++ b/Rendering/vtkOpenGLPolyDataMapper.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLPolyDataMapper : public vtkPolyDataMapper
 {
 public:
   static vtkOpenGLPolyDataMapper *New();
-  vtkTypeRevisionMacro(vtkOpenGLPolyDataMapper,vtkPolyDataMapper);
+  vtkTypeMacro(vtkOpenGLPolyDataMapper,vtkPolyDataMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLPolyDataMapper2D.cxx b/Rendering/vtkOpenGLPolyDataMapper2D.cxx
index 53a88a91c05b0e7c93c41da11b7da2bafe9e15d3..07ed254fc70fe9f870dd923df380dddce317833c 100644
--- a/Rendering/vtkOpenGLPolyDataMapper2D.cxx
+++ b/Rendering/vtkOpenGLPolyDataMapper2D.cxx
@@ -38,7 +38,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLPolyDataMapper2D, "1.61");
 vtkStandardNewMacro(vtkOpenGLPolyDataMapper2D);
 #endif
 
diff --git a/Rendering/vtkOpenGLPolyDataMapper2D.h b/Rendering/vtkOpenGLPolyDataMapper2D.h
index b8a38a57809256104692e4712329456df50cdda4..23b5eaf66da7f7fb0dc69064d3b2e936ed3892a7 100644
--- a/Rendering/vtkOpenGLPolyDataMapper2D.h
+++ b/Rendering/vtkOpenGLPolyDataMapper2D.h
@@ -29,7 +29,7 @@
 class VTK_RENDERING_EXPORT vtkOpenGLPolyDataMapper2D : public vtkPolyDataMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLPolyDataMapper2D,vtkPolyDataMapper2D);
+  vtkTypeMacro(vtkOpenGLPolyDataMapper2D,vtkPolyDataMapper2D);
   static vtkOpenGLPolyDataMapper2D *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Rendering/vtkOpenGLProjectedPolyDataRayBounder.h b/Rendering/vtkOpenGLProjectedPolyDataRayBounder.h
index 4182e1d0ff47586fc466177729402819a99732f3..fc2259a6cecbe6b94d3edaf45723dfb85fe489f2 100644
--- a/Rendering/vtkOpenGLProjectedPolyDataRayBounder.h
+++ b/Rendering/vtkOpenGLProjectedPolyDataRayBounder.h
@@ -44,7 +44,7 @@ class vtkWindow;
 class VTK_RENDERING_EXPORT vtkOpenGLProjectedPolyDataRayBounder : public vtkProjectedPolyDataRayBounder
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLProjectedPolyDataRayBounder,vtkProjectedPolyDataRayBounder);    
+  vtkTypeMacro(vtkOpenGLProjectedPolyDataRayBounder,vtkProjectedPolyDataRayBounder);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLProperty.cxx b/Rendering/vtkOpenGLProperty.cxx
index 64c4dfa52d1da9cf96dae3de8c924477c25cfb71..bb1e25d69e0fefe8dc08ab7ab4c450f2829df6d3 100644
--- a/Rendering/vtkOpenGLProperty.cxx
+++ b/Rendering/vtkOpenGLProperty.cxx
@@ -44,7 +44,6 @@
 #include <assert.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLProperty, "1.60");
 vtkStandardNewMacro(vtkOpenGLProperty);
 #endif
 
diff --git a/Rendering/vtkOpenGLProperty.h b/Rendering/vtkOpenGLProperty.h
index 600579bda0fed36cd8f8323f1d45535adc54ad3d..259cdda7b13b637ef9e2313e3b8cf3a1fe6938d8 100644
--- a/Rendering/vtkOpenGLProperty.h
+++ b/Rendering/vtkOpenGLProperty.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLProperty : public vtkProperty
 {
 public:
   static vtkOpenGLProperty *New();
-  vtkTypeRevisionMacro(vtkOpenGLProperty,vtkProperty);
+  vtkTypeMacro(vtkOpenGLProperty,vtkProperty);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLRenderWindow.cxx b/Rendering/vtkOpenGLRenderWindow.cxx
index f944ffff5f1cd3701ec8964df41b15c69c378946..1eeb027b2fe3623429a39a706f8f574571d3a915 100644
--- a/Rendering/vtkOpenGLRenderWindow.cxx
+++ b/Rendering/vtkOpenGLRenderWindow.cxx
@@ -32,7 +32,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 
-vtkCxxRevisionMacro(vtkOpenGLRenderWindow, "1.108");
 #endif
 
 vtkCxxSetObjectMacro(vtkOpenGLRenderWindow, ExtensionManager, vtkOpenGLExtensionManager);
diff --git a/Rendering/vtkOpenGLRenderWindow.h b/Rendering/vtkOpenGLRenderWindow.h
index bf09680fdc3be36fd09dfa42982f13633a62cb36..f9464e5a04da746c66ccf9da9d9ff6fb6bdd194a 100644
--- a/Rendering/vtkOpenGLRenderWindow.h
+++ b/Rendering/vtkOpenGLRenderWindow.h
@@ -37,7 +37,7 @@ protected:
   long OldMonitorSetting;
 
 public:
-  vtkTypeRevisionMacro(vtkOpenGLRenderWindow,vtkRenderWindow);
+  vtkTypeMacro(vtkOpenGLRenderWindow,vtkRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLRenderer.cxx b/Rendering/vtkOpenGLRenderer.cxx
index bad08a08bd64bbc00ba036cdda71802f20f0fdd4..ded7022a971f5f76ebdf526f2af903f12025c52d 100644
--- a/Rendering/vtkOpenGLRenderer.cxx
+++ b/Rendering/vtkOpenGLRenderer.cxx
@@ -46,7 +46,6 @@ public:
 };
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLRenderer, "1.97");
 vtkStandardNewMacro(vtkOpenGLRenderer);
 #endif
 
diff --git a/Rendering/vtkOpenGLRenderer.h b/Rendering/vtkOpenGLRenderer.h
index ec47da83fe870f332f787fe88f3c3b1490324523..50e2e72e0d2a9884c4e15c3e8fc2ac5cd41340cc 100644
--- a/Rendering/vtkOpenGLRenderer.h
+++ b/Rendering/vtkOpenGLRenderer.h
@@ -32,7 +32,7 @@ protected:
 
 public:
   static vtkOpenGLRenderer *New();
-  vtkTypeRevisionMacro(vtkOpenGLRenderer,vtkRenderer);
+  vtkTypeMacro(vtkOpenGLRenderer,vtkRenderer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLRepresentationPainter.cxx b/Rendering/vtkOpenGLRepresentationPainter.cxx
index bae7d38563fbc2a83f7c4803b877f08d2dda9a37..3c7887c6c3e0070d2cec4bcbb4096941692a37d1 100644
--- a/Rendering/vtkOpenGLRepresentationPainter.cxx
+++ b/Rendering/vtkOpenGLRepresentationPainter.cxx
@@ -28,7 +28,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLRepresentationPainter);
-vtkCxxRevisionMacro(vtkOpenGLRepresentationPainter, "1.11");
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkOpenGLRepresentationPainter.h b/Rendering/vtkOpenGLRepresentationPainter.h
index 2a1c359c7bcdca9364c486c07d63cfc44a8f420e..940f3fbf4e0aa5e661c987bd5c3b7cb64f687cb9 100644
--- a/Rendering/vtkOpenGLRepresentationPainter.h
+++ b/Rendering/vtkOpenGLRepresentationPainter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLRepresentationPainter :
 {
 public:
   static vtkOpenGLRepresentationPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLRepresentationPainter, vtkRepresentationPainter);
+  vtkTypeMacro(vtkOpenGLRepresentationPainter, vtkRepresentationPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOpenGLScalarsToColorsPainter.cxx b/Rendering/vtkOpenGLScalarsToColorsPainter.cxx
index fda22af811426fd64e77ecb23c73294577df1a98..5b90e1967da42514f20612429f6f116ab388c954 100644
--- a/Rendering/vtkOpenGLScalarsToColorsPainter.cxx
+++ b/Rendering/vtkOpenGLScalarsToColorsPainter.cxx
@@ -37,7 +37,6 @@
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
 vtkStandardNewMacro(vtkOpenGLScalarsToColorsPainter);
-vtkCxxRevisionMacro(vtkOpenGLScalarsToColorsPainter, "1.8");
 #endif
 //-----------------------------------------------------------------------------
 vtkOpenGLScalarsToColorsPainter::vtkOpenGLScalarsToColorsPainter()
diff --git a/Rendering/vtkOpenGLScalarsToColorsPainter.h b/Rendering/vtkOpenGLScalarsToColorsPainter.h
index 8ac97ceb2012f71c92a9fa0c42d198928d2c1b58..a52185d2c06187116cb49aecad898f5043221ef3 100644
--- a/Rendering/vtkOpenGLScalarsToColorsPainter.h
+++ b/Rendering/vtkOpenGLScalarsToColorsPainter.h
@@ -30,7 +30,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLScalarsToColorsPainter :
 {
 public:
   static vtkOpenGLScalarsToColorsPainter* New();
-  vtkTypeRevisionMacro(vtkOpenGLScalarsToColorsPainter, 
+  vtkTypeMacro(vtkOpenGLScalarsToColorsPainter,
     vtkScalarsToColorsPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Rendering/vtkOpenGLTexture.cxx b/Rendering/vtkOpenGLTexture.cxx
index 675d50b4c5009319a3904539de87c674da52f964..1cd75d4ead09b708ca48e1fcd9317926c6324cab 100644
--- a/Rendering/vtkOpenGLTexture.cxx
+++ b/Rendering/vtkOpenGLTexture.cxx
@@ -31,7 +31,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLTexture, "1.81");
 vtkStandardNewMacro(vtkOpenGLTexture);
 #endif
 
diff --git a/Rendering/vtkOpenGLTexture.h b/Rendering/vtkOpenGLTexture.h
index 6ca4a418bc51a43ed82bbf460adda89c794ed9cf..52ee572e69cd13f0b4a3aa46ae2d0e8b7786153a 100644
--- a/Rendering/vtkOpenGLTexture.h
+++ b/Rendering/vtkOpenGLTexture.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkOpenGLTexture : public vtkTexture
 {
 public:
   static vtkOpenGLTexture *New();
-  vtkTypeRevisionMacro(vtkOpenGLTexture,vtkTexture);
+  vtkTypeMacro(vtkOpenGLTexture,vtkTexture);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkOverlayPass.cxx b/Rendering/vtkOverlayPass.cxx
index b1973ac894f0198e39721371fbbe9806b23dd802..77e0e10b5c7e2da62b49a9394c0bccea040e2bac 100644
--- a/Rendering/vtkOverlayPass.cxx
+++ b/Rendering/vtkOverlayPass.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkOverlayPass, "1.1");
 vtkStandardNewMacro(vtkOverlayPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkOverlayPass.h b/Rendering/vtkOverlayPass.h
index ea1f3b75c8d56c479491dad04f71fe95b3933ccf..06806f1cda07aed2cd2a53bb101b4c58d497e927 100644
--- a/Rendering/vtkOverlayPass.h
+++ b/Rendering/vtkOverlayPass.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkOverlayPass : public vtkDefaultPass
 {
 public:
   static vtkOverlayPass *New();
-  vtkTypeRevisionMacro(vtkOverlayPass,vtkDefaultPass);
+  vtkTypeMacro(vtkOverlayPass,vtkDefaultPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkPOVExporter.cxx b/Rendering/vtkPOVExporter.cxx
index d051ab2068c8002277ffaa0eb9de1c3d3e990729..4d06f766db9bf7e2150ea8aecd1bfcde2c858b3c 100644
--- a/Rendering/vtkPOVExporter.cxx
+++ b/Rendering/vtkPOVExporter.cxx
@@ -83,7 +83,6 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPOVExporter, "1.7");
 vtkStandardNewMacro(vtkPOVExporter);
 
 //Can't use printf("%d", a_vtkIdType) because vtkIdType is not always int.
diff --git a/Rendering/vtkPOVExporter.h b/Rendering/vtkPOVExporter.h
index f125abcf444fd0d1e95d416df9e9877a15a038ae..19edeb98cd1cbe7d1511da32e554e55d37436b35 100644
--- a/Rendering/vtkPOVExporter.h
+++ b/Rendering/vtkPOVExporter.h
@@ -88,7 +88,7 @@ class VTK_RENDERING_EXPORT vtkPOVExporter : public vtkExporter
 {
 public:
     static vtkPOVExporter *New();
-    vtkTypeRevisionMacro(vtkPOVExporter, vtkExporter);
+    vtkTypeMacro(vtkPOVExporter, vtkExporter);
     void PrintSelf(ostream& os, vtkIndent indent);
 
     //Description:
diff --git a/Rendering/vtkPainter.cxx b/Rendering/vtkPainter.cxx
index 697196505c9ff8d3fcc98a48af9f7ad25eaaf4bd..84854183bf0872366fb24dfe6a5282ecde3b4791 100644
--- a/Rendering/vtkPainter.cxx
+++ b/Rendering/vtkPainter.cxx
@@ -37,7 +37,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkPainter, "1.7");
 vtkCxxSetObjectMacro(vtkPainter, Input, vtkDataObject);
 vtkCxxSetObjectMacro(vtkPainter, Information, vtkInformation);
 vtkInformationKeyMacro(vtkPainter, STATIC_DATA, Integer);
diff --git a/Rendering/vtkPainter.h b/Rendering/vtkPainter.h
index 0d2d002769565f189f01db09aba657564a4c9d21..09772a6030456e58a202101e4c9f73152c1b9bbf 100644
--- a/Rendering/vtkPainter.h
+++ b/Rendering/vtkPainter.h
@@ -57,7 +57,7 @@ class vtkWindow;
 class VTK_RENDERING_EXPORT vtkPainter : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkPainter, vtkObject);
+  vtkTypeMacro(vtkPainter, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPainterDeviceAdapter.cxx b/Rendering/vtkPainterDeviceAdapter.cxx
index 3d7b293843792e08cd793fc9514a505083adaa3f..07b959b6ae73c522bd69775279700bf1db8d0e31 100644
--- a/Rendering/vtkPainterDeviceAdapter.cxx
+++ b/Rendering/vtkPainterDeviceAdapter.cxx
@@ -28,7 +28,6 @@
 
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkPainterDeviceAdapter);
-vtkCxxRevisionMacro(vtkPainterDeviceAdapter, "1.5");
 
 //-----------------------------------------------------------------------------
 vtkPainterDeviceAdapter::vtkPainterDeviceAdapter()
diff --git a/Rendering/vtkPainterDeviceAdapter.h b/Rendering/vtkPainterDeviceAdapter.h
index ddf2039115b03fbbd9ec635d1a554b44a412a8ce..a256fe79e27371ad3baaaa3bd55db8e0b319c6e3 100644
--- a/Rendering/vtkPainterDeviceAdapter.h
+++ b/Rendering/vtkPainterDeviceAdapter.h
@@ -52,7 +52,7 @@ class VTK_RENDERING_EXPORT vtkPainterDeviceAdapter : public vtkObject
 {
 public:
   static vtkPainterDeviceAdapter* New();
-  vtkTypeRevisionMacro(vtkPainterDeviceAdapter, vtkObject);
+  vtkTypeMacro(vtkPainterDeviceAdapter, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPainterPolyDataMapper.cxx b/Rendering/vtkPainterPolyDataMapper.cxx
index e8d8b1fe45db7270838e4429b1e0414c070ee9e9..08a9b4345160f76f4033134ee711fe5f0f6d5052 100644
--- a/Rendering/vtkPainterPolyDataMapper.cxx
+++ b/Rendering/vtkPainterPolyDataMapper.cxx
@@ -39,7 +39,6 @@
 #include "vtkgl.h"
 
 vtkStandardNewMacro(vtkPainterPolyDataMapper);
-vtkCxxRevisionMacro(vtkPainterPolyDataMapper, "1.23")
 //-----------------------------------------------------------------------------
 class vtkPainterPolyDataMapperObserver : public vtkCommand
 {
diff --git a/Rendering/vtkPainterPolyDataMapper.h b/Rendering/vtkPainterPolyDataMapper.h
index 79b5ac7fa67571637097178b1a16b9cb712845e9..fc4dc4fc606fdf7b5f4b37d25bf391a7a3718a1c 100644
--- a/Rendering/vtkPainterPolyDataMapper.h
+++ b/Rendering/vtkPainterPolyDataMapper.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkPainterPolyDataMapper : public vtkPolyDataMapper
 {
 public:
   static vtkPainterPolyDataMapper* New();
-  vtkTypeRevisionMacro(vtkPainterPolyDataMapper, vtkPolyDataMapper);
+  vtkTypeMacro(vtkPainterPolyDataMapper, vtkPolyDataMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkParallelCoordinatesActor.cxx b/Rendering/vtkParallelCoordinatesActor.cxx
index 6af2351fe9941d8a146f47026b3c892968264001..47a586a6ab76579f78bec76253de230aa484929b 100644
--- a/Rendering/vtkParallelCoordinatesActor.cxx
+++ b/Rendering/vtkParallelCoordinatesActor.cxx
@@ -26,7 +26,6 @@
 #include "vtkViewport.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkParallelCoordinatesActor, "1.37");
 vtkStandardNewMacro(vtkParallelCoordinatesActor);
 
 vtkCxxSetObjectMacro(vtkParallelCoordinatesActor,Input,vtkDataObject);
diff --git a/Rendering/vtkParallelCoordinatesActor.h b/Rendering/vtkParallelCoordinatesActor.h
index 5f695f396f273e5cf08a710e3061d8bf34dfa419..5829d154a8aa4f95dc401c7bb0d37fde79dc17a8 100644
--- a/Rendering/vtkParallelCoordinatesActor.h
+++ b/Rendering/vtkParallelCoordinatesActor.h
@@ -70,7 +70,7 @@ class vtkTextProperty;
 class VTK_RENDERING_EXPORT vtkParallelCoordinatesActor : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkParallelCoordinatesActor,vtkActor2D);
+  vtkTypeMacro(vtkParallelCoordinatesActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkParallelCoordinatesInteractorStyle.cxx b/Rendering/vtkParallelCoordinatesInteractorStyle.cxx
index 6f123b74594e890a8d396f3fc87a6d828511f30c..b3d89b4c95313d1bfe08ab820a53038292af2e99 100644
--- a/Rendering/vtkParallelCoordinatesInteractorStyle.cxx
+++ b/Rendering/vtkParallelCoordinatesInteractorStyle.cxx
@@ -29,7 +29,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 //#include <wx/wx.h>
 
-vtkCxxRevisionMacro(vtkParallelCoordinatesInteractorStyle, "1.3");
 vtkStandardNewMacro(vtkParallelCoordinatesInteractorStyle);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkParallelCoordinatesInteractorStyle.h b/Rendering/vtkParallelCoordinatesInteractorStyle.h
index 75f1df3fe599270a7f1f773bc7f53aa67973a54c..3ee9a350481be8bbaee043e5a3b2aa5f99d53cd4 100644
--- a/Rendering/vtkParallelCoordinatesInteractorStyle.h
+++ b/Rendering/vtkParallelCoordinatesInteractorStyle.h
@@ -51,7 +51,7 @@ class VTK_RENDERING_EXPORT vtkParallelCoordinatesInteractorStyle : public vtkInt
 {
 public:
   static vtkParallelCoordinatesInteractorStyle *New();
-  vtkTypeRevisionMacro(vtkParallelCoordinatesInteractorStyle, vtkInteractorStyleTrackballCamera);
+  vtkTypeMacro(vtkParallelCoordinatesInteractorStyle, vtkInteractorStyleTrackballCamera);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkPicker.cxx b/Rendering/vtkPicker.cxx
index a2c24d1328bac661234ed3688a37ad6133009152..2488bf0f7898b7a6631aa35c0656d80ae6e9998c 100644
--- a/Rendering/vtkPicker.cxx
+++ b/Rendering/vtkPicker.cxx
@@ -36,7 +36,6 @@
 #include "vtkBox.h"
 #include "vtkImageActor.h"
 
-vtkCxxRevisionMacro(vtkPicker, "1.99");
 vtkStandardNewMacro(vtkPicker);
 
 // Construct object with initial tolerance of 1/40th of window. There are no
diff --git a/Rendering/vtkPicker.h b/Rendering/vtkPicker.h
index 84cef79d2f62355b2ed7cad2102fd5bc4a5e2eb3..e635cc59c4aae9e1c9ef863d59749f3758383348 100644
--- a/Rendering/vtkPicker.h
+++ b/Rendering/vtkPicker.h
@@ -51,7 +51,7 @@ class VTK_RENDERING_EXPORT vtkPicker : public vtkAbstractPropPicker
 {
 public:
   static vtkPicker *New();
-  vtkTypeRevisionMacro(vtkPicker,vtkAbstractPropPicker);
+  vtkTypeMacro(vtkPicker,vtkAbstractPropPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPixelBufferObject.cxx b/Rendering/vtkPixelBufferObject.cxx
index 9e8b86d9d2b0951e54f4d9687275e4d7c46235e7..d19702a602e64980443295640106a970581782ba 100644
--- a/Rendering/vtkPixelBufferObject.cxx
+++ b/Rendering/vtkPixelBufferObject.cxx
@@ -62,7 +62,6 @@ const char *BufferObjectUsageAsString[9]=
 #endif
 
 vtkStandardNewMacro(vtkPixelBufferObject);
-vtkCxxRevisionMacro(vtkPixelBufferObject, "1.10");
 //----------------------------------------------------------------------------
 vtkPixelBufferObject::vtkPixelBufferObject()
 {
diff --git a/Rendering/vtkPixelBufferObject.h b/Rendering/vtkPixelBufferObject.h
index 8ea2cbbb328a9e0e99c0253b2fb05ac1b5b81ecd..6b8e6cc3d4f3ed880b867ebeb70588846168cce8 100644
--- a/Rendering/vtkPixelBufferObject.h
+++ b/Rendering/vtkPixelBufferObject.h
@@ -55,7 +55,7 @@ public:
   //ETX
   
   static vtkPixelBufferObject* New();
-  vtkTypeRevisionMacro(vtkPixelBufferObject, vtkObject);
+  vtkTypeMacro(vtkPixelBufferObject, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPointPicker.cxx b/Rendering/vtkPointPicker.cxx
index 7893b97c0df71d95d4f9492c3944966f4b3152a9..079181da4ae18a098f00d8abefa72ec815f7f030 100644
--- a/Rendering/vtkPointPicker.cxx
+++ b/Rendering/vtkPointPicker.cxx
@@ -21,7 +21,6 @@
 #include "vtkImageActor.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPointPicker, "1.35");
 vtkStandardNewMacro(vtkPointPicker);
 
 vtkPointPicker::vtkPointPicker()
diff --git a/Rendering/vtkPointPicker.h b/Rendering/vtkPointPicker.h
index fdc7b9d63ee7f8af8532e1c88f47830369e840ae..480ee5133fb3bdcbc5904e9a4befe73509a99237 100644
--- a/Rendering/vtkPointPicker.h
+++ b/Rendering/vtkPointPicker.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkPointPicker : public vtkPicker
 {
 public:
   static vtkPointPicker *New();
-  vtkTypeRevisionMacro(vtkPointPicker,vtkPicker);
+  vtkTypeMacro(vtkPointPicker,vtkPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPointSetToLabelHierarchy.cxx b/Rendering/vtkPointSetToLabelHierarchy.cxx
index 0af6becba37497309b8cbeea5a008390812eec2a..4624e94f6ddc2a261d3ea9f35c98729535b3ee55 100644
--- a/Rendering/vtkPointSetToLabelHierarchy.cxx
+++ b/Rendering/vtkPointSetToLabelHierarchy.cxx
@@ -41,7 +41,6 @@
 #include <vtkstd/vector>
 
 vtkStandardNewMacro(vtkPointSetToLabelHierarchy);
-vtkCxxRevisionMacro(vtkPointSetToLabelHierarchy, "1.12");
 vtkCxxSetObjectMacro(vtkPointSetToLabelHierarchy, TextProperty, vtkTextProperty);
 
 vtkPointSetToLabelHierarchy::vtkPointSetToLabelHierarchy()
diff --git a/Rendering/vtkPointSetToLabelHierarchy.h b/Rendering/vtkPointSetToLabelHierarchy.h
index 0c2d415a389526e4a633a5c2b6bbd8c1c8695e1f..f4389d4def002c0b7f6c0f2c28c43dcacf8320d6 100644
--- a/Rendering/vtkPointSetToLabelHierarchy.h
+++ b/Rendering/vtkPointSetToLabelHierarchy.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkPointSetToLabelHierarchy : public vtkLabelHierarch
 {
 public:
   static vtkPointSetToLabelHierarchy* New();
-  vtkTypeRevisionMacro(vtkPointSetToLabelHierarchy,vtkLabelHierarchyAlgorithm);
+  vtkTypeMacro(vtkPointSetToLabelHierarchy,vtkLabelHierarchyAlgorithm);
   virtual void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/Rendering/vtkPointsPainter.cxx b/Rendering/vtkPointsPainter.cxx
index 97d161371df1efe1f3d2c47bf69d490ac17ee8cc..e81c3f1f9fe808e33f89851a7e8445b30e430a35 100644
--- a/Rendering/vtkPointsPainter.cxx
+++ b/Rendering/vtkPointsPainter.cxx
@@ -27,7 +27,6 @@
 #include "vtkUnsignedCharArray.h"
 
 vtkStandardNewMacro(vtkPointsPainter);
-vtkCxxRevisionMacro(vtkPointsPainter, "1.4");
 //-----------------------------------------------------------------------------
 vtkPointsPainter::vtkPointsPainter()
 {
diff --git a/Rendering/vtkPointsPainter.h b/Rendering/vtkPointsPainter.h
index b0fbf544cc01b56f8c2564b284809f4a35f667c1..bb1af2f02136ed10be6045df52e67c746b7e224f 100644
--- a/Rendering/vtkPointsPainter.h
+++ b/Rendering/vtkPointsPainter.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkPointsPainter : public vtkPrimitivePainter
 {
 public:
   static vtkPointsPainter* New();
-  vtkTypeRevisionMacro(vtkPointsPainter, vtkPrimitivePainter);
+  vtkTypeMacro(vtkPointsPainter, vtkPrimitivePainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkPolyDataMapper.cxx b/Rendering/vtkPolyDataMapper.cxx
index 6cf32ec6de2f378e9873a221368790f8759ab1d0..b54f8b082296c08365a6f332afd6fd3ff558b78c 100644
--- a/Rendering/vtkPolyDataMapper.cxx
+++ b/Rendering/vtkPolyDataMapper.cxx
@@ -21,7 +21,6 @@
 #include "vtkPolyData.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkPolyDataMapper, "1.50");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkPolyDataMapper.h b/Rendering/vtkPolyDataMapper.h
index beff4b04ede7d385c5a3c3a36cd0bad6cc481c93..64427f2e4713e960921e10859c7cffa451308b67 100644
--- a/Rendering/vtkPolyDataMapper.h
+++ b/Rendering/vtkPolyDataMapper.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkPolyDataMapper : public vtkMapper
 {
 public:
   static vtkPolyDataMapper *New();
-  vtkTypeRevisionMacro(vtkPolyDataMapper,vtkMapper);
+  vtkTypeMacro(vtkPolyDataMapper,vtkMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPolyDataMapper2D.cxx b/Rendering/vtkPolyDataMapper2D.cxx
index 68814283b050ae676c3e9575f8438d5df8a5c83d..5858de20c9a19ad4bd7f1a5e012fd0847c28f031 100644
--- a/Rendering/vtkPolyDataMapper2D.cxx
+++ b/Rendering/vtkPolyDataMapper2D.cxx
@@ -21,7 +21,6 @@
 #include "vtkLookupTable.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPolyDataMapper2D, "1.45");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkPolyDataMapper2D.h b/Rendering/vtkPolyDataMapper2D.h
index 4603b0d293072dcd832a92b0ab5eb4873b2fc6b4..825918eec85671c293f70ad742f92f5f24ef4df8 100644
--- a/Rendering/vtkPolyDataMapper2D.h
+++ b/Rendering/vtkPolyDataMapper2D.h
@@ -41,7 +41,7 @@ class vtkUnsignedCharArray;
 class VTK_RENDERING_EXPORT vtkPolyDataMapper2D : public vtkMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataMapper2D,vtkMapper2D);
+  vtkTypeMacro(vtkPolyDataMapper2D,vtkMapper2D);
   static vtkPolyDataMapper2D *New();
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Rendering/vtkPolyDataPainter.cxx b/Rendering/vtkPolyDataPainter.cxx
index f38b033537b3c7408cd43cbe1f8288d4ac0a3aa8..78ee70686b6115b6d4ef6b7ca959d60d80458ba7 100644
--- a/Rendering/vtkPolyDataPainter.cxx
+++ b/Rendering/vtkPolyDataPainter.cxx
@@ -32,7 +32,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkPolyDataPainter, "1.5");
 vtkInformationKeyMacro(vtkPolyDataPainter, BUILD_NORMALS, Integer);
 vtkInformationKeyMacro(vtkPolyDataPainter, DATA_ARRAY_TO_VERTEX_ATTRIBUTE, ObjectBase);
 vtkInformationKeyMacro(vtkPolyDataPainter, DISABLE_SCALAR_COLOR, Integer);
diff --git a/Rendering/vtkPolyDataPainter.h b/Rendering/vtkPolyDataPainter.h
index 7c8b2bf87a87ad31e1a233a6e730ff56b5e6c3ed..6b57f7cd1249c93ccd7343dad062f2ea9a3b3223 100644
--- a/Rendering/vtkPolyDataPainter.h
+++ b/Rendering/vtkPolyDataPainter.h
@@ -50,7 +50,7 @@ class vtkPolyData;
 class VTK_RENDERING_EXPORT vtkPolyDataPainter : public vtkPainter
 {
 public:
-  vtkTypeRevisionMacro(vtkPolyDataPainter, vtkPainter);
+  vtkTypeMacro(vtkPolyDataPainter, vtkPainter);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPolygonsPainter.cxx b/Rendering/vtkPolygonsPainter.cxx
index 62ed0034b1be8ef497037e850562b9d68933f7a0..9ef88fa3529c572574395c40a135d77a198d9798 100644
--- a/Rendering/vtkPolygonsPainter.cxx
+++ b/Rendering/vtkPolygonsPainter.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkUnsignedCharArray.h"
 vtkStandardNewMacro(vtkPolygonsPainter);
-vtkCxxRevisionMacro(vtkPolygonsPainter, "1.4");
 
 #define VTK_PP_INVALID_TYPE -1
 //-----------------------------------------------------------------------------
diff --git a/Rendering/vtkPolygonsPainter.h b/Rendering/vtkPolygonsPainter.h
index d69114c1b82287d9b0206f3a5f40496e189e5800..40f23098b26a455db67ed0f41a6afd113af8e215 100644
--- a/Rendering/vtkPolygonsPainter.h
+++ b/Rendering/vtkPolygonsPainter.h
@@ -26,7 +26,7 @@ class VTK_RENDERING_EXPORT vtkPolygonsPainter : public vtkPrimitivePainter
 {
 public:
   static vtkPolygonsPainter* New();
-  vtkTypeRevisionMacro(vtkPolygonsPainter, vtkPrimitivePainter);
+  vtkTypeMacro(vtkPolygonsPainter, vtkPrimitivePainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkPrimitivePainter.cxx b/Rendering/vtkPrimitivePainter.cxx
index df859e92038bc51b4294c02273b19bb36f377968..e822a852e5d257ab7fa14768bab703a71bffcf70 100644
--- a/Rendering/vtkPrimitivePainter.cxx
+++ b/Rendering/vtkPrimitivePainter.cxx
@@ -37,7 +37,6 @@
 #include "vtkGLSLShaderDeviceAdapter2.h"
 #include "vtkOpenGLProperty.h"
 
-vtkCxxRevisionMacro(vtkPrimitivePainter, "1.11");
 //---------------------------------------------------------------------------
 vtkPrimitivePainter::vtkPrimitivePainter()
 {
diff --git a/Rendering/vtkPrimitivePainter.h b/Rendering/vtkPrimitivePainter.h
index 100cc22a1e1536389c6a721d05de234f6e3de663..099c87a0cc67300bbc2c46ba4909a9470e3f4832 100644
--- a/Rendering/vtkPrimitivePainter.h
+++ b/Rendering/vtkPrimitivePainter.h
@@ -35,7 +35,7 @@ class vtkUnsignedCharArray;
 class VTK_RENDERING_EXPORT vtkPrimitivePainter : public vtkPolyDataPainter
 {
 public:
-  vtkTypeRevisionMacro(vtkPrimitivePainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkPrimitivePainter, vtkPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkProp3D.cxx b/Rendering/vtkProp3D.cxx
index deb76e8d993fd819554d8f967f048e10a0269762..2b26b5a3bfe05f4b21323b0b5a134bfcf8410ffd 100644
--- a/Rendering/vtkProp3D.cxx
+++ b/Rendering/vtkProp3D.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkProp3D, "1.41");
 
 //----------------------------------------------------------------------------
 // Construct with the following defaults: origin(0,0,0)
diff --git a/Rendering/vtkProp3D.h b/Rendering/vtkProp3D.h
index e6ae426d493e22e67f2f0c8a8698bff46d53fa7d..2080851e4cced4b992bf5b2c78259b88062259d6 100644
--- a/Rendering/vtkProp3D.h
+++ b/Rendering/vtkProp3D.h
@@ -39,7 +39,7 @@ class vtkLinearTransform;
 class VTK_RENDERING_EXPORT vtkProp3D : public vtkProp
 {
 public:
-  vtkTypeRevisionMacro(vtkProp3D,vtkProp);
+  vtkTypeMacro(vtkProp3D,vtkProp);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkProp3DCollection.cxx b/Rendering/vtkProp3DCollection.cxx
index fc176fdc3f52745acd724e33f987e51c05971b98..ba872fa04977ef5702b2ae7885d7c335a4a8e68d 100644
--- a/Rendering/vtkProp3DCollection.cxx
+++ b/Rendering/vtkProp3DCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkProp3DCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkProp3DCollection, "1.7");
 vtkStandardNewMacro(vtkProp3DCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkProp3DCollection.h b/Rendering/vtkProp3DCollection.h
index cc3b846038b0aac9b395600763b1be81b3f0862d..59dbfca6a05747c51422c4a01216428ddf05ab9c 100644
--- a/Rendering/vtkProp3DCollection.h
+++ b/Rendering/vtkProp3DCollection.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkProp3DCollection : public vtkPropCollection
 {
 public:
   static vtkProp3DCollection *New();
-  vtkTypeRevisionMacro(vtkProp3DCollection,vtkPropCollection);
+  vtkTypeMacro(vtkProp3DCollection,vtkPropCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkPropPicker.cxx b/Rendering/vtkPropPicker.cxx
index f4434c01f34d5ca5f868791f2ef31ac479574815..54157f833c19a2d57d04a2e13a7fe53e5db8e162 100644
--- a/Rendering/vtkPropPicker.cxx
+++ b/Rendering/vtkPropPicker.cxx
@@ -21,7 +21,6 @@
 #include "vtkRenderer.h"
 #include "vtkWorldPointPicker.h"
 
-vtkCxxRevisionMacro(vtkPropPicker, "1.26");
 vtkStandardNewMacro(vtkPropPicker);
 
 vtkPropPicker::vtkPropPicker()
diff --git a/Rendering/vtkPropPicker.h b/Rendering/vtkPropPicker.h
index 6bf6bb24a99ff6caf1b314377123fc40e45c78de..1bd864091ef7dec7938497269fb25d4c60161d4b 100644
--- a/Rendering/vtkPropPicker.h
+++ b/Rendering/vtkPropPicker.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkPropPicker : public vtkAbstractPropPicker
 public:
   static vtkPropPicker *New();
 
-  vtkTypeRevisionMacro(vtkPropPicker,vtkAbstractPropPicker);
+  vtkTypeMacro(vtkPropPicker,vtkAbstractPropPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkProperty.cxx b/Rendering/vtkProperty.cxx
index 18fbbef9c0b66f863726edbbdfa54c147a89cacc..f02db0747c7dcbbf7f5767f305fd3a111a8e1592 100644
--- a/Rendering/vtkProperty.cxx
+++ b/Rendering/vtkProperty.cxx
@@ -52,7 +52,6 @@ public:
   MapOfTextureNames TextureNames;
 };
 
-vtkCxxRevisionMacro(vtkProperty, "1.78");
 vtkCxxSetObjectMacro(vtkProperty, ShaderProgram, vtkShaderProgram);
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkProperty.h b/Rendering/vtkProperty.h
index 4be2d7433ca51fce2c9129e312ee48de380de92b..fd9d08b5cbf53b5e90dee75ad0176a99927a363c 100644
--- a/Rendering/vtkProperty.h
+++ b/Rendering/vtkProperty.h
@@ -53,7 +53,7 @@ class vtkPropertyInternals;
 class VTK_RENDERING_EXPORT vtkProperty : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkProperty,vtkObject);
+  vtkTypeMacro(vtkProperty,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkQImageToImageSource.cxx b/Rendering/vtkQImageToImageSource.cxx
index 716b369a6b148b4b018f18e7b659c580fb339aa4..829bfcc9288af4e7088fcfa9539d5e2235eb71f4 100644
--- a/Rendering/vtkQImageToImageSource.cxx
+++ b/Rendering/vtkQImageToImageSource.cxx
@@ -30,7 +30,6 @@
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkQImageToImageSource, "1.5");
 vtkStandardNewMacro(vtkQImageToImageSource);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkQImageToImageSource.h b/Rendering/vtkQImageToImageSource.h
index 89e0b1762e882ba6875880ee3f1f3f34c7f4af43..a655c3adb1b7d1593de85347a0cdff6f877569a6 100644
--- a/Rendering/vtkQImageToImageSource.h
+++ b/Rendering/vtkQImageToImageSource.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkQImageToImageSource : public vtkImageAlgorithm
 {
 public:
   static vtkQImageToImageSource *New();
-  vtkTypeRevisionMacro(vtkQImageToImageSource,vtkImageAlgorithm);
+  vtkTypeMacro(vtkQImageToImageSource,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkQtInitialization.cxx b/Rendering/vtkQtInitialization.cxx
index 3ba2331a57987d7613ade10f15d5e303c113a515..66838390f6c90bf843cab727f211831a110dbe8a 100644
--- a/Rendering/vtkQtInitialization.cxx
+++ b/Rendering/vtkQtInitialization.cxx
@@ -23,7 +23,6 @@
 
 #include <QApplication>
 
-vtkCxxRevisionMacro(vtkQtInitialization, "1.1");
 vtkStandardNewMacro(vtkQtInitialization);
 
 vtkQtInitialization::vtkQtInitialization()
diff --git a/Rendering/vtkQtInitialization.h b/Rendering/vtkQtInitialization.h
index 3fd929d50693b33a1cb315161f6ec668f230aff3..8e6af12b4da52392cf945852bd25486479d12e10 100644
--- a/Rendering/vtkQtInitialization.h
+++ b/Rendering/vtkQtInitialization.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkQtInitialization : public vtkObject
 {
 public:
   static vtkQtInitialization* New();
-  vtkTypeRevisionMacro(vtkQtInitialization, vtkObject);
+  vtkTypeMacro(vtkQtInitialization, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkQtLabelRenderStrategy.cxx b/Rendering/vtkQtLabelRenderStrategy.cxx
index c9b973c7f75015b634f87d0962a2cdfa06254f32..f5b477d2fe85effb2634b166ca443b7442f25cf0 100644
--- a/Rendering/vtkQtLabelRenderStrategy.cxx
+++ b/Rendering/vtkQtLabelRenderStrategy.cxx
@@ -45,7 +45,6 @@
 #include <QTextDocument>
 #include <QTextStream>
 
-vtkCxxRevisionMacro(vtkQtLabelRenderStrategy, "1.13");
 vtkStandardNewMacro(vtkQtLabelRenderStrategy);
 
 struct vtkQtLabelMapEntry
diff --git a/Rendering/vtkQtLabelRenderStrategy.h b/Rendering/vtkQtLabelRenderStrategy.h
index 534c0bffce099815ec15c4206de8b6325af1b926..c9be4b8e905fd5a1da5e5cd00de7137b5b274b84 100644
--- a/Rendering/vtkQtLabelRenderStrategy.h
+++ b/Rendering/vtkQtLabelRenderStrategy.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkQtLabelRenderStrategy : public vtkLabelRenderStrat
 {
  public:
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkQtLabelRenderStrategy, vtkLabelRenderStrategy);
+  vtkTypeMacro(vtkQtLabelRenderStrategy, vtkLabelRenderStrategy);
   static vtkQtLabelRenderStrategy* New();
 
   //BTX
diff --git a/Rendering/vtkQtTreeRingLabelMapper.cxx b/Rendering/vtkQtTreeRingLabelMapper.cxx
index 9888f8846415b78f935d10f108f1e43f16e8fad1..6f24dc063df962e1a3eecc3a3e050dd29da22dc1 100644
--- a/Rendering/vtkQtTreeRingLabelMapper.cxx
+++ b/Rendering/vtkQtTreeRingLabelMapper.cxx
@@ -57,7 +57,6 @@ PURPOSE.  See the above copyright notice for more information.
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkQtTreeRingLabelMapper, "1.12");
 vtkStandardNewMacro(vtkQtTreeRingLabelMapper);
 
 vtkCxxSetObjectMacro(vtkQtTreeRingLabelMapper,LabelTextProperty,vtkTextProperty);
diff --git a/Rendering/vtkQtTreeRingLabelMapper.h b/Rendering/vtkQtTreeRingLabelMapper.h
index 2eda9e780d969ce5d4495a90aef15c792e21a951..6ee27e29ff283179fb96c398043801ae95b2e440 100644
--- a/Rendering/vtkQtTreeRingLabelMapper.h
+++ b/Rendering/vtkQtTreeRingLabelMapper.h
@@ -63,7 +63,7 @@ class VTK_RENDERING_EXPORT vtkQtTreeRingLabelMapper : public vtkLabeledDataMappe
 {
 public:
   static vtkQtTreeRingLabelMapper *New();
-  vtkTypeRevisionMacro(vtkQtTreeRingLabelMapper,vtkLabeledDataMapper);
+  vtkTypeMacro(vtkQtTreeRingLabelMapper,vtkLabeledDataMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkQuadricLODActor.cxx b/Rendering/vtkQuadricLODActor.cxx
index 76b41d986591f9a696a065079ffd8d4c5a6989b6..9cced882e073c79710f3571d0c533d9f0f29b9fc 100644
--- a/Rendering/vtkQuadricLODActor.cxx
+++ b/Rendering/vtkQuadricLODActor.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkFollower.h"
 
-vtkCxxRevisionMacro(vtkQuadricLODActor, "1.4");
 vtkStandardNewMacro(vtkQuadricLODActor);
 
 //---------------------------------------------------------------------------
diff --git a/Rendering/vtkQuadricLODActor.h b/Rendering/vtkQuadricLODActor.h
index 5d50d7a11444a9072512cf7e2f38f1da0e30c50a..b02318dd146b38d2da7937f6582a2925ac7bf36a 100644
--- a/Rendering/vtkQuadricLODActor.h
+++ b/Rendering/vtkQuadricLODActor.h
@@ -62,7 +62,7 @@ public:
 
   // Description:
   // Standard class methods.
-  vtkTypeRevisionMacro(vtkQuadricLODActor,vtkActor);
+  vtkTypeMacro(vtkQuadricLODActor,vtkActor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkQuaternionInterpolator.cxx b/Rendering/vtkQuaternionInterpolator.cxx
index ee3bf10862b1d545f8a8b7a48e07ad9b124d120f..11a28ac29439d01e62a7e41c5d6763133cbc695e 100644
--- a/Rendering/vtkQuaternionInterpolator.cxx
+++ b/Rendering/vtkQuaternionInterpolator.cxx
@@ -17,7 +17,6 @@
 #include "vtkMath.h"
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkQuaternionInterpolator, "1.8");
 vtkStandardNewMacro(vtkQuaternionInterpolator);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkQuaternionInterpolator.h b/Rendering/vtkQuaternionInterpolator.h
index 01d7017a13cf190ea10114be95819d5ab2f3d5ed..0a1002f716f0e395545b4284cd51450c5ae4b6b4 100644
--- a/Rendering/vtkQuaternionInterpolator.h
+++ b/Rendering/vtkQuaternionInterpolator.h
@@ -58,7 +58,7 @@ class vtkQuaternionList;
 class VTK_RENDERING_EXPORT vtkQuaternionInterpolator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkQuaternionInterpolator, vtkObject);
+  vtkTypeMacro(vtkQuaternionInterpolator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRenderPass.cxx b/Rendering/vtkRenderPass.cxx
index 361d2acce15c3864684a96f237847d9c297c1707..31cc79838a9eada9f65d44c7f1c884cdddf01af5 100644
--- a/Rendering/vtkRenderPass.cxx
+++ b/Rendering/vtkRenderPass.cxx
@@ -18,7 +18,6 @@
 #include "vtkRenderer.h"
 #include "vtkOpenGLRenderer.h"
 
-vtkCxxRevisionMacro(vtkRenderPass, "1.2");
 
 // ----------------------------------------------------------------------------
 // Description:
diff --git a/Rendering/vtkRenderPass.h b/Rendering/vtkRenderPass.h
index 54c6ccbbc891da2ae426b6414af09fe21bc32250..d0c2063e537536c1471c1a75f474119500081d5a 100644
--- a/Rendering/vtkRenderPass.h
+++ b/Rendering/vtkRenderPass.h
@@ -51,7 +51,7 @@ class vtkRenderer;
 class VTK_RENDERING_EXPORT vtkRenderPass : public vtkObject
 {
  public:
-  vtkTypeRevisionMacro(vtkRenderPass,vtkObject);
+  vtkTypeMacro(vtkRenderPass,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkRenderPassCollection.cxx b/Rendering/vtkRenderPassCollection.cxx
index f973d4858832220888a0eca6801efacb7cdb98d9..fbf34c8571fd226c095d6479f76321effcd5008f 100644
--- a/Rendering/vtkRenderPassCollection.cxx
+++ b/Rendering/vtkRenderPassCollection.cxx
@@ -16,7 +16,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderPass.h"
 
-vtkCxxRevisionMacro(vtkRenderPassCollection, "1.2");
 vtkStandardNewMacro(vtkRenderPassCollection);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkRenderPassCollection.h b/Rendering/vtkRenderPassCollection.h
index 09105919287ad8d8ad78dcaeed3ac6bad34a2f48..de646b96fe10f8b3d1ee7a6afd1d48e917b417b6 100644
--- a/Rendering/vtkRenderPassCollection.h
+++ b/Rendering/vtkRenderPassCollection.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkRenderPassCollection : public vtkCollection
 {
  public:
   static vtkRenderPassCollection *New();
-  vtkTypeRevisionMacro(vtkRenderPassCollection,vtkCollection);
+  vtkTypeMacro(vtkRenderPassCollection,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkRenderWindow.cxx b/Rendering/vtkRenderWindow.cxx
index 4ead2df0bb69056dc6551f81820ba8b06b16a572..c52d050a7019b595946d55e0263766781c64997a 100644
--- a/Rendering/vtkRenderWindow.cxx
+++ b/Rendering/vtkRenderWindow.cxx
@@ -24,7 +24,6 @@
 #include "vtkTimerLog.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkRenderWindow, "1.160");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkRenderWindow.h b/Rendering/vtkRenderWindow.h
index 1cc138cbcabe9ea53128f45a638b926c6efae06c..c61b185bfbc66052bf8a3d0fce365447638d3bbf 100644
--- a/Rendering/vtkRenderWindow.h
+++ b/Rendering/vtkRenderWindow.h
@@ -94,7 +94,7 @@ class vtkUnsignedCharArray;
 class VTK_RENDERING_EXPORT vtkRenderWindow : public vtkWindow
 {
 public:
-  vtkTypeRevisionMacro(vtkRenderWindow,vtkWindow);
+  vtkTypeMacro(vtkRenderWindow,vtkWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRenderWindowCollection.cxx b/Rendering/vtkRenderWindowCollection.cxx
index e4318e60d888980ac2f699b73e9229b37d441fd4..7e9edfa0025befa139deca9ec8dbe00f68629a68 100644
--- a/Rendering/vtkRenderWindowCollection.cxx
+++ b/Rendering/vtkRenderWindowCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkRenderWindowCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkRenderWindowCollection, "1.8");
 vtkStandardNewMacro(vtkRenderWindowCollection);
 
 void vtkRenderWindowCollection::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/Rendering/vtkRenderWindowCollection.h b/Rendering/vtkRenderWindowCollection.h
index 6bdf64d636b6426a87a26a7ddad725566f16a728..c19b7d04b8168f54ca8ad0dd6152f811c4b01c67 100644
--- a/Rendering/vtkRenderWindowCollection.h
+++ b/Rendering/vtkRenderWindowCollection.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkRenderWindowCollection : public vtkCollection
 {
  public:
   static vtkRenderWindowCollection *New();
-  vtkTypeRevisionMacro(vtkRenderWindowCollection,vtkCollection);
+  vtkTypeMacro(vtkRenderWindowCollection,vtkCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRenderWindowInteractor.cxx b/Rendering/vtkRenderWindowInteractor.cxx
index a208350eb869dfa5a2a8efc4721c1f795bccc565..0850672de5145e74544c682d9a707e08467a5240 100644
--- a/Rendering/vtkRenderWindowInteractor.cxx
+++ b/Rendering/vtkRenderWindowInteractor.cxx
@@ -27,7 +27,6 @@
 #include "vtkObserverMediator.h"
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkRenderWindowInteractor, "1.123");
 
 // PIMPL'd class to keep track of timers. It maps the ids returned by CreateTimer()
 // to the platform-specific representation for timer ids.
diff --git a/Rendering/vtkRenderWindowInteractor.h b/Rendering/vtkRenderWindowInteractor.h
index 79de22b62afad5650756c40f3a4d1253aa0a819b..d5bec72bad3afc8bedde3c9e96f2eae9a803590b 100644
--- a/Rendering/vtkRenderWindowInteractor.h
+++ b/Rendering/vtkRenderWindowInteractor.h
@@ -65,7 +65,7 @@ class VTK_RENDERING_EXPORT vtkRenderWindowInteractor : public vtkObject
   //ETX
 public:
   static vtkRenderWindowInteractor *New();
-  vtkTypeRevisionMacro(vtkRenderWindowInteractor,vtkObject);
+  vtkTypeMacro(vtkRenderWindowInteractor,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRenderedAreaPicker.cxx b/Rendering/vtkRenderedAreaPicker.cxx
index bd71a00860507ac23dc9208ddee81bc8d4a75a46..bf022f1c7fc26479092f1b31866785515e521fed 100644
--- a/Rendering/vtkRenderedAreaPicker.cxx
+++ b/Rendering/vtkRenderedAreaPicker.cxx
@@ -35,7 +35,6 @@
 #include "vtkPlane.h"
 #include "vtkPoints.h"
 
-vtkCxxRevisionMacro(vtkRenderedAreaPicker, "1.11");
 vtkStandardNewMacro(vtkRenderedAreaPicker);
 
 //--------------------------------------------------------------------------
diff --git a/Rendering/vtkRenderedAreaPicker.h b/Rendering/vtkRenderedAreaPicker.h
index 25c1dfc3330171314049052d477a6b4571cc371a..9d55aee5e5a3af7d6b34d38b0185dcbdb56e9d3f 100644
--- a/Rendering/vtkRenderedAreaPicker.h
+++ b/Rendering/vtkRenderedAreaPicker.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkRenderedAreaPicker : public vtkAreaPicker
 {
 public:
   static vtkRenderedAreaPicker *New();
-  vtkTypeRevisionMacro(vtkRenderedAreaPicker,vtkAreaPicker);
+  vtkTypeMacro(vtkRenderedAreaPicker,vtkAreaPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRenderer.cxx b/Rendering/vtkRenderer.cxx
index d5be160eb4ff6241c9b6a380a383e7e1f00bbbb8..3d3547c8a032ce5985772c71071cd1e9e9201679 100644
--- a/Rendering/vtkRenderer.cxx
+++ b/Rendering/vtkRenderer.cxx
@@ -41,7 +41,6 @@
 #include "vtkRenderState.h"
 #include "vtkTexture.h"
 
-vtkCxxRevisionMacro(vtkRenderer, "1.256");
 vtkCxxSetObjectMacro(vtkRenderer, Delegate, vtkRendererDelegate);
 vtkCxxSetObjectMacro(vtkRenderer, Pass, vtkRenderPass);
 vtkCxxSetObjectMacro(vtkRenderer, BackgroundTexture, vtkTexture);
diff --git a/Rendering/vtkRenderer.h b/Rendering/vtkRenderer.h
index 42c0e4a8f19268de4deff503f46ec30423913345..d79d53052c3ab9c50e05a68eb839db0a1fbbde90 100644
--- a/Rendering/vtkRenderer.h
+++ b/Rendering/vtkRenderer.h
@@ -58,7 +58,7 @@ class vtkVisibleCellSelector;
 class VTK_RENDERING_EXPORT vtkRenderer : public vtkViewport
 {
 public:
-  vtkTypeRevisionMacro(vtkRenderer,vtkViewport);
+  vtkTypeMacro(vtkRenderer,vtkViewport);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRendererCollection.cxx b/Rendering/vtkRendererCollection.cxx
index 5e60976824406f96a01d623f50c4471b2a54ded6..b71d4296d5909918b68233689da0e1d56153088e 100644
--- a/Rendering/vtkRendererCollection.cxx
+++ b/Rendering/vtkRendererCollection.cxx
@@ -18,7 +18,6 @@
 
 #include <stdlib.h>
 
-vtkCxxRevisionMacro(vtkRendererCollection, "1.33");
 vtkStandardNewMacro(vtkRendererCollection);
 
 // Forward the Render() method to each renderer in the list.
diff --git a/Rendering/vtkRendererCollection.h b/Rendering/vtkRendererCollection.h
index 2a8f4ab298d1045baa3ac57cd1dd1871395962d4..995acf98f3e937e84204ec03131982f112d094e1 100644
--- a/Rendering/vtkRendererCollection.h
+++ b/Rendering/vtkRendererCollection.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkRendererCollection : public vtkCollection
 {
  public:
   static vtkRendererCollection *New();
-  vtkTypeRevisionMacro(vtkRendererCollection,vtkCollection);
+  vtkTypeMacro(vtkRendererCollection,vtkCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRendererDelegate.cxx b/Rendering/vtkRendererDelegate.cxx
index 64dd4b0e7557fd357ee127a06a07a4beb36fc7bf..f1c549a96177d77649be03f1c8de3d0a73b52b95 100644
--- a/Rendering/vtkRendererDelegate.cxx
+++ b/Rendering/vtkRendererDelegate.cxx
@@ -15,7 +15,6 @@
 
 #include "vtkRendererDelegate.h"
 
-vtkCxxRevisionMacro(vtkRendererDelegate, "1.1");
 
 vtkRendererDelegate::vtkRendererDelegate()
 {
diff --git a/Rendering/vtkRendererDelegate.h b/Rendering/vtkRendererDelegate.h
index 5b78c76357371392859db6f92218d18844b78048..ee34dc21fec488b1d52bd5975bef4032da44e614 100644
--- a/Rendering/vtkRendererDelegate.h
+++ b/Rendering/vtkRendererDelegate.h
@@ -33,7 +33,7 @@ class vtkRenderer;
 class VTK_RENDERING_EXPORT vtkRendererDelegate : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkRendererDelegate,vtkObject);
+  vtkTypeMacro(vtkRendererDelegate,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRendererSource.cxx b/Rendering/vtkRendererSource.cxx
index 1322605c4b848fabda8a1af71cc9b8b473d65b81..cfafd44a348ae319c7eb37dffcabf8e830b70a19 100644
--- a/Rendering/vtkRendererSource.cxx
+++ b/Rendering/vtkRendererSource.cxx
@@ -27,7 +27,6 @@
 #include "vtkStreamingDemandDrivenPipeline.h"
 #include "vtkUnsignedCharArray.h"
 
-vtkCxxRevisionMacro(vtkRendererSource, "1.63");
 vtkStandardNewMacro(vtkRendererSource);
 
 vtkCxxSetObjectMacro(vtkRendererSource,Input,vtkRenderer);
diff --git a/Rendering/vtkRendererSource.h b/Rendering/vtkRendererSource.h
index c2ac670f15ebd530df373aea4ea19845e919074e..a643a343ac28a86fe54392d3b952a3eb8502c5d9 100644
--- a/Rendering/vtkRendererSource.h
+++ b/Rendering/vtkRendererSource.h
@@ -40,7 +40,7 @@ class VTK_RENDERING_EXPORT vtkRendererSource : public vtkAlgorithm
 {
 public:
   static vtkRendererSource *New();
-  vtkTypeRevisionMacro(vtkRendererSource,vtkAlgorithm);
+  vtkTypeMacro(vtkRendererSource,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkRepresentationPainter.cxx b/Rendering/vtkRepresentationPainter.cxx
index 5046a16a19d0f462447acae1d8a6e4f19ae9e88e..b60da5e746ad8ab23056e76902099e134067ec66 100644
--- a/Rendering/vtkRepresentationPainter.cxx
+++ b/Rendering/vtkRepresentationPainter.cxx
@@ -18,7 +18,6 @@
 #include "vtkObjectFactory.h"
 
 vtkInstantiatorNewMacro(vtkRepresentationPainter);
-vtkCxxRevisionMacro(vtkRepresentationPainter, "1.3");
 //-----------------------------------------------------------------------------
 vtkRepresentationPainter::vtkRepresentationPainter()
 {
diff --git a/Rendering/vtkRepresentationPainter.h b/Rendering/vtkRepresentationPainter.h
index 4d063858f7a8ed0d1d4eeea2ae24fcbd09c65597..3766ab82133a349aa6a401ef565e7d5eff549971 100644
--- a/Rendering/vtkRepresentationPainter.h
+++ b/Rendering/vtkRepresentationPainter.h
@@ -27,7 +27,7 @@ class VTK_RENDERING_EXPORT vtkRepresentationPainter : public vtkPolyDataPainter
 {
 public:
   static vtkRepresentationPainter* New();
-  vtkTypeRevisionMacro(vtkRepresentationPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkRepresentationPainter, vtkPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkScalarBarActor.cxx b/Rendering/vtkScalarBarActor.cxx
index 1307d8df52fb3464564c02a9af471f8616e33933..73064c5022308dedffc8204a967f335a9df6ef84 100644
--- a/Rendering/vtkScalarBarActor.cxx
+++ b/Rendering/vtkScalarBarActor.cxx
@@ -32,7 +32,6 @@
 #include "vtkRenderer.h"
 #include "vtkProperty2D.h"
 
-vtkCxxRevisionMacro(vtkScalarBarActor, "1.69");
 vtkStandardNewMacro(vtkScalarBarActor);
 
 vtkCxxSetObjectMacro(vtkScalarBarActor,LookupTable,vtkScalarsToColors);
diff --git a/Rendering/vtkScalarBarActor.h b/Rendering/vtkScalarBarActor.h
index 9fa5b3db5fcedcf6487f7d1b3d65b8613e10fc11..2fda32a0d187339b033ae116dfe76b6de5b50133 100644
--- a/Rendering/vtkScalarBarActor.h
+++ b/Rendering/vtkScalarBarActor.h
@@ -68,7 +68,7 @@ class vtkTexture;
 class VTK_RENDERING_EXPORT vtkScalarBarActor : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkScalarBarActor,vtkActor2D);
+  vtkTypeMacro(vtkScalarBarActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkScalarsToColorsPainter.cxx b/Rendering/vtkScalarsToColorsPainter.cxx
index 3a1b02fb89a6434189af8e066fc562d5b0f78d52..c9599179f11bf4fa1d60a07efdd94d5b2489f9a7 100644
--- a/Rendering/vtkScalarsToColorsPainter.cxx
+++ b/Rendering/vtkScalarsToColorsPainter.cxx
@@ -66,7 +66,6 @@ static inline void vtkMultiplyColorsWithAlpha(vtkDataArray* array)
 
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkScalarsToColorsPainter);
-vtkCxxRevisionMacro(vtkScalarsToColorsPainter, "1.22");
 vtkCxxSetObjectMacro(vtkScalarsToColorsPainter, LookupTable, vtkScalarsToColors);
 vtkInformationKeyMacro(vtkScalarsToColorsPainter, USE_LOOKUP_TABLE_SCALAR_RANGE, Integer);
 vtkInformationKeyMacro(vtkScalarsToColorsPainter, SCALAR_RANGE, DoubleVector);
diff --git a/Rendering/vtkScalarsToColorsPainter.h b/Rendering/vtkScalarsToColorsPainter.h
index 3f9e32122ea588756d82778e8ea2a35c72248df8..f9f4aa9404aa78d3a0a4a5f516768a60232842cf 100644
--- a/Rendering/vtkScalarsToColorsPainter.h
+++ b/Rendering/vtkScalarsToColorsPainter.h
@@ -37,7 +37,7 @@ class VTK_RENDERING_EXPORT vtkScalarsToColorsPainter : public vtkPainter
 {
 public:
   static vtkScalarsToColorsPainter* New();
-  vtkTypeRevisionMacro(vtkScalarsToColorsPainter, vtkPainter);
+  vtkTypeMacro(vtkScalarsToColorsPainter, vtkPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkScaledTextActor.cxx b/Rendering/vtkScaledTextActor.cxx
index 3ee3abe3c9d985dba869554e68690f86a3a4ec23..5d31a5cd654e4b32b0fe6240e341faaf154e64f2 100644
--- a/Rendering/vtkScaledTextActor.cxx
+++ b/Rendering/vtkScaledTextActor.cxx
@@ -15,7 +15,6 @@
 #include "vtkScaledTextActor.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkScaledTextActor, "1.29");
 vtkStandardNewMacro(vtkScaledTextActor);
 
 vtkScaledTextActor::vtkScaledTextActor()
diff --git a/Rendering/vtkScaledTextActor.h b/Rendering/vtkScaledTextActor.h
index 10f22b717c0a41cca1ee5b4db4924571e3575c12..20bfc19fde9432efcc4baed5bfd7e06fd7945096 100644
--- a/Rendering/vtkScaledTextActor.h
+++ b/Rendering/vtkScaledTextActor.h
@@ -28,7 +28,7 @@
 class VTK_RENDERING_EXPORT vtkScaledTextActor : public vtkTextActor
 {
 public:
-  vtkTypeRevisionMacro(vtkScaledTextActor,vtkTextActor);
+  vtkTypeMacro(vtkScaledTextActor,vtkTextActor);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkScenePicker.cxx b/Rendering/vtkScenePicker.cxx
index 6115f97591eff300620e3b5b19037ed6eedbcfcc..d57d3567f2e2efe11e492d3cd2ae89cd3ba9e4dc 100644
--- a/Rendering/vtkScenePicker.cxx
+++ b/Rendering/vtkScenePicker.cxx
@@ -59,7 +59,6 @@ protected:
   bool InteractiveRender;
 };
 
-vtkCxxRevisionMacro(vtkScenePicker, "1.4");
 vtkStandardNewMacro(vtkScenePicker);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkScenePicker.h b/Rendering/vtkScenePicker.h
index 8d09f138db2b434224ecc1cc97bafbbe3e1e9ab2..46e02715a6cd857fcc99d04857c5238999b54dd6 100644
--- a/Rendering/vtkScenePicker.h
+++ b/Rendering/vtkScenePicker.h
@@ -56,7 +56,7 @@ class VTK_RENDERING_EXPORT vtkScenePicker : public vtkObject
   //ETX
 public:
   static vtkScenePicker * New();
-  vtkTypeRevisionMacro(vtkScenePicker,vtkObject);
+  vtkTypeMacro(vtkScenePicker,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkSelectVisiblePoints.cxx b/Rendering/vtkSelectVisiblePoints.cxx
index 64a71ce97c1709b102ba97927ce2ced5388dd3f6..5b8d6787bef763e0b0fe1eaa1f3000656ef3b2c5 100644
--- a/Rendering/vtkSelectVisiblePoints.cxx
+++ b/Rendering/vtkSelectVisiblePoints.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkSelectVisiblePoints, "1.41");
 vtkStandardNewMacro(vtkSelectVisiblePoints);
 
 // Instantiate object with no renderer; window selection turned off; 
diff --git a/Rendering/vtkSelectVisiblePoints.h b/Rendering/vtkSelectVisiblePoints.h
index ea4ea187513e9a0c78eef7349d12fab3a361ba4d..5dbbce489baca390d375c85abe7e4e7d6e7b3068 100644
--- a/Rendering/vtkSelectVisiblePoints.h
+++ b/Rendering/vtkSelectVisiblePoints.h
@@ -50,7 +50,7 @@ class vtkMatrix4x4;
 class VTK_RENDERING_EXPORT vtkSelectVisiblePoints : public vtkPolyDataAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkSelectVisiblePoints,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkSelectVisiblePoints,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkSequencePass.cxx b/Rendering/vtkSequencePass.cxx
index aa3a75d32777f9cc8f3d9cf3307a6e52cb111056..62abb25376f00a45239ad745aa8709f1f5712dac 100644
--- a/Rendering/vtkSequencePass.cxx
+++ b/Rendering/vtkSequencePass.cxx
@@ -18,7 +18,6 @@
 #include <assert.h>
 #include "vtkRenderPassCollection.h"
 
-vtkCxxRevisionMacro(vtkSequencePass, "1.1");
 vtkStandardNewMacro(vtkSequencePass);
 vtkCxxSetObjectMacro(vtkSequencePass,Passes,vtkRenderPassCollection);
 
diff --git a/Rendering/vtkSequencePass.h b/Rendering/vtkSequencePass.h
index 905ca3158d6d0f82d47eb4828d3c0e2efd031db5..08021622c35e1edb1e68a76d9bfdd4b0963ffd13 100644
--- a/Rendering/vtkSequencePass.h
+++ b/Rendering/vtkSequencePass.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkSequencePass : public vtkRenderPass
 {
 public:
   static vtkSequencePass *New();
-  vtkTypeRevisionMacro(vtkSequencePass,vtkRenderPass);
+  vtkTypeMacro(vtkSequencePass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkShader.cxx b/Rendering/vtkShader.cxx
index 657487d3584f2ee19189d85a93dfd052d78b3120..8741717e1a12f61ebc22c596e3c48eae3c2c7836 100644
--- a/Rendering/vtkShader.cxx
+++ b/Rendering/vtkShader.cxx
@@ -339,7 +339,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkShader, "1.25")
 vtkCxxSetObjectMacro(vtkShader, XMLShader, vtkXMLShader);
 //-----------------------------------------------------------------------------
 vtkShader::vtkShader()
diff --git a/Rendering/vtkShader.h b/Rendering/vtkShader.h
index fb97c56215eaabc7f163e8c749d4f2283b5242e0..d13e90731a12297e16559b9399110370a93818b1 100644
--- a/Rendering/vtkShader.h
+++ b/Rendering/vtkShader.h
@@ -57,7 +57,7 @@ class vtkXMLShader;
 class VTK_RENDERING_EXPORT vtkShader : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkShader, vtkObject);
+  vtkTypeMacro(vtkShader, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkShader2.cxx b/Rendering/vtkShader2.cxx
index dfa977d0b140371330caf10d9b6ca6b3f13e2777..a62293a0085f75185036d751649395a2e6dcd68b 100644
--- a/Rendering/vtkShader2.cxx
+++ b/Rendering/vtkShader2.cxx
@@ -37,7 +37,6 @@ const char *TypeAsStringArray[5]={
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkShader2, "1.6");
 vtkStandardNewMacro(vtkShader2);
 vtkCxxSetObjectMacro(vtkShader2,UniformVariables,vtkUniformVariables);
 
diff --git a/Rendering/vtkShader2.h b/Rendering/vtkShader2.h
index 7840bc916c3455557a65be084878fa6e54dee97d..1efe178bff7c599e2da44b9780461404fcb6e7ba 100644
--- a/Rendering/vtkShader2.h
+++ b/Rendering/vtkShader2.h
@@ -55,7 +55,7 @@ class VTK_RENDERING_EXPORT vtkShader2 : public vtkObject
 {
 public:
   static vtkShader2 *New();
-  vtkTypeRevisionMacro(vtkShader2,vtkObject);
+  vtkTypeMacro(vtkShader2,vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkShader2Collection.cxx b/Rendering/vtkShader2Collection.cxx
index 9b0347eded89958eb91a4099b870983b3b17da43..e46b48fe6c051fcfe34a2d2afdb0586d877c1dbc 100644
--- a/Rendering/vtkShader2Collection.cxx
+++ b/Rendering/vtkShader2Collection.cxx
@@ -17,7 +17,6 @@
 #include "vtkShader2.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkShader2Collection, "1.4");
 vtkStandardNewMacro(vtkShader2Collection);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkShader2Collection.h b/Rendering/vtkShader2Collection.h
index 81aec30531842b6bc889705a191baa377af4e9d2..725cf216f9c66b04511659930946a44abc61e69a 100644
--- a/Rendering/vtkShader2Collection.h
+++ b/Rendering/vtkShader2Collection.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkShader2Collection : public vtkCollection
 {
  public:
   static vtkShader2Collection *New();
-  vtkTypeRevisionMacro(vtkShader2Collection,vtkCollection);
+  vtkTypeMacro(vtkShader2Collection,vtkCollection);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkShaderDeviceAdapter.cxx b/Rendering/vtkShaderDeviceAdapter.cxx
index 271129989d31d3d4d4ad9b11bcd645f4ec725872..a385cd0b186b7991d2d50ff78154177cf0de69a0 100644
--- a/Rendering/vtkShaderDeviceAdapter.cxx
+++ b/Rendering/vtkShaderDeviceAdapter.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkShaderProgram.h"
 
-vtkCxxRevisionMacro(vtkShaderDeviceAdapter, "Revision: 1.0$");
 
 //---------------------------------------------------------------------------
 vtkShaderDeviceAdapter::vtkShaderDeviceAdapter()
diff --git a/Rendering/vtkShaderDeviceAdapter.h b/Rendering/vtkShaderDeviceAdapter.h
index ba5db1f14d81c815dc6914e74fab96548d2ce203..6d9f671fff38e862ae595b98f2dbb34dcb0b1f60 100644
--- a/Rendering/vtkShaderDeviceAdapter.h
+++ b/Rendering/vtkShaderDeviceAdapter.h
@@ -35,7 +35,7 @@ class vtkShaderProgram;
 class VTK_RENDERING_EXPORT vtkShaderDeviceAdapter : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkShaderDeviceAdapter, vtkObject);
+  vtkTypeMacro(vtkShaderDeviceAdapter, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkShaderProgram.cxx b/Rendering/vtkShaderProgram.cxx
index d3b3e08d5b99768aadd55935cdf17e775af0ec33..f329a14a5654c49ed062c30dfd1cf457d35577b2 100644
--- a/Rendering/vtkShaderProgram.cxx
+++ b/Rendering/vtkShaderProgram.cxx
@@ -45,7 +45,6 @@
 #include "vtkGLSLShaderProgram.h"
 #endif
 
-vtkCxxRevisionMacro(vtkShaderProgram, "1.10");
 vtkCxxSetObjectMacro(vtkShaderProgram, Material, vtkXMLMaterial);
 //-----------------------------------------------------------------------------
 vtkShaderProgram::vtkShaderProgram()
diff --git a/Rendering/vtkShaderProgram.h b/Rendering/vtkShaderProgram.h
index ea8e5a4589c19942863c5ebc097625cd71a2059e..44c72ff83ddb42f18a23c0a9f39db20ce69bb811 100644
--- a/Rendering/vtkShaderProgram.h
+++ b/Rendering/vtkShaderProgram.h
@@ -68,7 +68,7 @@ class vtkShaderDeviceAdapter;
 class VTK_RENDERING_EXPORT vtkShaderProgram : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkShaderProgram, vtkObject);
+  vtkTypeMacro(vtkShaderProgram, vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
 
   // .Description:
diff --git a/Rendering/vtkShaderProgram2.cxx b/Rendering/vtkShaderProgram2.cxx
index 2d6cea6239cba0e407e8291813074b67889415b9..8c1180afa8a6292bb5bdf34c16ab6b5252e7d8f0 100644
--- a/Rendering/vtkShaderProgram2.cxx
+++ b/Rendering/vtkShaderProgram2.cxx
@@ -29,7 +29,6 @@
 #include "vtkStdString.h"
 
 vtkStandardNewMacro(vtkShaderProgram2);
-vtkCxxRevisionMacro(vtkShaderProgram2, "1.14");
 vtkCxxSetObjectMacro(vtkShaderProgram2,UniformVariables,vtkUniformVariables);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkShaderProgram2.h b/Rendering/vtkShaderProgram2.h
index bf33a95b240e6f368f6ad49c5aa453ba39c8d91a..5175109d83d2911b24fdceb85389cb3037aa7271 100644
--- a/Rendering/vtkShaderProgram2.h
+++ b/Rendering/vtkShaderProgram2.h
@@ -47,7 +47,7 @@ class VTK_RENDERING_EXPORT vtkShaderProgram2 : public vtkObject
 {
 public:
   static vtkShaderProgram2* New();
-  vtkTypeRevisionMacro(vtkShaderProgram2, vtkObject);
+  vtkTypeMacro(vtkShaderProgram2, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkShadowMapPass.cxx b/Rendering/vtkShadowMapPass.cxx
index 3cab9e60bdd838329c589ab69b134b1567957b6c..48a55aead456f685cf56407e5e4be211e9b473f6 100644
--- a/Rendering/vtkShadowMapPass.cxx
+++ b/Rendering/vtkShadowMapPass.cxx
@@ -66,7 +66,6 @@
 #include "vtkOpenGLState.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkShadowMapPass, "1.8");
 vtkStandardNewMacro(vtkShadowMapPass);
 vtkCxxSetObjectMacro(vtkShadowMapPass,OpaquePass,vtkRenderPass);
 vtkCxxSetObjectMacro(vtkShadowMapPass,CompositeZPass,vtkRenderPass);
diff --git a/Rendering/vtkShadowMapPass.h b/Rendering/vtkShadowMapPass.h
index 6898f3af89659a400bb8ee7a9c14be78db31ff77..071fc36ad385e3de72af2ceeabb348e9616c1e70 100644
--- a/Rendering/vtkShadowMapPass.h
+++ b/Rendering/vtkShadowMapPass.h
@@ -58,7 +58,7 @@ class VTK_RENDERING_EXPORT vtkShadowMapPass : public vtkRenderPass
 {
 public:
   static vtkShadowMapPass *New();
-  vtkTypeRevisionMacro(vtkShadowMapPass,vtkRenderPass);
+  vtkTypeMacro(vtkShadowMapPass,vtkRenderPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkSobelGradientMagnitudePass.cxx b/Rendering/vtkSobelGradientMagnitudePass.cxx
index b37fecc285cbfccc780d0feacf10fe70f1d2a1da..e5099944e2be0ccfb83b2229c096d820011fca6c 100644
--- a/Rendering/vtkSobelGradientMagnitudePass.cxx
+++ b/Rendering/vtkSobelGradientMagnitudePass.cxx
@@ -38,7 +38,6 @@
 #include "vtkPixelBufferObject.h"
 #include "vtkImageExtractComponents.h"
 
-vtkCxxRevisionMacro(vtkSobelGradientMagnitudePass, "1.6");
 vtkStandardNewMacro(vtkSobelGradientMagnitudePass);
 
 extern const char *vtkSobelGradientMagnitudePassShader1_fs;
diff --git a/Rendering/vtkSobelGradientMagnitudePass.h b/Rendering/vtkSobelGradientMagnitudePass.h
index 06be1b625f0e12a99fa64d77e6cd93507af8d727..86c12620bec3e05c9d082ab3f318d2f07079aaf8 100644
--- a/Rendering/vtkSobelGradientMagnitudePass.h
+++ b/Rendering/vtkSobelGradientMagnitudePass.h
@@ -69,7 +69,7 @@ class VTK_RENDERING_EXPORT vtkSobelGradientMagnitudePass : public vtkImageProces
 {
 public:
   static vtkSobelGradientMagnitudePass *New();
-  vtkTypeRevisionMacro(vtkSobelGradientMagnitudePass,vtkImageProcessingPass);
+  vtkTypeMacro(vtkSobelGradientMagnitudePass,vtkImageProcessingPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkStandardPolyDataPainter.cxx b/Rendering/vtkStandardPolyDataPainter.cxx
index bd6401c153326b8def6c447ba8aae99debff7443..260996087ef84a25220951b63bfaec8f95fb41cc 100644
--- a/Rendering/vtkStandardPolyDataPainter.cxx
+++ b/Rendering/vtkStandardPolyDataPainter.cxx
@@ -65,7 +65,6 @@ public:
 };
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkStandardPolyDataPainter, "1.18");
 vtkStandardNewMacro(vtkStandardPolyDataPainter);
 //-----------------------------------------------------------------------------
 static inline int vtkStandardPolyDataPainterGetTotalCells(vtkPolyData* pd,
diff --git a/Rendering/vtkStandardPolyDataPainter.h b/Rendering/vtkStandardPolyDataPainter.h
index a6a1fcb2416d732184e57bf9f7e98be942842b3c..3e369230d4a51ea5c1f28bb71375d28bb0a8919e 100644
--- a/Rendering/vtkStandardPolyDataPainter.h
+++ b/Rendering/vtkStandardPolyDataPainter.h
@@ -50,7 +50,7 @@ class vtkGLSLShaderDeviceAdapter2;
 class VTK_RENDERING_EXPORT vtkStandardPolyDataPainter : public vtkPolyDataPainter
 {
 public:
-  vtkTypeRevisionMacro(vtkStandardPolyDataPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkStandardPolyDataPainter, vtkPolyDataPainter);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkStandardPolyDataPainter *New();
 
diff --git a/Rendering/vtkSurfaceLICDefaultPainter.cxx b/Rendering/vtkSurfaceLICDefaultPainter.cxx
index 234edfac4d2630df034b45bb0eddc7c7c4162b37..5ec86f2c4760eaf85e591211f811bb7c0250bbdd 100644
--- a/Rendering/vtkSurfaceLICDefaultPainter.cxx
+++ b/Rendering/vtkSurfaceLICDefaultPainter.cxx
@@ -20,7 +20,6 @@
 #include "vtkScalarsToColorsPainter.h"
 
 vtkStandardNewMacro(vtkSurfaceLICDefaultPainter);
-vtkCxxRevisionMacro(vtkSurfaceLICDefaultPainter, "1.1");
 vtkCxxSetObjectMacro(vtkSurfaceLICDefaultPainter, SurfaceLICPainter, vtkSurfaceLICPainter);
 //----------------------------------------------------------------------------
 vtkSurfaceLICDefaultPainter::vtkSurfaceLICDefaultPainter()
diff --git a/Rendering/vtkSurfaceLICDefaultPainter.h b/Rendering/vtkSurfaceLICDefaultPainter.h
index 32dd47c7f576b35d5880576276c2fa48602824e5..d1411bdda6ebabc3d50264811431f96e7fd72132 100644
--- a/Rendering/vtkSurfaceLICDefaultPainter.h
+++ b/Rendering/vtkSurfaceLICDefaultPainter.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkSurfaceLICDefaultPainter : public vtkDefaultPainte
 {
 public:
   static vtkSurfaceLICDefaultPainter* New();
-  vtkTypeRevisionMacro(vtkSurfaceLICDefaultPainter, vtkDefaultPainter);
+  vtkTypeMacro(vtkSurfaceLICDefaultPainter, vtkDefaultPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkSurfaceLICPainter.cxx b/Rendering/vtkSurfaceLICPainter.cxx
index 1ccfc5036fb04a889b716b2dca4a6d289dafd048..49ae07fbcd1cc317a5de3a639008c9888becc94a 100644
--- a/Rendering/vtkSurfaceLICPainter.cxx
+++ b/Rendering/vtkSurfaceLICPainter.cxx
@@ -130,7 +130,6 @@ public:
 };
 
 vtkStandardNewMacro(vtkSurfaceLICPainter);
-vtkCxxRevisionMacro(vtkSurfaceLICPainter, "1.6");
 //----------------------------------------------------------------------------
 vtkSurfaceLICPainter::vtkSurfaceLICPainter()
 {
diff --git a/Rendering/vtkSurfaceLICPainter.h b/Rendering/vtkSurfaceLICPainter.h
index b727bbff12215e6974b98da33b21f048eff89ab9..34fdc48119175bb3f8375f15c70caadfee0bb88e 100644
--- a/Rendering/vtkSurfaceLICPainter.h
+++ b/Rendering/vtkSurfaceLICPainter.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkSurfaceLICPainter : public vtkPolyDataPainter
 {
 public:
   static vtkSurfaceLICPainter* New();
-  vtkTypeRevisionMacro(vtkSurfaceLICPainter, vtkPolyDataPainter);
+  vtkTypeMacro(vtkSurfaceLICPainter, vtkPolyDataPainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTDxDevice.cxx b/Rendering/vtkTDxDevice.cxx
index 89ead392303835a411d8667f6d6626545db7efbd..d98b814173ee5b2fca821c47e5c4a121284fe798 100644
--- a/Rendering/vtkTDxDevice.cxx
+++ b/Rendering/vtkTDxDevice.cxx
@@ -16,7 +16,6 @@
 
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkTDxDevice,"1.1");
 
 // ----------------------------------------------------------------------------
 vtkTDxDevice::vtkTDxDevice()
diff --git a/Rendering/vtkTDxDevice.h b/Rendering/vtkTDxDevice.h
index 6b0a7c5fabea4b1a3e15d3b49be3981345fffa90..b5aef66d8620d909abc693edd80dfe3308f9c274 100644
--- a/Rendering/vtkTDxDevice.h
+++ b/Rendering/vtkTDxDevice.h
@@ -33,7 +33,7 @@ class vtkRenderWindowInteractor;
 class VTK_RENDERING_EXPORT vtkTDxDevice : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTDxDevice,vtkObject);
+  vtkTypeMacro(vtkTDxDevice,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTDxInteractorStyle.cxx b/Rendering/vtkTDxInteractorStyle.cxx
index df3aa07e6cc7e90da6bdce2fdd13c61a8c7e7fc5..52ff7460a8062976209da71c414ced9c03221f7f 100644
--- a/Rendering/vtkTDxInteractorStyle.cxx
+++ b/Rendering/vtkTDxInteractorStyle.cxx
@@ -19,7 +19,6 @@
 #include "vtkTDxInteractorStyleSettings.h"
 #include "vtkTDxMotionEventInfo.h" // Borland needs it.
 
-vtkCxxRevisionMacro(vtkTDxInteractorStyle, "1.3");
 
 vtkCxxSetObjectMacro(vtkTDxInteractorStyle,Settings,
                      vtkTDxInteractorStyleSettings);
diff --git a/Rendering/vtkTDxInteractorStyle.h b/Rendering/vtkTDxInteractorStyle.h
index a6bd93e7d02dfec5fe27d8727a42108482fef604..5d2d63b6f0433e1f52719e8e1fe46245626905a4 100644
--- a/Rendering/vtkTDxInteractorStyle.h
+++ b/Rendering/vtkTDxInteractorStyle.h
@@ -38,7 +38,7 @@ class vtkTDxInteractorStyleSettings;
 class VTK_RENDERING_EXPORT vtkTDxInteractorStyle : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTDxInteractorStyle,vtkObject);
+  vtkTypeMacro(vtkTDxInteractorStyle,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkTDxInteractorStyleCamera.cxx b/Rendering/vtkTDxInteractorStyleCamera.cxx
index 51d910996214866d2356c61859fbc9f37e8d33ea..cf6f7fdff3e1a948759d94813aede5ead91bad2a 100644
--- a/Rendering/vtkTDxInteractorStyleCamera.cxx
+++ b/Rendering/vtkTDxInteractorStyleCamera.cxx
@@ -25,7 +25,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkTDxInteractorStyleSettings.h"
 
-vtkCxxRevisionMacro(vtkTDxInteractorStyleCamera, "1.3");
 vtkStandardNewMacro(vtkTDxInteractorStyleCamera);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkTDxInteractorStyleCamera.h b/Rendering/vtkTDxInteractorStyleCamera.h
index 165ef021946c87bddcc69513e1c706f16ca615ce..98455b9da1570cba4e619c6afc4131627262bcd8 100644
--- a/Rendering/vtkTDxInteractorStyleCamera.h
+++ b/Rendering/vtkTDxInteractorStyleCamera.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkTDxInteractorStyleCamera : public vtkTDxInteractor
 {
 public:
   static vtkTDxInteractorStyleCamera *New();
-  vtkTypeRevisionMacro(vtkTDxInteractorStyleCamera,vtkTDxInteractorStyle);
+  vtkTypeMacro(vtkTDxInteractorStyleCamera,vtkTDxInteractorStyle);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkTDxInteractorStyleSettings.cxx b/Rendering/vtkTDxInteractorStyleSettings.cxx
index c90667d976d61aba50829307bc7bee004fb9ede2..2c49dc2f770a8c684e6cbbcfaacb91c915ed010f 100644
--- a/Rendering/vtkTDxInteractorStyleSettings.cxx
+++ b/Rendering/vtkTDxInteractorStyleSettings.cxx
@@ -16,7 +16,6 @@
 #include "vtkTDxInteractorStyleSettings.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTDxInteractorStyleSettings, "1.1");
 vtkStandardNewMacro(vtkTDxInteractorStyleSettings);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkTDxInteractorStyleSettings.h b/Rendering/vtkTDxInteractorStyleSettings.h
index fd612e3e4597104087bc256de41baaf4bb00a5d4..d7461eb652a537c88db404dac5c3c71530226f70 100644
--- a/Rendering/vtkTDxInteractorStyleSettings.h
+++ b/Rendering/vtkTDxInteractorStyleSettings.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkTDxInteractorStyleSettings : public vtkObject
 {
 public:
   static vtkTDxInteractorStyleSettings *New();
-  vtkTypeRevisionMacro(vtkTDxInteractorStyleSettings,vtkObject);
+  vtkTypeMacro(vtkTDxInteractorStyleSettings,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkTDxMacDevice.cxx b/Rendering/vtkTDxMacDevice.cxx
index 1f47d8c891a0fc54422af35ae67f564821c72868..4b33dc49c81ef47627bc75bb87c0479183dd7307 100644
--- a/Rendering/vtkTDxMacDevice.cxx
+++ b/Rendering/vtkTDxMacDevice.cxx
@@ -25,7 +25,6 @@
 #include <vtkstd/map>
 #include <cstring> // for strlen()
 
-vtkCxxRevisionMacro(vtkTDxMacDevice,"1.1");
 vtkStandardNewMacro(vtkTDxMacDevice);
 
 void vtkTDxMacDeviceMessageHandler(io_connect_t connection,
diff --git a/Rendering/vtkTDxMacDevice.h b/Rendering/vtkTDxMacDevice.h
index fb9cac5e84bc3ab057a7e7adaba7ab6f860dbbac..e205db7931ddcc68ac04ee1bd93900eff4cc8366 100644
--- a/Rendering/vtkTDxMacDevice.h
+++ b/Rendering/vtkTDxMacDevice.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkTDxMacDevice : public vtkTDxDevice
 {
 public:
   static vtkTDxMacDevice *New();
-  vtkTypeRevisionMacro(vtkTDxMacDevice,vtkTDxDevice);
+  vtkTypeMacro(vtkTDxMacDevice,vtkTDxDevice);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTDxUnixDevice.cxx b/Rendering/vtkTDxUnixDevice.cxx
index f8e2c1c61f8654c9934dd7a3e2b5a5800f834e43..3a1968df188580833d080c3940fcc7bf395aee99 100644
--- a/Rendering/vtkTDxUnixDevice.cxx
+++ b/Rendering/vtkTDxUnixDevice.cxx
@@ -34,7 +34,6 @@ extern "C" {
 #include "vtkRenderWindowInteractor.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkTDxUnixDevice,"1.5");
 vtkStandardNewMacro(vtkTDxUnixDevice);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkTDxUnixDevice.h b/Rendering/vtkTDxUnixDevice.h
index 6ac45602497ebfdb28c3223950b628f69d235433..190477346f4949a8b5449bcfe0335853abdba347 100644
--- a/Rendering/vtkTDxUnixDevice.h
+++ b/Rendering/vtkTDxUnixDevice.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkTDxUnixDevice : public vtkTDxDevice
 {
 public:
   static vtkTDxUnixDevice *New();
-  vtkTypeRevisionMacro(vtkTDxUnixDevice,vtkTDxDevice);
+  vtkTypeMacro(vtkTDxUnixDevice,vtkTDxDevice);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTDxWinDevice.cxx b/Rendering/vtkTDxWinDevice.cxx
index 087c2ffc4d4a5766bed18ae4eb72b7142a31aa49..d5143314380f048b520a480c88de70dd11ea15b4 100644
--- a/Rendering/vtkTDxWinDevice.cxx
+++ b/Rendering/vtkTDxWinDevice.cxx
@@ -36,7 +36,6 @@
 
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkTDxWinDevice,"1.11");
 vtkStandardNewMacro(vtkTDxWinDevice);
 
 #include <atlbase.h> // for CComPtr<> (a smart pointer)
diff --git a/Rendering/vtkTDxWinDevice.h b/Rendering/vtkTDxWinDevice.h
index ae2567c461a13d7221f004567b92792172abcc89..1e60a9f366496fd64e8be4ae7f64722547f811d5 100644
--- a/Rendering/vtkTDxWinDevice.h
+++ b/Rendering/vtkTDxWinDevice.h
@@ -38,7 +38,7 @@ class VTK_RENDERING_EXPORT vtkTDxWinDevice : public vtkTDxDevice
 {
 public:
   static vtkTDxWinDevice *New();
-  vtkTypeRevisionMacro(vtkTDxWinDevice,vtkTDxDevice);
+  vtkTypeMacro(vtkTDxWinDevice,vtkTDxDevice);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkTStripsPainter.cxx b/Rendering/vtkTStripsPainter.cxx
index 101070fd4299c66c2c26db18b91234c2e0a4df3b..906510c0285ea169748438173c440162bc396eda 100644
--- a/Rendering/vtkTStripsPainter.cxx
+++ b/Rendering/vtkTStripsPainter.cxx
@@ -31,7 +31,6 @@
 #include "vtkTimerLog.h"
 
 vtkStandardNewMacro(vtkTStripsPainter);
-vtkCxxRevisionMacro(vtkTStripsPainter, "1.5");
 //-----------------------------------------------------------------------------
 vtkTStripsPainter::vtkTStripsPainter()
 {
diff --git a/Rendering/vtkTStripsPainter.h b/Rendering/vtkTStripsPainter.h
index 5d2a8244620d9c887fff51c4458c98ddc842fbc3..de62e9a18ddea264e99d8b237660009a39e5f5d6 100644
--- a/Rendering/vtkTStripsPainter.h
+++ b/Rendering/vtkTStripsPainter.h
@@ -23,7 +23,7 @@ class VTK_RENDERING_EXPORT vtkTStripsPainter : public vtkPrimitivePainter
 {
 public:
   static vtkTStripsPainter* New();
-  vtkTypeRevisionMacro(vtkTStripsPainter, vtkPrimitivePainter);
+  vtkTypeMacro(vtkTStripsPainter, vtkPrimitivePainter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Rendering/vtkTesting.cxx b/Rendering/vtkTesting.cxx
index 2003603dd8c5ca3ffe18f6658c2c0da3381899df..a5d23c107f77801ff33de2e46927d88270335fb2 100644
--- a/Rendering/vtkTesting.cxx
+++ b/Rendering/vtkTesting.cxx
@@ -42,7 +42,6 @@
 #include <sys/stat.h>
 
 vtkStandardNewMacro(vtkTesting);
-vtkCxxRevisionMacro(vtkTesting, "1.37");
 vtkCxxSetObjectMacro(vtkTesting, RenderWindow, vtkRenderWindow);
 
 using vtkstd::vector;
diff --git a/Rendering/vtkTesting.h b/Rendering/vtkTesting.h
index fb5ff7f6d2c5a9d373b5dd3f3ae4d51c56cd3454..1947340b1f72da5de10e2813bf3a537e7e43beb1 100644
--- a/Rendering/vtkTesting.h
+++ b/Rendering/vtkTesting.h
@@ -73,7 +73,7 @@ class VTK_RENDERING_EXPORT vtkTesting : public vtkObject
 {
 public:
   static vtkTesting *New();
-  vtkTypeRevisionMacro(vtkTesting,vtkObject);
+  vtkTypeMacro(vtkTesting,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Rendering/vtkTestingInteractor.cxx b/Rendering/vtkTestingInteractor.cxx
index 2e8a93434163086d2f7d316bc97dc3087048ff35..85c3d6a2ce661784784a3871a5cb5ff7f822c194 100644
--- a/Rendering/vtkTestingInteractor.cxx
+++ b/Rendering/vtkTestingInteractor.cxx
@@ -17,7 +17,6 @@
 #include "vtkSmartPointer.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkTestingInteractor, "1.5");
 vtkStandardNewMacro(vtkTestingInteractor);
 
 int         vtkTestingInteractor::TestReturnStatus = -1;
diff --git a/Rendering/vtkTestingInteractor.h b/Rendering/vtkTestingInteractor.h
index a1cb94fb16e2a64e109890758d4d7d2edc932fe5..13e73ff9e875cf1940676bc7196c5dbca7fadade 100644
--- a/Rendering/vtkTestingInteractor.h
+++ b/Rendering/vtkTestingInteractor.h
@@ -46,7 +46,7 @@ class VTK_RENDERING_EXPORT vtkTestingInteractor : public vtkRenderWindowInteract
 {
 public:
   static vtkTestingInteractor* New();
-  vtkTypeRevisionMacro(vtkTestingInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkTestingInteractor,vtkRenderWindowInteractor);
   virtual void Start();
 
   static int      TestReturnStatus;  // Return status of the test
diff --git a/Rendering/vtkTestingObjectFactory.cxx b/Rendering/vtkTestingObjectFactory.cxx
index f83637e1bcbecac808553eeb71bae1efef116c61..3c22c1a4d002726a679181ae4e5babf6a8809d5c 100644
--- a/Rendering/vtkTestingObjectFactory.cxx
+++ b/Rendering/vtkTestingObjectFactory.cxx
@@ -16,7 +16,6 @@
 #include "vtkTestingObjectFactory.h"
 #include "vtkSmartPointer.h"
 
-vtkCxxRevisionMacro(vtkTestingObjectFactory, "1.2");
 vtkStandardNewMacro(vtkTestingObjectFactory);
 
 VTK_CREATE_CREATE_FUNCTION(vtkTestingInteractor);
diff --git a/Rendering/vtkTestingObjectFactory.h b/Rendering/vtkTestingObjectFactory.h
index ac7343d7a9b7690eb3a4f80ac477ee3d9bcbf3ae..e8bb1cedfe8ea940cef5a35c8fb4b1c8138d9479 100644
--- a/Rendering/vtkTestingObjectFactory.h
+++ b/Rendering/vtkTestingObjectFactory.h
@@ -42,7 +42,7 @@ class VTK_RENDERING_EXPORT vtkTestingObjectFactory : public vtkObjectFactory
 {
 public:
   static vtkTestingObjectFactory* New();
-  vtkTypeRevisionMacro(vtkTestingObjectFactory,vtkObjectFactory);
+  vtkTypeMacro(vtkTestingObjectFactory,vtkObjectFactory);
   virtual const char* GetVTKSourceVersion();
   const char* GetDescription() { return "Factory for overrides during testing"; }
   void PrintSelf(ostream& os, vtkIndent indent);
diff --git a/Rendering/vtkTextActor.cxx b/Rendering/vtkTextActor.cxx
index 25b5974161bdd82485b0369afc09a117c9131f99..25e15ad1585b6bf0b00959c54b43d3ac0e6a4da8 100644
--- a/Rendering/vtkTextActor.cxx
+++ b/Rendering/vtkTextActor.cxx
@@ -32,7 +32,6 @@
 #include "vtkTexture.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkTextActor, "1.48");
 vtkStandardNewMacro(vtkTextActor);
 vtkCxxSetObjectMacro(vtkTextActor,Texture,vtkTexture);
 
diff --git a/Rendering/vtkTextActor.h b/Rendering/vtkTextActor.h
index 5f0e8da073d31d8edc6f162590f90c90d29548fe..5ed913a9006772d074cf3f642acb698be3d5b1ce 100644
--- a/Rendering/vtkTextActor.h
+++ b/Rendering/vtkTextActor.h
@@ -46,7 +46,7 @@ class vtkTexture;
 class VTK_RENDERING_EXPORT vtkTextActor : public vtkActor2D
 {
 public:
-  vtkTypeRevisionMacro(vtkTextActor,vtkActor2D);
+  vtkTypeMacro(vtkTextActor,vtkActor2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTextActor3D.cxx b/Rendering/vtkTextActor3D.cxx
index 67bf3d7419e3fc0ae2155a3d59d16eaabd590c6d..f0ff344a737ef9c802ef29fb894f653eeada8947 100644
--- a/Rendering/vtkTextActor3D.cxx
+++ b/Rendering/vtkTextActor3D.cxx
@@ -26,7 +26,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkTextActor3D, "1.9");
 vtkStandardNewMacro(vtkTextActor3D);
 
 vtkCxxSetObjectMacro(vtkTextActor3D, TextProperty, vtkTextProperty);
diff --git a/Rendering/vtkTextActor3D.h b/Rendering/vtkTextActor3D.h
index d31307734930906f8fe9828506ddd4b36ee79b03..8db932bc14ab32eb338f780a23cabe48497745bb 100644
--- a/Rendering/vtkTextActor3D.h
+++ b/Rendering/vtkTextActor3D.h
@@ -43,7 +43,7 @@ class VTK_RENDERING_EXPORT vtkTextActor3D : public vtkProp3D
 {
 public:
   static vtkTextActor3D *New();
-  vtkTypeRevisionMacro(vtkTextActor3D,vtkProp3D);
+  vtkTypeMacro(vtkTextActor3D,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTextMapper.cxx b/Rendering/vtkTextMapper.cxx
index 6b8e52117587c33bb03eab9be317d7e39d4e50ca..b0470c5de39d75f35f17774277017b1b4bba3e83 100644
--- a/Rendering/vtkTextMapper.cxx
+++ b/Rendering/vtkTextMapper.cxx
@@ -18,7 +18,6 @@
 #include "vtkTextProperty.h"
 #include "vtkToolkits.h"
 
-vtkCxxRevisionMacro(vtkTextMapper, "1.57");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkTextMapper.h b/Rendering/vtkTextMapper.h
index e98593f9c8ebf9cb9161220986db74df6c7a33d7..aeecfe1b42c6ebfa56d755b560e6e8dd18e6f0dd 100644
--- a/Rendering/vtkTextMapper.h
+++ b/Rendering/vtkTextMapper.h
@@ -35,7 +35,7 @@ class vtkViewport;
 class VTK_RENDERING_EXPORT vtkTextMapper : public vtkMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkTextMapper,vtkMapper2D);
+  vtkTypeMacro(vtkTextMapper,vtkMapper2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTextProperty.cxx b/Rendering/vtkTextProperty.cxx
index 034d6fd0b6af402340e546b8de1b6d89ca9f3a48..4f1831ced24d72735d1c3bc93cf0cda7fc1be66b 100644
--- a/Rendering/vtkTextProperty.cxx
+++ b/Rendering/vtkTextProperty.cxx
@@ -15,7 +15,6 @@
 #include "vtkTextProperty.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkTextProperty, "1.14");
 vtkStandardNewMacro(vtkTextProperty);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkTextProperty.h b/Rendering/vtkTextProperty.h
index b02e3ef94b8af82d40b33b6e17648b8199206f5e..9330f757b4cc4c51826fe2022a44120b12a80e1a 100644
--- a/Rendering/vtkTextProperty.h
+++ b/Rendering/vtkTextProperty.h
@@ -29,7 +29,7 @@
 class VTK_RENDERING_EXPORT vtkTextProperty : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTextProperty,vtkObject);
+  vtkTypeMacro(vtkTextProperty,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTexture.cxx b/Rendering/vtkTexture.cxx
index 36869dd2c22653d9e128e01448d607aa83a5574a..27b7008bd1d6effecf81768e7b799b49c8b4147d 100644
--- a/Rendering/vtkTexture.cxx
+++ b/Rendering/vtkTexture.cxx
@@ -25,7 +25,6 @@
 #include "vtkPointData.h"
 
 
-vtkCxxRevisionMacro(vtkTexture, "1.65");
 vtkCxxSetObjectMacro(vtkTexture, LookupTable, vtkScalarsToColors);
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/Rendering/vtkTexture.h b/Rendering/vtkTexture.h
index e5ced9cf2b33ddb9459bf77c3fe4b4eb0266ed54..ba6cd9ca2d8897ff38d3e071f97ee24ea2c3164c 100644
--- a/Rendering/vtkTexture.h
+++ b/Rendering/vtkTexture.h
@@ -60,7 +60,7 @@ class VTK_RENDERING_EXPORT vtkTexture : public vtkImageAlgorithm
 {
 public:
   static vtkTexture *New();
-  vtkTypeRevisionMacro(vtkTexture,vtkImageAlgorithm);
+  vtkTypeMacro(vtkTexture,vtkImageAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTextureObject.cxx b/Rendering/vtkTextureObject.cxx
index 35ef2bceeb30138cf13d7b9e9b6f6897aed5ab0d..995665e81363b3d7ca67ff9ff9dd795bc34838d0 100644
--- a/Rendering/vtkTextureObject.cxx
+++ b/Rendering/vtkTextureObject.cxx
@@ -132,7 +132,6 @@ const char *DepthInternalFormatFilterAsString[6]=
 };
 
 vtkStandardNewMacro(vtkTextureObject);
-vtkCxxRevisionMacro(vtkTextureObject, "1.13");
 //----------------------------------------------------------------------------
 vtkTextureObject::vtkTextureObject()
 {
diff --git a/Rendering/vtkTextureObject.h b/Rendering/vtkTextureObject.h
index d4c71cd5872dd7cec34bfce5b90df18373493334..f7e57cf321ed6058607bad8d00c3026a137c8dc4 100644
--- a/Rendering/vtkTextureObject.h
+++ b/Rendering/vtkTextureObject.h
@@ -94,7 +94,7 @@ public:
   //ETX
   
   static vtkTextureObject* New();
-  vtkTypeRevisionMacro(vtkTextureObject, vtkObject);
+  vtkTypeMacro(vtkTextureObject, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTextureUnitManager.cxx b/Rendering/vtkTextureUnitManager.cxx
index a5a39ee41667d899b3435c11e29c7e1a566ec183..cae61e3288aee7de62e5d41f918b5fc4fd2d4b5a 100644
--- a/Rendering/vtkTextureUnitManager.cxx
+++ b/Rendering/vtkTextureUnitManager.cxx
@@ -22,7 +22,6 @@
 #include <assert.h>
 
 vtkStandardNewMacro(vtkTextureUnitManager);
-vtkCxxRevisionMacro(vtkTextureUnitManager, "1.4");
 
 // ----------------------------------------------------------------------------
 vtkTextureUnitManager::vtkTextureUnitManager()
diff --git a/Rendering/vtkTextureUnitManager.h b/Rendering/vtkTextureUnitManager.h
index 214704d0a4bc2281fb0483000ca7146dfc400349..4f3a803206d59b691d70c1b934efe4fa0e8da807 100644
--- a/Rendering/vtkTextureUnitManager.h
+++ b/Rendering/vtkTextureUnitManager.h
@@ -34,7 +34,7 @@ class vtkOpenGLRenderWindow;
 class VTK_RENDERING_EXPORT vtkTextureUnitManager : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTextureUnitManager,vtkObject);
+  vtkTypeMacro(vtkTextureUnitManager,vtkObject);
 
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Rendering/vtkTexturedActor2D.cxx b/Rendering/vtkTexturedActor2D.cxx
index 9e35cf920de44b92d7052a70388cc052d7a8eb30..c655e488a7785d5457263702c3d7bb43701a17c0 100644
--- a/Rendering/vtkTexturedActor2D.cxx
+++ b/Rendering/vtkTexturedActor2D.cxx
@@ -18,7 +18,6 @@
 #include "vtkRenderer.h"
 #include "vtkTexture.h"
 
-vtkCxxRevisionMacro(vtkTexturedActor2D, "1.1");
 vtkStandardNewMacro(vtkTexturedActor2D);
 
 vtkCxxSetObjectMacro(vtkTexturedActor2D, Texture, vtkTexture);
diff --git a/Rendering/vtkTexturedActor2D.h b/Rendering/vtkTexturedActor2D.h
index 6a9edfb3800e325e89450470b173ae18e2044571..3bf82f000df3618275fea88bb9b6191f569694f6 100644
--- a/Rendering/vtkTexturedActor2D.h
+++ b/Rendering/vtkTexturedActor2D.h
@@ -36,7 +36,7 @@ class VTK_RENDERING_EXPORT vtkTexturedActor2D : public vtkActor2D
 public:
   static vtkTexturedActor2D* New();
   void PrintSelf(ostream& os, vtkIndent indent);
-  vtkTypeRevisionMacro(vtkTexturedActor2D, vtkActor2D);
+  vtkTypeMacro(vtkTexturedActor2D, vtkActor2D);
 
   // Description: 
   // Set/Get the texture object to control rendering texture maps.  This will
diff --git a/Rendering/vtkTransformInterpolator.cxx b/Rendering/vtkTransformInterpolator.cxx
index c0efb5d56982903b050235f47a46811ec81a57c5..d9478ff45574ea92cf6ade9cb7779dd45aed17c1 100644
--- a/Rendering/vtkTransformInterpolator.cxx
+++ b/Rendering/vtkTransformInterpolator.cxx
@@ -21,7 +21,6 @@
 #include "vtkQuaternionInterpolator.h"
 #include <vtkstd/list>
 
-vtkCxxRevisionMacro(vtkTransformInterpolator, "1.4");
 vtkStandardNewMacro(vtkTransformInterpolator);
 
 // PIMPL STL encapsulation for list of transforms, and list of
diff --git a/Rendering/vtkTransformInterpolator.h b/Rendering/vtkTransformInterpolator.h
index d677e372ce350d4240260797c68baba7debb2bb4..b4056267a40670a573f8e8c40fae6eccc459e388 100644
--- a/Rendering/vtkTransformInterpolator.h
+++ b/Rendering/vtkTransformInterpolator.h
@@ -61,7 +61,7 @@ class vtkTransformList;
 class VTK_RENDERING_EXPORT vtkTransformInterpolator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTransformInterpolator, vtkObject);
+  vtkTypeMacro(vtkTransformInterpolator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkTranslucentPass.cxx b/Rendering/vtkTranslucentPass.cxx
index 51df6348ffe18b230fcbd76ac1c471621b8ba3b5..fe4da3f780c1bdc7e3dd159f60fa3cd6479891a6 100644
--- a/Rendering/vtkTranslucentPass.cxx
+++ b/Rendering/vtkTranslucentPass.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkTranslucentPass, "1.1");
 vtkStandardNewMacro(vtkTranslucentPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkTranslucentPass.h b/Rendering/vtkTranslucentPass.h
index 4780b4c42348fcbe08f0ad066c99ba6494cdd9d7..6d0a8c9d67ff073e404610701957277a6ae94e13 100644
--- a/Rendering/vtkTranslucentPass.h
+++ b/Rendering/vtkTranslucentPass.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkTranslucentPass : public vtkDefaultPass
 {
 public:
   static vtkTranslucentPass *New();
-  vtkTypeRevisionMacro(vtkTranslucentPass,vtkDefaultPass);
+  vtkTypeMacro(vtkTranslucentPass,vtkDefaultPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkTupleInterpolator.cxx b/Rendering/vtkTupleInterpolator.cxx
index 18372962078514a76a562d13378082ace99d1426..780352a6988ac75ab5b8e6f60571fa6a7e14151a 100644
--- a/Rendering/vtkTupleInterpolator.cxx
+++ b/Rendering/vtkTupleInterpolator.cxx
@@ -19,7 +19,6 @@
 #include "vtkPiecewiseFunction.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkTupleInterpolator, "1.2");
 vtkStandardNewMacro(vtkTupleInterpolator);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkTupleInterpolator.h b/Rendering/vtkTupleInterpolator.h
index 1bc91c7afcd4344b3ec3ceae5ff4e881d8e87b63..61caff65bc8f1654952fe42b4d18dd63ffa86f30 100644
--- a/Rendering/vtkTupleInterpolator.h
+++ b/Rendering/vtkTupleInterpolator.h
@@ -50,7 +50,7 @@ class vtkPiecewiseFunction;
 class VTK_RENDERING_EXPORT vtkTupleInterpolator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTupleInterpolator, vtkObject);
+  vtkTypeMacro(vtkTupleInterpolator, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkUniformVariables.cxx b/Rendering/vtkUniformVariables.cxx
index e73b27d0383273c51e7741a40f5f004b1ca8e2da..fe492a5858bd36e8102ed785999e3a59e9b56546 100644
--- a/Rendering/vtkUniformVariables.cxx
+++ b/Rendering/vtkUniformVariables.cxx
@@ -21,7 +21,6 @@
 #include <vtksys/stl/map>
 
 //-----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkUniformVariables, "1.9");
 vtkStandardNewMacro(vtkUniformVariables);
 
 class ltstr
diff --git a/Rendering/vtkUniformVariables.h b/Rendering/vtkUniformVariables.h
index 6f070777f31d32ef2d40f04c9ea6787a636bcb3a..5e1834c7bae7fe34e4a333a2d1802c38b9b0c919 100644
--- a/Rendering/vtkUniformVariables.h
+++ b/Rendering/vtkUniformVariables.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkUniformVariables : public vtkObject
 {
 public:
   static vtkUniformVariables *New();
-  vtkTypeRevisionMacro(vtkUniformVariables,vtkObject);
+  vtkTypeMacro(vtkUniformVariables,vtkObject);
   void PrintSelf(ostream &os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkVRMLExporter.cxx b/Rendering/vtkVRMLExporter.cxx
index 718671151a971a5192d827362b3ee97b484d7579..b3d30f4ef0c1e448fee51217e78ce995e15f5406 100644
--- a/Rendering/vtkVRMLExporter.cxx
+++ b/Rendering/vtkVRMLExporter.cxx
@@ -33,7 +33,6 @@
 #include "vtkTexture.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkVRMLExporter, "1.84");
 vtkStandardNewMacro(vtkVRMLExporter);
 
 vtkVRMLExporter::vtkVRMLExporter()
diff --git a/Rendering/vtkVRMLExporter.h b/Rendering/vtkVRMLExporter.h
index 7b568a96845406a7207f2bed4441a5398e84f355..3092fe84ba68d769daefcf173ab297f8388e550d 100644
--- a/Rendering/vtkVRMLExporter.h
+++ b/Rendering/vtkVRMLExporter.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkVRMLExporter : public vtkExporter
 {
 public:
   static vtkVRMLExporter *New();
-  vtkTypeRevisionMacro(vtkVRMLExporter,vtkExporter);
+  vtkTypeMacro(vtkVRMLExporter,vtkExporter);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkViewTheme.cxx b/Rendering/vtkViewTheme.cxx
index 32d7dca95e0d20451f8181268bc075b0ab277940..5bc722f2df768bbb4572483e5ef67b25f9d94516 100644
--- a/Rendering/vtkViewTheme.cxx
+++ b/Rendering/vtkViewTheme.cxx
@@ -24,7 +24,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkTextProperty.h"
 
-vtkCxxRevisionMacro(vtkViewTheme, "1.8");
 vtkStandardNewMacro(vtkViewTheme);
 vtkCxxSetObjectMacro(vtkViewTheme, PointLookupTable, vtkScalarsToColors);
 vtkCxxSetObjectMacro(vtkViewTheme, CellLookupTable, vtkScalarsToColors);
diff --git a/Rendering/vtkViewTheme.h b/Rendering/vtkViewTheme.h
index 7f5c55ae7fe7e6129feb9132f7655cb2e72e3229..acabf4abce2912895f8dd30c787ae6dbd9441ca5 100644
--- a/Rendering/vtkViewTheme.h
+++ b/Rendering/vtkViewTheme.h
@@ -39,7 +39,7 @@ class VTK_RENDERING_EXPORT vtkViewTheme : public vtkObject
 {
 public:
   static vtkViewTheme* New();
-  vtkTypeRevisionMacro(vtkViewTheme, vtkObject);
+  vtkTypeMacro(vtkViewTheme, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkVisibilitySort.cxx b/Rendering/vtkVisibilitySort.cxx
index f1f725501a40740294ca50f80b59a1f0bbc5b627..bacaa6eb597bf5b7e3c856e74200fbb579f32b24 100644
--- a/Rendering/vtkVisibilitySort.cxx
+++ b/Rendering/vtkVisibilitySort.cxx
@@ -31,7 +31,6 @@
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkVisibilitySort, "1.3");
 vtkCxxSetObjectMacro(vtkVisibilitySort, Camera, vtkCamera);
 vtkCxxSetObjectMacro(vtkVisibilitySort, Input, vtkDataSet);
 
diff --git a/Rendering/vtkVisibilitySort.h b/Rendering/vtkVisibilitySort.h
index a9f4c765d2d2a4cf71239fbb2c8cd77a0a5776b6..8704bebf1a16a1a2bc2af0ef27bf0ea4eb165e03 100644
--- a/Rendering/vtkVisibilitySort.h
+++ b/Rendering/vtkVisibilitySort.h
@@ -53,7 +53,7 @@ class vtkCamera;
 class VTK_RENDERING_EXPORT vtkVisibilitySort : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkVisibilitySort, vtkObject);
+  vtkTypeMacro(vtkVisibilitySort, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkVisibleCellSelector.cxx b/Rendering/vtkVisibleCellSelector.cxx
index 750a4e8ae100e682bf808d2de3785b0115dba633..3605de4c5506da5b8bf3ce745c736a8de3e19e41 100644
--- a/Rendering/vtkVisibleCellSelector.cxx
+++ b/Rendering/vtkVisibleCellSelector.cxx
@@ -200,7 +200,6 @@ public:
 };
 
 //////////////////////////////////////////////////////////////////////////////
-vtkCxxRevisionMacro(vtkVisibleCellSelector, "1.28");
 vtkStandardNewMacro(vtkVisibleCellSelector);
 vtkCxxSetObjectMacro(vtkVisibleCellSelector, Renderer, vtkRenderer);
 
diff --git a/Rendering/vtkVisibleCellSelector.h b/Rendering/vtkVisibleCellSelector.h
index 22e90d3bd6e7f634105ce0f889133f948ad1dcd0..fde76da87b9a1b0f18393dfde941957361765a64 100644
--- a/Rendering/vtkVisibleCellSelector.h
+++ b/Rendering/vtkVisibleCellSelector.h
@@ -66,7 +66,7 @@ class vtkIdentColoredPainter;
 class VTK_RENDERING_EXPORT vtkVisibleCellSelector  : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkVisibleCellSelector, vtkObject);
+  vtkTypeMacro(vtkVisibleCellSelector, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   static vtkVisibleCellSelector *New();
 
diff --git a/Rendering/vtkVolume.cxx b/Rendering/vtkVolume.cxx
index aa5d8a9c60144f8a76ebd7d0b1f37367605fb7df..4aec74d696ce1ca199c2db87df26db77f8b1ae44 100644
--- a/Rendering/vtkVolume.cxx
+++ b/Rendering/vtkVolume.cxx
@@ -31,7 +31,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolume, "1.89");
 vtkStandardNewMacro(vtkVolume);
 
 // Creates a Volume with the following defaults: origin(0,0,0) 
diff --git a/Rendering/vtkVolume.h b/Rendering/vtkVolume.h
index 2e6e37fb1c8b6cf3992734fe747ded7094136178..34dd0a278ed92cfb25cbf87b5885f20a76aae88c 100644
--- a/Rendering/vtkVolume.h
+++ b/Rendering/vtkVolume.h
@@ -40,7 +40,7 @@ class vtkAbstractVolumeMapper;
 class VTK_RENDERING_EXPORT vtkVolume : public vtkProp3D
 {
 public:
-  vtkTypeRevisionMacro(vtkVolume,vtkProp3D);
+  vtkTypeMacro(vtkVolume,vtkProp3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkVolumeCollection.cxx b/Rendering/vtkVolumeCollection.cxx
index 2021e99d9984afb76d160065b629bd660a7ee5b1..a2a4963dbfa6636f04c3180eae0c68dbec968b45 100644
--- a/Rendering/vtkVolumeCollection.cxx
+++ b/Rendering/vtkVolumeCollection.cxx
@@ -15,7 +15,6 @@
 #include "vtkVolumeCollection.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkVolumeCollection, "1.8");
 vtkStandardNewMacro(vtkVolumeCollection);
 
 //----------------------------------------------------------------------------
diff --git a/Rendering/vtkVolumeCollection.h b/Rendering/vtkVolumeCollection.h
index 8feb96ea290239f5e9b184a272980d8c332c1b7b..70ee85c3a4639ee9f3ea226353780f1bec302f68 100644
--- a/Rendering/vtkVolumeCollection.h
+++ b/Rendering/vtkVolumeCollection.h
@@ -32,7 +32,7 @@ class VTK_RENDERING_EXPORT vtkVolumeCollection : public vtkPropCollection
 {
  public:
   static vtkVolumeCollection *New();
-  vtkTypeRevisionMacro(vtkVolumeCollection,vtkPropCollection);
+  vtkTypeMacro(vtkVolumeCollection,vtkPropCollection);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkVolumeProperty.cxx b/Rendering/vtkVolumeProperty.cxx
index 87ebcb0274b48434e5985b392a0f3ab3359d6129..a4e394f08482b8abd34cd703f307be3376e7fcd3 100644
--- a/Rendering/vtkVolumeProperty.cxx
+++ b/Rendering/vtkVolumeProperty.cxx
@@ -18,7 +18,6 @@
 #include "vtkPiecewiseFunction.h"
 #include "vtkColorTransferFunction.h"
 
-vtkCxxRevisionMacro(vtkVolumeProperty, "1.42");
 vtkStandardNewMacro(vtkVolumeProperty);
 
 // Construct a new vtkVolumeProperty with default values
diff --git a/Rendering/vtkVolumeProperty.h b/Rendering/vtkVolumeProperty.h
index 4a6775735fd1953cc9c372f444cfb55ad0b47be1..b9664877d4dfcf00efb3bcf682bbc2f4e957c872 100644
--- a/Rendering/vtkVolumeProperty.h
+++ b/Rendering/vtkVolumeProperty.h
@@ -51,7 +51,7 @@ class VTK_RENDERING_EXPORT vtkVolumeProperty : public vtkObject
 {
 public:
   static vtkVolumeProperty *New();
-  vtkTypeRevisionMacro(vtkVolumeProperty,vtkObject);
+  vtkTypeMacro(vtkVolumeProperty,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   void DeepCopy(vtkVolumeProperty *p);
 
diff --git a/Rendering/vtkVolumetricPass.cxx b/Rendering/vtkVolumetricPass.cxx
index ecdeb870e46f2d602fc4c808c4f22045cfc88e52..8453f035dbaac2a7aa961af97417a26914fdd72a 100644
--- a/Rendering/vtkVolumetricPass.cxx
+++ b/Rendering/vtkVolumetricPass.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkVolumetricPass, "1.1");
 vtkStandardNewMacro(vtkVolumetricPass);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkVolumetricPass.h b/Rendering/vtkVolumetricPass.h
index ba690c7abd055dcd1d96897102e8b3e7ef70212b..3bdb060926e42ac58a611878b227c45e36d8a43e 100644
--- a/Rendering/vtkVolumetricPass.h
+++ b/Rendering/vtkVolumetricPass.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkVolumetricPass : public vtkDefaultPass
 {
 public:
   static vtkVolumetricPass *New();
-  vtkTypeRevisionMacro(vtkVolumetricPass,vtkDefaultPass);
+  vtkTypeMacro(vtkVolumetricPass,vtkDefaultPass);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   //BTX
diff --git a/Rendering/vtkWin32OpenGLRenderWindow.cxx b/Rendering/vtkWin32OpenGLRenderWindow.cxx
index 251869a3d992e868f2f802d2756d21ee45d3e0c9..a4485d20927c47759c3962f4dddffa000c77c60f 100644
--- a/Rendering/vtkWin32OpenGLRenderWindow.cxx
+++ b/Rendering/vtkWin32OpenGLRenderWindow.cxx
@@ -32,7 +32,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #include "vtkOpenGL.h"
 
-vtkCxxRevisionMacro(vtkWin32OpenGLRenderWindow, "1.163");
 vtkStandardNewMacro(vtkWin32OpenGLRenderWindow);
 
 #define VTK_MAX_LIGHTS 8
diff --git a/Rendering/vtkWin32OpenGLRenderWindow.h b/Rendering/vtkWin32OpenGLRenderWindow.h
index 7f68f713382b2a506dc678a64e3e3c2c9ab392c8..dd9869891a73820aea854f5c15b6830ae838cdbb 100644
--- a/Rendering/vtkWin32OpenGLRenderWindow.h
+++ b/Rendering/vtkWin32OpenGLRenderWindow.h
@@ -29,7 +29,7 @@ class VTK_RENDERING_EXPORT vtkWin32OpenGLRenderWindow : public vtkOpenGLRenderWi
 {
 public:
   static vtkWin32OpenGLRenderWindow *New();
-  vtkTypeRevisionMacro(vtkWin32OpenGLRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkWin32OpenGLRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkWin32RenderWindowInteractor.cxx b/Rendering/vtkWin32RenderWindowInteractor.cxx
index 19c6d24fddcb68c9c52ec55d7e6ce5cc550b22e2..a53bbc8552ccaeada47ccc8ff79ca1e0094ecc8d 100644
--- a/Rendering/vtkWin32RenderWindowInteractor.cxx
+++ b/Rendering/vtkWin32RenderWindowInteractor.cxx
@@ -51,7 +51,6 @@ VTK_RENDERING_EXPORT LRESULT CALLBACK vtkHandleMessage2(HWND,UINT,WPARAM,LPARAM,
 #endif
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkWin32RenderWindowInteractor, "1.108");
 vtkStandardNewMacro(vtkWin32RenderWindowInteractor);
 #endif
 
diff --git a/Rendering/vtkWin32RenderWindowInteractor.h b/Rendering/vtkWin32RenderWindowInteractor.h
index 6a88ed0212d887033915de6f8d2aaf6b565cb048..aa5b975d1fac90a14676a6251d3985ec9deb8f1a 100644
--- a/Rendering/vtkWin32RenderWindowInteractor.h
+++ b/Rendering/vtkWin32RenderWindowInteractor.h
@@ -41,7 +41,7 @@ public:
   // Construct object so that light follows camera motion.
   static vtkWin32RenderWindowInteractor *New();
 
-  vtkTypeRevisionMacro(vtkWin32RenderWindowInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkWin32RenderWindowInteractor,vtkRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkWinCEOpenGLRenderWindow.cxx b/Rendering/vtkWinCEOpenGLRenderWindow.cxx
index b87a12825edd55c65ce5ff07e5df49a15b371ea7..99f18a339184a57fd3176bc09d2428fd8c7b9492 100644
--- a/Rendering/vtkWinCEOpenGLRenderWindow.cxx
+++ b/Rendering/vtkWinCEOpenGLRenderWindow.cxx
@@ -28,7 +28,6 @@
 #include "vtkOpenGLPolyDataMapper.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkWinCEOpenGLRenderWindow, "1.13");
 vtkStandardNewMacro(vtkWinCEOpenGLRenderWindow);
 
 #define VTK_MAX_LIGHTS 8
diff --git a/Rendering/vtkWinCEOpenGLRenderWindow.h b/Rendering/vtkWinCEOpenGLRenderWindow.h
index 958860491a437d8a292b878e0141f6f44cc0bf00..fcb5f2e179cf2f3eccb5eb89e646cea702421a3a 100644
--- a/Rendering/vtkWinCEOpenGLRenderWindow.h
+++ b/Rendering/vtkWinCEOpenGLRenderWindow.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkWinCEOpenGLRenderWindow : public vtkOpenGLRenderWi
 {
 public:
   static vtkWinCEOpenGLRenderWindow *New();
-  vtkTypeRevisionMacro(vtkWinCEOpenGLRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkWinCEOpenGLRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkWindowToImageFilter.cxx b/Rendering/vtkWindowToImageFilter.cxx
index d85a6d1fa63340c2e520ca516582a4ba57116d69..000f466caae7ba81327429f09e98220916691844 100644
--- a/Rendering/vtkWindowToImageFilter.cxx
+++ b/Rendering/vtkWindowToImageFilter.cxx
@@ -28,7 +28,6 @@
 #include "vtkActor2DCollection.h"
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkWindowToImageFilter, "1.50");
 vtkStandardNewMacro(vtkWindowToImageFilter);
 
 class vtkWTI2DHelperClass
diff --git a/Rendering/vtkWindowToImageFilter.h b/Rendering/vtkWindowToImageFilter.h
index c84b70e1a0ae9a3b27ab65573f178f7d487b5a26..14fac7913ba513cd276b01ec9f787bd6ae9d9f45 100644
--- a/Rendering/vtkWindowToImageFilter.h
+++ b/Rendering/vtkWindowToImageFilter.h
@@ -65,7 +65,7 @@ class VTK_RENDERING_EXPORT vtkWindowToImageFilter : public vtkAlgorithm
 public:
   static vtkWindowToImageFilter *New();
 
-  vtkTypeRevisionMacro(vtkWindowToImageFilter,vtkAlgorithm);
+  vtkTypeMacro(vtkWindowToImageFilter,vtkAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);   
 
   // Description:
diff --git a/Rendering/vtkWorldPointPicker.cxx b/Rendering/vtkWorldPointPicker.cxx
index 0dea837b2bf3ee24f792ea7698f9b549fac21cb1..56143f31c26a6c1c60e16d553eedc650292c10b2 100644
--- a/Rendering/vtkWorldPointPicker.cxx
+++ b/Rendering/vtkWorldPointPicker.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkWorldPointPicker, "1.22");
 vtkStandardNewMacro(vtkWorldPointPicker);
 
 vtkWorldPointPicker::vtkWorldPointPicker()
diff --git a/Rendering/vtkWorldPointPicker.h b/Rendering/vtkWorldPointPicker.h
index 89fc480d8a62eb1e78bbe752d63af189cf475550..3bfac86297d7062a281030efe6783aae48195cf4 100644
--- a/Rendering/vtkWorldPointPicker.h
+++ b/Rendering/vtkWorldPointPicker.h
@@ -35,7 +35,7 @@ class VTK_RENDERING_EXPORT vtkWorldPointPicker : public vtkAbstractPicker
 {
 public:
   static vtkWorldPointPicker *New();
-  vtkTypeRevisionMacro(vtkWorldPointPicker,vtkAbstractPicker);
+  vtkTypeMacro(vtkWorldPointPicker,vtkAbstractPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkXGPUInfoList.cxx b/Rendering/vtkXGPUInfoList.cxx
index 62e16ac92873a55e76c7a6f2e6fdaef212dab8c9..609580be99bc19192f58f1f1db12e1f372fd0016 100644
--- a/Rendering/vtkXGPUInfoList.cxx
+++ b/Rendering/vtkXGPUInfoList.cxx
@@ -26,7 +26,6 @@
 #include "NVCtrlLib.h" // needs NVCtrl.h (NV_CTRL_VIDEO_RAM, XNVCTRLQueryAttribute() )
 #endif
 
-vtkCxxRevisionMacro(vtkXGPUInfoList, "1.3");
 vtkStandardNewMacro(vtkXGPUInfoList);
 
 // ----------------------------------------------------------------------------
diff --git a/Rendering/vtkXGPUInfoList.h b/Rendering/vtkXGPUInfoList.h
index e736d3b6c08cab54c330bc29ada74f07a7d398bd..40ef2692e29e0d333370bc5d03259a5c1e243ca8 100644
--- a/Rendering/vtkXGPUInfoList.h
+++ b/Rendering/vtkXGPUInfoList.h
@@ -31,7 +31,7 @@ class VTK_RENDERING_EXPORT vtkXGPUInfoList : public vtkGPUInfoList
 {
 public:
   static vtkXGPUInfoList* New();
-  vtkTypeRevisionMacro(vtkXGPUInfoList, vtkGPUInfoList);
+  vtkTypeMacro(vtkXGPUInfoList, vtkGPUInfoList);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Rendering/vtkXMesaRenderWindow.cxx b/Rendering/vtkXMesaRenderWindow.cxx
index 4a822905a82110184340247b5fb726cf6af32a03..95fec03ea6df5bf5e611d76f5b15979ec5581492 100644
--- a/Rendering/vtkXMesaRenderWindow.cxx
+++ b/Rendering/vtkXMesaRenderWindow.cxx
@@ -50,5 +50,4 @@
 // now include the source for vtkXOpenGLRenderWindow
 #include "vtkXOpenGLRenderWindow.cxx"
 
-vtkCxxRevisionMacro(vtkXMesaRenderWindow, "1.6");
 vtkStandardNewMacro(vtkXMesaRenderWindow);
diff --git a/Rendering/vtkXMesaRenderWindow.h b/Rendering/vtkXMesaRenderWindow.h
index 21c5a13fd0e9dddcc52a93924f38797ab8d26fd2..4004c120bb6fb3b758b9103c0b2c5c6361af5ef3 100644
--- a/Rendering/vtkXMesaRenderWindow.h
+++ b/Rendering/vtkXMesaRenderWindow.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkXMesaRenderWindow : public vtkMesaRenderWindow
 {
 public:
   static vtkXMesaRenderWindow *New();
-  vtkTypeRevisionMacro(vtkXMesaRenderWindow,vtkMesaRenderWindow);
+  vtkTypeMacro(vtkXMesaRenderWindow,vtkMesaRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkXOpenGLRenderWindow.cxx b/Rendering/vtkXOpenGLRenderWindow.cxx
index 5d68c4861e4ceb4641a8408d8af97891f47007e8..5a87aae536a75ff0aea66b5b2507d57d0beea824 100644
--- a/Rendering/vtkXOpenGLRenderWindow.cxx
+++ b/Rendering/vtkXOpenGLRenderWindow.cxx
@@ -117,7 +117,6 @@ vtkXOpenGLRenderWindowInternal::vtkXOpenGLRenderWindowInternal(
 
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkXOpenGLRenderWindow, "1.104");
 vtkStandardNewMacro(vtkXOpenGLRenderWindow);
 #endif
 
diff --git a/Rendering/vtkXOpenGLRenderWindow.h b/Rendering/vtkXOpenGLRenderWindow.h
index b0da11d1ad8b8b6438fd3211887b2d0410f6702a..2ad5f92d7214b6954a676a5aa0c4512bcff28be4 100644
--- a/Rendering/vtkXOpenGLRenderWindow.h
+++ b/Rendering/vtkXOpenGLRenderWindow.h
@@ -33,7 +33,7 @@ class VTK_RENDERING_EXPORT vtkXOpenGLRenderWindow : public vtkOpenGLRenderWindow
 {
 public:
   static vtkXOpenGLRenderWindow *New();
-  vtkTypeRevisionMacro(vtkXOpenGLRenderWindow,vtkOpenGLRenderWindow);
+  vtkTypeMacro(vtkXOpenGLRenderWindow,vtkOpenGLRenderWindow);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkXRenderWindowInteractor.cxx b/Rendering/vtkXRenderWindowInteractor.cxx
index deb595ee8a54735f9f3d18fd98b9d41487d7b53d..c6e3763a5813d684286f8ba01675c7413c5269e3 100644
--- a/Rendering/vtkXRenderWindowInteractor.cxx
+++ b/Rendering/vtkXRenderWindowInteractor.cxx
@@ -39,7 +39,6 @@
 #include "vtkTDxUnixDevice.h"
 #endif
 
-vtkCxxRevisionMacro(vtkXRenderWindowInteractor, "1.143");
 vtkStandardNewMacro(vtkXRenderWindowInteractor);
 
 // Map between the X native id to our own integer count id.  Note this
diff --git a/Rendering/vtkXRenderWindowInteractor.h b/Rendering/vtkXRenderWindowInteractor.h
index f72f67c1978aac966f9ed8c2227f4f49f38aa2fc..359aa6d665a77784b6cf787922210a8d60c4aa5e 100644
--- a/Rendering/vtkXRenderWindowInteractor.h
+++ b/Rendering/vtkXRenderWindowInteractor.h
@@ -50,7 +50,7 @@ class VTK_RENDERING_EXPORT vtkXRenderWindowInteractor : public vtkRenderWindowIn
 {
 public:
   static vtkXRenderWindowInteractor *New();
-  vtkTypeRevisionMacro(vtkXRenderWindowInteractor,vtkRenderWindowInteractor);
+  vtkTypeMacro(vtkXRenderWindowInteractor,vtkRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Rendering/vtkXRenderWindowTclInteractor.cxx b/Rendering/vtkXRenderWindowTclInteractor.cxx
index 548cdca6328974e07efcb469ebe65dc946205a11..18195b0d8f7a04bfe40a7861342485787d12d6bc 100644
--- a/Rendering/vtkXRenderWindowTclInteractor.cxx
+++ b/Rendering/vtkXRenderWindowTclInteractor.cxx
@@ -24,7 +24,6 @@
 #include <vtkTk.h>
 
 //-------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkXRenderWindowTclInteractor, "1.59");
 vtkStandardNewMacro(vtkXRenderWindowTclInteractor);
 
 
diff --git a/Rendering/vtkXRenderWindowTclInteractor.h b/Rendering/vtkXRenderWindowTclInteractor.h
index 8a5564a1232b48fc4f4d387d186c7b0eadd17bb8..a33d9002d2fa2bf0f8bb6e3d3ac6d8e5ff3c85e5 100644
--- a/Rendering/vtkXRenderWindowTclInteractor.h
+++ b/Rendering/vtkXRenderWindowTclInteractor.h
@@ -34,7 +34,7 @@ class VTK_RENDERING_EXPORT vtkXRenderWindowTclInteractor : public vtkXRenderWind
 {
 public:
   static vtkXRenderWindowTclInteractor *New();
-  vtkTypeRevisionMacro(vtkXRenderWindowTclInteractor,vtkXRenderWindowInteractor);
+  vtkTypeMacro(vtkXRenderWindowTclInteractor,vtkXRenderWindowInteractor);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/Testing/Cxx/TestPushTokenValueFilter.cxx b/TextAnalysis/Testing/Cxx/TestPushTokenValueFilter.cxx
index 6624e07d17c7b8fa00c7fd53b1df3285762c71be..88a801aee7f5583eb9f57f17c357c0779620ee67 100644
--- a/TextAnalysis/Testing/Cxx/TestPushTokenValueFilter.cxx
+++ b/TextAnalysis/Testing/Cxx/TestPushTokenValueFilter.cxx
@@ -61,7 +61,7 @@
 class vtkStreamAwareFeatureDictionary : public vtkFeatureDictionary {
 public:
   static vtkStreamAwareFeatureDictionary* New();
-  vtkTypeRevisionMacro(vtkStreamAwareFeatureDictionary, vtkFeatureDictionary);
+  vtkTypeMacro(vtkStreamAwareFeatureDictionary, vtkFeatureDictionary);
   
 protected:
   vtkStreamAwareFeatureDictionary() {}
@@ -85,7 +85,6 @@ private:
   void operator=(const vtkStreamAwareFeatureDictionary&);   // Not implemented
 };
 
-vtkCxxRevisionMacro(vtkStreamAwareFeatureDictionary, "1.1");
 vtkStandardNewMacro(vtkStreamAwareFeatureDictionary);
 
 int TestPushTokenValueFilter(int vtkNotUsed(argc), char *vtkNotUsed(argv)[])
diff --git a/TextAnalysis/vtkAssignMimeType.cxx b/TextAnalysis/vtkAssignMimeType.cxx
index b279c6906a00308fbbe54a89f70a59ec16e73a15..f517ac747da123a407526471eeef1da2ce70a3e2 100644
--- a/TextAnalysis/vtkAssignMimeType.cxx
+++ b/TextAnalysis/vtkAssignMimeType.cxx
@@ -30,7 +30,6 @@
 
 #include <stdexcept>
 
-vtkCxxRevisionMacro(vtkAssignMimeType, "1.4");
 vtkStandardNewMacro(vtkAssignMimeType);
 vtkCxxSetObjectMacro(vtkAssignMimeType,MimeTypes,vtkMimeTypes);
 
diff --git a/TextAnalysis/vtkAssignMimeType.h b/TextAnalysis/vtkAssignMimeType.h
index 7a373302549875201fa56b60da8afd093c4a747f..0cb53a202b9b2141c2d4aba6916a6f737bc56e3e 100644
--- a/TextAnalysis/vtkAssignMimeType.h
+++ b/TextAnalysis/vtkAssignMimeType.h
@@ -56,7 +56,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkAssignMimeType :
 {
 public:
   static vtkAssignMimeType* New();
-  vtkTypeRevisionMacro(vtkAssignMimeType, vtkTableAlgorithm);
+  vtkTypeMacro(vtkAssignMimeType, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkConcatenateArray.cxx b/TextAnalysis/vtkConcatenateArray.cxx
index 290cbd19ae37783f29ed6dca991a6e84b38be7c9..b029ce3e386cbd4ea2c981ffa63b65792587881f 100644
--- a/TextAnalysis/vtkConcatenateArray.cxx
+++ b/TextAnalysis/vtkConcatenateArray.cxx
@@ -50,7 +50,6 @@ static void CopyValues(vtkArray* const source, vtkArray* const target, const vtk
 ///////////////////////////////////////////////////////////////////////////////
 // vtkConcatenateArray
 
-vtkCxxRevisionMacro(vtkConcatenateArray, "1.2");
 vtkStandardNewMacro(vtkConcatenateArray);
 
 vtkConcatenateArray::vtkConcatenateArray() :
diff --git a/TextAnalysis/vtkConcatenateArray.h b/TextAnalysis/vtkConcatenateArray.h
index 96c10e87d399e61af72d4ee3c4c617d01bb621b7..ce18f8bbb7480781e4cb31e0b3cf89b5a80f50e5 100644
--- a/TextAnalysis/vtkConcatenateArray.h
+++ b/TextAnalysis/vtkConcatenateArray.h
@@ -45,7 +45,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkConcatenateArray : public vtkArrayDataAlgorith
 {
 public:
   static vtkConcatenateArray* New();
-  vtkTypeRevisionMacro(vtkConcatenateArray, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkConcatenateArray, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkDocumentReader.cxx b/TextAnalysis/vtkDocumentReader.cxx
index 8e66d83fcdde10dccfe47f6d8e711e0e8bb31e21..4367460f60cf4f9033ce793296d4b13f05c33596 100644
--- a/TextAnalysis/vtkDocumentReader.cxx
+++ b/TextAnalysis/vtkDocumentReader.cxx
@@ -69,7 +69,6 @@ public:
   vtkstd::vector<vtkIdType> ID;
 };
 
-vtkCxxRevisionMacro(vtkDocumentReader, "1.7");
 vtkStandardNewMacro(vtkDocumentReader);
 
 vtkDocumentReader::vtkDocumentReader() :
diff --git a/TextAnalysis/vtkDocumentReader.h b/TextAnalysis/vtkDocumentReader.h
index 70bdc81c0f63469ce92838ba10f6c5946f39318a..3e7338d01d77d1555c885f4af30232a6f514f390 100644
--- a/TextAnalysis/vtkDocumentReader.h
+++ b/TextAnalysis/vtkDocumentReader.h
@@ -55,7 +55,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkDocumentReader :
 {
 public:
   static vtkDocumentReader* New();
-  vtkTypeRevisionMacro(vtkDocumentReader, vtkTableAlgorithm);
+  vtkTypeMacro(vtkDocumentReader, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkEntropyMatrixWeighting.cxx b/TextAnalysis/vtkEntropyMatrixWeighting.cxx
index adc46d542d55685fa18dfa8ea51148aad3c493a7..f36ad00010023bb3923b27ed90512d840da71df6 100644
--- a/TextAnalysis/vtkEntropyMatrixWeighting.cxx
+++ b/TextAnalysis/vtkEntropyMatrixWeighting.cxx
@@ -41,7 +41,6 @@ static inline double log2(double n)
 ///////////////////////////////////////////////////////////////////////////////
 // vtkEntropyMatrixWeighting
 
-vtkCxxRevisionMacro(vtkEntropyMatrixWeighting, "1.2");
 vtkStandardNewMacro(vtkEntropyMatrixWeighting);
 
 vtkEntropyMatrixWeighting::vtkEntropyMatrixWeighting() :
diff --git a/TextAnalysis/vtkEntropyMatrixWeighting.h b/TextAnalysis/vtkEntropyMatrixWeighting.h
index 7350a3f11bef303f3fe29daacbaa72292a7910b2..0fcfde4afe5b65877cea15eca2575fbba2c1ef94 100644
--- a/TextAnalysis/vtkEntropyMatrixWeighting.h
+++ b/TextAnalysis/vtkEntropyMatrixWeighting.h
@@ -40,7 +40,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkEntropyMatrixWeighting :
 {
 public:
   static vtkEntropyMatrixWeighting* New();
-  vtkTypeRevisionMacro(vtkEntropyMatrixWeighting, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkEntropyMatrixWeighting, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkExtractSelectedSlices.cxx b/TextAnalysis/vtkExtractSelectedSlices.cxx
index f7e0c2d9e6494f5468cd0a66d33f16e00a8887dc..0e614e6886c32c398dabfff5fed86bc0fcaf9d96 100644
--- a/TextAnalysis/vtkExtractSelectedSlices.cxx
+++ b/TextAnalysis/vtkExtractSelectedSlices.cxx
@@ -37,7 +37,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkExtractSelectedSlices
 
-vtkCxxRevisionMacro(vtkExtractSelectedSlices, "1.2");
 vtkStandardNewMacro(vtkExtractSelectedSlices);
 
 vtkExtractSelectedSlices::vtkExtractSelectedSlices() :
diff --git a/TextAnalysis/vtkExtractSelectedSlices.h b/TextAnalysis/vtkExtractSelectedSlices.h
index b1149b36a84ca6e9b4935d04829d31dfc16306fc..71d154d2a4f31c86c26244099ec47b177c51e393 100644
--- a/TextAnalysis/vtkExtractSelectedSlices.h
+++ b/TextAnalysis/vtkExtractSelectedSlices.h
@@ -47,7 +47,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkExtractSelectedSlices :
 {
 public:
   static vtkExtractSelectedSlices* New();
-  vtkTypeRevisionMacro(vtkExtractSelectedSlices, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkExtractSelectedSlices, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkFeatureDictionary.cxx b/TextAnalysis/vtkFeatureDictionary.cxx
index 9f70829c805b98e3edfc71cea4900df9bdd0b557..730bab9b63122dd537e4e416c07478659b633def 100644
--- a/TextAnalysis/vtkFeatureDictionary.cxx
+++ b/TextAnalysis/vtkFeatureDictionary.cxx
@@ -35,7 +35,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkFeatureDictionary
 
-vtkCxxRevisionMacro(vtkFeatureDictionary, "1.2");
 vtkStandardNewMacro(vtkFeatureDictionary);
 
 vtkFeatureDictionary::vtkFeatureDictionary()
diff --git a/TextAnalysis/vtkFeatureDictionary.h b/TextAnalysis/vtkFeatureDictionary.h
index 23b58ee0f8a02be534e31abb73ad8dbe50fc305c..6cebbaaace3affd222d26207c89a66b91b2f609c 100644
--- a/TextAnalysis/vtkFeatureDictionary.h
+++ b/TextAnalysis/vtkFeatureDictionary.h
@@ -50,7 +50,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkFeatureDictionary :
 {
 public:
   static vtkFeatureDictionary* New();
-  vtkTypeRevisionMacro(vtkFeatureDictionary, vtkTableAlgorithm);
+  vtkTypeMacro(vtkFeatureDictionary, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/TextAnalysis/vtkFileExtensionMimeTypeStrategy.cxx b/TextAnalysis/vtkFileExtensionMimeTypeStrategy.cxx
index 17e6a4de067143d4995fdcbd34a466900946930a..50d83182bc637acf260105146d786e3282753ef7 100644
--- a/TextAnalysis/vtkFileExtensionMimeTypeStrategy.cxx
+++ b/TextAnalysis/vtkFileExtensionMimeTypeStrategy.cxx
@@ -24,7 +24,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-vtkCxxRevisionMacro(vtkFileExtensionMimeTypeStrategy, "1.8");
 vtkStandardNewMacro(vtkFileExtensionMimeTypeStrategy);
 
 class vtkFileExtensionMimeTypeStrategy::implementation
diff --git a/TextAnalysis/vtkFileExtensionMimeTypeStrategy.h b/TextAnalysis/vtkFileExtensionMimeTypeStrategy.h
index 5c79e9262f7f5052668906f848b09612df7ea7c9..92f6cb874184eb175a73c3ba55f38975cb510c08 100644
--- a/TextAnalysis/vtkFileExtensionMimeTypeStrategy.h
+++ b/TextAnalysis/vtkFileExtensionMimeTypeStrategy.h
@@ -37,7 +37,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkFileExtensionMimeTypeStrategy :
 {
 public:
   static vtkFileExtensionMimeTypeStrategy* New();
-  vtkTypeRevisionMacro(vtkFileExtensionMimeTypeStrategy, vtkMimeTypeStrategy);
+  vtkTypeMacro(vtkFileExtensionMimeTypeStrategy, vtkMimeTypeStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkStdString Lookup(const vtkStdString& uri, const vtkTypeUInt8* begin, const vtkTypeUInt8* end);
diff --git a/TextAnalysis/vtkFoldCase.cxx b/TextAnalysis/vtkFoldCase.cxx
index c0443b2e3021139abc110448f9d8930b75ec7b8d..9f33a20f82d83f928ca4e888b65bd4a7b9924dd6 100644
--- a/TextAnalysis/vtkFoldCase.cxx
+++ b/TextAnalysis/vtkFoldCase.cxx
@@ -31,7 +31,6 @@
 
 #include <stdexcept>
 
-vtkCxxRevisionMacro(vtkFoldCase, "1.3");
 vtkStandardNewMacro(vtkFoldCase);
 
 vtkFoldCase::vtkFoldCase() :
diff --git a/TextAnalysis/vtkFoldCase.h b/TextAnalysis/vtkFoldCase.h
index 88ec8d4d00adaea4f3aabd16305418d59c0c5589..2eaa135b4e5d922efd3017cc028459a37898233f 100644
--- a/TextAnalysis/vtkFoldCase.h
+++ b/TextAnalysis/vtkFoldCase.h
@@ -47,7 +47,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkFoldCase :
 {
 public:
   static vtkFoldCase* New();
-  vtkTypeRevisionMacro(vtkFoldCase, vtkTableAlgorithm);
+  vtkTypeMacro(vtkFoldCase, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkSetStringMacro(ResultArray);
diff --git a/TextAnalysis/vtkForceMimeTypeStrategy.cxx b/TextAnalysis/vtkForceMimeTypeStrategy.cxx
index ff2e33b7b9d4b9b87f71a5205a028644db7716b9..2bd6f3b8eaeafb36c5dfba32e58b911a21b352dd 100644
--- a/TextAnalysis/vtkForceMimeTypeStrategy.cxx
+++ b/TextAnalysis/vtkForceMimeTypeStrategy.cxx
@@ -24,7 +24,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-vtkCxxRevisionMacro(vtkForceMimeTypeStrategy, "1.1");
 vtkStandardNewMacro(vtkForceMimeTypeStrategy);
 
 vtkForceMimeTypeStrategy::vtkForceMimeTypeStrategy() :
diff --git a/TextAnalysis/vtkForceMimeTypeStrategy.h b/TextAnalysis/vtkForceMimeTypeStrategy.h
index a44f49ed0116927f6f506fc4eb78b11cb087180b..d0032795a1f8e484c0f8bf3f10e5142c189f0972 100644
--- a/TextAnalysis/vtkForceMimeTypeStrategy.h
+++ b/TextAnalysis/vtkForceMimeTypeStrategy.h
@@ -40,7 +40,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkForceMimeTypeStrategy :
 {
 public:
   static vtkForceMimeTypeStrategy* New();
-  vtkTypeRevisionMacro(vtkForceMimeTypeStrategy, vtkMimeTypeStrategy);
+  vtkTypeMacro(vtkForceMimeTypeStrategy, vtkMimeTypeStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   vtkGetStringMacro(MimeType);
diff --git a/TextAnalysis/vtkMimeTypeStrategy.cxx b/TextAnalysis/vtkMimeTypeStrategy.cxx
index 173dc32730a577563b08995be3e11cd9e149073d..b061f0016450c1b81a98533ce327c90ecf789ce5 100644
--- a/TextAnalysis/vtkMimeTypeStrategy.cxx
+++ b/TextAnalysis/vtkMimeTypeStrategy.cxx
@@ -20,7 +20,6 @@
 
 #include <vtkMimeTypeStrategy.h>
 
-vtkCxxRevisionMacro(vtkMimeTypeStrategy, "1.2");
 
 vtkMimeTypeStrategy::vtkMimeTypeStrategy()
 {
diff --git a/TextAnalysis/vtkMimeTypeStrategy.h b/TextAnalysis/vtkMimeTypeStrategy.h
index b12630ed93abef41dc4253a064d6496894233848..f3876ed3104535fc37c44c8dd44cc23cf1c5a9a1 100644
--- a/TextAnalysis/vtkMimeTypeStrategy.h
+++ b/TextAnalysis/vtkMimeTypeStrategy.h
@@ -40,7 +40,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkMimeTypeStrategy :
   public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkMimeTypeStrategy, vtkObject);
+  vtkTypeMacro(vtkMimeTypeStrategy, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkMimeTypes.cxx b/TextAnalysis/vtkMimeTypes.cxx
index da3f79ba700e484471cb266ef4e0818cb9fa2b53..380c4e849fd4b58ffda82cf42204988af8fff74c 100644
--- a/TextAnalysis/vtkMimeTypes.cxx
+++ b/TextAnalysis/vtkMimeTypes.cxx
@@ -40,7 +40,6 @@ public:
 ////////////////////////////////////////////////////////////////
 // vtkMimeTypes
 
-vtkCxxRevisionMacro(vtkMimeTypes, "1.9");
 vtkStandardNewMacro(vtkMimeTypes);
 
 vtkMimeTypes::vtkMimeTypes() :
diff --git a/TextAnalysis/vtkMimeTypes.h b/TextAnalysis/vtkMimeTypes.h
index b890ee133a861e5a42b0642c25e804a9d377a69a..5c834dfde7ceaf41d47ccfbcf6ca596526b20cf7 100644
--- a/TextAnalysis/vtkMimeTypes.h
+++ b/TextAnalysis/vtkMimeTypes.h
@@ -55,7 +55,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkMimeTypes :
 {
 public:
   static vtkMimeTypes* New();
-  vtkTypeRevisionMacro(vtkMimeTypes, vtkObject);
+  vtkTypeMacro(vtkMimeTypes, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkNGramExtraction.cxx b/TextAnalysis/vtkNGramExtraction.cxx
index a0e39863f24eb107a7f754ff9ae9b9dabb1a8ac4..068f41a7a29b424c12ff8af07b8a906bacd15e6b 100644
--- a/TextAnalysis/vtkNGramExtraction.cxx
+++ b/TextAnalysis/vtkNGramExtraction.cxx
@@ -31,7 +31,6 @@
 #include <vtksys/ios/sstream>
 #include <vtksys/stl/stdexcept>
 
-vtkCxxRevisionMacro(vtkNGramExtraction, "1.3");
 vtkStandardNewMacro(vtkNGramExtraction);
 
 vtkNGramExtraction::vtkNGramExtraction() :
diff --git a/TextAnalysis/vtkNGramExtraction.h b/TextAnalysis/vtkNGramExtraction.h
index 6c09e9d1b89660ab49efe4c10f60cb96d76c5c0e..a09ac0ef70ae38ff33dccd7ca743d651a8cde03a 100644
--- a/TextAnalysis/vtkNGramExtraction.h
+++ b/TextAnalysis/vtkNGramExtraction.h
@@ -49,7 +49,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkNGramExtraction :
 {
 public:
   static vtkNGramExtraction* New();
-  vtkTypeRevisionMacro(vtkNGramExtraction, vtkTableAlgorithm);
+  vtkTypeMacro(vtkNGramExtraction, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkPlainTextExtractionStrategy.cxx b/TextAnalysis/vtkPlainTextExtractionStrategy.cxx
index e92721716be0a360dff47dceb56175b658d2a2d4..e1554ff94ee38e5048ba92902eb121b0d1af6a4e 100644
--- a/TextAnalysis/vtkPlainTextExtractionStrategy.cxx
+++ b/TextAnalysis/vtkPlainTextExtractionStrategy.cxx
@@ -25,7 +25,6 @@
 #include <vtkStringArray.h>
 #include <vtkUnicodeStringArray.h>
 
-vtkCxxRevisionMacro(vtkPlainTextExtractionStrategy, "1.5");
 vtkStandardNewMacro(vtkPlainTextExtractionStrategy);
 
 vtkPlainTextExtractionStrategy::vtkPlainTextExtractionStrategy()
diff --git a/TextAnalysis/vtkPlainTextExtractionStrategy.h b/TextAnalysis/vtkPlainTextExtractionStrategy.h
index b0b678f0042a1c325788a9b9c25131211e3844b3..4b24983ac5aca2f2bc977e4a998538f570ae9401 100644
--- a/TextAnalysis/vtkPlainTextExtractionStrategy.h
+++ b/TextAnalysis/vtkPlainTextExtractionStrategy.h
@@ -43,7 +43,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkPlainTextExtractionStrategy :
 {
 public:
   static vtkPlainTextExtractionStrategy* New();
-  vtkTypeRevisionMacro(vtkPlainTextExtractionStrategy, vtkTextExtractionStrategy);
+  vtkTypeMacro(vtkPlainTextExtractionStrategy, vtkTextExtractionStrategy);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual bool Extract(
diff --git a/TextAnalysis/vtkPointwiseMutualInformation.cxx b/TextAnalysis/vtkPointwiseMutualInformation.cxx
index aaff22efadb76a6d3cc8a63c0ba9ee3caf5e6a7c..3c134989709fc0131dfdf06d4ba40ed6e7344882 100644
--- a/TextAnalysis/vtkPointwiseMutualInformation.cxx
+++ b/TextAnalysis/vtkPointwiseMutualInformation.cxx
@@ -35,7 +35,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkPointwiseMutualInformation
 
-vtkCxxRevisionMacro(vtkPointwiseMutualInformation, "1.3");
 vtkStandardNewMacro(vtkPointwiseMutualInformation);
 
 vtkPointwiseMutualInformation::vtkPointwiseMutualInformation()
diff --git a/TextAnalysis/vtkPointwiseMutualInformation.h b/TextAnalysis/vtkPointwiseMutualInformation.h
index 3d7ca2ec18f05ca2b49423f77ec855aa6a0bad2a..757034b4c4a41dcf0fc8c6becd6dc166473874ec 100644
--- a/TextAnalysis/vtkPointwiseMutualInformation.h
+++ b/TextAnalysis/vtkPointwiseMutualInformation.h
@@ -37,7 +37,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkPointwiseMutualInformation : public vtkArrayDa
 {
 public:
   static vtkPointwiseMutualInformation* New();
-  vtkTypeRevisionMacro(vtkPointwiseMutualInformation, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkPointwiseMutualInformation, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/TextAnalysis/vtkPowerWeighting.cxx b/TextAnalysis/vtkPowerWeighting.cxx
index 6107e925ff0c5af5985694738a7b1060513e3a8f..34309199860b9d71558de8240a09a2a7a9808435 100644
--- a/TextAnalysis/vtkPowerWeighting.cxx
+++ b/TextAnalysis/vtkPowerWeighting.cxx
@@ -34,7 +34,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkPowerWeighting
 
-vtkCxxRevisionMacro(vtkPowerWeighting, "1.1");
 vtkStandardNewMacro(vtkPowerWeighting);
 
 vtkPowerWeighting::vtkPowerWeighting() :
diff --git a/TextAnalysis/vtkPowerWeighting.h b/TextAnalysis/vtkPowerWeighting.h
index 940d242e4823cf933b4ad9504fdbe2b6986e386e..ba16f2de7ce676547fa23a36595577df6bac8a4c 100644
--- a/TextAnalysis/vtkPowerWeighting.h
+++ b/TextAnalysis/vtkPowerWeighting.h
@@ -34,7 +34,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkPowerWeighting : public vtkArrayDataAlgorithm
 {
 public:
   static vtkPowerWeighting* New();
-  vtkTypeRevisionMacro(vtkPowerWeighting, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkPowerWeighting, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkQtXMLProcessor.cxx b/TextAnalysis/vtkQtXMLProcessor.cxx
index de62cb3023cd281651669d6bf97433374ec4568c..da1503daafb86197011a12f10137435e961fc625 100644
--- a/TextAnalysis/vtkQtXMLProcessor.cxx
+++ b/TextAnalysis/vtkQtXMLProcessor.cxx
@@ -302,7 +302,6 @@ public:
 ////////////////////////////////////////////////////////////////////////////////////////
 // vtkQtXMLProcessor
 
-vtkCxxRevisionMacro(vtkQtXMLProcessor, "1.3");
 vtkStandardNewMacro(vtkQtXMLProcessor);
 
 vtkQtXMLProcessor::vtkQtXMLProcessor() :
diff --git a/TextAnalysis/vtkQtXMLProcessor.h b/TextAnalysis/vtkQtXMLProcessor.h
index ccbc760ded5c4f6afd9e93662893674f7103180a..5e2c4c28d21c206918b8b4b9077dc5b56cb8de41 100644
--- a/TextAnalysis/vtkQtXMLProcessor.h
+++ b/TextAnalysis/vtkQtXMLProcessor.h
@@ -114,7 +114,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkQtXMLProcessor:
 {
 public:
   static vtkQtXMLProcessor* New();
-  vtkTypeRevisionMacro(vtkQtXMLProcessor,vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkQtXMLProcessor,vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
   
 //BTX
diff --git a/TextAnalysis/vtkScaleDimension.cxx b/TextAnalysis/vtkScaleDimension.cxx
index 626db58f181ce589ba0709f003c37f90ed40a5c7..fdc90f6c00d66684130a8bc2df65b9d50b880ee8 100644
--- a/TextAnalysis/vtkScaleDimension.cxx
+++ b/TextAnalysis/vtkScaleDimension.cxx
@@ -32,7 +32,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkScaleDimension
 
-vtkCxxRevisionMacro(vtkScaleDimension, "1.2");
 vtkStandardNewMacro(vtkScaleDimension);
 
 vtkScaleDimension::vtkScaleDimension() :
diff --git a/TextAnalysis/vtkScaleDimension.h b/TextAnalysis/vtkScaleDimension.h
index 8e2277bea6b32cda6a1c9fd406168b478d4fd058..87272a182ce8b5b2884396b56202ae7e8cfd4f5a 100644
--- a/TextAnalysis/vtkScaleDimension.h
+++ b/TextAnalysis/vtkScaleDimension.h
@@ -48,7 +48,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkScaleDimension :
 {
 public:
   static vtkScaleDimension* New();
-  vtkTypeRevisionMacro(vtkScaleDimension, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkScaleDimension, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkSelectArraySlices.cxx b/TextAnalysis/vtkSelectArraySlices.cxx
index e6cbd392948938b304b6b49fadc4f5ad73b6648c..1646be760cc77944e9d70d9777287f1c3980c741 100644
--- a/TextAnalysis/vtkSelectArraySlices.cxx
+++ b/TextAnalysis/vtkSelectArraySlices.cxx
@@ -38,7 +38,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkSelectArraySlices
 
-vtkCxxRevisionMacro(vtkSelectArraySlices, "1.2");
 vtkStandardNewMacro(vtkSelectArraySlices);
 
 vtkSelectArraySlices::vtkSelectArraySlices() :
diff --git a/TextAnalysis/vtkSelectArraySlices.h b/TextAnalysis/vtkSelectArraySlices.h
index fc9885d73aa0fd7f8304126866dd4dac97b261fd..a31f5af8c7e39f1ccd23e319c4e3a7ef36b23ed3 100644
--- a/TextAnalysis/vtkSelectArraySlices.h
+++ b/TextAnalysis/vtkSelectArraySlices.h
@@ -41,7 +41,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkSelectArraySlices :
 {
 public:
   static vtkSelectArraySlices* New();
-  vtkTypeRevisionMacro(vtkSelectArraySlices, vtkSelectionAlgorithm);
+  vtkTypeMacro(vtkSelectArraySlices, vtkSelectionAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkTextExtraction.cxx b/TextAnalysis/vtkTextExtraction.cxx
index 58e3ea40ff97b8e2eeb9e1bf555a89cd9dd91562..cd55d6d4802a80df4b27a8c58e5f0ac5cd20ec15 100644
--- a/TextAnalysis/vtkTextExtraction.cxx
+++ b/TextAnalysis/vtkTextExtraction.cxx
@@ -44,7 +44,6 @@ public:
 ////////////////////////////////////////////////////////////////
 // vtkTextExtraction
 
-vtkCxxRevisionMacro(vtkTextExtraction, "1.9");
 vtkStandardNewMacro(vtkTextExtraction);
 
 vtkTextExtraction::vtkTextExtraction() :
diff --git a/TextAnalysis/vtkTextExtraction.h b/TextAnalysis/vtkTextExtraction.h
index e613dec37c91c91919f21b0703465a2218df6517..9514c30b043e245b26a6611c722060ec71a7dc1c 100644
--- a/TextAnalysis/vtkTextExtraction.h
+++ b/TextAnalysis/vtkTextExtraction.h
@@ -74,7 +74,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkTextExtraction :
 {
 public:
   static vtkTextExtraction* New();
-  vtkTypeRevisionMacro(vtkTextExtraction, vtkTableAlgorithm);
+  vtkTypeMacro(vtkTextExtraction, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkTextExtractionStrategy.cxx b/TextAnalysis/vtkTextExtractionStrategy.cxx
index 1f26e043dc51744c5941085ee92361c7b38dd68e..2996dbef4d26f92d8d754a28c3b2f350017c0486 100644
--- a/TextAnalysis/vtkTextExtractionStrategy.cxx
+++ b/TextAnalysis/vtkTextExtractionStrategy.cxx
@@ -20,7 +20,6 @@
 
 #include <vtkTextExtractionStrategy.h>
 
-vtkCxxRevisionMacro(vtkTextExtractionStrategy, "1.1");
 
 vtkTextExtractionStrategy::vtkTextExtractionStrategy()
 {
diff --git a/TextAnalysis/vtkTextExtractionStrategy.h b/TextAnalysis/vtkTextExtractionStrategy.h
index d4fd284f59fc165fbd980b6b5e2d0562614ccc23..5a83ae9d9682ec175b1ecaf29d1b37035c6b679d 100644
--- a/TextAnalysis/vtkTextExtractionStrategy.h
+++ b/TextAnalysis/vtkTextExtractionStrategy.h
@@ -45,7 +45,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkTextExtractionStrategy :
   public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkTextExtractionStrategy, vtkObject);
+  vtkTypeMacro(vtkTextExtractionStrategy, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/TextAnalysis/vtkTokenLengthFilter.cxx b/TextAnalysis/vtkTokenLengthFilter.cxx
index 7c93b7ac69bf8fb5f2962bd7b0018476d854847c..6ba6176ca0fb84989cc5490b534e333b66905873 100644
--- a/TextAnalysis/vtkTokenLengthFilter.cxx
+++ b/TextAnalysis/vtkTokenLengthFilter.cxx
@@ -31,7 +31,6 @@
 
 #include <stdexcept>
 
-vtkCxxRevisionMacro(vtkTokenLengthFilter, "1.3");
 vtkStandardNewMacro(vtkTokenLengthFilter);
 
 vtkTokenLengthFilter::vtkTokenLengthFilter() :
diff --git a/TextAnalysis/vtkTokenLengthFilter.h b/TextAnalysis/vtkTokenLengthFilter.h
index d1769a0efce78de0cf899700a93eb4a84576954a..cf666ad50ab5cbebb333ed2fbdd7d67945e30034 100644
--- a/TextAnalysis/vtkTokenLengthFilter.h
+++ b/TextAnalysis/vtkTokenLengthFilter.h
@@ -47,7 +47,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkTokenLengthFilter :
 {
 public:
   static vtkTokenLengthFilter* New();
-  vtkTypeRevisionMacro(vtkTokenLengthFilter, vtkTableAlgorithm);
+  vtkTypeMacro(vtkTokenLengthFilter, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkTokenValueFilter.cxx b/TextAnalysis/vtkTokenValueFilter.cxx
index ec00b27fa625ae2156208493337d2e21464f14f3..d2f075b05c3cc1ca2e9cced59773fc080c29da8b 100644
--- a/TextAnalysis/vtkTokenValueFilter.cxx
+++ b/TextAnalysis/vtkTokenValueFilter.cxx
@@ -34,7 +34,6 @@
 #include <sstream>
 #include <stdexcept>
 
-vtkCxxRevisionMacro(vtkTokenValueFilter, "1.2");
 vtkStandardNewMacro(vtkTokenValueFilter);
 
 class vtkTokenValueFilter::Internals
diff --git a/TextAnalysis/vtkTokenValueFilter.h b/TextAnalysis/vtkTokenValueFilter.h
index b2d11112e37e0b9dfabe14f23dbb54fe52c0980b..824b2cbdfe9f865065a9d9f8f5b064a80db683be 100644
--- a/TextAnalysis/vtkTokenValueFilter.h
+++ b/TextAnalysis/vtkTokenValueFilter.h
@@ -52,7 +52,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkTokenValueFilter :
 {
 public:
   static vtkTokenValueFilter* New();
-  vtkTypeRevisionMacro(vtkTokenValueFilter, vtkTableAlgorithm);
+  vtkTypeMacro(vtkTokenValueFilter, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/TextAnalysis/vtkTokenizer.cxx b/TextAnalysis/vtkTokenizer.cxx
index 4dbc3ca2718ad1f94c32d257116180c8140ed797..07b69bd85f13d61854f97f218c75d5d7ee77bf0d 100644
--- a/TextAnalysis/vtkTokenizer.cxx
+++ b/TextAnalysis/vtkTokenizer.cxx
@@ -63,7 +63,6 @@ public:
   DelimiterRanges KeptDelimiters;
 };
 
-vtkCxxRevisionMacro(vtkTokenizer, "1.6");
 vtkStandardNewMacro(vtkTokenizer);
 
 vtkTokenizer::vtkTokenizer() :
diff --git a/TextAnalysis/vtkTokenizer.h b/TextAnalysis/vtkTokenizer.h
index 1f241965dd9b16f745e1ac574ebf89c26f30e42a..badbfbfa2243129e2c239a93fdf82e85023d9687 100644
--- a/TextAnalysis/vtkTokenizer.h
+++ b/TextAnalysis/vtkTokenizer.h
@@ -81,7 +81,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkTokenizer :
 {
 public:
   static vtkTokenizer* New();
-  vtkTypeRevisionMacro(vtkTokenizer, vtkTableAlgorithm);
+  vtkTypeMacro(vtkTokenizer, vtkTableAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/TextAnalysis/vtkUnityMatrixWeighting.cxx b/TextAnalysis/vtkUnityMatrixWeighting.cxx
index 6d772f4fb5ab9a4d55ea3ae9d931ce320009967f..d38c3fef3eb076a7ef801037f8a6c8ebb93a2d74 100644
--- a/TextAnalysis/vtkUnityMatrixWeighting.cxx
+++ b/TextAnalysis/vtkUnityMatrixWeighting.cxx
@@ -32,7 +32,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 // vtkUnityMatrixWeighting
 
-vtkCxxRevisionMacro(vtkUnityMatrixWeighting, "1.2");
 vtkStandardNewMacro(vtkUnityMatrixWeighting);
 
 vtkUnityMatrixWeighting::vtkUnityMatrixWeighting() :
diff --git a/TextAnalysis/vtkUnityMatrixWeighting.h b/TextAnalysis/vtkUnityMatrixWeighting.h
index 680d799010cc123f4f3c4d848fa85a606eae0636..f26198578b4bfe09e45e09b375c898ea0fcc57c0 100644
--- a/TextAnalysis/vtkUnityMatrixWeighting.h
+++ b/TextAnalysis/vtkUnityMatrixWeighting.h
@@ -34,7 +34,7 @@ class VTK_TEXT_ANALYSIS_EXPORT vtkUnityMatrixWeighting :
 {
 public:
   static vtkUnityMatrixWeighting* New();
-  vtkTypeRevisionMacro(vtkUnityMatrixWeighting, vtkArrayDataAlgorithm);
+  vtkTypeMacro(vtkUnityMatrixWeighting, vtkArrayDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Utilities/Doxygen/doxyfile.in b/Utilities/Doxygen/doxyfile.in
index 46ba3cd5da86b415f3c85b9ad75a8dab1746a370..da707ae15cc1291b7f4f7887caf1de59926f4066 100644
--- a/Utilities/Doxygen/doxyfile.in
+++ b/Utilities/Doxygen/doxyfile.in
@@ -201,7 +201,7 @@ PREDEFINED  = "vtkSetMacro(name,type)= \
                    static int IsTypeOf(const char *type); \
                    virtual int IsA(const char *type); \
                    static thisClass* SafeDownCast(vtkObject *o);" \
-               "vtkTypeRevisionMacro(thisClass,superclass)= \
+               "vtkTypeMacro(thisClass,superclass)= \
                    typedef superclass Superclass; \
                    virtual const char *GetClassName(); \
                    static int IsTypeOf(const char *type); \
diff --git a/Utilities/Upgrading/README.WindowsMangling.txt b/Utilities/Upgrading/README.WindowsMangling.txt
index a3c67c440a69ae8d99750401adc80bc4a59fca13..b2f9aacdb41c7977ab20ac1ea83a30e9c0d9ff83 100644
--- a/Utilities/Upgrading/README.WindowsMangling.txt
+++ b/Utilities/Upgrading/README.WindowsMangling.txt
@@ -211,4 +211,4 @@ GetClassName to get it to work whether or not windows.h is included or
 UNICODE is defined.  The method is no longer virtual so user code must
 define a GetClassNameInternal protected method instead of GetClassName
 in order to override it.  Since most user code defines the method with
-vtkTypeRevisionMacro anyway this should not require many changes.
+vtkTypeMacro anyway this should not require many changes.
diff --git a/Views/vtkConvertSelectionDomain.cxx b/Views/vtkConvertSelectionDomain.cxx
index 25cc033233a7b260eb307c8778f87a99338e6ef4..d8ebabf48fffe443ad0ad5a0d9c020734ca74746 100644
--- a/Views/vtkConvertSelectionDomain.cxx
+++ b/Views/vtkConvertSelectionDomain.cxx
@@ -41,7 +41,6 @@
 
 #include <vtksys/stl/set>
 
-vtkCxxRevisionMacro(vtkConvertSelectionDomain, "1.7");
 vtkStandardNewMacro(vtkConvertSelectionDomain);
 //----------------------------------------------------------------------------
 vtkConvertSelectionDomain::vtkConvertSelectionDomain()
diff --git a/Views/vtkConvertSelectionDomain.h b/Views/vtkConvertSelectionDomain.h
index 8b4671f68f01ec5e71b46d2d9f904bb6eccf8d5f..203f28347d8343def938caff40f226a42dbf8f42 100644
--- a/Views/vtkConvertSelectionDomain.h
+++ b/Views/vtkConvertSelectionDomain.h
@@ -46,7 +46,7 @@ class VTK_VIEWS_EXPORT vtkConvertSelectionDomain : public vtkPassInputTypeAlgori
 {
 public:
   static vtkConvertSelectionDomain *New();
-  vtkTypeRevisionMacro(vtkConvertSelectionDomain, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkConvertSelectionDomain, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 protected:
diff --git a/Views/vtkDataRepresentation.cxx b/Views/vtkDataRepresentation.cxx
index df3441ef819e8267badc99a8fc6f196034e1ebbc..90cbd07f2aba4c639bb01d14f6bff1a98df06579 100644
--- a/Views/vtkDataRepresentation.cxx
+++ b/Views/vtkDataRepresentation.cxx
@@ -87,7 +87,6 @@ private:
 // vtkDataRepresentation
 //----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkDataRepresentation, "1.16");
 vtkStandardNewMacro(vtkDataRepresentation);
 vtkCxxSetObjectMacro(vtkDataRepresentation,
   AnnotationLinkInternal, vtkAnnotationLink);
diff --git a/Views/vtkDataRepresentation.h b/Views/vtkDataRepresentation.h
index 1cac8f1ff0409c0d6a563a5240294e307b8fc3be..d5be12d0e3b0a909f27034e57766b08e99db8600 100644
--- a/Views/vtkDataRepresentation.h
+++ b/Views/vtkDataRepresentation.h
@@ -62,7 +62,7 @@ class VTK_VIEWS_EXPORT vtkDataRepresentation : public vtkPassInputTypeAlgorithm
 {
 public:
   static vtkDataRepresentation *New();
-  vtkTypeRevisionMacro(vtkDataRepresentation, vtkPassInputTypeAlgorithm);
+  vtkTypeMacro(vtkDataRepresentation, vtkPassInputTypeAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkEmptyRepresentation.cxx b/Views/vtkEmptyRepresentation.cxx
index fa05643595f99656bf26aa18210d565350b1d07a..a6cd7693c313fffd14b8e1e214601af689627122 100644
--- a/Views/vtkEmptyRepresentation.cxx
+++ b/Views/vtkEmptyRepresentation.cxx
@@ -24,7 +24,6 @@
 #include "vtkConvertSelectionDomain.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkEmptyRepresentation, "1.2");
 vtkStandardNewMacro(vtkEmptyRepresentation);
 
 
diff --git a/Views/vtkEmptyRepresentation.h b/Views/vtkEmptyRepresentation.h
index f9cd7e721fffe029f322e7b5afa83f58a7d9ea76..ffc0f1fce2e69739922c076c5a603da713a1e79c 100644
--- a/Views/vtkEmptyRepresentation.h
+++ b/Views/vtkEmptyRepresentation.h
@@ -33,7 +33,7 @@ class VTK_VIEWS_EXPORT vtkEmptyRepresentation : public vtkDataRepresentation
 {
 public:
   static vtkEmptyRepresentation* New();
-  vtkTypeRevisionMacro(vtkEmptyRepresentation, vtkDataRepresentation);
+  vtkTypeMacro(vtkEmptyRepresentation, vtkDataRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkGraphLayoutView.cxx b/Views/vtkGraphLayoutView.cxx
index 6a4f81dc4e8828414f28174e408ebe8506ae597e..0f706ef5224bf1eba877bf673bf01ab6bb97f37c 100644
--- a/Views/vtkGraphLayoutView.cxx
+++ b/Views/vtkGraphLayoutView.cxx
@@ -35,7 +35,6 @@
 #include "vtkSimple2DLayoutStrategy.h"
 #include "vtkTextProperty.h"
 
-vtkCxxRevisionMacro(vtkGraphLayoutView, "1.67");
 vtkStandardNewMacro(vtkGraphLayoutView);
 //----------------------------------------------------------------------------
 vtkGraphLayoutView::vtkGraphLayoutView()
diff --git a/Views/vtkGraphLayoutView.h b/Views/vtkGraphLayoutView.h
index a39b413c987a86865f2026ff34779e197207c410..3abc2c2af50def3de9cc8cd6d9989a7196cc290c 100644
--- a/Views/vtkGraphLayoutView.h
+++ b/Views/vtkGraphLayoutView.h
@@ -50,7 +50,7 @@ class VTK_VIEWS_EXPORT vtkGraphLayoutView : public vtkRenderView
 {
 public:
   static vtkGraphLayoutView *New();
-  vtkTypeRevisionMacro(vtkGraphLayoutView, vtkRenderView);
+  vtkTypeMacro(vtkGraphLayoutView, vtkRenderView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkHierarchicalGraphPipeline.cxx b/Views/vtkHierarchicalGraphPipeline.cxx
index 12f09f2670137f0eee72d64afff262620a045f8f..3a01fba6f1eb8a7b4fbfb78b013d036f0298133b 100644
--- a/Views/vtkHierarchicalGraphPipeline.cxx
+++ b/Views/vtkHierarchicalGraphPipeline.cxx
@@ -43,7 +43,6 @@
 #include "vtkTextProperty.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalGraphPipeline, "1.16");
 vtkStandardNewMacro(vtkHierarchicalGraphPipeline);
 
 vtkHierarchicalGraphPipeline::vtkHierarchicalGraphPipeline()
diff --git a/Views/vtkHierarchicalGraphPipeline.h b/Views/vtkHierarchicalGraphPipeline.h
index 8ab5c964d5d94c32ddd520ffffd85a0b55d7c813..88e6b3eb4a7b9db07495593edccd6128b986a280 100644
--- a/Views/vtkHierarchicalGraphPipeline.h
+++ b/Views/vtkHierarchicalGraphPipeline.h
@@ -47,7 +47,7 @@ class VTK_VIEWS_EXPORT vtkHierarchicalGraphPipeline : public vtkObject
 {
 public:
   static vtkHierarchicalGraphPipeline* New();
-  vtkTypeRevisionMacro(vtkHierarchicalGraphPipeline, vtkObject);
+  vtkTypeMacro(vtkHierarchicalGraphPipeline, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkHierarchicalGraphView.cxx b/Views/vtkHierarchicalGraphView.cxx
index b5498ddefdb0abe1c97c7fa5afae5330ec0fdfb9..bfc63a46499c3227ebae100dafb48bef651cb367 100644
--- a/Views/vtkHierarchicalGraphView.cxx
+++ b/Views/vtkHierarchicalGraphView.cxx
@@ -26,7 +26,6 @@
 #include "vtkRenderedHierarchyRepresentation.h"
 #include "vtkTree.h"
 
-vtkCxxRevisionMacro(vtkHierarchicalGraphView, "1.12");
 vtkStandardNewMacro(vtkHierarchicalGraphView);
 //----------------------------------------------------------------------------
 vtkHierarchicalGraphView::vtkHierarchicalGraphView()
diff --git a/Views/vtkHierarchicalGraphView.h b/Views/vtkHierarchicalGraphView.h
index 8e737538480ff65de3e4b6c2496e3ceb9cad2ca3..fb8b593b2bd5567310d589b2bf40448201f79732 100644
--- a/Views/vtkHierarchicalGraphView.h
+++ b/Views/vtkHierarchicalGraphView.h
@@ -46,7 +46,7 @@ class VTK_VIEWS_EXPORT vtkHierarchicalGraphView : public vtkGraphLayoutView
 {
 public:
   static vtkHierarchicalGraphView *New();
-  vtkTypeRevisionMacro(vtkHierarchicalGraphView, vtkGraphLayoutView);
+  vtkTypeMacro(vtkHierarchicalGraphView, vtkGraphLayoutView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Views/vtkIcicleView.cxx b/Views/vtkIcicleView.cxx
index 42c3bc84a2f267725bb00f7944b5595e7d926764..fb8e6ba8173f80349e233fad42c2177d6b7223fc 100644
--- a/Views/vtkIcicleView.cxx
+++ b/Views/vtkIcicleView.cxx
@@ -25,7 +25,6 @@
 #include "vtkStackedTreeLayoutStrategy.h"
 #include "vtkTreeMapToPolyData.h"
 
-vtkCxxRevisionMacro(vtkIcicleView, "1.5");
 vtkStandardNewMacro(vtkIcicleView);
 //----------------------------------------------------------------------------
 vtkIcicleView::vtkIcicleView()
diff --git a/Views/vtkIcicleView.h b/Views/vtkIcicleView.h
index a1b68e45ba1bb1eeea03b390e68113eb8fcb4461..3bef481228901649b5d56cf0a929a4ef873e71d0 100644
--- a/Views/vtkIcicleView.h
+++ b/Views/vtkIcicleView.h
@@ -34,7 +34,7 @@ class VTK_VIEWS_EXPORT vtkIcicleView : public vtkTreeAreaView
 {
 public:
   static vtkIcicleView *New();
-  vtkTypeRevisionMacro(vtkIcicleView, vtkTreeAreaView);
+  vtkTypeMacro(vtkIcicleView, vtkTreeAreaView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkInteractorStyleAreaSelectHover.cxx b/Views/vtkInteractorStyleAreaSelectHover.cxx
index f97e2818a7f4e41f9716428d8b13c6bf4dcce52a..ace306ba3191aced8c727850f848ffd4c7d5a02b 100644
--- a/Views/vtkInteractorStyleAreaSelectHover.cxx
+++ b/Views/vtkInteractorStyleAreaSelectHover.cxx
@@ -47,7 +47,6 @@
 #define VTK_CREATE(type, name)                                  \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkInteractorStyleAreaSelectHover, "1.1");
 vtkStandardNewMacro(vtkInteractorStyleAreaSelectHover);
 
 vtkCxxSetObjectMacro(vtkInteractorStyleAreaSelectHover, Layout, vtkAreaLayout);
diff --git a/Views/vtkInteractorStyleAreaSelectHover.h b/Views/vtkInteractorStyleAreaSelectHover.h
index 9447f66c5c766bccd9abce5f4e5db76d54e3df91..6aa6a0ed8c26ea706e07574f0973270cb318c904 100644
--- a/Views/vtkInteractorStyleAreaSelectHover.h
+++ b/Views/vtkInteractorStyleAreaSelectHover.h
@@ -45,7 +45,7 @@ class VTK_VIEWS_EXPORT vtkInteractorStyleAreaSelectHover : public vtkInteractorS
 {
 public:
   static vtkInteractorStyleAreaSelectHover* New();
-  vtkTypeRevisionMacro(vtkInteractorStyleAreaSelectHover,vtkInteractorStyleRubberBand2D);
+  vtkTypeMacro(vtkInteractorStyleAreaSelectHover,vtkInteractorStyleRubberBand2D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkInteractorStyleTreeMapHover.cxx b/Views/vtkInteractorStyleTreeMapHover.cxx
index 78aa6b8614371810614a36eb1fae506d8b7b2dc4..120b4912246487aa6a4e55521acfc96e1243fa44 100644
--- a/Views/vtkInteractorStyleTreeMapHover.cxx
+++ b/Views/vtkInteractorStyleTreeMapHover.cxx
@@ -40,7 +40,6 @@
 #include "vtkWorldPointPicker.h"
 #include "vtkVariant.h"
 
-vtkCxxRevisionMacro(vtkInteractorStyleTreeMapHover, "1.1");
 vtkStandardNewMacro(vtkInteractorStyleTreeMapHover);
 
 //----------------------------------------------------------------------------
diff --git a/Views/vtkInteractorStyleTreeMapHover.h b/Views/vtkInteractorStyleTreeMapHover.h
index 21a714e6f73a92e4acbe9ffe9b988e0598d49051..20c07e4f818ee538a60ea9d566116d91a3a354bb 100644
--- a/Views/vtkInteractorStyleTreeMapHover.h
+++ b/Views/vtkInteractorStyleTreeMapHover.h
@@ -45,7 +45,7 @@ class VTK_VIEWS_EXPORT vtkInteractorStyleTreeMapHover : public vtkInteractorStyl
 {
 public:
   static vtkInteractorStyleTreeMapHover* New();
-  vtkTypeRevisionMacro(vtkInteractorStyleTreeMapHover,vtkInteractorStyleImage);
+  vtkTypeMacro(vtkInteractorStyleTreeMapHover,vtkInteractorStyleImage);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkParallelCoordinatesHistogramRepresentation.cxx b/Views/vtkParallelCoordinatesHistogramRepresentation.cxx
index 31635b02f29983450ee5d853c0057217d5adda4f..68d72d9a98c3fa6e695e208e94580a04736b011b 100644
--- a/Views/vtkParallelCoordinatesHistogramRepresentation.cxx
+++ b/Views/vtkParallelCoordinatesHistogramRepresentation.cxx
@@ -55,7 +55,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkUnsignedIntArray.h"
 #include "vtkViewTheme.h"
 //------------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkParallelCoordinatesHistogramRepresentation, "1.4");
 vtkStandardNewMacro(vtkParallelCoordinatesHistogramRepresentation);
 //------------------------------------------------------------------------------
 vtkParallelCoordinatesHistogramRepresentation::vtkParallelCoordinatesHistogramRepresentation()
diff --git a/Views/vtkParallelCoordinatesHistogramRepresentation.h b/Views/vtkParallelCoordinatesHistogramRepresentation.h
index 830fd8eabb79a043f2ad22127bd44b0658ed45d4..db7577a86c5a06025578decd3c74c280d5e9af5a 100644
--- a/Views/vtkParallelCoordinatesHistogramRepresentation.h
+++ b/Views/vtkParallelCoordinatesHistogramRepresentation.h
@@ -64,7 +64,7 @@ class VTK_VIEWS_EXPORT vtkParallelCoordinatesHistogramRepresentation : public vt
 {
 public:
   static vtkParallelCoordinatesHistogramRepresentation* New();
-  vtkTypeRevisionMacro(vtkParallelCoordinatesHistogramRepresentation, vtkParallelCoordinatesRepresentation);
+  vtkTypeMacro(vtkParallelCoordinatesHistogramRepresentation, vtkParallelCoordinatesRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkParallelCoordinatesRepresentation.cxx b/Views/vtkParallelCoordinatesRepresentation.cxx
index 9035e6c83b0ecb61e9f9e6d5f9904a82198a34e6..67c0f51f138c08d5232d81b1c16c92f3a9e5835e 100644
--- a/Views/vtkParallelCoordinatesRepresentation.cxx
+++ b/Views/vtkParallelCoordinatesRepresentation.cxx
@@ -81,7 +81,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtkstd/vector>
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkParallelCoordinatesRepresentation, "1.11");
 vtkStandardNewMacro(vtkParallelCoordinatesRepresentation);
 
 //------------------------------------------------------------------------------
diff --git a/Views/vtkParallelCoordinatesRepresentation.h b/Views/vtkParallelCoordinatesRepresentation.h
index 4bdca30b8fd9b3490f4edfb7a8f0060d13fbf03e..b3e43e06a12d2ae7fcaf81bb004e5e8c86d154ff 100644
--- a/Views/vtkParallelCoordinatesRepresentation.h
+++ b/Views/vtkParallelCoordinatesRepresentation.h
@@ -82,7 +82,7 @@ class VTK_VIEWS_EXPORT vtkParallelCoordinatesRepresentation : public vtkRendered
 {
 public:
   static vtkParallelCoordinatesRepresentation* New();
-  vtkTypeRevisionMacro(vtkParallelCoordinatesRepresentation, vtkRenderedRepresentation);
+  vtkTypeMacro(vtkParallelCoordinatesRepresentation, vtkRenderedRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkParallelCoordinatesView.cxx b/Views/vtkParallelCoordinatesView.cxx
index f1850a410a41bb4b8a96af06b82ada8fa67d13be..7fe8f15b3c74d62a8279dd3c00d78b4b14953403 100644
--- a/Views/vtkParallelCoordinatesView.cxx
+++ b/Views/vtkParallelCoordinatesView.cxx
@@ -47,7 +47,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include <vtksys/ios/sstream>
 #include <assert.h>
 
-vtkCxxRevisionMacro(vtkParallelCoordinatesView, "1.4");
 vtkStandardNewMacro(vtkParallelCoordinatesView);
 
 // ----------------------------------------------------------------------
diff --git a/Views/vtkParallelCoordinatesView.h b/Views/vtkParallelCoordinatesView.h
index 0602abdea41792e3c456e850e7f2cbc322501b95..9862b2c4d154c0d809dcad79cdf8b5dfbd726633 100644
--- a/Views/vtkParallelCoordinatesView.h
+++ b/Views/vtkParallelCoordinatesView.h
@@ -50,7 +50,7 @@ class vtkPolyDataMapper2D;
 class VTK_VIEWS_EXPORT vtkParallelCoordinatesView : public vtkRenderView
 {
 public:
-  vtkTypeRevisionMacro(vtkParallelCoordinatesView, vtkRenderView);
+  vtkTypeMacro(vtkParallelCoordinatesView, vtkRenderView);
   static vtkParallelCoordinatesView *New();
   void PrintSelf(ostream &os, vtkIndent indent);
 
diff --git a/Views/vtkPipelineGraphSource.cxx b/Views/vtkPipelineGraphSource.cxx
index 96a4a7cd0b6dd620043120b9b28c6a9fe3c90326..8224378332cff89783d638a1eebf2e642f981f89 100644
--- a/Views/vtkPipelineGraphSource.cxx
+++ b/Views/vtkPipelineGraphSource.cxx
@@ -47,7 +47,6 @@ using vtksys_ios::ostringstream;
 #define VTK_CREATE(type, name) \
   vtkSmartPointer<type> name = vtkSmartPointer<type>::New()
 
-vtkCxxRevisionMacro(vtkPipelineGraphSource, "1.3");
 vtkStandardNewMacro(vtkPipelineGraphSource);
 
 // ----------------------------------------------------------------------
diff --git a/Views/vtkPipelineGraphSource.h b/Views/vtkPipelineGraphSource.h
index 7c00a92b90231e8fc3ae538c3b0c86b77dd5600e..21ec02a8d239576fc788bee66dfe04d2ecbaff53 100644
--- a/Views/vtkPipelineGraphSource.h
+++ b/Views/vtkPipelineGraphSource.h
@@ -28,7 +28,7 @@ class VTK_VIEWS_EXPORT vtkPipelineGraphSource : public vtkDirectedGraphAlgorithm
 {
 public:
   static vtkPipelineGraphSource* New();
-  vtkTypeRevisionMacro(vtkPipelineGraphSource,vtkDirectedGraphAlgorithm);
+  vtkTypeMacro(vtkPipelineGraphSource,vtkDirectedGraphAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void AddSink(vtkObject* object);
diff --git a/Views/vtkRenderView.cxx b/Views/vtkRenderView.cxx
index 66b3d66f0475ec0827207fd00afa0ff91de1cf54..9cc57d3f59f022807e83d8a4fdf945869fbe93e6 100644
--- a/Views/vtkRenderView.cxx
+++ b/Views/vtkRenderView.cxx
@@ -60,7 +60,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkRenderView, "1.38");
 vtkStandardNewMacro(vtkRenderView);
 vtkCxxSetObjectMacro(vtkRenderView, Transform, vtkAbstractTransform);
 vtkCxxSetObjectMacro(vtkRenderView, IconTexture, vtkTexture);
diff --git a/Views/vtkRenderView.h b/Views/vtkRenderView.h
index 4b80a41753c2c773deb716e81031501660997cbb..4cd4bbe9c2afaf3df853e1d98b8b949e007fd76f 100644
--- a/Views/vtkRenderView.h
+++ b/Views/vtkRenderView.h
@@ -58,7 +58,7 @@ class VTK_VIEWS_EXPORT vtkRenderView : public vtkView
 {
 public:
   static vtkRenderView* New();
-  vtkTypeRevisionMacro(vtkRenderView, vtkView);
+  vtkTypeMacro(vtkRenderView, vtkView);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Views/vtkRenderedGraphRepresentation.cxx b/Views/vtkRenderedGraphRepresentation.cxx
index 2c949b6e85a25e80d497ddc880ee346758cf1ae0..c8c65290ff26435538061042a564cbb0027b3037 100644
--- a/Views/vtkRenderedGraphRepresentation.cxx
+++ b/Views/vtkRenderedGraphRepresentation.cxx
@@ -95,7 +95,6 @@
 
 
 
-vtkCxxRevisionMacro(vtkRenderedGraphRepresentation, "1.33");
 vtkStandardNewMacro(vtkRenderedGraphRepresentation);
 
 vtkRenderedGraphRepresentation::vtkRenderedGraphRepresentation()
diff --git a/Views/vtkRenderedGraphRepresentation.h b/Views/vtkRenderedGraphRepresentation.h
index b19a072a6973077ef7c1787b1f354de569cfe6f7..083b9402d1ba346a5087fac230b88fd2c9cc3c7d 100644
--- a/Views/vtkRenderedGraphRepresentation.h
+++ b/Views/vtkRenderedGraphRepresentation.h
@@ -62,7 +62,7 @@ class VTK_VIEWS_EXPORT vtkRenderedGraphRepresentation : public vtkRenderedRepres
 {
 public:
   static vtkRenderedGraphRepresentation* New();
-  vtkTypeRevisionMacro(vtkRenderedGraphRepresentation, vtkRenderedRepresentation);
+  vtkTypeMacro(vtkRenderedGraphRepresentation, vtkRenderedRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // ------------------------------------------------------------------------
diff --git a/Views/vtkRenderedHierarchyRepresentation.cxx b/Views/vtkRenderedHierarchyRepresentation.cxx
index 7f8f8dbac1a8cc570708026ced125f2cb9371e82..b051ff2e04c6a6308c95123feeb41c6a4bce5f95 100644
--- a/Views/vtkRenderedHierarchyRepresentation.cxx
+++ b/Views/vtkRenderedHierarchyRepresentation.cxx
@@ -49,7 +49,6 @@ public:
   vtkstd::vector<vtkSmartPointer<vtkHierarchicalGraphPipeline> > Graphs;
 };
 
-vtkCxxRevisionMacro(vtkRenderedHierarchyRepresentation, "1.8");
 vtkStandardNewMacro(vtkRenderedHierarchyRepresentation);
 
 vtkRenderedHierarchyRepresentation::vtkRenderedHierarchyRepresentation()
diff --git a/Views/vtkRenderedHierarchyRepresentation.h b/Views/vtkRenderedHierarchyRepresentation.h
index 9c6d2279b646e65d139ce9178a831bed023246ab..5b77adc3c40bedee3f2e4a46ad216af3db2c4d14 100644
--- a/Views/vtkRenderedHierarchyRepresentation.h
+++ b/Views/vtkRenderedHierarchyRepresentation.h
@@ -30,7 +30,7 @@ class VTK_VIEWS_EXPORT vtkRenderedHierarchyRepresentation : public vtkRenderedGr
 {
 public:
   static vtkRenderedHierarchyRepresentation* New();
-  vtkTypeRevisionMacro(vtkRenderedHierarchyRepresentation, vtkRenderedGraphRepresentation);
+  vtkTypeMacro(vtkRenderedHierarchyRepresentation, vtkRenderedGraphRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkRenderedRepresentation.cxx b/Views/vtkRenderedRepresentation.cxx
index a8a4fb85954b4ce279b5382fb3fe616ab4609bdc..958f9021a90a54f8b8f17f256eab4532280a0aa8 100644
--- a/Views/vtkRenderedRepresentation.cxx
+++ b/Views/vtkRenderedRepresentation.cxx
@@ -32,7 +32,6 @@
 
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkRenderedRepresentation, "1.4");
 vtkStandardNewMacro(vtkRenderedRepresentation);
 
 class vtkRenderedRepresentation::Internals
diff --git a/Views/vtkRenderedRepresentation.h b/Views/vtkRenderedRepresentation.h
index 5f62504aefc202e1c41008abd03e27556fe0555e..4beb96336d3dc9f575cdc2edf75a2a4363a6bbfd 100644
--- a/Views/vtkRenderedRepresentation.h
+++ b/Views/vtkRenderedRepresentation.h
@@ -40,7 +40,7 @@ class VTK_VIEWS_EXPORT vtkRenderedRepresentation : public vtkDataRepresentation
 {
 public:
   static vtkRenderedRepresentation* New();
-  vtkTypeRevisionMacro(vtkRenderedRepresentation, vtkDataRepresentation);
+  vtkTypeMacro(vtkRenderedRepresentation, vtkDataRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkRenderedSurfaceRepresentation.cxx b/Views/vtkRenderedSurfaceRepresentation.cxx
index 7c7d6bf812dc000f440a64ccf14aa431d3e57367..29380e561eb86f5fcc28471e3f282d2fef41877a 100644
--- a/Views/vtkRenderedSurfaceRepresentation.cxx
+++ b/Views/vtkRenderedSurfaceRepresentation.cxx
@@ -43,7 +43,6 @@
 #include "vtkTransformFilter.h"
 #include "vtkViewTheme.h"
 
-vtkCxxRevisionMacro(vtkRenderedSurfaceRepresentation, "1.7");
 vtkStandardNewMacro(vtkRenderedSurfaceRepresentation);
 //----------------------------------------------------------------------------
 vtkRenderedSurfaceRepresentation::vtkRenderedSurfaceRepresentation()
diff --git a/Views/vtkRenderedSurfaceRepresentation.h b/Views/vtkRenderedSurfaceRepresentation.h
index 9f89be0286aa01780e4c740cb1123d2839707d79..c0072a540948aec50d255cfa641abc74a6ab23cc 100644
--- a/Views/vtkRenderedSurfaceRepresentation.h
+++ b/Views/vtkRenderedSurfaceRepresentation.h
@@ -46,7 +46,7 @@ class VTK_VIEWS_EXPORT vtkRenderedSurfaceRepresentation : public vtkRenderedRepr
 {
 public:
   static vtkRenderedSurfaceRepresentation *New();
-  vtkTypeRevisionMacro(vtkRenderedSurfaceRepresentation, vtkRenderedRepresentation);
+  vtkTypeMacro(vtkRenderedSurfaceRepresentation, vtkRenderedRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   //Description:
diff --git a/Views/vtkRenderedTreeAreaRepresentation.cxx b/Views/vtkRenderedTreeAreaRepresentation.cxx
index 3cc7cc0ee683f902810c3b9159012ba4414ccf88..afbcc50861ed2f7779722d096846509bc04b648e 100644
--- a/Views/vtkRenderedTreeAreaRepresentation.cxx
+++ b/Views/vtkRenderedTreeAreaRepresentation.cxx
@@ -83,7 +83,6 @@ public:
   vtkstd::vector<vtkSmartPointer<vtkHierarchicalGraphPipeline> > Graphs;
 };
 
-vtkCxxRevisionMacro(vtkRenderedTreeAreaRepresentation, "1.19");
 vtkStandardNewMacro(vtkRenderedTreeAreaRepresentation);
 
 vtkRenderedTreeAreaRepresentation::vtkRenderedTreeAreaRepresentation()
diff --git a/Views/vtkRenderedTreeAreaRepresentation.h b/Views/vtkRenderedTreeAreaRepresentation.h
index 96fed7697505e78ed7406604930a1557af76ab7d..16eeca24e2683fe8ae062272ad2f6899e0132932 100644
--- a/Views/vtkRenderedTreeAreaRepresentation.h
+++ b/Views/vtkRenderedTreeAreaRepresentation.h
@@ -49,7 +49,7 @@ class VTK_VIEWS_EXPORT vtkRenderedTreeAreaRepresentation : public vtkRenderedRep
 {
 public:
   static vtkRenderedTreeAreaRepresentation* New();
-  vtkTypeRevisionMacro(vtkRenderedTreeAreaRepresentation, vtkRenderedRepresentation);
+  vtkTypeMacro(vtkRenderedTreeAreaRepresentation, vtkRenderedRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkTreeAreaView.cxx b/Views/vtkTreeAreaView.cxx
index cb83e329db252d1d2834dc93efa0b42f8b5b6b65..a62dcafae3b7cf5e6a96521a6447383a7604e320 100644
--- a/Views/vtkTreeAreaView.cxx
+++ b/Views/vtkTreeAreaView.cxx
@@ -36,7 +36,6 @@
 #include "vtkTree.h"
 #include "vtkAreaLayoutStrategy.h"
 
-vtkCxxRevisionMacro(vtkTreeAreaView, "1.10");
 vtkStandardNewMacro(vtkTreeAreaView);
 //----------------------------------------------------------------------------
 vtkTreeAreaView::vtkTreeAreaView()
diff --git a/Views/vtkTreeAreaView.h b/Views/vtkTreeAreaView.h
index 4484209608b01f45e908b725402ef0ccf1249ccb..ec40c23d55dd5c42dcee9fcc77b07c4ebfcb5892 100644
--- a/Views/vtkTreeAreaView.h
+++ b/Views/vtkTreeAreaView.h
@@ -50,7 +50,7 @@ class VTK_VIEWS_EXPORT vtkTreeAreaView : public vtkRenderView
 {
 public:
   static vtkTreeAreaView *New();
-  vtkTypeRevisionMacro(vtkTreeAreaView, vtkRenderView);
+  vtkTypeMacro(vtkTreeAreaView, vtkRenderView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkTreeMapView.cxx b/Views/vtkTreeMapView.cxx
index 67e8159f604f092eda61e534e69a34d27c36f174..c0e2f38bc905f362ff5fcd778b183ba1d0229868 100644
--- a/Views/vtkTreeMapView.cxx
+++ b/Views/vtkTreeMapView.cxx
@@ -31,7 +31,6 @@
 #include "vtkTextProperty.h"
 #include "vtkTreeMapToPolyData.h"
 
-vtkCxxRevisionMacro(vtkTreeMapView, "1.8");
 vtkStandardNewMacro(vtkTreeMapView);
 //----------------------------------------------------------------------------
 vtkTreeMapView::vtkTreeMapView()
diff --git a/Views/vtkTreeMapView.h b/Views/vtkTreeMapView.h
index fdaedf5a5666fda77c25551241a13c9c30a8fd42..87d9b025b55268d73e74e1c5995ec379755e0ec6 100644
--- a/Views/vtkTreeMapView.h
+++ b/Views/vtkTreeMapView.h
@@ -37,7 +37,7 @@ class VTK_VIEWS_EXPORT vtkTreeMapView : public vtkTreeAreaView
 {
 public:
   static vtkTreeMapView *New();
-  vtkTypeRevisionMacro(vtkTreeMapView, vtkTreeAreaView);
+  vtkTypeMacro(vtkTreeMapView, vtkTreeAreaView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkTreeRingView.cxx b/Views/vtkTreeRingView.cxx
index 6c18c599ab03c8e3aa72e40d7779c912898b0e67..c1121649fa1f218abf059b650213b847b8aa7171 100644
--- a/Views/vtkTreeRingView.cxx
+++ b/Views/vtkTreeRingView.cxx
@@ -26,7 +26,6 @@
 #include "vtkStackedTreeLayoutStrategy.h"
 #include "vtkTreeRingToPolyData.h"
 
-vtkCxxRevisionMacro(vtkTreeRingView, "1.9");
 vtkStandardNewMacro(vtkTreeRingView);
 //----------------------------------------------------------------------------
 vtkTreeRingView::vtkTreeRingView()
diff --git a/Views/vtkTreeRingView.h b/Views/vtkTreeRingView.h
index cbed289860e2c0056bcb34f97f442a3ab948a650..50f9bfd53a37b1c33491ae19f50123a893def03e 100644
--- a/Views/vtkTreeRingView.h
+++ b/Views/vtkTreeRingView.h
@@ -42,7 +42,7 @@ class VTK_VIEWS_EXPORT vtkTreeRingView : public vtkTreeAreaView
 {
 public:
   static vtkTreeRingView *New();
-  vtkTypeRevisionMacro(vtkTreeRingView, vtkTreeAreaView);
+  vtkTypeMacro(vtkTreeRingView, vtkTreeAreaView);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Views/vtkView.cxx b/Views/vtkView.cxx
index 180f4350bd246fc75545b2c56aa0b5f3f27781ab..2cac9add3cfb5c9287b1d45c17fd16abd5cf645f 100644
--- a/Views/vtkView.cxx
+++ b/Views/vtkView.cxx
@@ -76,7 +76,6 @@ public:
 };
   
 
-vtkCxxRevisionMacro(vtkView, "1.23");
 vtkStandardNewMacro(vtkView);
 //----------------------------------------------------------------------------
 vtkView::vtkView()
diff --git a/Views/vtkView.h b/Views/vtkView.h
index 5fcb1a47b7d87d25d7925aeb7e084faaf10d4ab7..57c85198a87704380e4f06503349fac022aafbbe 100644
--- a/Views/vtkView.h
+++ b/Views/vtkView.h
@@ -51,7 +51,7 @@ class VTK_VIEWS_EXPORT vtkView : public vtkObject
 {
 public:
   static vtkView *New();
-  vtkTypeRevisionMacro(vtkView, vtkObject);
+  vtkTypeMacro(vtkView, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Views/vtkViewUpdater.cxx b/Views/vtkViewUpdater.cxx
index 3404e5310514bab905d2e5728a5ffad13299a54a..49ec43238e4a7ee890567f882f6a14cd06ca9293 100644
--- a/Views/vtkViewUpdater.cxx
+++ b/Views/vtkViewUpdater.cxx
@@ -28,7 +28,6 @@
 
 #include <vtksys/stl/vector>
 
-vtkCxxRevisionMacro(vtkViewUpdater, "1.3");
 vtkStandardNewMacro(vtkViewUpdater);
 
 class vtkViewUpdater::vtkViewUpdaterInternals : public vtkCommand
diff --git a/Views/vtkViewUpdater.h b/Views/vtkViewUpdater.h
index 2059848513cf2f11e3a77bf1f9cdabc4076912de..d756f9387eb36d8bfcdf75fe6707225dba9fdfef 100644
--- a/Views/vtkViewUpdater.h
+++ b/Views/vtkViewUpdater.h
@@ -37,7 +37,7 @@ class VTK_VIEWS_EXPORT vtkViewUpdater : public vtkObject
 {
 public:
   static vtkViewUpdater *New();
-  vtkTypeRevisionMacro(vtkViewUpdater, vtkObject);
+  vtkTypeMacro(vtkViewUpdater, vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   void AddView(vtkView* view);
diff --git a/VolumeRendering/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx b/VolumeRendering/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
index e15b3423a2f515364310b57ad7b043f280e53f63..7bc70412cecead837797f9d3b6cdfe58ca23ec9e 100644
--- a/VolumeRendering/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
+++ b/VolumeRendering/Testing/Cxx/ExerciseUnstructuredGridRayCastMapper.cxx
@@ -51,7 +51,7 @@
 class vtkClassifyVolume : public vtkDataSetAlgorithm
 {
 public:
-  vtkTypeRevisionMacro(vtkClassifyVolume, vtkDataSetAlgorithm);
+  vtkTypeMacro(vtkClassifyVolume, vtkDataSetAlgorithm);
   static vtkClassifyVolume *New();
 
   vtkGetObjectMacro(TransferFunction, vtkVolumeProperty);
@@ -75,7 +75,6 @@ private:
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkClassifyVolume, "1.4");
 vtkStandardNewMacro(vtkClassifyVolume);
 
 vtkClassifyVolume::vtkClassifyVolume()
diff --git a/VolumeRendering/vtkDirectionEncoder.cxx b/VolumeRendering/vtkDirectionEncoder.cxx
index 5df116933dabda53299b6f7b3b47bbcba9c9a87e..232666dcd5517a9a8b4f592afe2b99adfb8324df 100644
--- a/VolumeRendering/vtkDirectionEncoder.cxx
+++ b/VolumeRendering/vtkDirectionEncoder.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkDirectionEncoder.h"
 
-vtkCxxRevisionMacro(vtkDirectionEncoder, "1.1");
 
 //----------------------------------------------------------------------------
 void vtkDirectionEncoder::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/VolumeRendering/vtkDirectionEncoder.h b/VolumeRendering/vtkDirectionEncoder.h
index f8ae4d1758565d5f066059d3d97f7f0c7f3b8fb2..d92c72b4ce44210d6e4808e3fa29cc07cc31dffe 100644
--- a/VolumeRendering/vtkDirectionEncoder.h
+++ b/VolumeRendering/vtkDirectionEncoder.h
@@ -37,7 +37,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkDirectionEncoder : public vtkObject
 public:
   // Description:
   // Get the name of this class
-  vtkTypeRevisionMacro(vtkDirectionEncoder,vtkObject);
+  vtkTypeMacro(vtkDirectionEncoder,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkEncodedGradientEstimator.cxx b/VolumeRendering/vtkEncodedGradientEstimator.cxx
index 97c455b7b561ea84e5eabfd113469e16ac131bef..17d09c9c5db0cdb36d55a5ca605940ca92024c85 100644
--- a/VolumeRendering/vtkEncodedGradientEstimator.cxx
+++ b/VolumeRendering/vtkEncodedGradientEstimator.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkEncodedGradientEstimator, "1.2");
 
 vtkCxxSetObjectMacro(vtkEncodedGradientEstimator, Input, vtkImageData );
 
diff --git a/VolumeRendering/vtkEncodedGradientEstimator.h b/VolumeRendering/vtkEncodedGradientEstimator.h
index 9fc8377501a328d220e15ba3d1761e114e6a3bfc..ac24fba80b626a9cbbcd245017d753c2180939d9 100644
--- a/VolumeRendering/vtkEncodedGradientEstimator.h
+++ b/VolumeRendering/vtkEncodedGradientEstimator.h
@@ -40,7 +40,7 @@ class vtkMultiThreader;
 class VTK_VOLUMERENDERING_EXPORT vtkEncodedGradientEstimator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkEncodedGradientEstimator,vtkObject);
+  vtkTypeMacro(vtkEncodedGradientEstimator,vtkObject);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkEncodedGradientShader.cxx b/VolumeRendering/vtkEncodedGradientShader.cxx
index 4d7d8ed233191a7aaed52d725f7cb1e7629f7869..c4c145dbe6b7fe26cbae88d719a2204387f2e200 100644
--- a/VolumeRendering/vtkEncodedGradientShader.cxx
+++ b/VolumeRendering/vtkEncodedGradientShader.cxx
@@ -28,7 +28,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkEncodedGradientShader, "1.4");
 vtkStandardNewMacro(vtkEncodedGradientShader);
 
 vtkEncodedGradientShader::vtkEncodedGradientShader()
diff --git a/VolumeRendering/vtkEncodedGradientShader.h b/VolumeRendering/vtkEncodedGradientShader.h
index 108fc202e449fd5337d33f20cefbc942239c4798..2ceab3a52f6bccb9181ba117600d7f0eb5c73cf0 100644
--- a/VolumeRendering/vtkEncodedGradientShader.h
+++ b/VolumeRendering/vtkEncodedGradientShader.h
@@ -42,7 +42,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkEncodedGradientShader : public vtkObject
 {
 public:
   static vtkEncodedGradientShader *New();
-  vtkTypeRevisionMacro(vtkEncodedGradientShader,vtkObject);
+  vtkTypeMacro(vtkEncodedGradientShader,vtkObject);
 
   // Description:
   // Print the vtkEncodedGradientShader
diff --git a/VolumeRendering/vtkFiniteDifferenceGradientEstimator.cxx b/VolumeRendering/vtkFiniteDifferenceGradientEstimator.cxx
index 03ef529927f7d61ed5c7886378b1e6d5623060b1..614a522d76dc7de5b1e07a8681e71cd0c8691fe1 100644
--- a/VolumeRendering/vtkFiniteDifferenceGradientEstimator.cxx
+++ b/VolumeRendering/vtkFiniteDifferenceGradientEstimator.cxx
@@ -32,7 +32,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFiniteDifferenceGradientEstimator, "1.3");
 vtkStandardNewMacro(vtkFiniteDifferenceGradientEstimator);
 
 // This is the templated function that actually computes the EncodedNormal
diff --git a/VolumeRendering/vtkFiniteDifferenceGradientEstimator.h b/VolumeRendering/vtkFiniteDifferenceGradientEstimator.h
index cec1ae546f9c967df2eda090e483fef5c483590c..12b823cfb17365d06c6ee6aecafaf0da2b57e704 100644
--- a/VolumeRendering/vtkFiniteDifferenceGradientEstimator.h
+++ b/VolumeRendering/vtkFiniteDifferenceGradientEstimator.h
@@ -41,7 +41,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkFiniteDifferenceGradientEstimator : public vtkEncodedGradientEstimator
 {
 public:
-  vtkTypeRevisionMacro(vtkFiniteDifferenceGradientEstimator,vtkEncodedGradientEstimator);
+  vtkTypeMacro(vtkFiniteDifferenceGradientEstimator,vtkEncodedGradientEstimator);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkFixedPointRayCastImage.cxx b/VolumeRendering/vtkFixedPointRayCastImage.cxx
index 9b15a4d6f8e5d5e1fa05b156711ad8986d626d6c..86238a9ff3176d102bd190f4dc75b27dcd0d1b28 100644
--- a/VolumeRendering/vtkFixedPointRayCastImage.cxx
+++ b/VolumeRendering/vtkFixedPointRayCastImage.cxx
@@ -15,7 +15,6 @@
 #include "vtkFixedPointRayCastImage.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkFixedPointRayCastImage, "1.3");
 vtkStandardNewMacro(vtkFixedPointRayCastImage);
 
 // Construct a new vtkFixedPointRayCastImage with default values
diff --git a/VolumeRendering/vtkFixedPointRayCastImage.h b/VolumeRendering/vtkFixedPointRayCastImage.h
index 6463a65daf9839add2a675ec6ed04cc0a6a16225..b51bea6f8ffaf1d0f66c0ca5cb072b6073b1adce 100644
--- a/VolumeRendering/vtkFixedPointRayCastImage.h
+++ b/VolumeRendering/vtkFixedPointRayCastImage.h
@@ -36,7 +36,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointRayCastImage : public vtkObject
 {
 public:
   static vtkFixedPointRayCastImage *New();
-  vtkTypeRevisionMacro(vtkFixedPointRayCastImage,vtkObject);
+  vtkTypeMacro(vtkFixedPointRayCastImage,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
index 531986fa8bc1063586bc21d8ac5ad613a52b2b3f..5f0629ce8899124cdbd87fa5796a94cae91d1b77 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.cxx
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastCompositeGOHelper, "1.9");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeGOHelper);
 
 // Construct a new vtkFixedPointVolumeRayCastCompositeGOHelper with default values
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.h
index 08d9de87487f6f0291b3c28603e98fc5621bc074..f5d1e13722f0151044c3697aa7bde6ee2c894e07 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOHelper.h
@@ -38,7 +38,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastCompositeGOHelper : p
 {
 public:
   static vtkFixedPointVolumeRayCastCompositeGOHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastCompositeGOHelper,vtkFixedPointVolumeRayCastHelper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeGOHelper,vtkFixedPointVolumeRayCastHelper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void  GenerateImage( int threadID, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
index 454a5cb49a3564020e66bd5ce58791ddf0048d6e..8ab80d650775bdd2f41f285a35ee025ffe775013 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.cxx
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper, "1.9");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper);
 
 // Construct a new vtkFixedPointVolumeRayCastCompositeGOShadeHelper with default values
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
index dd0a4dc092b2013e696c631bf7ffb1cbaa901c49..7c7c2bffca85e142a8072ec8fa765ec70c32b1e0 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeGOShadeHelper.h
@@ -38,7 +38,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastCompositeGOShadeHelpe
 {
 public:
   static vtkFixedPointVolumeRayCastCompositeGOShadeHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper,vtkFixedPointVolumeRayCastHelper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeGOShadeHelper,vtkFixedPointVolumeRayCastHelper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void  GenerateImage( int threadID, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.cxx
index 9bee77a7e9d1dfc6b1fd398de3419e4f6147706b..36bac0ab2755c1f86933f7fb275512df6a181eda 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.cxx
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastCompositeHelper, "1.9");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeHelper);
 
 // Construct a new vtkFixedPointVolumeRayCastCompositeHelper with default values
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.h
index 47b85a0c0c24720aed76505f882ac976b34d0bf9..438f6843cd5328d33149fc2e18c9987a266bbddf 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeHelper.h
@@ -38,7 +38,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastCompositeHelper : pub
 {
 public:
   static vtkFixedPointVolumeRayCastCompositeHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastCompositeHelper,vtkFixedPointVolumeRayCastHelper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeHelper,vtkFixedPointVolumeRayCastHelper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void  GenerateImage( int threadID, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
index d6d304e21f274c4af0a7a211e402d3256acadfcd..4d938103a05353d25335a421bc2e4e22043f3f29 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.cxx
@@ -29,7 +29,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper, "1.9");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper);
 
 // Construct a new vtkFixedPointVolumeRayCastCompositeShadeHelper with default values
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
index a31f2363c6e1b927e6cf7b1b2661ed2ad393c840..8d670562a30efb83223dd96e86314348a75c2b63 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastCompositeShadeHelper.h
@@ -38,7 +38,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastCompositeShadeHelper
 {
 public:
   static vtkFixedPointVolumeRayCastCompositeShadeHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper,vtkFixedPointVolumeRayCastHelper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastCompositeShadeHelper,vtkFixedPointVolumeRayCastHelper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void  GenerateImage( int threadID, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastHelper.cxx
index 298440490214053b02cfd8fecd87a441086d30da..708cffebfd8af3eba12fa14f8d74e1871264f01a 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastHelper.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastHelper, "1.2");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastHelper);
 
 vtkFixedPointVolumeRayCastHelper::vtkFixedPointVolumeRayCastHelper()
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastHelper.h
index 12b26c72b81810e39c24a79e0d102e2a93413b41..cc8ee0d04b31dc81eaaa100175e392fdeaa670f4 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastHelper.h
@@ -1312,7 +1312,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastHelper : public vtkOb
 {
 public:
   static vtkFixedPointVolumeRayCastHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastHelper,vtkObject);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastHelper,vtkObject);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void   GenerateImage( int, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.cxx
index cc6fe60df925b489738bbdeafb18f4171d156fe2..a6f270c6dfa07b50cb733f90d6f0868c6d80d930 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastMIPHelper, "1.11");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastMIPHelper);
 
 // Construct a new vtkFixedPointVolumeRayCastMIPHelper with default values
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.h b/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.h
index 20ce7e620bf762531ed5bbda64e1501d61c0631f..d98212277719c87f79407f6899831969df2bbf95 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastMIPHelper.h
@@ -34,7 +34,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastMIPHelper : public vt
 {
 public:
   static vtkFixedPointVolumeRayCastMIPHelper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastMIPHelper,vtkFixedPointVolumeRayCastHelper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastMIPHelper,vtkFixedPointVolumeRayCastHelper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   virtual void  GenerateImage( int threadID, 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastMapper.cxx b/VolumeRendering/vtkFixedPointVolumeRayCastMapper.cxx
index 29585c912de07697194558358bc683af8d1f89df..25b6f2b63f2249e73232512a87098eb46805a474 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastMapper.cxx
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastMapper.cxx
@@ -46,7 +46,6 @@
 #include <vtkstd/exception>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkFixedPointVolumeRayCastMapper, "1.51");
 vtkStandardNewMacro(vtkFixedPointVolumeRayCastMapper); 
 vtkCxxSetObjectMacro(vtkFixedPointVolumeRayCastMapper, RayCastImage, vtkFixedPointRayCastImage);
 
diff --git a/VolumeRendering/vtkFixedPointVolumeRayCastMapper.h b/VolumeRendering/vtkFixedPointVolumeRayCastMapper.h
index c5dc65e3d6fc613d063cc1f03d874b9e2d4ca5f3..f6a8a8ab33b2c6e4c835af0d13254ffb1ee23d4b 100644
--- a/VolumeRendering/vtkFixedPointVolumeRayCastMapper.h
+++ b/VolumeRendering/vtkFixedPointVolumeRayCastMapper.h
@@ -92,7 +92,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkFixedPointVolumeRayCastMapper : public vtkVo
 {
 public:
   static vtkFixedPointVolumeRayCastMapper *New();
-  vtkTypeRevisionMacro(vtkFixedPointVolumeRayCastMapper,vtkVolumeMapper);
+  vtkTypeMacro(vtkFixedPointVolumeRayCastMapper,vtkVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkGPUVolumeRayCastMapper.cxx b/VolumeRendering/vtkGPUVolumeRayCastMapper.cxx
index 2abed7ceccb56064f9f58307651b9a3d010138e0..16a8a0f7ea8463c98ed8e7056b0b1be9d3aefee4 100644
--- a/VolumeRendering/vtkGPUVolumeRayCastMapper.cxx
+++ b/VolumeRendering/vtkGPUVolumeRayCastMapper.cxx
@@ -33,7 +33,6 @@
 #include "vtkGPUInfoList.h"
 #include "vtkGPUInfo.h"
 
-vtkCxxRevisionMacro(vtkGPUVolumeRayCastMapper, "1.8");
 vtkInstantiatorNewMacro(vtkGPUVolumeRayCastMapper);
 vtkCxxSetObjectMacro(vtkGPUVolumeRayCastMapper, MaskInput, vtkImageData);
 vtkCxxSetObjectMacro(vtkGPUVolumeRayCastMapper, TransformedInput, vtkImageData);
diff --git a/VolumeRendering/vtkGPUVolumeRayCastMapper.h b/VolumeRendering/vtkGPUVolumeRayCastMapper.h
index d166f17ae506acf16795eaab8f515a26b3a07050..fe822d1db5a0194fb278a49e7848b7fa11766149 100644
--- a/VolumeRendering/vtkGPUVolumeRayCastMapper.h
+++ b/VolumeRendering/vtkGPUVolumeRayCastMapper.h
@@ -33,7 +33,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkGPUVolumeRayCastMapper : public vtkVolumeMap
 {
 public:
   static vtkGPUVolumeRayCastMapper *New();
-  vtkTypeRevisionMacro(vtkGPUVolumeRayCastMapper,vtkVolumeMapper);
+  vtkTypeMacro(vtkGPUVolumeRayCastMapper,vtkVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkHAVSVolumeMapper.cxx b/VolumeRendering/vtkHAVSVolumeMapper.cxx
index 9d96b66135351a3c2af1f1afa8c801c047376174..3b4cb09f73dd032f55fc91e0d1d89f50bf702189 100644
--- a/VolumeRendering/vtkHAVSVolumeMapper.cxx
+++ b/VolumeRendering/vtkHAVSVolumeMapper.cxx
@@ -36,7 +36,6 @@ PURPOSE.  See the above copyright notice for more information.
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkHAVSVolumeMapper, "1.8");
 // Needed when we don't use the vtkStandardNewMacro.
 vtkInstantiatorNewMacro(vtkHAVSVolumeMapper);
 
diff --git a/VolumeRendering/vtkHAVSVolumeMapper.h b/VolumeRendering/vtkHAVSVolumeMapper.h
index c64c38fd5b10429a5c1f455069aaa04141a06c80..f3b3e7afbc70ae700befb9ab67a56e3077f2d0a8 100644
--- a/VolumeRendering/vtkHAVSVolumeMapper.h
+++ b/VolumeRendering/vtkHAVSVolumeMapper.h
@@ -120,7 +120,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkHAVSVolumeMapper : public vtkUnstructuredGri
 {
 public:
   static vtkHAVSVolumeMapper *New();
-  vtkTypeRevisionMacro(vtkHAVSVolumeMapper,
+  vtkTypeMacro(vtkHAVSVolumeMapper,
                        vtkUnstructuredGridVolumeMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/VolumeRendering/vtkMesaProjectedTetrahedraMapper.cxx b/VolumeRendering/vtkMesaProjectedTetrahedraMapper.cxx
index 48f59275f14f67c1dd11a52a2564fcbd2f02532e..efd7c6ab5c726e8b783b2d7ea6fd642a48d83921 100644
--- a/VolumeRendering/vtkMesaProjectedTetrahedraMapper.cxx
+++ b/VolumeRendering/vtkMesaProjectedTetrahedraMapper.cxx
@@ -38,5 +38,4 @@
 #include "vtkOpenGLProjectedTetrahedraMapper.cxx"
 #undef vtkOpenGLProjectedTetrahedraMapper
 
-//vtkCxxRevisionMacro(vtkMesaProjectedTetrahedraMapper, "1.1");
 //vtkStandardNewMacro(vtkMesaProjectedTetrahedraMapper);
diff --git a/VolumeRendering/vtkMesaProjectedTetrahedraMapper.h b/VolumeRendering/vtkMesaProjectedTetrahedraMapper.h
index d56eb8734cbdd2394101967fa3ae28c7f2bafb9b..3cc28a26420ee44b78477771e01c87768ccafa4c 100644
--- a/VolumeRendering/vtkMesaProjectedTetrahedraMapper.h
+++ b/VolumeRendering/vtkMesaProjectedTetrahedraMapper.h
@@ -42,7 +42,7 @@ class vtkFloatArray;
 class VTK_VOLUMERENDERING_EXPORT vtkMesaProjectedTetrahedraMapper : public vtkProjectedTetrahedraMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkMesaProjectedTetrahedraMapper,
+  vtkTypeMacro(vtkMesaProjectedTetrahedraMapper,
                        vtkProjectedTetrahedraMapper);
   static vtkMesaProjectedTetrahedraMapper *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkMesaRayCastImageDisplayHelper.cxx b/VolumeRendering/vtkMesaRayCastImageDisplayHelper.cxx
index 8fdcdf536f6c0c65425a3167c6fe2fc2de4fb8ec..2faf09bbf0bd3e18101f58a434754a08d7c44f49 100644
--- a/VolumeRendering/vtkMesaRayCastImageDisplayHelper.cxx
+++ b/VolumeRendering/vtkMesaRayCastImageDisplayHelper.cxx
@@ -33,5 +33,4 @@
 #include "vtkOpenGLRayCastImageDisplayHelper.cxx"
 #undef vtkOpenGLRayCastImageDisplayHelper
 
-vtkCxxRevisionMacro(vtkMesaRayCastImageDisplayHelper, "1.1");
 vtkStandardNewMacro(vtkMesaRayCastImageDisplayHelper);
diff --git a/VolumeRendering/vtkMesaRayCastImageDisplayHelper.h b/VolumeRendering/vtkMesaRayCastImageDisplayHelper.h
index 40342dd504ba5e321829158fa012bce925e3b823..16dc8a294198fcab4f889b58ef18bbee2695861e 100644
--- a/VolumeRendering/vtkMesaRayCastImageDisplayHelper.h
+++ b/VolumeRendering/vtkMesaRayCastImageDisplayHelper.h
@@ -34,7 +34,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkMesaRayCastImageDisplayHelper : public vtkRa
 {
 public:
   static vtkMesaRayCastImageDisplayHelper *New();
-  vtkTypeRevisionMacro(vtkMesaRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
+  vtkTypeMacro(vtkMesaRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
diff --git a/VolumeRendering/vtkMesaVolumeTextureMapper2D.cxx b/VolumeRendering/vtkMesaVolumeTextureMapper2D.cxx
index 591aa3046ea11280ef3d88afd70e7e164640e488..594b276515b7ce8ed0c40d417ea90ed014dbe73b 100644
--- a/VolumeRendering/vtkMesaVolumeTextureMapper2D.cxx
+++ b/VolumeRendering/vtkMesaVolumeTextureMapper2D.cxx
@@ -38,5 +38,4 @@
 #include "vtkOpenGLVolumeTextureMapper2D.cxx"
 #undef vtkOpenGLVolumeTextureMapper2D
 
-vtkCxxRevisionMacro(vtkMesaVolumeTextureMapper2D, "1.1");
 vtkStandardNewMacro(vtkMesaVolumeTextureMapper2D);
diff --git a/VolumeRendering/vtkMesaVolumeTextureMapper2D.h b/VolumeRendering/vtkMesaVolumeTextureMapper2D.h
index dc99269de04d455ddd248639e14a43889133b5b1..ab884290fa430c974cf45267b9e6e1af09a34d01 100644
--- a/VolumeRendering/vtkMesaVolumeTextureMapper2D.h
+++ b/VolumeRendering/vtkMesaVolumeTextureMapper2D.h
@@ -29,7 +29,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkMesaVolumeTextureMapper2D : public vtkVolumeTextureMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkMesaVolumeTextureMapper2D,vtkVolumeTextureMapper2D);
+  vtkTypeMacro(vtkMesaVolumeTextureMapper2D,vtkVolumeTextureMapper2D);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   static vtkMesaVolumeTextureMapper2D *New();
diff --git a/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx b/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx
index 36a31fdb19919d2c3b876f3c9d03680de4146fc4..058f73cede735c146bf6f7751efb6d02ea21c69f 100644
--- a/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx
+++ b/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.cxx
@@ -226,7 +226,6 @@ const int vtkOpenGLGPUVolumeRayCastMapperNumberOfTextureObjects=vtkOpenGLGPUVolu
 const int vtkOpenGLGPUVolumeRayCastMapperOpacityTableSize=1024; //power of two
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLGPUVolumeRayCastMapper, "1.11");
 vtkStandardNewMacro(vtkOpenGLGPUVolumeRayCastMapper);
 #endif
 
diff --git a/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.h b/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.h
index b9d217d6241e90abe98641c452e361a694b7408d..ab1ad4ab56671a92a1db1dbd1e52c415b64e3fb8 100644
--- a/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.h
+++ b/VolumeRendering/vtkOpenGLGPUVolumeRayCastMapper.h
@@ -51,7 +51,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkOpenGLGPUVolumeRayCastMapper : public vtkGPU
 {
 public:
   static vtkOpenGLGPUVolumeRayCastMapper *New();
-  vtkTypeRevisionMacro(vtkOpenGLGPUVolumeRayCastMapper,vtkGPUVolumeRayCastMapper);
+  vtkTypeMacro(vtkOpenGLGPUVolumeRayCastMapper,vtkGPUVolumeRayCastMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkOpenGLHAVSVolumeMapper.cxx b/VolumeRendering/vtkOpenGLHAVSVolumeMapper.cxx
index 47f3366f010a6744cabe3a0e3cbeffa977d1ce70..2f46bc003d64ec8ed54f0bbe4c21616e7d9dc6e4 100644
--- a/VolumeRendering/vtkOpenGLHAVSVolumeMapper.cxx
+++ b/VolumeRendering/vtkOpenGLHAVSVolumeMapper.cxx
@@ -41,7 +41,6 @@ PURPOSE.  See the above copyright notice for more information.
 #include "vtkHAVSVolumeMapper_k6FP.h"
 #include "vtkHAVSVolumeMapper_k6EndFP.h"
 
-vtkCxxRevisionMacro(vtkOpenGLHAVSVolumeMapper, "1.13");
 vtkStandardNewMacro(vtkOpenGLHAVSVolumeMapper);
 
 //----------------------------------------------------------------------------
diff --git a/VolumeRendering/vtkOpenGLHAVSVolumeMapper.h b/VolumeRendering/vtkOpenGLHAVSVolumeMapper.h
index 58300cc8367e7d5e9b45ca88e51b11a0ade65901..472947e826b9c86b95bd4e6f0ed3484b30ff0f91 100644
--- a/VolumeRendering/vtkOpenGLHAVSVolumeMapper.h
+++ b/VolumeRendering/vtkOpenGLHAVSVolumeMapper.h
@@ -114,7 +114,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkOpenGLHAVSVolumeMapper : public vtkHAVSVolum
 {
 public:
   static vtkOpenGLHAVSVolumeMapper *New();
-  vtkTypeRevisionMacro(vtkOpenGLHAVSVolumeMapper,
+  vtkTypeMacro(vtkOpenGLHAVSVolumeMapper,
                        vtkHAVSVolumeMapper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.cxx b/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.cxx
index 1d08c7d9d9a98b1403d679397249d250f5bdc30f..1b12496d3025b3b060c3638e8c0e9a3fee752f60 100644
--- a/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.cxx
+++ b/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.cxx
@@ -57,7 +57,6 @@ const int SqrtTableSize = 2048;
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkOpenGLProjectedTetrahedraMapper, "1.10");
 vtkStandardNewMacro(vtkOpenGLProjectedTetrahedraMapper);
 
 vtkOpenGLProjectedTetrahedraMapper::vtkOpenGLProjectedTetrahedraMapper()
diff --git a/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.h b/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.h
index 9a99bee84af9048f19ac2edb469cf5fe7efcf1ac..7ef7f704e18abcb56893a2c71ce8299f9de34926 100644
--- a/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.h
+++ b/VolumeRendering/vtkOpenGLProjectedTetrahedraMapper.h
@@ -42,7 +42,7 @@ class vtkFloatArray;
 class VTK_VOLUMERENDERING_EXPORT vtkOpenGLProjectedTetrahedraMapper : public vtkProjectedTetrahedraMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLProjectedTetrahedraMapper,
+  vtkTypeMacro(vtkOpenGLProjectedTetrahedraMapper,
                        vtkProjectedTetrahedraMapper);
   static vtkOpenGLProjectedTetrahedraMapper *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.cxx b/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.cxx
index 093263a6bbdeecce17622ae153b9c81d6b2f2bec..1257e0e3d521be8d0b6d906ff58aed5fa6cb0ead 100644
--- a/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.cxx
+++ b/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.cxx
@@ -29,7 +29,6 @@
 #include <math.h>
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLRayCastImageDisplayHelper, "1.6");
 vtkStandardNewMacro(vtkOpenGLRayCastImageDisplayHelper);
 #endif
 
diff --git a/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.h b/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.h
index a499bc0eb1cd353479472b8dfe0408855f4b7814..c36f36c0f66f06a4abf78fcb74b805eaf25cb506 100644
--- a/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.h
+++ b/VolumeRendering/vtkOpenGLRayCastImageDisplayHelper.h
@@ -34,7 +34,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkOpenGLRayCastImageDisplayHelper : public vtk
 {
 public:
   static vtkOpenGLRayCastImageDisplayHelper *New();
-  vtkTypeRevisionMacro(vtkOpenGLRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
+  vtkTypeMacro(vtkOpenGLRayCastImageDisplayHelper,vtkRayCastImageDisplayHelper);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
diff --git a/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.cxx b/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.cxx
index c96e62365a536aa92f2f7f993f96c964f4608588..2cc9fd91156f8fcc7fe26a48dbe19cbf0d1af069 100644
--- a/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.cxx
+++ b/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.cxx
@@ -25,7 +25,6 @@
 
 #include "vtkOpenGL.h"
 
-vtkCxxRevisionMacro(vtkOpenGLVolumeProVP1000Mapper, "1.1");
 vtkStandardNewMacro(vtkOpenGLVolumeProVP1000Mapper);
 
 void vtkOpenGLVolumeProVP1000Mapper::RenderImageBuffer(vtkRenderer  *ren,
diff --git a/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.h b/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.h
index 938bf0d746d845cc3ae319c377bce057421a0958..5c729c7f04d0fc20245f35385df0fa1914da7f93 100644
--- a/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.h
+++ b/VolumeRendering/vtkOpenGLVolumeProVP1000Mapper.h
@@ -45,7 +45,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkOpenGLVolumeProVP1000Mapper : public vtkVolumeProVP1000Mapper
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLVolumeProVP1000Mapper,vtkVolumeProVP1000Mapper);
+  vtkTypeMacro(vtkOpenGLVolumeProVP1000Mapper,vtkVolumeProVP1000Mapper);
   static vtkOpenGLVolumeProVP1000Mapper *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.cxx b/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.cxx
index a093a4cc0d9e0f41b6ed44a75d942d20f8fc2dc6..8c98b8c8cc6352bcce2fed2dc56e861c06eaa22e 100644
--- a/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.cxx
+++ b/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.cxx
@@ -27,7 +27,6 @@
 
 
 #ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLVolumeTextureMapper2D, "1.2");
 vtkStandardNewMacro(vtkOpenGLVolumeTextureMapper2D);
 #endif
 
diff --git a/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.h b/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.h
index 1c1e48ea0d9a29f5f526a4208525f90d63d90103..943511773f151936e1bdde8c6b3285be7cf18ca4 100644
--- a/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.h
+++ b/VolumeRendering/vtkOpenGLVolumeTextureMapper2D.h
@@ -29,7 +29,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkOpenGLVolumeTextureMapper2D : public vtkVolumeTextureMapper2D
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLVolumeTextureMapper2D,vtkVolumeTextureMapper2D);
+  vtkTypeMacro(vtkOpenGLVolumeTextureMapper2D,vtkVolumeTextureMapper2D);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   static vtkOpenGLVolumeTextureMapper2D *New();
diff --git a/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx b/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx
index 7d815f0fcb708311503871e095ef8ab0a3f5e1e3..aa7cafc907a728a7338ed2e224d9332b3c538216 100644
--- a/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx
+++ b/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.cxx
@@ -41,7 +41,6 @@
 #include "vtkVolumeTextureMapper3D_FourDependentShadeFP.h"
 
 //#ifndef VTK_IMPLEMENT_MESA_CXX
-vtkCxxRevisionMacro(vtkOpenGLVolumeTextureMapper3D, "1.22");
 vtkStandardNewMacro(vtkOpenGLVolumeTextureMapper3D);
 //#endif
 
diff --git a/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.h b/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.h
index ec9ce0cd7c11f9de8c958dbacbceb9722648febf..6d0340aec79c1893105459acadf940bc976ed23b 100644
--- a/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.h
+++ b/VolumeRendering/vtkOpenGLVolumeTextureMapper3D.h
@@ -37,7 +37,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkOpenGLVolumeTextureMapper3D : public vtkVolumeTextureMapper3D
 {
 public:
-  vtkTypeRevisionMacro(vtkOpenGLVolumeTextureMapper3D,vtkVolumeTextureMapper3D);
+  vtkTypeMacro(vtkOpenGLVolumeTextureMapper3D,vtkVolumeTextureMapper3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkOpenGLVolumeTextureMapper3D *New();
diff --git a/VolumeRendering/vtkProjectedTetrahedraMapper.cxx b/VolumeRendering/vtkProjectedTetrahedraMapper.cxx
index e86ba5b7587c84991af6cfa623bc8db8f575bd53..653ab29e5ea424f7936f09b89439cabf08e419a0 100644
--- a/VolumeRendering/vtkProjectedTetrahedraMapper.cxx
+++ b/VolumeRendering/vtkProjectedTetrahedraMapper.cxx
@@ -48,7 +48,6 @@
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkProjectedTetrahedraMapper, "1.11");
 
 vtkCxxSetObjectMacro(vtkProjectedTetrahedraMapper,
                      VisibilitySort, vtkVisibilitySort);
diff --git a/VolumeRendering/vtkProjectedTetrahedraMapper.h b/VolumeRendering/vtkProjectedTetrahedraMapper.h
index 8ea3aa530cc83d712756de7e169926eaf71018e7..55bd2fe165ee00a49d82dfd9fcf220cbb9c8a373 100644
--- a/VolumeRendering/vtkProjectedTetrahedraMapper.h
+++ b/VolumeRendering/vtkProjectedTetrahedraMapper.h
@@ -50,7 +50,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkProjectedTetrahedraMapper : public vtkUnstructuredGridVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkProjectedTetrahedraMapper,
+  vtkTypeMacro(vtkProjectedTetrahedraMapper,
                        vtkUnstructuredGridVolumeMapper);
   static vtkProjectedTetrahedraMapper *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkRayCastImageDisplayHelper.cxx b/VolumeRendering/vtkRayCastImageDisplayHelper.cxx
index d2f059aaf95ff7e5d941f37508c5454d1b61cb98..ac3ce5df8c92220d89a08d2ae0e654daba0ff14d 100644
--- a/VolumeRendering/vtkRayCastImageDisplayHelper.cxx
+++ b/VolumeRendering/vtkRayCastImageDisplayHelper.cxx
@@ -15,7 +15,6 @@
 #include "vtkRayCastImageDisplayHelper.h"
 #include "vtkVolumeRenderingFactory.h"
 
-vtkCxxRevisionMacro(vtkRayCastImageDisplayHelper, "1.5");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/VolumeRendering/vtkRayCastImageDisplayHelper.h b/VolumeRendering/vtkRayCastImageDisplayHelper.h
index 42845ee7046eff491c5b0f4543bfaf79e589ac3d..f030c3d93374602051a3fceb772c8c8e63b9151e 100644
--- a/VolumeRendering/vtkRayCastImageDisplayHelper.h
+++ b/VolumeRendering/vtkRayCastImageDisplayHelper.h
@@ -35,7 +35,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkRayCastImageDisplayHelper : public vtkObject
 {
 public:
   static vtkRayCastImageDisplayHelper *New();
-  vtkTypeRevisionMacro(vtkRayCastImageDisplayHelper,vtkObject);
+  vtkTypeMacro(vtkRayCastImageDisplayHelper,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual void RenderTexture( vtkVolume *vol, vtkRenderer *ren,
diff --git a/VolumeRendering/vtkRecursiveSphereDirectionEncoder.cxx b/VolumeRendering/vtkRecursiveSphereDirectionEncoder.cxx
index c3ca6b43ea0c6cb9fe1ed7c115e68e85e530894c..8a795f8dcfdedfc68ad2990e084a75876cab87c0 100644
--- a/VolumeRendering/vtkRecursiveSphereDirectionEncoder.cxx
+++ b/VolumeRendering/vtkRecursiveSphereDirectionEncoder.cxx
@@ -17,7 +17,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkRecursiveSphereDirectionEncoder, "1.1");
 vtkStandardNewMacro(vtkRecursiveSphereDirectionEncoder);
 
 // Construct the object. Initialize the index table which will be
diff --git a/VolumeRendering/vtkRecursiveSphereDirectionEncoder.h b/VolumeRendering/vtkRecursiveSphereDirectionEncoder.h
index 28c4382ad5e0ff83ecbf97b4a634bb707a06220d..75d4b2f33b5836560ce09a310bb34d2dc4b36e74 100644
--- a/VolumeRendering/vtkRecursiveSphereDirectionEncoder.h
+++ b/VolumeRendering/vtkRecursiveSphereDirectionEncoder.h
@@ -31,7 +31,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkRecursiveSphereDirectionEncoder : public vtkDirectionEncoder
 {
 public:
-  vtkTypeRevisionMacro(vtkRecursiveSphereDirectionEncoder,vtkDirectionEncoder);
+  vtkTypeMacro(vtkRecursiveSphereDirectionEncoder,vtkDirectionEncoder);
   void PrintSelf( ostream& os, vtkIndent indent );
 
 // Description:
diff --git a/VolumeRendering/vtkSphericalDirectionEncoder.cxx b/VolumeRendering/vtkSphericalDirectionEncoder.cxx
index ed2efdc7238cf1a93f665f8d443e00e3b513c1ce..cd8d3ab469ecebe43b1808f80eac187f3d591726 100644
--- a/VolumeRendering/vtkSphericalDirectionEncoder.cxx
+++ b/VolumeRendering/vtkSphericalDirectionEncoder.cxx
@@ -18,7 +18,6 @@
 #include "vtkMath.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkSphericalDirectionEncoder, "1.5");
 vtkStandardNewMacro(vtkSphericalDirectionEncoder);
 
 float vtkSphericalDirectionEncoder::DecodedGradientTable[65536 * 3];
diff --git a/VolumeRendering/vtkSphericalDirectionEncoder.h b/VolumeRendering/vtkSphericalDirectionEncoder.h
index ac706cb15926f12fc32d6468677da70034281c20..bf0ca0d10b9c2188bc7656f3754d6466b0684bd0 100644
--- a/VolumeRendering/vtkSphericalDirectionEncoder.h
+++ b/VolumeRendering/vtkSphericalDirectionEncoder.h
@@ -28,7 +28,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkSphericalDirectionEncoder : public vtkDirectionEncoder
 {
 public:
-  vtkTypeRevisionMacro(vtkSphericalDirectionEncoder,vtkDirectionEncoder);
+  vtkTypeMacro(vtkSphericalDirectionEncoder,vtkDirectionEncoder);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.cxx b/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.cxx
index fd8136ec45cb325189153716223a8b1398c2e196..8b44fc5981a600c2ee790f62d23039efa2844b1b 100644
--- a/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.cxx
+++ b/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.cxx
@@ -33,7 +33,6 @@
 #include "vtkVolumeProperty.h"
 #include "vtkUnstructuredGridVolumeRayCastIterator.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridBunykRayCastFunction, "1.7");
 vtkStandardNewMacro(vtkUnstructuredGridBunykRayCastFunction);
 
 #define VTK_BUNYKRCF_NUMLISTS 100000
@@ -64,7 +63,7 @@ class vtkUnstructuredGridBunykRayCastIterator
   : public vtkUnstructuredGridVolumeRayCastIterator
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridBunykRayCastIterator,
+  vtkTypeMacro(vtkUnstructuredGridBunykRayCastIterator,
                        vtkUnstructuredGridVolumeRayCastIterator);
   static vtkUnstructuredGridBunykRayCastIterator *New();
 
@@ -96,7 +95,6 @@ private:
   void operator=(const vtkUnstructuredGridBunykRayCastIterator&);  // Not implemented
 };
 
-vtkCxxRevisionMacro(vtkUnstructuredGridBunykRayCastIterator, "1.7");
 vtkStandardNewMacro(vtkUnstructuredGridBunykRayCastIterator);
 
 vtkUnstructuredGridBunykRayCastIterator::vtkUnstructuredGridBunykRayCastIterator()
diff --git a/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.h b/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.h
index 1a75c67d9f42974f8958c8425cbe91621a65a2db..f8abd522d229779f25c33c41940d0d87d1acac11 100644
--- a/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.h
+++ b/VolumeRendering/vtkUnstructuredGridBunykRayCastFunction.h
@@ -80,7 +80,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridBunykRayCastFunction : publi
 { 
 public:
   static vtkUnstructuredGridBunykRayCastFunction *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridBunykRayCastFunction,vtkUnstructuredGridVolumeRayCastFunction);
+  vtkTypeMacro(vtkUnstructuredGridBunykRayCastFunction,vtkUnstructuredGridVolumeRayCastFunction);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.cxx b/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
index 8de16877287aa77c054f47c10724a062039f6fb5..dc5576fce996691e7bbc8a782ed4c5e2490de925 100644
--- a/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
+++ b/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.cxx
@@ -37,7 +37,6 @@
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkUnstructuredGridHomogeneousRayIntegrator, "1.2");
 vtkStandardNewMacro(vtkUnstructuredGridHomogeneousRayIntegrator);
 
 //-----------------------------------------------------------------------------
diff --git a/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.h b/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.h
index 55666852876577044d2890d514286c56589cbe6c..1ceabc6be77ff62163f876cb37bae98c5b6c69f0 100644
--- a/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.h
+++ b/VolumeRendering/vtkUnstructuredGridHomogeneousRayIntegrator.h
@@ -41,7 +41,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridHomogeneousRayIntegrator : public vtkUnstructuredGridVolumeRayIntegrator
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridHomogeneousRayIntegrator,
+  vtkTypeMacro(vtkUnstructuredGridHomogeneousRayIntegrator,
                        vtkUnstructuredGridVolumeRayIntegrator);
   static vtkUnstructuredGridHomogeneousRayIntegrator *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.cxx b/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.cxx
index 9184b87f557461b95e0d18ddae0d1cc8850311ab..0f7f81af4fead89d7813fecc3bfe2993f3294b98 100644
--- a/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.cxx
+++ b/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.cxx
@@ -310,7 +310,6 @@ inline void vtkLinearRayIntegratorTransferFunction::GetColor(double x,
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkUnstructuredGridLinearRayIntegrator, "1.4");
 vtkStandardNewMacro(vtkUnstructuredGridLinearRayIntegrator);
 
 vtkUnstructuredGridLinearRayIntegrator::vtkUnstructuredGridLinearRayIntegrator()
diff --git a/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.h b/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.h
index 55b56dc67da7dea718eb1f14f5d21184e49b45f0..52188be72d246221808a4dec148713ab07c7b8a0 100644
--- a/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.h
+++ b/VolumeRendering/vtkUnstructuredGridLinearRayIntegrator.h
@@ -48,7 +48,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridLinearRayIntegrator : public vtkUnstructuredGridVolumeRayIntegrator
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridLinearRayIntegrator,
+  vtkTypeMacro(vtkUnstructuredGridLinearRayIntegrator,
                        vtkUnstructuredGridVolumeRayIntegrator);
   static vtkUnstructuredGridLinearRayIntegrator *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.cxx b/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.cxx
index 63e4a65f1b4af8e20ff77ceb5505057052abd98b..b778f0ba4d9a78314b9e31faef382fbce2995d5a 100644
--- a/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.cxx
+++ b/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.cxx
@@ -293,7 +293,6 @@ inline void vtkPartialPreIntegrationTransferFunction::GetColor(double x,
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkUnstructuredGridPartialPreIntegration, "1.7");
 vtkStandardNewMacro(vtkUnstructuredGridPartialPreIntegration);
 
 float vtkUnstructuredGridPartialPreIntegration::PsiTable[PSI_TABLE_SIZE*PSI_TABLE_SIZE];
diff --git a/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.h b/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.h
index b9c6eada4718a2ebd462c5d4a5c110869de191e8..88dc46b6068cf6e57c13644bc5d8632bb4026219 100644
--- a/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.h
+++ b/VolumeRendering/vtkUnstructuredGridPartialPreIntegration.h
@@ -48,7 +48,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridPartialPreIntegration : public vtkUnstructuredGridVolumeRayIntegrator
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridPartialPreIntegration,
+  vtkTypeMacro(vtkUnstructuredGridPartialPreIntegration,
                        vtkUnstructuredGridVolumeRayIntegrator);
   static vtkUnstructuredGridPartialPreIntegration *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkUnstructuredGridPreIntegration.cxx b/VolumeRendering/vtkUnstructuredGridPreIntegration.cxx
index bf598243b4893cd24573860534dc4d698ecc5162..bece6654ee2d413d974c474903ccfc1e945eb3d6 100644
--- a/VolumeRendering/vtkUnstructuredGridPreIntegration.cxx
+++ b/VolumeRendering/vtkUnstructuredGridPreIntegration.cxx
@@ -37,7 +37,6 @@
 
 //-----------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkUnstructuredGridPreIntegration, "1.6");
 vtkStandardNewMacro(vtkUnstructuredGridPreIntegration);
 
 vtkCxxSetObjectMacro(vtkUnstructuredGridPreIntegration, Integrator,
diff --git a/VolumeRendering/vtkUnstructuredGridPreIntegration.h b/VolumeRendering/vtkUnstructuredGridPreIntegration.h
index 4acdef2f3c2045c43efbf12ce5580bf913b80790..74278bdda9af843a00a842dbc32641544f41a705 100644
--- a/VolumeRendering/vtkUnstructuredGridPreIntegration.h
+++ b/VolumeRendering/vtkUnstructuredGridPreIntegration.h
@@ -48,7 +48,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridPreIntegration : public vtkUnstructuredGridVolumeRayIntegrator
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridPreIntegration,
+  vtkTypeMacro(vtkUnstructuredGridPreIntegration,
                        vtkUnstructuredGridVolumeRayIntegrator);
   static vtkUnstructuredGridPreIntegration *New();
   virtual void PrintSelf(ostream &os, vtkIndent indent);
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeMapper.cxx b/VolumeRendering/vtkUnstructuredGridVolumeMapper.cxx
index 617e384cd6d2cd1210ddba42b37968005b414058..c4c96c74f0907822e5355233dad225a5ef212338 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeMapper.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeMapper.cxx
@@ -19,7 +19,6 @@
 #include "vtkInformation.h"
 #include "vtkUnstructuredGrid.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeMapper, "1.1");
 
 // Construct a vtkUnstructuredGridVolumeMapper with empty scalar input and
 // clipping off.
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeMapper.h b/VolumeRendering/vtkUnstructuredGridVolumeMapper.h
index e6dc63b6ef5e0bed1c21c2a7433a58d9dadf67ba..7e0d4f8cb2f2389a2250d3574500052921fcafd1 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeMapper.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeMapper.h
@@ -36,7 +36,7 @@ class vtkWindow;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeMapper : public vtkAbstractVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeMapper,vtkAbstractVolumeMapper);
+  vtkTypeMacro(vtkUnstructuredGridVolumeMapper,vtkAbstractVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.cxx b/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.cxx
index 883f5ae177923978c4532afce8526de489ed013a..157aadd809d7ded15cb0c5eb2a9dade3125199dc 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkUnstructuredGridVolumeRayCastFunction.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeRayCastFunction, "1.1");
 
 //----------------------------------------------------------------------------
 void vtkUnstructuredGridVolumeRayCastFunction::PrintSelf(ostream& os, vtkIndent indent)
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.h b/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.h
index 15c66e13e3a1f4b8fb6ba90081ce843328c18d3d..1be239d9a444d1da778f3b8fe87691400c4ba22a 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastFunction.h
@@ -34,7 +34,7 @@ class vtkUnstructuredGridVolumeRayCastIterator;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeRayCastFunction : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeRayCastFunction,vtkObject);
+  vtkTypeMacro(vtkUnstructuredGridVolumeRayCastFunction,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.cxx b/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.cxx
index b12bb63cb313fa5133145588317bc8f705a9c2b7..847a3bed1c5f930f772f34a0cf938e53faa84321 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.cxx
@@ -16,7 +16,6 @@
 =========================================================================*/
 #include "vtkUnstructuredGridVolumeRayCastIterator.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeRayCastIterator, "1.1");
 
 //----------------------------------------------------------------------------
 
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.h b/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.h
index 7c01bd7a5eca356dc3dca87bad78d2f63c6109fd..f75e6465328f56d189362e4190c12ce1572e5bca 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastIterator.h
@@ -40,7 +40,7 @@ class vtkDataArray;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeRayCastIterator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeRayCastIterator, vtkObject);
+  vtkTypeMacro(vtkUnstructuredGridVolumeRayCastIterator, vtkObject);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.cxx b/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.cxx
index a955517cce37e38b35d17dd5667fcfc23e3bc095..cf2947e593dfa2f0922524ba661e1bf2bed47c80 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.cxx
@@ -43,7 +43,6 @@
 VTK_THREAD_RETURN_TYPE UnstructuredGridVolumeRayCastMapper_CastRays( void *arg );
 
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeRayCastMapper, "1.7");
 vtkStandardNewMacro(vtkUnstructuredGridVolumeRayCastMapper);
 
 vtkCxxSetObjectMacro(vtkUnstructuredGridVolumeRayCastMapper, RayCastFunction,
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.h b/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.h
index 833991ee88dff8059e85755f206e86dbd8120695..3cb51fb007995574d6a06f3e75eb6640a7d089b7 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayCastMapper.h
@@ -40,7 +40,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeRayCastMapper : public
 {
 public:
   static vtkUnstructuredGridVolumeRayCastMapper *New();
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeRayCastMapper,vtkUnstructuredGridVolumeMapper);
+  vtkTypeMacro(vtkUnstructuredGridVolumeRayCastMapper,vtkUnstructuredGridVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.cxx b/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.cxx
index 6999a363f9e0777e38f5752280e8c1f8684f53c7..27794242366fd7a98af7d79ccbb644b6e2a84dc0 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.cxx
@@ -14,7 +14,6 @@
 =========================================================================*/
 #include "vtkUnstructuredGridVolumeRayIntegrator.h"
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeRayIntegrator, "1.1");
 
 //----------------------------------------------------------------------------
 vtkUnstructuredGridVolumeRayIntegrator::vtkUnstructuredGridVolumeRayIntegrator()
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.h b/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.h
index 48d1dec1e728194fece648e07826e4c8a0864c06..e6e654377f6664d721b9c6ffddacf045f93e36ce 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeRayIntegrator.h
@@ -37,7 +37,7 @@ class vtkDataArray;
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeRayIntegrator : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeRayIntegrator,vtkObject);
+  vtkTypeMacro(vtkUnstructuredGridVolumeRayIntegrator,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.cxx b/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.cxx
index 47138886da679e5fdd41fadd4fc413c022a0cffb..eb5bb22377317970b0d66ead1128c3426f07b9be 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.cxx
+++ b/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.cxx
@@ -2368,7 +2368,6 @@ using namespace vtkUnstructuredGridVolumeZSweepMapperNamespace;
 //-----------------------------------------------------------------------------
 // Implementation of the public class.
 
-vtkCxxRevisionMacro(vtkUnstructuredGridVolumeZSweepMapper, "1.13");
 vtkStandardNewMacro(vtkUnstructuredGridVolumeZSweepMapper);
 
 vtkCxxSetObjectMacro(vtkUnstructuredGridVolumeZSweepMapper, RayIntegrator,
diff --git a/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.h b/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.h
index 2d4db3251270f79ebf3fc0e89d1070e6a817eb5e..a9e15b2a5d17c183273e9b3712f65f2b5a23881d 100644
--- a/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.h
+++ b/VolumeRendering/vtkUnstructuredGridVolumeZSweepMapper.h
@@ -67,7 +67,7 @@ namespace vtkUnstructuredGridVolumeZSweepMapperNamespace
 class VTK_VOLUMERENDERING_EXPORT vtkUnstructuredGridVolumeZSweepMapper : public vtkUnstructuredGridVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkUnstructuredGridVolumeZSweepMapper,vtkUnstructuredGridVolumeMapper);
+  vtkTypeMacro(vtkUnstructuredGridVolumeZSweepMapper,vtkUnstructuredGridVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
   
   // Description:
diff --git a/VolumeRendering/vtkVolumeMapper.cxx b/VolumeRendering/vtkVolumeMapper.cxx
index 5492f5863c0c25c44b734eec8868772cd84747d3..437a274584ba36b5f2d842c11d8a6bc5f0433785 100644
--- a/VolumeRendering/vtkVolumeMapper.cxx
+++ b/VolumeRendering/vtkVolumeMapper.cxx
@@ -20,7 +20,6 @@
 #include "vtkImageData.h"
 #include "vtkInformation.h"
 
-vtkCxxRevisionMacro(vtkVolumeMapper, "1.2");
 
 // Construct a vtkVolumeMapper with empty scalar input and clipping off.
 vtkVolumeMapper::vtkVolumeMapper()
diff --git a/VolumeRendering/vtkVolumeMapper.h b/VolumeRendering/vtkVolumeMapper.h
index 3d3e48e67197087f477d03111ef122042485a3d1..2e8d6c1582b8b053e3544ae6b48329c3d5fb1f6c 100644
--- a/VolumeRendering/vtkVolumeMapper.h
+++ b/VolumeRendering/vtkVolumeMapper.h
@@ -42,7 +42,7 @@ class vtkWindow;
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeMapper : public vtkAbstractVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeMapper,vtkAbstractVolumeMapper);
+  vtkTypeMacro(vtkVolumeMapper,vtkAbstractVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeOutlineSource.cxx b/VolumeRendering/vtkVolumeOutlineSource.cxx
index 0466608b09b88329ff46653411b1e8e9ed6f9f21..3eeda4a26751c536e6a9ceee33c773a430e21ac5 100644
--- a/VolumeRendering/vtkVolumeOutlineSource.cxx
+++ b/VolumeRendering/vtkVolumeOutlineSource.cxx
@@ -27,7 +27,6 @@
 #include "vtkVolumeMapper.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkVolumeOutlineSource, "1.3");
 vtkStandardNewMacro(vtkVolumeOutlineSource);
 
 vtkCxxSetObjectMacro(vtkVolumeOutlineSource,VolumeMapper,vtkVolumeMapper);
diff --git a/VolumeRendering/vtkVolumeOutlineSource.h b/VolumeRendering/vtkVolumeOutlineSource.h
index 79cd92e38b37f5a14941cc6c87f253cb4364f26c..3be97e84252ed27a4becad4ef18f500fe7e2474e 100644
--- a/VolumeRendering/vtkVolumeOutlineSource.h
+++ b/VolumeRendering/vtkVolumeOutlineSource.h
@@ -35,7 +35,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumeOutlineSource : public vtkPolyDataAlgo
 {
 public:
   static vtkVolumeOutlineSource *New();
-  vtkTypeRevisionMacro(vtkVolumeOutlineSource,vtkPolyDataAlgorithm);
+  vtkTypeMacro(vtkVolumeOutlineSource,vtkPolyDataAlgorithm);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkVolumePicker.cxx b/VolumeRendering/vtkVolumePicker.cxx
index 219c56b8d7252f1a281c3b9aa118d8e5014d769e..77db5c5b1c1b3f52c11170ea0a686b01a60a47c2 100644
--- a/VolumeRendering/vtkVolumePicker.cxx
+++ b/VolumeRendering/vtkVolumePicker.cxx
@@ -20,7 +20,6 @@
 #include "vtkVolume.h"
 #include "vtkVolumeMapper.h"
 
-vtkCxxRevisionMacro(vtkVolumePicker, "1.10");
 vtkStandardNewMacro(vtkVolumePicker);
 
 //----------------------------------------------------------------------------
diff --git a/VolumeRendering/vtkVolumePicker.h b/VolumeRendering/vtkVolumePicker.h
index b81ff6aea30037145517e02c880b8a54aee1439b..8f8e447d3af9efad15781325d7b5e9bdc343b54d 100644
--- a/VolumeRendering/vtkVolumePicker.h
+++ b/VolumeRendering/vtkVolumePicker.h
@@ -36,7 +36,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumePicker : public vtkCellPicker
 {
 public:
   static vtkVolumePicker *New();
-  vtkTypeRevisionMacro(vtkVolumePicker, vtkCellPicker);
+  vtkTypeMacro(vtkVolumePicker, vtkCellPicker);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeProMapper.cxx b/VolumeRendering/vtkVolumeProMapper.cxx
index 88569298b62381baffb4eb5c0fa30636b6806284..4d6a24e5c8c10a651449a362acf8e49fecf3e8f4 100644
--- a/VolumeRendering/vtkVolumeProMapper.cxx
+++ b/VolumeRendering/vtkVolumeProMapper.cxx
@@ -27,7 +27,6 @@
 
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkVolumeProMapper, "1.5");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/VolumeRendering/vtkVolumeProMapper.h b/VolumeRendering/vtkVolumeProMapper.h
index 9ff0fa72e6ea2a4e114323c0ac4fdd118e2486d4..04a5d101d97136bb8139467e008fa80cfc2af5cb 100644
--- a/VolumeRendering/vtkVolumeProMapper.h
+++ b/VolumeRendering/vtkVolumeProMapper.h
@@ -88,7 +88,7 @@ class vtkTimerLog;
 class VTK_VOLUME_PRO_MAPPER_EXPORT vtkVolumeProMapper : public vtkVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeProMapper,vtkVolumeMapper);
+  vtkTypeMacro(vtkVolumeProMapper,vtkVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeProVP1000Mapper.cxx b/VolumeRendering/vtkVolumeProVP1000Mapper.cxx
index 6d9961fad7ff730e1c78acea83754ccb1a6ff307..480798058960446da8bbe0228288aeebd49a718b 100644
--- a/VolumeRendering/vtkVolumeProVP1000Mapper.cxx
+++ b/VolumeRendering/vtkVolumeProVP1000Mapper.cxx
@@ -36,7 +36,6 @@
 #include <stdio.h>
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolumeProVP1000Mapper, "1.4");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/VolumeRendering/vtkVolumeProVP1000Mapper.h b/VolumeRendering/vtkVolumeProVP1000Mapper.h
index 43e655606f23fbafd285f599a8465116239bbc89..ecaaba8f5180fb6adc16917fde553146f1826a8d 100644
--- a/VolumeRendering/vtkVolumeProVP1000Mapper.h
+++ b/VolumeRendering/vtkVolumeProVP1000Mapper.h
@@ -68,7 +68,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeProVP1000Mapper : public vtkVolumeProMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeProVP1000Mapper,vtkVolumeProMapper);
+  vtkTypeMacro(vtkVolumeProVP1000Mapper,vtkVolumeProMapper);
   static vtkVolumeProVP1000Mapper *New();
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/VolumeRendering/vtkVolumeRayCastCompositeFunction.cxx b/VolumeRendering/vtkVolumeRayCastCompositeFunction.cxx
index 66b55e0f2121a55608adc97b09fd3217085a8b53..debcf892b08f7142ac99407a9f8a8b95a14701b9 100644
--- a/VolumeRendering/vtkVolumeRayCastCompositeFunction.cxx
+++ b/VolumeRendering/vtkVolumeRayCastCompositeFunction.cxx
@@ -22,7 +22,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolumeRayCastCompositeFunction, "1.1");
 vtkStandardNewMacro(vtkVolumeRayCastCompositeFunction);
 
 #define VTK_REMAINING_OPACITY           0.02
diff --git a/VolumeRendering/vtkVolumeRayCastCompositeFunction.h b/VolumeRendering/vtkVolumeRayCastCompositeFunction.h
index 8cd3129a5e5c99c40dd638a50d0650c1841d6caa..62e2c62d0ebe30a69c46b0fee32aca08a936637d 100644
--- a/VolumeRendering/vtkVolumeRayCastCompositeFunction.h
+++ b/VolumeRendering/vtkVolumeRayCastCompositeFunction.h
@@ -35,7 +35,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumeRayCastCompositeFunction : public vtkV
 {
 public:
   static vtkVolumeRayCastCompositeFunction *New();
-  vtkTypeRevisionMacro(vtkVolumeRayCastCompositeFunction,vtkVolumeRayCastFunction);
+  vtkTypeMacro(vtkVolumeRayCastCompositeFunction,vtkVolumeRayCastFunction);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeRayCastFunction.cxx b/VolumeRendering/vtkVolumeRayCastFunction.cxx
index 44e7c358f94d148663ef5ae27c40a82cd2d79d25..e32b9f64050e105934e0621428b4eda00f8b2c6c 100644
--- a/VolumeRendering/vtkVolumeRayCastFunction.cxx
+++ b/VolumeRendering/vtkVolumeRayCastFunction.cxx
@@ -21,7 +21,6 @@
 #include "vtkVolumeProperty.h"
 #include "vtkVolumeRayCastMapper.h"
 
-vtkCxxRevisionMacro(vtkVolumeRayCastFunction, "1.1");
 
 // Grab everything we need for rendering now. This procedure will be called
 // during the initialization phase of ray casting. It is called once per 
diff --git a/VolumeRendering/vtkVolumeRayCastFunction.h b/VolumeRendering/vtkVolumeRayCastFunction.h
index 53945ef921ca2f0bedfacc7a284ce586a607c230..fdc91e17fdcd17978d36118529f008b02d526a51 100644
--- a/VolumeRendering/vtkVolumeRayCastFunction.h
+++ b/VolumeRendering/vtkVolumeRayCastFunction.h
@@ -130,7 +130,7 @@ typedef struct
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeRayCastFunction : public vtkObject
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeRayCastFunction,vtkObject);
+  vtkTypeMacro(vtkVolumeRayCastFunction,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.cxx b/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.cxx
index aba8ecee6772f8996093ac11c93b92fd8eb79184..c39a5ae0d499ede1386199e91f273edf4edccb23 100644
--- a/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.cxx
+++ b/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.cxx
@@ -26,7 +26,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolumeRayCastIsosurfaceFunction, "1.2");
 vtkStandardNewMacro(vtkVolumeRayCastIsosurfaceFunction);
 
 /*    Is x between y and z?                                     */
diff --git a/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.h b/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.h
index 335175d69e310a77f847a83b546ca0d5cd0f3942..ca9a04fae085715e5ac52ac8475f880074a5da65 100644
--- a/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.h
+++ b/VolumeRendering/vtkVolumeRayCastIsosurfaceFunction.h
@@ -35,7 +35,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeRayCastIsosurfaceFunction : public vtkVolumeRayCastFunction
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeRayCastIsosurfaceFunction,vtkVolumeRayCastFunction);
+  vtkTypeMacro(vtkVolumeRayCastIsosurfaceFunction,vtkVolumeRayCastFunction);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeRayCastMIPFunction.cxx b/VolumeRendering/vtkVolumeRayCastMIPFunction.cxx
index 5695dcc0decf4bbea3beb9c0c730cf79ef54bed2..4eb7a5ac998c7676d3a54a728357f9c704e0d121 100644
--- a/VolumeRendering/vtkVolumeRayCastMIPFunction.cxx
+++ b/VolumeRendering/vtkVolumeRayCastMIPFunction.cxx
@@ -19,7 +19,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolumeRayCastMIPFunction, "1.1");
 vtkStandardNewMacro(vtkVolumeRayCastMIPFunction);
 
 // This is the templated function that actually casts a ray and computes
diff --git a/VolumeRendering/vtkVolumeRayCastMIPFunction.h b/VolumeRendering/vtkVolumeRayCastMIPFunction.h
index b5ded898b5b583db6625c96cc67a51c4ebdde4c0..f2bf9659db0247dd56ee4bb88ba76808f2c728e6 100644
--- a/VolumeRendering/vtkVolumeRayCastMIPFunction.h
+++ b/VolumeRendering/vtkVolumeRayCastMIPFunction.h
@@ -40,7 +40,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumeRayCastMIPFunction : public vtkVolumeR
 {
 public:
   static vtkVolumeRayCastMIPFunction *New();
-  vtkTypeRevisionMacro(vtkVolumeRayCastMIPFunction,vtkVolumeRayCastFunction);
+  vtkTypeMacro(vtkVolumeRayCastMIPFunction,vtkVolumeRayCastFunction);
   void PrintSelf( ostream& os, vtkIndent indent );
 
 
diff --git a/VolumeRendering/vtkVolumeRayCastMapper.cxx b/VolumeRendering/vtkVolumeRayCastMapper.cxx
index e7d50c5c5e312514b31d85d8b79c5f801b270e8d..6afc89e9498f15bdef45740ebd455254734239b0 100644
--- a/VolumeRendering/vtkVolumeRayCastMapper.cxx
+++ b/VolumeRendering/vtkVolumeRayCastMapper.cxx
@@ -37,7 +37,6 @@
 
 #include <math.h>
 
-vtkCxxRevisionMacro(vtkVolumeRayCastMapper, "1.6");
 vtkStandardNewMacro(vtkVolumeRayCastMapper);
 
 vtkCxxSetObjectMacro(vtkVolumeRayCastMapper,VolumeRayCastFunction,
diff --git a/VolumeRendering/vtkVolumeRayCastMapper.h b/VolumeRendering/vtkVolumeRayCastMapper.h
index 0412a95fea03ba0b568b2c28778752f9fb99b4ec..d156b83f768f734f07725d85d5edc264b0d1d0bb 100644
--- a/VolumeRendering/vtkVolumeRayCastMapper.h
+++ b/VolumeRendering/vtkVolumeRayCastMapper.h
@@ -76,7 +76,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumeRayCastMapper : public vtkVolumeMapper
 {
 public:
   static vtkVolumeRayCastMapper *New();
-  vtkTypeRevisionMacro(vtkVolumeRayCastMapper,vtkVolumeMapper);
+  vtkTypeMacro(vtkVolumeRayCastMapper,vtkVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeRenderingFactory.cxx b/VolumeRendering/vtkVolumeRenderingFactory.cxx
index 3848fe2ac78526f1c5efc3b28df20dd85a415e1c..ada0488beb0fdb60cfcac62bda84d84c17249987 100644
--- a/VolumeRendering/vtkVolumeRenderingFactory.cxx
+++ b/VolumeRendering/vtkVolumeRenderingFactory.cxx
@@ -40,7 +40,6 @@
 
 #include "stdlib.h"
 
-vtkCxxRevisionMacro(vtkVolumeRenderingFactory, "1.14");
 vtkStandardNewMacro(vtkVolumeRenderingFactory);
 
 
diff --git a/VolumeRendering/vtkVolumeRenderingFactory.h b/VolumeRendering/vtkVolumeRenderingFactory.h
index 578bc2cd4cc11ec1443e78cd783ef0a09e299cc7..4b931b2e035750f197cab696a7f9138302f4da00 100644
--- a/VolumeRendering/vtkVolumeRenderingFactory.h
+++ b/VolumeRendering/vtkVolumeRenderingFactory.h
@@ -24,7 +24,7 @@ class VTK_VOLUMERENDERING_EXPORT vtkVolumeRenderingFactory : public vtkObject
 {
 public:
   static vtkVolumeRenderingFactory *New();
-  vtkTypeRevisionMacro(vtkVolumeRenderingFactory,vtkObject);
+  vtkTypeMacro(vtkVolumeRenderingFactory,vtkObject);
   virtual void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeTextureMapper.cxx b/VolumeRendering/vtkVolumeTextureMapper.cxx
index 60c35f10dcf3feab485a9a7829703d992f65e42a..8040d45bd4eb122b9659038c83a3723a9821cc11 100644
--- a/VolumeRendering/vtkVolumeTextureMapper.cxx
+++ b/VolumeRendering/vtkVolumeTextureMapper.cxx
@@ -24,7 +24,6 @@
 #include "vtkVolume.h"
 #include "vtkVolumeProperty.h"
 
-vtkCxxRevisionMacro(vtkVolumeTextureMapper, "1.4");
 
 vtkVolumeTextureMapper::vtkVolumeTextureMapper()
 {
diff --git a/VolumeRendering/vtkVolumeTextureMapper.h b/VolumeRendering/vtkVolumeTextureMapper.h
index b9d136c321e8b235f007ab74915d9febda425599..75c5beb97e0cf4734b42f806bc915a314e5f9cbd 100644
--- a/VolumeRendering/vtkVolumeTextureMapper.h
+++ b/VolumeRendering/vtkVolumeTextureMapper.h
@@ -35,7 +35,7 @@ class vtkVolume;
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeTextureMapper : public vtkVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeTextureMapper,vtkVolumeMapper);
+  vtkTypeMacro(vtkVolumeTextureMapper,vtkVolumeMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   // Description:
diff --git a/VolumeRendering/vtkVolumeTextureMapper2D.cxx b/VolumeRendering/vtkVolumeTextureMapper2D.cxx
index 45a5968dac4ecb21691093b1b5a97816b1aae605..eabe32b01dc48b873463535454ac8c5135dbb172 100644
--- a/VolumeRendering/vtkVolumeTextureMapper2D.cxx
+++ b/VolumeRendering/vtkVolumeTextureMapper2D.cxx
@@ -461,7 +461,6 @@ void vtkVolumeTextureMapper2D_TraverseVolume( T *data_ptr,
 
 }
 
-vtkCxxRevisionMacro(vtkVolumeTextureMapper2D, "1.5");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/VolumeRendering/vtkVolumeTextureMapper2D.h b/VolumeRendering/vtkVolumeTextureMapper2D.h
index ba1c138107fac99e718d254a53e51d51703d3e34..363fcec9d43e362fe3417a336f6d2385de07c6d5 100644
--- a/VolumeRendering/vtkVolumeTextureMapper2D.h
+++ b/VolumeRendering/vtkVolumeTextureMapper2D.h
@@ -29,7 +29,7 @@
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeTextureMapper2D : public vtkVolumeTextureMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeTextureMapper2D,vtkVolumeTextureMapper);
+  vtkTypeMacro(vtkVolumeTextureMapper2D,vtkVolumeTextureMapper);
   void PrintSelf( ostream& os, vtkIndent indent );
 
   static vtkVolumeTextureMapper2D *New();
diff --git a/VolumeRendering/vtkVolumeTextureMapper3D.cxx b/VolumeRendering/vtkVolumeTextureMapper3D.cxx
index aa48c7443512956759ee8378f055dabcec56d625..00de75dcc6ec32a37c9dcacc13bc838378fab3d5 100644
--- a/VolumeRendering/vtkVolumeTextureMapper3D.cxx
+++ b/VolumeRendering/vtkVolumeTextureMapper3D.cxx
@@ -27,7 +27,6 @@
 #include "vtkVolumeProperty.h"
 #include "vtkVolumeRenderingFactory.h"
 
-vtkCxxRevisionMacro(vtkVolumeTextureMapper3D, "1.16");
 
 //----------------------------------------------------------------------------
 // Needed when we don't use the vtkStandardNewMacro.
diff --git a/VolumeRendering/vtkVolumeTextureMapper3D.h b/VolumeRendering/vtkVolumeTextureMapper3D.h
index d2bcc11d81656e83e13a3b034b92c5a470e9bf0a..d629bbde2351311cc43a8b47365804f4b5da13d6 100644
--- a/VolumeRendering/vtkVolumeTextureMapper3D.h
+++ b/VolumeRendering/vtkVolumeTextureMapper3D.h
@@ -83,7 +83,7 @@ class vtkVolumeProperty;
 class VTK_VOLUMERENDERING_EXPORT vtkVolumeTextureMapper3D : public vtkVolumeMapper
 {
 public:
-  vtkTypeRevisionMacro(vtkVolumeTextureMapper3D,vtkVolumeMapper);
+  vtkTypeMacro(vtkVolumeTextureMapper3D,vtkVolumeMapper);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkVolumeTextureMapper3D *New();
diff --git a/Widgets/vtk3DWidget.cxx b/Widgets/vtk3DWidget.cxx
index f00fceadbe10e4fc1f2ca2b8edd357d46acab4af..462a2edb76d263d2145d4dcbcf6688879665f3fd 100644
--- a/Widgets/vtk3DWidget.cxx
+++ b/Widgets/vtk3DWidget.cxx
@@ -22,7 +22,6 @@
 #include "vtkRenderer.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtk3DWidget, "1.2");
 
 vtkCxxSetObjectMacro(vtk3DWidget,Prop3D,vtkProp3D);
 vtkCxxSetObjectMacro(vtk3DWidget,Input,vtkDataSet);
diff --git a/Widgets/vtk3DWidget.h b/Widgets/vtk3DWidget.h
index 6c629d9beba9511bb0173fee814fc34ab746ccc8..22261db9d93965da02f2b6a1cba65f98e5714ae4 100644
--- a/Widgets/vtk3DWidget.h
+++ b/Widgets/vtk3DWidget.h
@@ -61,7 +61,7 @@ class vtkProp3D;
 class VTK_WIDGETS_EXPORT vtk3DWidget : public vtkInteractorObserver
 {
 public:
-  vtkTypeRevisionMacro(vtk3DWidget,vtkInteractorObserver);
+  vtkTypeMacro(vtk3DWidget,vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx b/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx
index f41193d0dedfb6b51029bf0198f5680e1c0905f4..e3f4d723af689fae257958527037aee9c1a0b179 100644
--- a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx
+++ b/Widgets/vtkAbstractPolygonalHandleRepresentation3D.cxx
@@ -34,7 +34,6 @@
 #include "vtkVectorText.h"
 #include "vtkFollower.h"
 
-vtkCxxRevisionMacro(vtkAbstractPolygonalHandleRepresentation3D, "1.7");
 vtkCxxSetObjectMacro(vtkAbstractPolygonalHandleRepresentation3D,Property,vtkProperty);
 vtkCxxSetObjectMacro(vtkAbstractPolygonalHandleRepresentation3D,SelectedProperty,vtkProperty);
 
diff --git a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h b/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
index 9f206fa02252fb2f40210857b8a2fbb5a5e78121..5b7a37c53a6d2a133033fb3a00773797bbbed6b2 100644
--- a/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
+++ b/Widgets/vtkAbstractPolygonalHandleRepresentation3D.h
@@ -50,7 +50,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkAbstractPolygonalHandleRepresentation3D,vtkHandleRepresentation);
+  vtkTypeMacro(vtkAbstractPolygonalHandleRepresentation3D,vtkHandleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAbstractWidget.cxx b/Widgets/vtkAbstractWidget.cxx
index 804b721cd97e50db3965a8c997cb3f93980c7c8b..d7fd21d66f9bf40d3b913e2fcb8e4264c78f3568 100644
--- a/Widgets/vtkAbstractWidget.cxx
+++ b/Widgets/vtkAbstractWidget.cxx
@@ -23,7 +23,6 @@
 #include "vtkEvent.h"
 #include "vtkWidgetEvent.h"
 
-vtkCxxRevisionMacro(vtkAbstractWidget, "1.8");
 
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkAbstractWidget.h b/Widgets/vtkAbstractWidget.h
index 567b87b6826be60e207e4d308f02c75eb95b4b72..a4f17c28dc7474db613e1b8a84577c44c042e85f 100644
--- a/Widgets/vtkAbstractWidget.h
+++ b/Widgets/vtkAbstractWidget.h
@@ -62,7 +62,7 @@ class VTK_WIDGETS_EXPORT vtkAbstractWidget : public vtkInteractorObserver
 public:
   // Description:
   // Standard macros implementing standard VTK methods.
-  vtkTypeRevisionMacro(vtkAbstractWidget,vtkInteractorObserver);
+  vtkTypeMacro(vtkAbstractWidget,vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAffineRepresentation.cxx b/Widgets/vtkAffineRepresentation.cxx
index ea837d9fa14ddeb712805a816c55735e3f6618e1..6e5af703e3c73d96e3630ad53e819f255d0d6e0f 100644
--- a/Widgets/vtkAffineRepresentation.cxx
+++ b/Widgets/vtkAffineRepresentation.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 
 
-vtkCxxRevisionMacro(vtkAffineRepresentation, "1.2");
 
 //----------------------------------------------------------------------
 vtkAffineRepresentation::vtkAffineRepresentation()
diff --git a/Widgets/vtkAffineRepresentation.h b/Widgets/vtkAffineRepresentation.h
index 4fd404fa2f08c13d60f789f1ef268c0587fff928..8719ec873292eaa096adaced5d79713358fd1a38 100644
--- a/Widgets/vtkAffineRepresentation.h
+++ b/Widgets/vtkAffineRepresentation.h
@@ -46,7 +46,7 @@ class VTK_WIDGETS_EXPORT vtkAffineRepresentation : public vtkWidgetRepresentatio
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkAffineRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkAffineRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAffineRepresentation2D.cxx b/Widgets/vtkAffineRepresentation2D.cxx
index 338d34bd48d36dbf3e31e1402c0632bbbf0bb987..4a4ee7bd35dc2839d6d635fd79259e4fe798fe06 100644
--- a/Widgets/vtkAffineRepresentation2D.cxx
+++ b/Widgets/vtkAffineRepresentation2D.cxx
@@ -36,7 +36,6 @@
 #include "vtkWindow.h"
 
 
-vtkCxxRevisionMacro(vtkAffineRepresentation2D, "1.9");
 vtkStandardNewMacro(vtkAffineRepresentation2D);
 
 vtkCxxSetObjectMacro(vtkAffineRepresentation2D,Property,vtkProperty2D);
diff --git a/Widgets/vtkAffineRepresentation2D.h b/Widgets/vtkAffineRepresentation2D.h
index 86696dac6dc90d5f15a651bfaa709d04719effb6..f34574f83df70fd223194791539008c5dec01981 100644
--- a/Widgets/vtkAffineRepresentation2D.h
+++ b/Widgets/vtkAffineRepresentation2D.h
@@ -62,7 +62,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkAffineRepresentation2D,vtkAffineRepresentation);
+  vtkTypeMacro(vtkAffineRepresentation2D,vtkAffineRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAffineWidget.cxx b/Widgets/vtkAffineWidget.cxx
index a343e311ae51f8855b73a8f583901ecaa16603fd..c89d7273fe025a63614ca62ef15a964207d7bfae 100644
--- a/Widgets/vtkAffineWidget.cxx
+++ b/Widgets/vtkAffineWidget.cxx
@@ -25,7 +25,6 @@
 #include "vtkEvent.h"
 #include "vtkWidgetEvent.h"
 
-vtkCxxRevisionMacro(vtkAffineWidget, "1.7");
 vtkStandardNewMacro(vtkAffineWidget);
 
 //----------------------------------------------------------------------------------
diff --git a/Widgets/vtkAffineWidget.h b/Widgets/vtkAffineWidget.h
index cad572ba408cb1bd7454093f1d4c028b30e264d6..f46276ed50e2a297206e3a9fc10a4f1ef6d064a2 100644
--- a/Widgets/vtkAffineWidget.h
+++ b/Widgets/vtkAffineWidget.h
@@ -67,7 +67,7 @@ public:
 
   // Description:
   // Standard VTK class macros.
-  vtkTypeRevisionMacro(vtkAffineWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkAffineWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAngleRepresentation.cxx b/Widgets/vtkAngleRepresentation.cxx
index 43fd8c38177b2f223ea6b1d552b4d31d3f94c918..7c7f25b0ca203051069a951b2b385d2e71298c0a 100644
--- a/Widgets/vtkAngleRepresentation.cxx
+++ b/Widgets/vtkAngleRepresentation.cxx
@@ -25,7 +25,6 @@
 #include "vtkTextProperty.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkAngleRepresentation, "1.7");
 
 vtkCxxSetObjectMacro(vtkAngleRepresentation,HandleRepresentation,vtkHandleRepresentation);
 
diff --git a/Widgets/vtkAngleRepresentation.h b/Widgets/vtkAngleRepresentation.h
index d7564fdf1addee3dbec6cb1a5757d327b6e9e2c6..dffa308190e2541d1d65fc47127c5e08cf1c0c3f 100644
--- a/Widgets/vtkAngleRepresentation.h
+++ b/Widgets/vtkAngleRepresentation.h
@@ -38,7 +38,7 @@ class VTK_WIDGETS_EXPORT vtkAngleRepresentation : public vtkWidgetRepresentation
 public:
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkAngleRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkAngleRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAngleRepresentation2D.cxx b/Widgets/vtkAngleRepresentation2D.cxx
index 7bb03880669d4ea1a5560d62df63339b38acaf20..4b3d0ade81ec7433e77da7c022bec1507f2e24b9 100644
--- a/Widgets/vtkAngleRepresentation2D.cxx
+++ b/Widgets/vtkAngleRepresentation2D.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkAngleRepresentation2D, "1.14");
 vtkStandardNewMacro(vtkAngleRepresentation2D);
 
 
diff --git a/Widgets/vtkAngleRepresentation2D.h b/Widgets/vtkAngleRepresentation2D.h
index 06a68a31dd7e6e63587f5476ca75b0da95360e5e..ae9a105c718ced4cda137c24c3d523562d0eea2a 100644
--- a/Widgets/vtkAngleRepresentation2D.h
+++ b/Widgets/vtkAngleRepresentation2D.h
@@ -44,7 +44,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkAngleRepresentation2D,vtkAngleRepresentation);
+  vtkTypeMacro(vtkAngleRepresentation2D,vtkAngleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAngleRepresentation3D.cxx b/Widgets/vtkAngleRepresentation3D.cxx
index 66baf5e09b6181e865a7584ca3f69fc9aae70967..32741c166634bba106f88bc428f59c5af7cac6b7 100644
--- a/Widgets/vtkAngleRepresentation3D.cxx
+++ b/Widgets/vtkAngleRepresentation3D.cxx
@@ -30,7 +30,6 @@
 #include "vtkWindow.h"
 #include "vtkCamera.h"
 
-vtkCxxRevisionMacro(vtkAngleRepresentation3D, "1.3");
 vtkStandardNewMacro(vtkAngleRepresentation3D);
 
 
diff --git a/Widgets/vtkAngleRepresentation3D.h b/Widgets/vtkAngleRepresentation3D.h
index d36bc36f8d8883968c96c781bba73b32f580a0ea..c9990049e7d1840487eade278f5a79510eaf2d34 100644
--- a/Widgets/vtkAngleRepresentation3D.h
+++ b/Widgets/vtkAngleRepresentation3D.h
@@ -50,7 +50,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkAngleRepresentation3D,vtkAngleRepresentation);
+  vtkTypeMacro(vtkAngleRepresentation3D,vtkAngleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkAngleWidget.cxx b/Widgets/vtkAngleWidget.cxx
index 738344e8b53238d023cbdb73cdff89a799ec7ef1..8db5e022bd6a764dfb95655120fe67f9c249d735 100644
--- a/Widgets/vtkAngleWidget.cxx
+++ b/Widgets/vtkAngleWidget.cxx
@@ -25,7 +25,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkWidgetEventTranslator.h"
 
-vtkCxxRevisionMacro(vtkAngleWidget, "1.13");
 vtkStandardNewMacro(vtkAngleWidget);
 
 // The angle widget observes the handles.
diff --git a/Widgets/vtkAngleWidget.h b/Widgets/vtkAngleWidget.h
index 5fe2e22e9551c09a700c27a435c6ca0ada66c174..233a67102e291e7e84d1a2ab9502dca85666c682 100644
--- a/Widgets/vtkAngleWidget.h
+++ b/Widgets/vtkAngleWidget.h
@@ -83,7 +83,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkAngleWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkAngleWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBalloonRepresentation.cxx b/Widgets/vtkBalloonRepresentation.cxx
index 1db26c460a3c1f863b6e97ea2b7accbe02ed813a..aa5e1c2ba4a926256c158425e0534a19192f0514 100644
--- a/Widgets/vtkBalloonRepresentation.cxx
+++ b/Widgets/vtkBalloonRepresentation.cxx
@@ -35,7 +35,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkInteractorObserver.h"
 
-vtkCxxRevisionMacro(vtkBalloonRepresentation, "1.10");
 vtkStandardNewMacro(vtkBalloonRepresentation);
 
 vtkCxxSetObjectMacro(vtkBalloonRepresentation, TextProperty, vtkTextProperty);
diff --git a/Widgets/vtkBalloonRepresentation.h b/Widgets/vtkBalloonRepresentation.h
index 77c1fae4005a3896648d497d5cac6ae99bda423e..db8d48d58bcb2cf3d87cb31921ecb4bab9f41488 100644
--- a/Widgets/vtkBalloonRepresentation.h
+++ b/Widgets/vtkBalloonRepresentation.h
@@ -79,7 +79,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkBalloonRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkBalloonRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBalloonWidget.cxx b/Widgets/vtkBalloonWidget.cxx
index fc61e34a05ab561c34468037edcfe518eba48d45..13a0ef5f8107d1ebb8074562fa0d49f022743118 100644
--- a/Widgets/vtkBalloonWidget.cxx
+++ b/Widgets/vtkBalloonWidget.cxx
@@ -29,7 +29,6 @@
 #include "vtkImageData.h"
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkBalloonWidget, "1.5");
 vtkStandardNewMacro(vtkBalloonWidget);
 
 //-- Define the PIMPLd array of vtkProp and vtkString --
diff --git a/Widgets/vtkBalloonWidget.h b/Widgets/vtkBalloonWidget.h
index 12ecaecc68a5529f686af3fe57b2c5f03fa78366..34676ba52061b1723ad92786f6ef5cddb75df098 100644
--- a/Widgets/vtkBalloonWidget.h
+++ b/Widgets/vtkBalloonWidget.h
@@ -86,7 +86,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkBalloonWidget,vtkHoverWidget);
+  vtkTypeMacro(vtkBalloonWidget,vtkHoverWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBezierContourLineInterpolator.cxx b/Widgets/vtkBezierContourLineInterpolator.cxx
index 77c957b8c39bc2936dce529c359f601e0a7a3a74..cdb3f600a2dfa712b6db183fe624de42667a4657 100644
--- a/Widgets/vtkBezierContourLineInterpolator.cxx
+++ b/Widgets/vtkBezierContourLineInterpolator.cxx
@@ -20,7 +20,6 @@
 #include "vtkRenderer.h"
 #include "vtkIntArray.h"
 
-vtkCxxRevisionMacro(vtkBezierContourLineInterpolator, "1.6");
 vtkStandardNewMacro(vtkBezierContourLineInterpolator);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkBezierContourLineInterpolator.h b/Widgets/vtkBezierContourLineInterpolator.h
index dc048aac7081393e0773a1724ddeb68fad8d20ae..65e4638523d5b968031d3fef9df4b846e472fde6 100644
--- a/Widgets/vtkBezierContourLineInterpolator.h
+++ b/Widgets/vtkBezierContourLineInterpolator.h
@@ -37,7 +37,7 @@ public:
   
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkBezierContourLineInterpolator,vtkContourLineInterpolator);
+  vtkTypeMacro(vtkBezierContourLineInterpolator,vtkContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual int InterpolateLine( vtkRenderer *ren, 
diff --git a/Widgets/vtkBiDimensionalRepresentation2D.cxx b/Widgets/vtkBiDimensionalRepresentation2D.cxx
index 444094b1a5a78cf77f00a48135d56a682e4e98b6..284def38462c2fbc697f57616dfddb063fcca512 100644
--- a/Widgets/vtkBiDimensionalRepresentation2D.cxx
+++ b/Widgets/vtkBiDimensionalRepresentation2D.cxx
@@ -34,7 +34,6 @@
 
 #include <vtksys/ios/sstream>
 
-vtkCxxRevisionMacro(vtkBiDimensionalRepresentation2D, "1.26");
 vtkStandardNewMacro(vtkBiDimensionalRepresentation2D);
 
 
diff --git a/Widgets/vtkBiDimensionalRepresentation2D.h b/Widgets/vtkBiDimensionalRepresentation2D.h
index 5b973e242ee0505581b37d90d37b9fb991f8024c..cb39b9dead020344a6923b0baea5c5feb8a2477e 100644
--- a/Widgets/vtkBiDimensionalRepresentation2D.h
+++ b/Widgets/vtkBiDimensionalRepresentation2D.h
@@ -61,7 +61,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkBiDimensionalRepresentation2D,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkBiDimensionalRepresentation2D,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBiDimensionalWidget.cxx b/Widgets/vtkBiDimensionalWidget.cxx
index e2626a7f50d49d75c95bbda6aeec7a939fc42650..de5c06ad911495172285f0198b07afdd2b45ae12 100644
--- a/Widgets/vtkBiDimensionalWidget.cxx
+++ b/Widgets/vtkBiDimensionalWidget.cxx
@@ -26,7 +26,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkBiDimensionalWidget, "1.10");
 vtkStandardNewMacro(vtkBiDimensionalWidget);
 
 
diff --git a/Widgets/vtkBiDimensionalWidget.h b/Widgets/vtkBiDimensionalWidget.h
index 1fc4ce101651b97510b9a1e3d8a357597b98cd6f..57f169f6a8f69277fae1c4696fd43bd83b699218 100644
--- a/Widgets/vtkBiDimensionalWidget.h
+++ b/Widgets/vtkBiDimensionalWidget.h
@@ -106,7 +106,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkBiDimensionalWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkBiDimensionalWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBorderRepresentation.cxx b/Widgets/vtkBorderRepresentation.cxx
index 6c84837bc7e817cefd9dad5f2bbb0c4ecb541da2..0eda541aff80143116f0b470130f1550efe953e4 100644
--- a/Widgets/vtkBorderRepresentation.cxx
+++ b/Widgets/vtkBorderRepresentation.cxx
@@ -26,7 +26,6 @@
 #include "vtkObjectFactory.h"
 
 
-vtkCxxRevisionMacro(vtkBorderRepresentation, "1.8");
 vtkStandardNewMacro(vtkBorderRepresentation);
 
 
diff --git a/Widgets/vtkBorderRepresentation.h b/Widgets/vtkBorderRepresentation.h
index f4b3a739349242e566809712df205e43fcebffcb..07e217a6655cc238330ab494df2e1d073856ff8a 100644
--- a/Widgets/vtkBorderRepresentation.h
+++ b/Widgets/vtkBorderRepresentation.h
@@ -58,7 +58,7 @@ public:
 
   // Description:
   // Define standard methods.
-  vtkTypeRevisionMacro(vtkBorderRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkBorderRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBorderWidget.cxx b/Widgets/vtkBorderWidget.cxx
index b6b70fe45eee313399f78f68fc63257e25ab73a3..240f41d15f266b3a882c239235dba1cdda1bba0d 100644
--- a/Widgets/vtkBorderWidget.cxx
+++ b/Widgets/vtkBorderWidget.cxx
@@ -26,7 +26,6 @@
 #include "vtkWidgetEvent.h"
 
 
-vtkCxxRevisionMacro(vtkBorderWidget, "1.9");
 vtkStandardNewMacro(vtkBorderWidget);
 
 
diff --git a/Widgets/vtkBorderWidget.h b/Widgets/vtkBorderWidget.h
index 172518f791bee8e9afcfe4d73b56f066b0d6fd7c..57a54b1c38409170c7c296b3c3c5ce8a63dfebb0 100644
--- a/Widgets/vtkBorderWidget.h
+++ b/Widgets/vtkBorderWidget.h
@@ -83,7 +83,7 @@ public:
 
   // Description;
   // Standard methods for class.
-  vtkTypeRevisionMacro(vtkBorderWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkBorderWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBoundedPlanePointPlacer.cxx b/Widgets/vtkBoundedPlanePointPlacer.cxx
index d622f58affb7df4c5d39d922a190a3ca1a3c04ff..e553f3c341554461ea609cb68138412498ab76bb 100644
--- a/Widgets/vtkBoundedPlanePointPlacer.cxx
+++ b/Widgets/vtkBoundedPlanePointPlacer.cxx
@@ -26,7 +26,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkBoundedPlanePointPlacer, "1.10");
 vtkStandardNewMacro(vtkBoundedPlanePointPlacer);
 
 vtkCxxSetObjectMacro(vtkBoundedPlanePointPlacer, ObliquePlane, vtkPlane);
diff --git a/Widgets/vtkBoundedPlanePointPlacer.h b/Widgets/vtkBoundedPlanePointPlacer.h
index 943121020ea0e7400bfe86791c890c0defebbf11..aa74adbc8cd3b11e52eb1dd59c10e805a53c7547 100644
--- a/Widgets/vtkBoundedPlanePointPlacer.h
+++ b/Widgets/vtkBoundedPlanePointPlacer.h
@@ -40,7 +40,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkBoundedPlanePointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkBoundedPlanePointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBoxRepresentation.cxx b/Widgets/vtkBoxRepresentation.cxx
index 4c6bc620f4ca35d9df1be68d66a38c6fc8b60127..3b217721b6e4c58d8a5aebf1d09b1b564b18815d 100644
--- a/Widgets/vtkBoxRepresentation.cxx
+++ b/Widgets/vtkBoxRepresentation.cxx
@@ -38,7 +38,6 @@
 #include "vtkObjectFactory.h"
 
 
-vtkCxxRevisionMacro(vtkBoxRepresentation, "1.10");
 vtkStandardNewMacro(vtkBoxRepresentation);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkBoxRepresentation.h b/Widgets/vtkBoxRepresentation.h
index c7d5559182dc7c9b45c3660f8c6ec24d406cdfd8..d4152c228f756202a7a19c8d29ab9d36c65dbaf5 100644
--- a/Widgets/vtkBoxRepresentation.h
+++ b/Widgets/vtkBoxRepresentation.h
@@ -62,7 +62,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkBoxRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkBoxRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBoxWidget.cxx b/Widgets/vtkBoxWidget.cxx
index be12194723b8ed164e17ad13e3139404512ee50d..882d5293288fad9f697cb33815bce0546ec3d2c3 100644
--- a/Widgets/vtkBoxWidget.cxx
+++ b/Widgets/vtkBoxWidget.cxx
@@ -34,7 +34,6 @@
 #include "vtkSphereSource.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkBoxWidget, "1.3");
 vtkStandardNewMacro(vtkBoxWidget);
 
 vtkBoxWidget::vtkBoxWidget()
diff --git a/Widgets/vtkBoxWidget.h b/Widgets/vtkBoxWidget.h
index 89b0f16f9003258927c1ba20b0a79534b0d11992..612cd42d897b45feecb95da8db1998bdba312c08 100644
--- a/Widgets/vtkBoxWidget.h
+++ b/Widgets/vtkBoxWidget.h
@@ -96,7 +96,7 @@ public:
   // Instantiate the object.
   static vtkBoxWidget *New();
 
-  vtkTypeRevisionMacro(vtkBoxWidget,vtk3DWidget);
+  vtkTypeMacro(vtkBoxWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkBoxWidget2.cxx b/Widgets/vtkBoxWidget2.cxx
index 7789ac39a03c6fcee31472a605a49edfee6adac6..457aa2600c7809e7530e7573242f37b193af4550 100644
--- a/Widgets/vtkBoxWidget2.cxx
+++ b/Widgets/vtkBoxWidget2.cxx
@@ -26,7 +26,6 @@
 #include "vtkRenderer.h"
 
 
-vtkCxxRevisionMacro(vtkBoxWidget2, "1.3");
 vtkStandardNewMacro(vtkBoxWidget2);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkBoxWidget2.h b/Widgets/vtkBoxWidget2.h
index 77e2d624e836a5b003ff7977aa75f3cae4e1c840..42af817ba4a9fe176cd79a724486da213fc51c25 100644
--- a/Widgets/vtkBoxWidget2.h
+++ b/Widgets/vtkBoxWidget2.h
@@ -105,7 +105,7 @@ public:
 
   // Description:
   // Standard class methods for type information and printing.
-  vtkTypeRevisionMacro(vtkBoxWidget2,vtkAbstractWidget);
+  vtkTypeMacro(vtkBoxWidget2,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCameraRepresentation.cxx b/Widgets/vtkCameraRepresentation.cxx
index c8fff31ac2b604abba75773c550da6768c277984..e4384494befaba64dd6a648ace34f371d306b0b4 100644
--- a/Widgets/vtkCameraRepresentation.cxx
+++ b/Widgets/vtkCameraRepresentation.cxx
@@ -30,7 +30,6 @@
 #include "vtkTransformPolyDataFilter.h"
 
 
-vtkCxxRevisionMacro(vtkCameraRepresentation, "1.5");
 vtkStandardNewMacro(vtkCameraRepresentation);
 
 vtkCxxSetObjectMacro(vtkCameraRepresentation, Camera, vtkCamera);
diff --git a/Widgets/vtkCameraRepresentation.h b/Widgets/vtkCameraRepresentation.h
index 6b0abb6036bc7ed20eded3620f524ec6c46e1b3b..60fbc08b7b0149fb1a8c3657edfce4778ffb563e 100644
--- a/Widgets/vtkCameraRepresentation.h
+++ b/Widgets/vtkCameraRepresentation.h
@@ -50,7 +50,7 @@ public:
 
   // Description:
   // Standard VTK class methods.
-  vtkTypeRevisionMacro(vtkCameraRepresentation,vtkBorderRepresentation);
+  vtkTypeMacro(vtkCameraRepresentation,vtkBorderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCameraWidget.cxx b/Widgets/vtkCameraWidget.cxx
index 480c8835ce3d2b5f7838e67c215f30e1077682b7..f88945604d3c12acde6a594081353a05089ccca2 100644
--- a/Widgets/vtkCameraWidget.cxx
+++ b/Widgets/vtkCameraWidget.cxx
@@ -18,7 +18,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCameraWidget, "1.3");
 vtkStandardNewMacro(vtkCameraWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkCameraWidget.h b/Widgets/vtkCameraWidget.h
index 563e081d922d1b9c7bca929b29b084ebae17c46c..893122002c01e067f9817af712574df1fa838d3f 100644
--- a/Widgets/vtkCameraWidget.h
+++ b/Widgets/vtkCameraWidget.h
@@ -44,7 +44,7 @@ public:
 
   // Description:
   // Standar VTK class methods.
-  vtkTypeRevisionMacro(vtkCameraWidget,vtkBorderWidget);
+  vtkTypeMacro(vtkCameraWidget,vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCaptionRepresentation.cxx b/Widgets/vtkCaptionRepresentation.cxx
index 7d2fc026baa3d9a0a6ef68d97050d10c2d54881a..dbf03d37785d185d914c4ece91d6abf744b1a030 100644
--- a/Widgets/vtkCaptionRepresentation.cxx
+++ b/Widgets/vtkCaptionRepresentation.cxx
@@ -26,7 +26,6 @@
 #include "vtkTextMapper.h"
 #include "vtkFreeTypeUtilities.h"
 
-vtkCxxRevisionMacro(vtkCaptionRepresentation, "1.8");
 vtkStandardNewMacro(vtkCaptionRepresentation);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkCaptionRepresentation.h b/Widgets/vtkCaptionRepresentation.h
index 4a4b3cb08bc6c16e4078dd3ca63e7ed9b15432a9..cdf440f93b33f14b428b201fb82766d45cee88fb 100644
--- a/Widgets/vtkCaptionRepresentation.h
+++ b/Widgets/vtkCaptionRepresentation.h
@@ -51,7 +51,7 @@ public:
 
   // Description:
   // Standard VTK class methods.
-  vtkTypeRevisionMacro(vtkCaptionRepresentation,vtkBorderRepresentation);
+  vtkTypeMacro(vtkCaptionRepresentation,vtkBorderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCaptionWidget.cxx b/Widgets/vtkCaptionWidget.cxx
index 187ea061efdbe27cb81ed53b5c11e00e8e96654e..e1a2bc249cee27cb2a8c94b072c0690a3e51bbf2 100644
--- a/Widgets/vtkCaptionWidget.cxx
+++ b/Widgets/vtkCaptionWidget.cxx
@@ -22,7 +22,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkCaptionWidget, "1.4");
 vtkStandardNewMacro(vtkCaptionWidget);
 
 // The point widget invokes events that we watch for. Basically
diff --git a/Widgets/vtkCaptionWidget.h b/Widgets/vtkCaptionWidget.h
index 40544f9e3e17a6ec18630b93071730449d2bce08..60521ff75fa9390d6b1e3c4f3710b1a469265f37 100644
--- a/Widgets/vtkCaptionWidget.h
+++ b/Widgets/vtkCaptionWidget.h
@@ -54,7 +54,7 @@ public:
 
   // Description:
   // Standard VTK class methods.
-  vtkTypeRevisionMacro(vtkCaptionWidget,vtkBorderWidget);
+  vtkTypeMacro(vtkCaptionWidget,vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCenteredSliderRepresentation.cxx b/Widgets/vtkCenteredSliderRepresentation.cxx
index 94f267b351dd65dc013d5b604af8cbfd15f47ef7..9ccc0997c6cdaee637599aaa234b43e3b9d10404 100644
--- a/Widgets/vtkCenteredSliderRepresentation.cxx
+++ b/Widgets/vtkCenteredSliderRepresentation.cxx
@@ -43,7 +43,6 @@
 #include "vtkUnsignedCharArray.h"
 #include "vtkPointData.h"
 
-vtkCxxRevisionMacro(vtkCenteredSliderRepresentation, "1.4");
 vtkStandardNewMacro(vtkCenteredSliderRepresentation);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkCenteredSliderRepresentation.h b/Widgets/vtkCenteredSliderRepresentation.h
index fe9781f63dcb57558df81a5f87ae5ce6dfd52dcc..69351c68b1da8800ecf5b74761ee542d5d9fd95d 100644
--- a/Widgets/vtkCenteredSliderRepresentation.h
+++ b/Widgets/vtkCenteredSliderRepresentation.h
@@ -63,7 +63,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkCenteredSliderRepresentation,
+  vtkTypeMacro(vtkCenteredSliderRepresentation,
                        vtkSliderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkCenteredSliderWidget.cxx b/Widgets/vtkCenteredSliderWidget.cxx
index a9d33d822965f1a11a8071252cc8db46ef172128..590800a465f9587a42c620dd4002f62a63cdad5f 100644
--- a/Widgets/vtkCenteredSliderWidget.cxx
+++ b/Widgets/vtkCenteredSliderWidget.cxx
@@ -25,7 +25,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkTimerLog.h"
 
-vtkCxxRevisionMacro(vtkCenteredSliderWidget, "1.3");
 vtkStandardNewMacro(vtkCenteredSliderWidget);
 
 //------------------------------------------------------------
diff --git a/Widgets/vtkCenteredSliderWidget.h b/Widgets/vtkCenteredSliderWidget.h
index 6bb5340a2306e477b0f58a3d21b9a3f98cbe9491..fee6aa5b66386e74e11fa181a6ca8236ff71a87d 100644
--- a/Widgets/vtkCenteredSliderWidget.h
+++ b/Widgets/vtkCenteredSliderWidget.h
@@ -80,7 +80,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkCenteredSliderWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkCenteredSliderWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCheckerboardRepresentation.cxx b/Widgets/vtkCheckerboardRepresentation.cxx
index 69f7f4aaad417bcddf34f88311f338f292ae432e..7d455550dffbe88cda6aec1f13dd4457b06a1a77 100644
--- a/Widgets/vtkCheckerboardRepresentation.cxx
+++ b/Widgets/vtkCheckerboardRepresentation.cxx
@@ -20,7 +20,6 @@
 #include "vtkCommand.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkCheckerboardRepresentation, "1.6");
 vtkStandardNewMacro(vtkCheckerboardRepresentation);
 
 vtkCxxSetObjectMacro(vtkCheckerboardRepresentation,Checkerboard,vtkImageCheckerboard);
diff --git a/Widgets/vtkCheckerboardRepresentation.h b/Widgets/vtkCheckerboardRepresentation.h
index eda5c8591a95c411a42b09d97ba72ce6f4184d88..92c7f2b07913fc3e7a020e959e4af442a5cd6d32 100644
--- a/Widgets/vtkCheckerboardRepresentation.h
+++ b/Widgets/vtkCheckerboardRepresentation.h
@@ -46,7 +46,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkCheckerboardRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkCheckerboardRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkCheckerboardWidget.cxx b/Widgets/vtkCheckerboardWidget.cxx
index cbb85e3682d9b0c5ac475eb98d786d9a270da912..45e293d27bfa709fd6ce6e724f9fb3f8f7147840 100644
--- a/Widgets/vtkCheckerboardWidget.cxx
+++ b/Widgets/vtkCheckerboardWidget.cxx
@@ -22,7 +22,6 @@
 #include "vtkRenderer.h"
 #include "vtkSliderWidget.h"
 
-vtkCxxRevisionMacro(vtkCheckerboardWidget, "1.3");
 vtkStandardNewMacro(vtkCheckerboardWidget);
 
 
diff --git a/Widgets/vtkCheckerboardWidget.h b/Widgets/vtkCheckerboardWidget.h
index 8c3da1e5169b9d17bab5a6f9809e6f307d540366..84044276db2099e7127435c1f764f4e7be4ef3db 100644
--- a/Widgets/vtkCheckerboardWidget.h
+++ b/Widgets/vtkCheckerboardWidget.h
@@ -59,7 +59,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkCheckerboardWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkCheckerboardWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkClosedSurfacePointPlacer.cxx b/Widgets/vtkClosedSurfacePointPlacer.cxx
index 02fd6d429cd1456bd5e09ca6bf2458689d2f89af..516a76eda7c38be148cf3f31a559e78e41204840 100644
--- a/Widgets/vtkClosedSurfacePointPlacer.cxx
+++ b/Widgets/vtkClosedSurfacePointPlacer.cxx
@@ -26,7 +26,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/vector>
 
-vtkCxxRevisionMacro(vtkClosedSurfacePointPlacer, "1.5");
 vtkStandardNewMacro(vtkClosedSurfacePointPlacer);
 vtkCxxSetObjectMacro(vtkClosedSurfacePointPlacer, BoundingPlanes,vtkPlaneCollection);
 
diff --git a/Widgets/vtkClosedSurfacePointPlacer.h b/Widgets/vtkClosedSurfacePointPlacer.h
index 1f3ee6dc1cb12e3d12746701fa0a05730c74bd31..8264eaea115ac0e6153ec7d7cf57b2eb6bbf2a71 100644
--- a/Widgets/vtkClosedSurfacePointPlacer.h
+++ b/Widgets/vtkClosedSurfacePointPlacer.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkClosedSurfacePointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkClosedSurfacePointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkConstrainedPointHandleRepresentation.cxx b/Widgets/vtkConstrainedPointHandleRepresentation.cxx
index fbe2ff7ea1f34e66b93b8f7f807983ff6fd98e99..d5c6de927ae3c49d557c7e03ef9c3d1e553ccd8d 100644
--- a/Widgets/vtkConstrainedPointHandleRepresentation.cxx
+++ b/Widgets/vtkConstrainedPointHandleRepresentation.cxx
@@ -41,7 +41,6 @@
 #include "vtkTransform.h"
 #include "vtkCamera.h"
 
-vtkCxxRevisionMacro(vtkConstrainedPointHandleRepresentation, "1.8");
 vtkStandardNewMacro(vtkConstrainedPointHandleRepresentation);
 
 vtkCxxSetObjectMacro(vtkConstrainedPointHandleRepresentation, ObliquePlane, vtkPlane);
diff --git a/Widgets/vtkConstrainedPointHandleRepresentation.h b/Widgets/vtkConstrainedPointHandleRepresentation.h
index 5579798ddb229e66ba0bc34cca6856e9f31cc2fb..44a458960c0d3d2045f8afbf987e0e2017263563 100644
--- a/Widgets/vtkConstrainedPointHandleRepresentation.h
+++ b/Widgets/vtkConstrainedPointHandleRepresentation.h
@@ -58,7 +58,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkConstrainedPointHandleRepresentation,vtkHandleRepresentation);
+  vtkTypeMacro(vtkConstrainedPointHandleRepresentation,vtkHandleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkContinuousValueWidget.cxx b/Widgets/vtkContinuousValueWidget.cxx
index 5baf4c5169c3aa0ed847aa2a9c5a76a21040a308..a86c3152d5cd063892d42d90233038d5e4303e5b 100644
--- a/Widgets/vtkContinuousValueWidget.cxx
+++ b/Widgets/vtkContinuousValueWidget.cxx
@@ -31,7 +31,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkWidgetEventTranslator.h"
 
-vtkCxxRevisionMacro(vtkContinuousValueWidget, "1.1");
 
 //------------------------------------------------------------
 vtkContinuousValueWidget::vtkContinuousValueWidget()
diff --git a/Widgets/vtkContinuousValueWidget.h b/Widgets/vtkContinuousValueWidget.h
index 9276c9d8896d0bb3faac79c54006403ca95b7eab..a7cdec2e33f5e9e552b05275cb6fcbe7857ff5b1 100644
--- a/Widgets/vtkContinuousValueWidget.h
+++ b/Widgets/vtkContinuousValueWidget.h
@@ -69,7 +69,7 @@ class VTK_WIDGETS_EXPORT vtkContinuousValueWidget : public vtkAbstractWidget
 public:
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkContinuousValueWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkContinuousValueWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkContinuousValueWidgetRepresentation.cxx b/Widgets/vtkContinuousValueWidgetRepresentation.cxx
index 66ce086d09fcf77d8f250094e2cb05f9ad93c9c8..b3abde74aaf92677cb6c8d9a1c177fe45529eaad 100644
--- a/Widgets/vtkContinuousValueWidgetRepresentation.cxx
+++ b/Widgets/vtkContinuousValueWidgetRepresentation.cxx
@@ -31,7 +31,6 @@
 #include "vtkRenderWindow.h"
 
 
-vtkCxxRevisionMacro(vtkContinuousValueWidgetRepresentation, "1.1");
 
 //----------------------------------------------------------------------
 vtkContinuousValueWidgetRepresentation::vtkContinuousValueWidgetRepresentation()
diff --git a/Widgets/vtkContinuousValueWidgetRepresentation.h b/Widgets/vtkContinuousValueWidgetRepresentation.h
index 81261c137d17dec2156bebeac84410d4682e6bba..bed488862489e01391ad54eca389712420b58b48 100644
--- a/Widgets/vtkContinuousValueWidgetRepresentation.h
+++ b/Widgets/vtkContinuousValueWidgetRepresentation.h
@@ -36,7 +36,7 @@ class VTK_WIDGETS_EXPORT vtkContinuousValueWidgetRepresentation :
 public:
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkContinuousValueWidgetRepresentation,
+  vtkTypeMacro(vtkContinuousValueWidgetRepresentation,
                        vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
   
diff --git a/Widgets/vtkContourLineInterpolator.cxx b/Widgets/vtkContourLineInterpolator.cxx
index c68943f54de4ed8627d5a0d99eeba333c82ddeaa..e13920b6ece5de53a32597797c35c6a39ea00bff 100644
--- a/Widgets/vtkContourLineInterpolator.cxx
+++ b/Widgets/vtkContourLineInterpolator.cxx
@@ -17,7 +17,6 @@
 #include "vtkContourRepresentation.h"
 #include "vtkIntArray.h"
 
-vtkCxxRevisionMacro(vtkContourLineInterpolator, "1.6");
 
 //----------------------------------------------------------------------
 vtkContourLineInterpolator::vtkContourLineInterpolator()
diff --git a/Widgets/vtkContourLineInterpolator.h b/Widgets/vtkContourLineInterpolator.h
index 5dba72c9d1252d657646bfd2f4a599bf4b0680d9..f715ec3ad4896c5ec9c17e4e94bacd0650d234db 100644
--- a/Widgets/vtkContourLineInterpolator.h
+++ b/Widgets/vtkContourLineInterpolator.h
@@ -42,7 +42,7 @@ class VTK_WIDGETS_EXPORT vtkContourLineInterpolator : public vtkObject
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkContourLineInterpolator,vtkObject);
+  vtkTypeMacro(vtkContourLineInterpolator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkContourRepresentation.cxx b/Widgets/vtkContourRepresentation.cxx
index 826081834d338d64e60d7a3676b17ef4d240ed33..6a7b5920d46a07e9bc539f21d4147b48ceb8b638 100644
--- a/Widgets/vtkContourRepresentation.cxx
+++ b/Widgets/vtkContourRepresentation.cxx
@@ -33,7 +33,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/iterator>
 
-vtkCxxRevisionMacro(vtkContourRepresentation, "1.28");
 vtkCxxSetObjectMacro(vtkContourRepresentation, PointPlacer, vtkPointPlacer);
 vtkCxxSetObjectMacro(vtkContourRepresentation, LineInterpolator, vtkContourLineInterpolator);
 
diff --git a/Widgets/vtkContourRepresentation.h b/Widgets/vtkContourRepresentation.h
index ef6ac6e010a7993fc222f970cfb18d48fe9be1f5..38d7a7456d467cddf7b682ceb9dc8bb0b5dbe836 100644
--- a/Widgets/vtkContourRepresentation.h
+++ b/Widgets/vtkContourRepresentation.h
@@ -107,7 +107,7 @@ class VTK_WIDGETS_EXPORT vtkContourRepresentation : public vtkWidgetRepresentati
 public:
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkContourRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkContourRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkContourWidget.cxx b/Widgets/vtkContourWidget.cxx
index c78208dd76b140ee043132b555ad959c2b22e245..819364ad27830cf1b1167b333b39df9d7aa8c9b0 100644
--- a/Widgets/vtkContourWidget.cxx
+++ b/Widgets/vtkContourWidget.cxx
@@ -27,7 +27,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkContourWidget, "1.37");
 vtkStandardNewMacro(vtkContourWidget);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkContourWidget.h b/Widgets/vtkContourWidget.h
index 4b83f1e8baca16ca1f6bf5e4ea3e38eae3d23ba6..d73faa51ed0101597f950e3ad720d77c4fcf8f5c 100644
--- a/Widgets/vtkContourWidget.h
+++ b/Widgets/vtkContourWidget.h
@@ -128,7 +128,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkContourWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkContourWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkDijkstraImageContourLineInterpolator.cxx b/Widgets/vtkDijkstraImageContourLineInterpolator.cxx
index b189b3eb2ac0d0f47ca32b9a6b7d618a49e882eb..de7ab341f2697d6fbc4c452d7053ef74e9bb9b25 100644
--- a/Widgets/vtkDijkstraImageContourLineInterpolator.cxx
+++ b/Widgets/vtkDijkstraImageContourLineInterpolator.cxx
@@ -27,7 +27,6 @@
 #include "vtkPoints.h"
 #include "vtkPolyData.h"
 
-vtkCxxRevisionMacro(vtkDijkstraImageContourLineInterpolator,"1.5");
 vtkStandardNewMacro(vtkDijkstraImageContourLineInterpolator);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkDijkstraImageContourLineInterpolator.h b/Widgets/vtkDijkstraImageContourLineInterpolator.h
index 254be98e2fe9286b52676cc4268b50e8d889dd21..016fa75960da63c9337ec6a782cd528d0c95c848 100644
--- a/Widgets/vtkDijkstraImageContourLineInterpolator.h
+++ b/Widgets/vtkDijkstraImageContourLineInterpolator.h
@@ -47,7 +47,7 @@ class VTK_WIDGETS_EXPORT vtkDijkstraImageContourLineInterpolator
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkDijkstraImageContourLineInterpolator,
+  vtkTypeMacro(vtkDijkstraImageContourLineInterpolator,
                               vtkContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkDistanceRepresentation.cxx b/Widgets/vtkDistanceRepresentation.cxx
index 23826dd7560fae95f11912b83b5ba0e51f7214bc..5fc14bd2afa31bfa3fd07103c28c721e1e0423e5 100644
--- a/Widgets/vtkDistanceRepresentation.cxx
+++ b/Widgets/vtkDistanceRepresentation.cxx
@@ -22,7 +22,6 @@
 #include "vtkMath.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkDistanceRepresentation, "1.5");
 vtkCxxSetObjectMacro(vtkDistanceRepresentation,HandleRepresentation,vtkHandleRepresentation);
 
 
diff --git a/Widgets/vtkDistanceRepresentation.h b/Widgets/vtkDistanceRepresentation.h
index 51aa6e32c5d453b31f0cd3a3e86ebc283a737891..20199ea4ed5faadb32435b5afe22ce1c426cfa2c 100644
--- a/Widgets/vtkDistanceRepresentation.h
+++ b/Widgets/vtkDistanceRepresentation.h
@@ -35,7 +35,7 @@ class VTK_WIDGETS_EXPORT vtkDistanceRepresentation : public vtkWidgetRepresentat
 public:
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkDistanceRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkDistanceRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkDistanceRepresentation2D.cxx b/Widgets/vtkDistanceRepresentation2D.cxx
index 214704aae3ea2d6001d92b1b8e502cbfe414bd69..d9a4964f6b159abd51cc298fa118c7ccc19090e3 100644
--- a/Widgets/vtkDistanceRepresentation2D.cxx
+++ b/Widgets/vtkDistanceRepresentation2D.cxx
@@ -27,7 +27,6 @@
 #include "vtkTextProperty.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkDistanceRepresentation2D, "1.8");
 vtkStandardNewMacro(vtkDistanceRepresentation2D);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkDistanceRepresentation2D.h b/Widgets/vtkDistanceRepresentation2D.h
index 5342dbafdd40dc865f92efb655b5f99c241e8350..7c3c4416f7b5a0551c5e9398cc87ad1fa23c3b8e 100644
--- a/Widgets/vtkDistanceRepresentation2D.h
+++ b/Widgets/vtkDistanceRepresentation2D.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkDistanceRepresentation2D,vtkDistanceRepresentation);
+  vtkTypeMacro(vtkDistanceRepresentation2D,vtkDistanceRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkDistanceWidget.cxx b/Widgets/vtkDistanceWidget.cxx
index 8f83d2f721fe4c84f8be38ee5f32b5be5c898a6f..b6409c3fb0e3cbff8ff358b4a8c064919e6fc5b4 100644
--- a/Widgets/vtkDistanceWidget.cxx
+++ b/Widgets/vtkDistanceWidget.cxx
@@ -25,7 +25,6 @@
 #include "vtkWidgetEvent.h"
 #include "vtkWidgetEventTranslator.h"
 
-vtkCxxRevisionMacro(vtkDistanceWidget, "1.10");
 vtkStandardNewMacro(vtkDistanceWidget);
 
 
diff --git a/Widgets/vtkDistanceWidget.h b/Widgets/vtkDistanceWidget.h
index 6d6fb369c9c6f5f0645ed19898f18bbbd49763d9..119f9309349368b060391e1f1ce4f3cf1da767e4 100644
--- a/Widgets/vtkDistanceWidget.h
+++ b/Widgets/vtkDistanceWidget.h
@@ -81,7 +81,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkDistanceWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkDistanceWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx b/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx
index 9e61517864e2bd00b57339482eb1092446a4ea80..2308b3bac6fe0346b4ac862ca052b613fa329ad5 100644
--- a/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx
+++ b/Widgets/vtkEllipsoidTensorProbeRepresentation.cxx
@@ -31,7 +31,6 @@
 #include "vtkCellPicker.h"
 #include "vtkAssemblyPath.h"
 
-vtkCxxRevisionMacro(vtkEllipsoidTensorProbeRepresentation, "1.2");
 vtkStandardNewMacro(vtkEllipsoidTensorProbeRepresentation);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkEllipsoidTensorProbeRepresentation.h b/Widgets/vtkEllipsoidTensorProbeRepresentation.h
index 0c429fa0074d36f7225d020d9b47f40d827c72a9..172bd3e8226e13d1d471ae44c958591f83e26f86 100644
--- a/Widgets/vtkEllipsoidTensorProbeRepresentation.h
+++ b/Widgets/vtkEllipsoidTensorProbeRepresentation.h
@@ -39,7 +39,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkEllipsoidTensorProbeRepresentation,
+  vtkTypeMacro(vtkEllipsoidTensorProbeRepresentation,
                                 vtkTensorProbeRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkEvent.cxx b/Widgets/vtkEvent.cxx
index 93ae27134ef16ce1e1e28ca53242708797c392c4..6c93489dd48eb22cc15d177e26f4566d2c7830cd 100644
--- a/Widgets/vtkEvent.cxx
+++ b/Widgets/vtkEvent.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkEvent, "1.7");
 vtkStandardNewMacro(vtkEvent);
 
 
diff --git a/Widgets/vtkEvent.h b/Widgets/vtkEvent.h
index 1bf36ce73031851b0a05e968255cd05108674680..74c5613b743f7a2c2dbbdbda5adf8ee64b344a6e 100644
--- a/Widgets/vtkEvent.h
+++ b/Widgets/vtkEvent.h
@@ -34,7 +34,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkEvent,vtkObject);
+  vtkTypeMacro(vtkEvent,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Widgets/vtkFocalPlaneContourRepresentation.cxx b/Widgets/vtkFocalPlaneContourRepresentation.cxx
index 5f0f606be4827b16ea7eed7f2b717ff1186c9a20..43968cd04c291f88f87cb4752f2e047e2fc3c19c 100644
--- a/Widgets/vtkFocalPlaneContourRepresentation.cxx
+++ b/Widgets/vtkFocalPlaneContourRepresentation.cxx
@@ -32,7 +32,6 @@
 #include <vtkstd/algorithm>
 #include <vtkstd/iterator>
 
-vtkCxxRevisionMacro(vtkFocalPlaneContourRepresentation, "1.5");
 
 //----------------------------------------------------------------------
 vtkFocalPlaneContourRepresentation::vtkFocalPlaneContourRepresentation()
diff --git a/Widgets/vtkFocalPlaneContourRepresentation.h b/Widgets/vtkFocalPlaneContourRepresentation.h
index f50715159ca17bfc29907dc7ed418f9625e9ecd0..f7ff4ae74ee863ef77aa700765bb80596bd11747 100644
--- a/Widgets/vtkFocalPlaneContourRepresentation.h
+++ b/Widgets/vtkFocalPlaneContourRepresentation.h
@@ -39,7 +39,7 @@ class VTK_WIDGETS_EXPORT vtkFocalPlaneContourRepresentation : public vtkContourR
 public:
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkFocalPlaneContourRepresentation,vtkContourRepresentation);
+  vtkTypeMacro(vtkFocalPlaneContourRepresentation,vtkContourRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkFocalPlanePointPlacer.cxx b/Widgets/vtkFocalPlanePointPlacer.cxx
index ea99f589a0c14bc720b31ec9bb985f3d304c9b9f..a5ec0527a98bab3ec532fd2527ed34c75c812299 100644
--- a/Widgets/vtkFocalPlanePointPlacer.cxx
+++ b/Widgets/vtkFocalPlanePointPlacer.cxx
@@ -22,7 +22,6 @@
 #include "vtkPlaneCollection.h"
 #include "vtkRenderer.h"
 
-vtkCxxRevisionMacro(vtkFocalPlanePointPlacer, "1.5");
 vtkStandardNewMacro(vtkFocalPlanePointPlacer);
 
 
diff --git a/Widgets/vtkFocalPlanePointPlacer.h b/Widgets/vtkFocalPlanePointPlacer.h
index 2d5c9eb955edec8f8e53b663fd4390e001424f47..a7d54b1abfdb0ca0a78aa40e9b712fc0b78e558b 100644
--- a/Widgets/vtkFocalPlanePointPlacer.h
+++ b/Widgets/vtkFocalPlanePointPlacer.h
@@ -34,7 +34,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkFocalPlanePointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkFocalPlanePointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descirption:
diff --git a/Widgets/vtkHandleRepresentation.cxx b/Widgets/vtkHandleRepresentation.cxx
index e1f354bb9569c1dd8a7c7d7361b7436317103c83..87b2e91db65208961e47e6472f92637512859011 100644
--- a/Widgets/vtkHandleRepresentation.cxx
+++ b/Widgets/vtkHandleRepresentation.cxx
@@ -20,7 +20,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkPointPlacer.h"
 
-vtkCxxRevisionMacro(vtkHandleRepresentation, "1.13");
 
 vtkCxxSetObjectMacro(vtkHandleRepresentation, PointPlacer, vtkPointPlacer );
 
diff --git a/Widgets/vtkHandleRepresentation.h b/Widgets/vtkHandleRepresentation.h
index fcbad69b4c5c14151e0fe100b9ccfddc87da4f55..9594b02ad169fe7a08d56c6ec8ad7dfc315dafff 100644
--- a/Widgets/vtkHandleRepresentation.h
+++ b/Widgets/vtkHandleRepresentation.h
@@ -54,7 +54,7 @@ class VTK_WIDGETS_EXPORT vtkHandleRepresentation : public vtkWidgetRepresentatio
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkHandleRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkHandleRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkHandleWidget.cxx b/Widgets/vtkHandleWidget.cxx
index fd77a460802783694b6b656695b52484c63ee266..f9d72c8cf0fdedbcbcc9f95928e5935b6f4d2922 100644
--- a/Widgets/vtkHandleWidget.cxx
+++ b/Widgets/vtkHandleWidget.cxx
@@ -26,7 +26,6 @@
 #include "vtkWidgetEvent.h"
 
 
-vtkCxxRevisionMacro(vtkHandleWidget, "1.9");
 vtkStandardNewMacro(vtkHandleWidget);
 
 //----------------------------------------------------------------------------------
diff --git a/Widgets/vtkHandleWidget.h b/Widgets/vtkHandleWidget.h
index 11558319d2791f16dc0ccc223807ea1e95de8a2f..4b28157bafc2aa1334cfc82c8dc9de867af63f1f 100644
--- a/Widgets/vtkHandleWidget.h
+++ b/Widgets/vtkHandleWidget.h
@@ -73,7 +73,7 @@ public:
 
   // Description:
   // Standard VTK class macros.
-  vtkTypeRevisionMacro(vtkHandleWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkHandleWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkHoverWidget.cxx b/Widgets/vtkHoverWidget.cxx
index 67f302006cd7f3d707e7aa597faf8b64829808f1..82490027b5d2bfbfa5772539c8bde54950af0afd 100644
--- a/Widgets/vtkHoverWidget.cxx
+++ b/Widgets/vtkHoverWidget.cxx
@@ -21,7 +21,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkEvent.h"
 
-vtkCxxRevisionMacro(vtkHoverWidget, "1.6");
 vtkStandardNewMacro(vtkHoverWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkHoverWidget.h b/Widgets/vtkHoverWidget.h
index 08d50be217a983e272aa8eeec12c54d00239d942..a5c0b640797b739b0bc723b37263709e853ef3cf 100644
--- a/Widgets/vtkHoverWidget.h
+++ b/Widgets/vtkHoverWidget.h
@@ -78,7 +78,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkHoverWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkHoverWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImageActorPointPlacer.cxx b/Widgets/vtkImageActorPointPlacer.cxx
index d4c4875b345a51cd202b47c5ce699a6789dff07d..8233f52916ac476cfbe772e0bb797fdf6d6fac35 100644
--- a/Widgets/vtkImageActorPointPlacer.cxx
+++ b/Widgets/vtkImageActorPointPlacer.cxx
@@ -20,7 +20,6 @@
 #include "vtkImageActor.h"
 #include "vtkImageData.h"
 
-vtkCxxRevisionMacro(vtkImageActorPointPlacer, "1.5");
 vtkStandardNewMacro(vtkImageActorPointPlacer);
 
 vtkCxxSetObjectMacro(vtkImageActorPointPlacer, ImageActor, vtkImageActor);
diff --git a/Widgets/vtkImageActorPointPlacer.h b/Widgets/vtkImageActorPointPlacer.h
index 5e3444c97aaeedee0a0a328a00d9ee60601bd3ba..57ccaf7290b7c03e5bd1afe3d67b1a510ae1c40b 100644
--- a/Widgets/vtkImageActorPointPlacer.h
+++ b/Widgets/vtkImageActorPointPlacer.h
@@ -39,7 +39,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkImageActorPointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkImageActorPointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImageOrthoPlanes.cxx b/Widgets/vtkImageOrthoPlanes.cxx
index 2c7dc7a10e2942fcdebe2d7719cb017ab9b66d79..f675c93e1067c97bfe7b971703a3529158758907 100644
--- a/Widgets/vtkImageOrthoPlanes.cxx
+++ b/Widgets/vtkImageOrthoPlanes.cxx
@@ -26,7 +26,6 @@
 
 //---------------------------------------------------------------------------
 
-vtkCxxRevisionMacro(vtkImageOrthoPlanes, "1.6"); 
 vtkStandardNewMacro(vtkImageOrthoPlanes);
 
 //---------------------------------------------------------------------------
diff --git a/Widgets/vtkImageOrthoPlanes.h b/Widgets/vtkImageOrthoPlanes.h
index 8edaf3e0b4125c25ddb1489b2111215ad9fa766a..90924a36b31e3c5e1b78f394c5bc3a9d9102620c 100644
--- a/Widgets/vtkImageOrthoPlanes.h
+++ b/Widgets/vtkImageOrthoPlanes.h
@@ -35,7 +35,7 @@ class VTK_WIDGETS_EXPORT vtkImageOrthoPlanes : public vtkObject
 {
 public:
   static vtkImageOrthoPlanes *New();
-  vtkTypeRevisionMacro(vtkImageOrthoPlanes,vtkObject);
+  vtkTypeMacro(vtkImageOrthoPlanes,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
   
   // Description:
diff --git a/Widgets/vtkImagePlaneWidget.cxx b/Widgets/vtkImagePlaneWidget.cxx
index b690f282d61fd3fae0a481637915d3fdf4cd46c2..db01d061acf3dd5cc6479b55bc61469e12ad02ca 100644
--- a/Widgets/vtkImagePlaneWidget.cxx
+++ b/Widgets/vtkImagePlaneWidget.cxx
@@ -40,7 +40,6 @@
 #include "vtkTexture.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkImagePlaneWidget, "1.19");
 vtkStandardNewMacro(vtkImagePlaneWidget);
 
 vtkCxxSetObjectMacro(vtkImagePlaneWidget, PlaneProperty, vtkProperty);
diff --git a/Widgets/vtkImagePlaneWidget.h b/Widgets/vtkImagePlaneWidget.h
index 541a4ef5591e982cc0163866b50eb20168b23e9d..f7424bb9fe4ac868240529f1010e89a1f1bf0f94 100644
--- a/Widgets/vtkImagePlaneWidget.h
+++ b/Widgets/vtkImagePlaneWidget.h
@@ -132,7 +132,7 @@ public:
   // Instantiate the object.
   static vtkImagePlaneWidget *New();
 
-  vtkTypeRevisionMacro(vtkImagePlaneWidget,vtkPolyDataSourceWidget);
+  vtkTypeMacro(vtkImagePlaneWidget,vtkPolyDataSourceWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImageTracerWidget.cxx b/Widgets/vtkImageTracerWidget.cxx
index 38def71ae8413aa7851dbde83d9c6612275d91ab..d6cfa520d83f16afaf104cbc7fc75d34ba98f25e 100644
--- a/Widgets/vtkImageTracerWidget.cxx
+++ b/Widgets/vtkImageTracerWidget.cxx
@@ -37,7 +37,6 @@
 #include "vtkTransformPolyDataFilter.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkImageTracerWidget, "1.5");
 vtkStandardNewMacro(vtkImageTracerWidget);
 
 vtkCxxSetObjectMacro(vtkImageTracerWidget, HandleProperty, vtkProperty);
diff --git a/Widgets/vtkImageTracerWidget.h b/Widgets/vtkImageTracerWidget.h
index d33893cfe7428faa166c8e8d9360ab1a48df09e3..d30dc432b55e8792f82cdc9995781514b975c106 100644
--- a/Widgets/vtkImageTracerWidget.h
+++ b/Widgets/vtkImageTracerWidget.h
@@ -80,7 +80,7 @@ public:
   // Instantiate the object.
   static vtkImageTracerWidget *New();
 
-  vtkTypeRevisionMacro(vtkImageTracerWidget,vtk3DWidget);
+  vtkTypeMacro(vtkImageTracerWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImplicitPlaneRepresentation.cxx b/Widgets/vtkImplicitPlaneRepresentation.cxx
index 0f5bf7efe6dab1038fbfc0de37d0a35576f08d83..0286a484fd62436d4f608f19f8656e99970fe878 100644
--- a/Widgets/vtkImplicitPlaneRepresentation.cxx
+++ b/Widgets/vtkImplicitPlaneRepresentation.cxx
@@ -40,7 +40,6 @@
 #include "vtkInteractorObserver.h"
 #include "vtkBox.h"
 
-vtkCxxRevisionMacro(vtkImplicitPlaneRepresentation, "1.16");
 vtkStandardNewMacro(vtkImplicitPlaneRepresentation);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkImplicitPlaneRepresentation.h b/Widgets/vtkImplicitPlaneRepresentation.h
index c5d2138453737d25f75b1b1293fc0d9a4eba3ea5..e9416f0b385a0f915ee55385de92811e6d78c410 100644
--- a/Widgets/vtkImplicitPlaneRepresentation.h
+++ b/Widgets/vtkImplicitPlaneRepresentation.h
@@ -65,7 +65,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkImplicitPlaneRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkImplicitPlaneRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImplicitPlaneWidget.cxx b/Widgets/vtkImplicitPlaneWidget.cxx
index 6673ef5f04b9fa797408b1e26f469b24d4969576..351e44e9a7b92d701b3702d5e1b8b2db3fff279d 100644
--- a/Widgets/vtkImplicitPlaneWidget.cxx
+++ b/Widgets/vtkImplicitPlaneWidget.cxx
@@ -38,7 +38,6 @@
 #include "vtkTransform.h"
 #include "vtkTubeFilter.h"
 
-vtkCxxRevisionMacro(vtkImplicitPlaneWidget, "1.12");
 vtkStandardNewMacro(vtkImplicitPlaneWidget);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkImplicitPlaneWidget.h b/Widgets/vtkImplicitPlaneWidget.h
index 88fb4e1691ec89ffd01dee403e3f9953a1dbb023..4ab6802829d821419d0a4510b9a8323f7195bd71 100644
--- a/Widgets/vtkImplicitPlaneWidget.h
+++ b/Widgets/vtkImplicitPlaneWidget.h
@@ -90,7 +90,7 @@ public:
   // Instantiate the object.
   static vtkImplicitPlaneWidget *New();
 
-  vtkTypeRevisionMacro(vtkImplicitPlaneWidget,vtkPolyDataSourceWidget);
+  vtkTypeMacro(vtkImplicitPlaneWidget,vtkPolyDataSourceWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkImplicitPlaneWidget2.cxx b/Widgets/vtkImplicitPlaneWidget2.cxx
index 38ffb7e6b08068a4d220dcd4511733322fef6fe9..977ee8b50756f48238043fff1b19737d581dad32 100644
--- a/Widgets/vtkImplicitPlaneWidget2.cxx
+++ b/Widgets/vtkImplicitPlaneWidget2.cxx
@@ -25,7 +25,6 @@
 #include "vtkRenderWindow.h"
 
 
-vtkCxxRevisionMacro(vtkImplicitPlaneWidget2, "1.3");
 vtkStandardNewMacro(vtkImplicitPlaneWidget2);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkImplicitPlaneWidget2.h b/Widgets/vtkImplicitPlaneWidget2.h
index 63aac4ec6c46c4515ab941b651ddc8c023e371c9..f422a69e3bf6ef2a52695bc1f0d3f2d567f8a583 100644
--- a/Widgets/vtkImplicitPlaneWidget2.h
+++ b/Widgets/vtkImplicitPlaneWidget2.h
@@ -100,7 +100,7 @@ public:
 
   // Description:
   // Standard vtkObject methods
-  vtkTypeRevisionMacro(vtkImplicitPlaneWidget2,vtkAbstractWidget);
+  vtkTypeMacro(vtkImplicitPlaneWidget2,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkLineRepresentation.cxx b/Widgets/vtkLineRepresentation.cxx
index 90930e5b098b13fb4ab9161857469a7d127c4e86..6799993056429c68fca46af3ae144ced72e27108 100644
--- a/Widgets/vtkLineRepresentation.cxx
+++ b/Widgets/vtkLineRepresentation.cxx
@@ -36,7 +36,6 @@
 #include "vtkCellPicker.h"
 #include "vtkPolyDataMapper.h"
 
-vtkCxxRevisionMacro(vtkLineRepresentation, "1.25");
 vtkStandardNewMacro(vtkLineRepresentation);
 
 vtkCxxSetObjectMacro(vtkLineRepresentation,HandleRepresentation,vtkPointHandleRepresentation3D);
diff --git a/Widgets/vtkLineRepresentation.h b/Widgets/vtkLineRepresentation.h
index 2baf52194c0099171f851b030af5011140d2ae6f..4b8a774c1759fc304641b93bb4ad3f9f9b5d89de 100644
--- a/Widgets/vtkLineRepresentation.h
+++ b/Widgets/vtkLineRepresentation.h
@@ -61,7 +61,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkLineRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkLineRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkLineWidget.cxx b/Widgets/vtkLineWidget.cxx
index 556ca581273f5bacd0dc9e8001f641ca52544284..72dffb3ba88228721d170f2f7630345e88624625 100644
--- a/Widgets/vtkLineWidget.cxx
+++ b/Widgets/vtkLineWidget.cxx
@@ -35,7 +35,6 @@
 #include "vtkRenderer.h"
 #include "vtkSphereSource.h"
 
-vtkCxxRevisionMacro(vtkLineWidget, "1.4");
 vtkStandardNewMacro(vtkLineWidget);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkLineWidget.h b/Widgets/vtkLineWidget.h
index 0153fa7a0c4b49f74b9a04cfd70943f33f3b57d1..e9bae5e145f24f68822d2da249f4f81453750549 100644
--- a/Widgets/vtkLineWidget.h
+++ b/Widgets/vtkLineWidget.h
@@ -92,7 +92,7 @@ public:
   // Instantiate the object.
   static vtkLineWidget *New();
 
-  vtkTypeRevisionMacro(vtkLineWidget,vtk3DWidget);
+  vtkTypeMacro(vtkLineWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkLineWidget2.cxx b/Widgets/vtkLineWidget2.cxx
index e8f7d2fdd6619e5820bc33b5c5038368251341cf..9666b76ed7c37522126b2408e0714de63e178fcc 100644
--- a/Widgets/vtkLineWidget2.cxx
+++ b/Widgets/vtkLineWidget2.cxx
@@ -27,7 +27,6 @@
 #include "vtkRenderWindow.h"
 
 
-vtkCxxRevisionMacro(vtkLineWidget2, "1.4");
 vtkStandardNewMacro(vtkLineWidget2);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkLineWidget2.h b/Widgets/vtkLineWidget2.h
index ab5a0851e8a8c29402d07129ea1c215399d65251..98232b9099b9c7c33863ce74d80e0477ffa810cb 100644
--- a/Widgets/vtkLineWidget2.h
+++ b/Widgets/vtkLineWidget2.h
@@ -94,7 +94,7 @@ public:
 
   // Description:
   // Standard vtkObject methods
-  vtkTypeRevisionMacro(vtkLineWidget2,vtkAbstractWidget);
+  vtkTypeMacro(vtkLineWidget2,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkLinearContourLineInterpolator.cxx b/Widgets/vtkLinearContourLineInterpolator.cxx
index 47040a74924e9b9709c43e198cd262380d3ed97a..93129f5e679ee7750be4d0019052329fab56fc2d 100644
--- a/Widgets/vtkLinearContourLineInterpolator.cxx
+++ b/Widgets/vtkLinearContourLineInterpolator.cxx
@@ -15,7 +15,6 @@
 #include "vtkLinearContourLineInterpolator.h"
 #include <vtkObjectFactory.h>
 
-vtkCxxRevisionMacro(vtkLinearContourLineInterpolator, "1.3");
 vtkStandardNewMacro(vtkLinearContourLineInterpolator);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkLinearContourLineInterpolator.h b/Widgets/vtkLinearContourLineInterpolator.h
index 5a13acde9a49b671b7ff1d992eaa779cbc553896..9ac8dac48d3807995638c2f94f0f6dca258f9dab 100644
--- a/Widgets/vtkLinearContourLineInterpolator.h
+++ b/Widgets/vtkLinearContourLineInterpolator.h
@@ -37,7 +37,7 @@ public:
   
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkLinearContourLineInterpolator,vtkContourLineInterpolator);
+  vtkTypeMacro(vtkLinearContourLineInterpolator,vtkContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   virtual int InterpolateLine( vtkRenderer *ren, 
diff --git a/Widgets/vtkLogoRepresentation.cxx b/Widgets/vtkLogoRepresentation.cxx
index 7abe548d6651897abf5d45bf676c72455f51f86d..5e13460d2b58fb356a2bcb9a740ebd78841e4cb3 100644
--- a/Widgets/vtkLogoRepresentation.cxx
+++ b/Widgets/vtkLogoRepresentation.cxx
@@ -31,7 +31,6 @@
 #include "vtkRenderer.h"
 #include "vtkWindow.h"
 
-vtkCxxRevisionMacro(vtkLogoRepresentation, "1.4");
 vtkStandardNewMacro(vtkLogoRepresentation);
 
 vtkCxxSetObjectMacro(vtkLogoRepresentation, Image, vtkImageData);
diff --git a/Widgets/vtkLogoRepresentation.h b/Widgets/vtkLogoRepresentation.h
index 22caadc86a0b5c2115034b6ddef42d2f28a7c636..db98dbdcb9a79a8232341e78dcfbb928c8946e85 100644
--- a/Widgets/vtkLogoRepresentation.h
+++ b/Widgets/vtkLogoRepresentation.h
@@ -48,7 +48,7 @@ public:
 
   // Description:
   // Standard VTK class methods.
-  vtkTypeRevisionMacro(vtkLogoRepresentation,vtkBorderRepresentation);
+  vtkTypeMacro(vtkLogoRepresentation,vtkBorderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkLogoWidget.cxx b/Widgets/vtkLogoWidget.cxx
index d58936dc324f45ca95220776b8826d08f46e5ef0..3624e517be3c566b4e032947c3bee245db00d76c 100644
--- a/Widgets/vtkLogoWidget.cxx
+++ b/Widgets/vtkLogoWidget.cxx
@@ -17,7 +17,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkLogoWidget, "1.1");
 vtkStandardNewMacro(vtkLogoWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkLogoWidget.h b/Widgets/vtkLogoWidget.h
index 68c15067e47c1cc5f111be0721098b4a9cc70cb7..6c5b66f88d858c21ba50f75994577bba2d192e76 100644
--- a/Widgets/vtkLogoWidget.h
+++ b/Widgets/vtkLogoWidget.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standar VTK class methods.
-  vtkTypeRevisionMacro(vtkLogoWidget,vtkBorderWidget);
+  vtkTypeMacro(vtkLogoWidget,vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkOrientationMarkerWidget.cxx b/Widgets/vtkOrientationMarkerWidget.cxx
index 44b6cdc52ad1b8e43c1cfb694b535cd2b7743699..1721ca59baa330ec38f1f3f2692ebc040f280321 100644
--- a/Widgets/vtkOrientationMarkerWidget.cxx
+++ b/Widgets/vtkOrientationMarkerWidget.cxx
@@ -29,7 +29,6 @@
 #include "vtkRenderWindowInteractor.h"
 
 vtkStandardNewMacro(vtkOrientationMarkerWidget);
-vtkCxxRevisionMacro(vtkOrientationMarkerWidget, "1.5");
 
 vtkCxxSetObjectMacro(vtkOrientationMarkerWidget, OrientationMarker, vtkProp);
 
diff --git a/Widgets/vtkOrientationMarkerWidget.h b/Widgets/vtkOrientationMarkerWidget.h
index 73925abf82b274d1fe5ef9686aab05c4a7c8afce..d36a522cc46f7a7a938b7d42e44e396ee7a68c65 100644
--- a/Widgets/vtkOrientationMarkerWidget.h
+++ b/Widgets/vtkOrientationMarkerWidget.h
@@ -78,7 +78,7 @@ class VTK_WIDGETS_EXPORT vtkOrientationMarkerWidget : public vtkInteractorObserv
 {
 public:
   static vtkOrientationMarkerWidget* New();
-  vtkTypeRevisionMacro(vtkOrientationMarkerWidget, vtkInteractorObserver);
+  vtkTypeMacro(vtkOrientationMarkerWidget, vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkOrientedGlyphContourRepresentation.cxx b/Widgets/vtkOrientedGlyphContourRepresentation.cxx
index 34a8c1491b23e4ed23d92d1cc2338915f2e23849..12ead1ca771e7a0b02c4e781505f470ba6954c88 100644
--- a/Widgets/vtkOrientedGlyphContourRepresentation.cxx
+++ b/Widgets/vtkOrientedGlyphContourRepresentation.cxx
@@ -42,7 +42,6 @@
 #include "vtkOpenGL.h"
 #include "vtkSphereSource.h"
 
-vtkCxxRevisionMacro(vtkOrientedGlyphContourRepresentation, "1.22");
 vtkStandardNewMacro(vtkOrientedGlyphContourRepresentation);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkOrientedGlyphContourRepresentation.h b/Widgets/vtkOrientedGlyphContourRepresentation.h
index e6392dc314a8f8fcdec60f71c1130e31d5d64ead..f5a352296255d04bb50fc3533271c792e533e474 100644
--- a/Widgets/vtkOrientedGlyphContourRepresentation.h
+++ b/Widgets/vtkOrientedGlyphContourRepresentation.h
@@ -43,7 +43,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkOrientedGlyphContourRepresentation,vtkContourRepresentation);
+  vtkTypeMacro(vtkOrientedGlyphContourRepresentation,vtkContourRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx b/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx
index 0f2f2d9a88e77c16cb2a80aa3f3d43c5ea667c21..bf73c88af4fae76c90c360efd40158741289c699 100644
--- a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx
+++ b/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.cxx
@@ -40,7 +40,6 @@
 #include "vtkFocalPlanePointPlacer.h"
 #include "vtkBezierContourLineInterpolator.h"
 
-vtkCxxRevisionMacro(vtkOrientedGlyphFocalPlaneContourRepresentation, "1.8");
 vtkStandardNewMacro(vtkOrientedGlyphFocalPlaneContourRepresentation);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h b/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
index 7e431fdf94cf6a88ccfa844aa8bc689782b39e46..915c925c307e1c0ff3cb747653c2784c2488f6dd 100644
--- a/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
+++ b/Widgets/vtkOrientedGlyphFocalPlaneContourRepresentation.h
@@ -48,7 +48,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkOrientedGlyphFocalPlaneContourRepresentation,
+  vtkTypeMacro(vtkOrientedGlyphFocalPlaneContourRepresentation,
                                     vtkFocalPlaneContourRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx b/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx
index c23772bb21f8c9c53bb064c543274f7e7e9c0140..a12d7695a2ff6ea3a10d3e71c257b36035f44721 100644
--- a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx
+++ b/Widgets/vtkOrientedPolygonalHandleRepresentation3D.cxx
@@ -23,7 +23,6 @@
 #include "vtkTransformPolyDataFilter.h"
 #include "vtkFollower.h"
 
-vtkCxxRevisionMacro(vtkOrientedPolygonalHandleRepresentation3D, "1.1");
 vtkStandardNewMacro(vtkOrientedPolygonalHandleRepresentation3D);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h b/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
index a957ac38fb006271d1da9e4ed14597646dbac972..c3bc69d4286634dc03aa9dae082b298f66649c19 100644
--- a/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
+++ b/Widgets/vtkOrientedPolygonalHandleRepresentation3D.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkOrientedPolygonalHandleRepresentation3D,
+  vtkTypeMacro(vtkOrientedPolygonalHandleRepresentation3D,
                        vtkAbstractPolygonalHandleRepresentation3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkParallelopipedRepresentation.cxx b/Widgets/vtkParallelopipedRepresentation.cxx
index f02ec644f102c12233a373f53210d58f6d4c2e3d..fa309bca0342984309591099fbf4932e481eff18 100644
--- a/Widgets/vtkParallelopipedRepresentation.cxx
+++ b/Widgets/vtkParallelopipedRepresentation.cxx
@@ -298,7 +298,6 @@ private:
 };
 
 //----------------------------------------------------------------------------
-vtkCxxRevisionMacro(vtkParallelopipedRepresentation, "1.11");
 vtkStandardNewMacro(vtkParallelopipedRepresentation);
 
 vtkCxxSetObjectMacro(vtkParallelopipedRepresentation, 
diff --git a/Widgets/vtkParallelopipedRepresentation.h b/Widgets/vtkParallelopipedRepresentation.h
index 11437b4df49d8616b52f1f237775eb65c06cbe6a..ae03fe390c5f05f3a3630826e2f4d2b667bc254e 100644
--- a/Widgets/vtkParallelopipedRepresentation.h
+++ b/Widgets/vtkParallelopipedRepresentation.h
@@ -53,7 +53,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkParallelopipedRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkParallelopipedRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkParallelopipedWidget.cxx b/Widgets/vtkParallelopipedWidget.cxx
index 0ddd45770a2b711ee6817386da1ad0cf4197d3e9..d181763466b8beb11393a5bb9d3904ffb98e7793 100644
--- a/Widgets/vtkParallelopipedWidget.cxx
+++ b/Widgets/vtkParallelopipedWidget.cxx
@@ -32,7 +32,6 @@
 #include "vtkWidgetSet.h"
 #include "vtkGarbageCollector.h"
 
-vtkCxxRevisionMacro(vtkParallelopipedWidget, "1.4");
 vtkStandardNewMacro(vtkParallelopipedWidget);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkParallelopipedWidget.h b/Widgets/vtkParallelopipedWidget.h
index d1a66ef80add5fc4bce3685f337c9521075dcd8a..09cc93d102759584554f4c3896c865047641dd50 100644
--- a/Widgets/vtkParallelopipedWidget.h
+++ b/Widgets/vtkParallelopipedWidget.h
@@ -56,7 +56,7 @@ public:
   // Instantiate the object.
   static vtkParallelopipedWidget *New();
 
-  vtkTypeRevisionMacro(vtkParallelopipedWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkParallelopipedWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPlaneWidget.cxx b/Widgets/vtkPlaneWidget.cxx
index 7cb21e929021c07918e384af78f70ebf8e203fab..3e79f3b683585c9e45e188e398db1c4110a019ac 100644
--- a/Widgets/vtkPlaneWidget.cxx
+++ b/Widgets/vtkPlaneWidget.cxx
@@ -38,7 +38,6 @@
 #include "vtkSphereSource.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkPlaneWidget, "1.6");
 vtkStandardNewMacro(vtkPlaneWidget);
 
 vtkCxxSetObjectMacro(vtkPlaneWidget,PlaneProperty,vtkProperty);
diff --git a/Widgets/vtkPlaneWidget.h b/Widgets/vtkPlaneWidget.h
index c86a2d5ee4921228f5a8bfef5b5543599f1c2f7f..1eb1a669fa7847ea1c40fef522f599ee9b8056b0 100644
--- a/Widgets/vtkPlaneWidget.h
+++ b/Widgets/vtkPlaneWidget.h
@@ -104,7 +104,7 @@ public:
   // Instantiate the object.
   static vtkPlaneWidget *New();
 
-  vtkTypeRevisionMacro(vtkPlaneWidget,vtkPolyDataSourceWidget);
+  vtkTypeMacro(vtkPlaneWidget,vtkPolyDataSourceWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPlaybackRepresentation.cxx b/Widgets/vtkPlaybackRepresentation.cxx
index 965810afc6d7aec5ae344df5061f564d7c07d238..10a300f6de354185ebc3487cfd8f78b7d4b6cfa3 100644
--- a/Widgets/vtkPlaybackRepresentation.cxx
+++ b/Widgets/vtkPlaybackRepresentation.cxx
@@ -30,7 +30,6 @@
 #include "vtkTransformPolyDataFilter.h"
 
 
-vtkCxxRevisionMacro(vtkPlaybackRepresentation, "1.2");
 vtkStandardNewMacro(vtkPlaybackRepresentation);
 
 vtkPlaybackRepresentation::vtkPlaybackRepresentation()
diff --git a/Widgets/vtkPlaybackRepresentation.h b/Widgets/vtkPlaybackRepresentation.h
index 04b53bf59043ae5de04e57c0a3c04e0981611f0d..ce4d1bc6b6d060adff6d55228f252f6c4847fea1 100644
--- a/Widgets/vtkPlaybackRepresentation.h
+++ b/Widgets/vtkPlaybackRepresentation.h
@@ -45,7 +45,7 @@ public:
 
   // Description:
   // Standard VTK class methods.
-  vtkTypeRevisionMacro(vtkPlaybackRepresentation,vtkBorderRepresentation);
+  vtkTypeMacro(vtkPlaybackRepresentation,vtkBorderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPlaybackWidget.cxx b/Widgets/vtkPlaybackWidget.cxx
index 24d396acb0a0437ba9bb25a22f52dfb109c4292c..2b55806e19405a8941f0193f99f5788a116c4060 100644
--- a/Widgets/vtkPlaybackWidget.cxx
+++ b/Widgets/vtkPlaybackWidget.cxx
@@ -17,7 +17,6 @@
 #include "vtkCallbackCommand.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPlaybackWidget, "1.2");
 vtkStandardNewMacro(vtkPlaybackWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkPlaybackWidget.h b/Widgets/vtkPlaybackWidget.h
index 8fb8abf8afc0b922e9c2b343925fad57a8efcbba..c86f65f1e7d8e1fd1d12e72e5591b680b2b90dc5 100644
--- a/Widgets/vtkPlaybackWidget.h
+++ b/Widgets/vtkPlaybackWidget.h
@@ -40,7 +40,7 @@ public:
 
   // Description:
   // Standar VTK class methods.
-  vtkTypeRevisionMacro(vtkPlaybackWidget,vtkBorderWidget);
+  vtkTypeMacro(vtkPlaybackWidget,vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPointHandleRepresentation2D.cxx b/Widgets/vtkPointHandleRepresentation2D.cxx
index b9a53bedf5dc4284df7dc082b61031fa311bbb2e..67d94975950152a5f003f8b053b53720a570e747 100644
--- a/Widgets/vtkPointHandleRepresentation2D.cxx
+++ b/Widgets/vtkPointHandleRepresentation2D.cxx
@@ -31,7 +31,6 @@
 #include "vtkCamera.h"
 #include "vtkPointPlacer.h"
 
-vtkCxxRevisionMacro(vtkPointHandleRepresentation2D, "1.9");
 vtkStandardNewMacro(vtkPointHandleRepresentation2D);
 
 vtkCxxSetObjectMacro(vtkPointHandleRepresentation2D,Property,vtkProperty2D);
diff --git a/Widgets/vtkPointHandleRepresentation2D.h b/Widgets/vtkPointHandleRepresentation2D.h
index e18a3d965706ba3cdd477d2ab82c413fd11cd537..b86b0ecbe8354cffc191bffe1df04f6215f458ce 100644
--- a/Widgets/vtkPointHandleRepresentation2D.h
+++ b/Widgets/vtkPointHandleRepresentation2D.h
@@ -45,7 +45,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPointHandleRepresentation2D,vtkHandleRepresentation);
+  vtkTypeMacro(vtkPointHandleRepresentation2D,vtkHandleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPointHandleRepresentation3D.cxx b/Widgets/vtkPointHandleRepresentation3D.cxx
index f3b2e3563a38e077937fe7e7ac90f901ccd9e3b3..e4d00c781de7f1b8fb12d30a9f48582df57a0224 100644
--- a/Widgets/vtkPointHandleRepresentation3D.cxx
+++ b/Widgets/vtkPointHandleRepresentation3D.cxx
@@ -29,7 +29,6 @@
 #include "vtkFocalPlanePointPlacer.h"
 #include "vtkCamera.h"
 
-vtkCxxRevisionMacro(vtkPointHandleRepresentation3D, "1.17");
 vtkStandardNewMacro(vtkPointHandleRepresentation3D);
 
 vtkCxxSetObjectMacro(vtkPointHandleRepresentation3D,Property,vtkProperty);
diff --git a/Widgets/vtkPointHandleRepresentation3D.h b/Widgets/vtkPointHandleRepresentation3D.h
index c0ae9a553840b5614a7e723cc4ea068f568b8a9b..b28e51e0be45a7a17b38918cd51c146a82f949c8 100644
--- a/Widgets/vtkPointHandleRepresentation3D.h
+++ b/Widgets/vtkPointHandleRepresentation3D.h
@@ -43,7 +43,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPointHandleRepresentation3D,vtkHandleRepresentation);
+  vtkTypeMacro(vtkPointHandleRepresentation3D,vtkHandleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPointPlacer.cxx b/Widgets/vtkPointPlacer.cxx
index 3c3356223ee4305b690f609592880eeaff0f0676..045e6d5efe458b879f2a4bc7961bcf73e91f479f 100644
--- a/Widgets/vtkPointPlacer.cxx
+++ b/Widgets/vtkPointPlacer.cxx
@@ -18,7 +18,6 @@
 #include "vtkRenderer.h"
 #include "vtkCoordinate.h"
 
-vtkCxxRevisionMacro(vtkPointPlacer, "$Revision 1.3");
 vtkStandardNewMacro(vtkPointPlacer);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkPointPlacer.h b/Widgets/vtkPointPlacer.h
index e61ff02c0297eb4ebdaf8a1ee1ff08b2d53a59b5..933a1d9da7b0738701d1a75e7ab6a38827ad6367 100644
--- a/Widgets/vtkPointPlacer.h
+++ b/Widgets/vtkPointPlacer.h
@@ -51,7 +51,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPointPlacer,vtkObject);
+  vtkTypeMacro(vtkPointPlacer,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPointWidget.cxx b/Widgets/vtkPointWidget.cxx
index c6a8e77d6573ad866047020c08c98951df097d86..2c3c330e0d5d8bd0a5ec8d06b53edda45642d503 100644
--- a/Widgets/vtkPointWidget.cxx
+++ b/Widgets/vtkPointWidget.cxx
@@ -28,7 +28,6 @@
 #include "vtkRenderWindow.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkPointWidget, "1.1");
 vtkStandardNewMacro(vtkPointWidget);
 
 vtkPointWidget::vtkPointWidget()
diff --git a/Widgets/vtkPointWidget.h b/Widgets/vtkPointWidget.h
index 0dbae54583942d7a5915f6aedf37800ba93a2df1..2684c4bf77dd8a60876d43f5458f1a2b1248e0c7 100644
--- a/Widgets/vtkPointWidget.h
+++ b/Widgets/vtkPointWidget.h
@@ -80,7 +80,7 @@ public:
   // Instantiate this widget
   static vtkPointWidget *New();
 
-  vtkTypeRevisionMacro(vtkPointWidget,vtk3DWidget);
+  vtkTypeMacro(vtkPointWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPolyDataContourLineInterpolator.cxx b/Widgets/vtkPolyDataContourLineInterpolator.cxx
index d22119331f7c0e2e170cd05861efcd7e9cf63ae9..98236e621334a1538e70bf6704c4812d07e7b668 100644
--- a/Widgets/vtkPolyDataContourLineInterpolator.cxx
+++ b/Widgets/vtkPolyDataContourLineInterpolator.cxx
@@ -20,7 +20,6 @@
 #include "vtkMath.h"
 #include "vtkPolyDataCollection.h"
 
-vtkCxxRevisionMacro(vtkPolyDataContourLineInterpolator, "1.2");
 
 //----------------------------------------------------------------------
 vtkPolyDataContourLineInterpolator::vtkPolyDataContourLineInterpolator()
diff --git a/Widgets/vtkPolyDataContourLineInterpolator.h b/Widgets/vtkPolyDataContourLineInterpolator.h
index 463db93697a620ad1c8404a2037e235c0b478261..dd91171acc9bbedb3543d85baed0c279a5a3aae7 100644
--- a/Widgets/vtkPolyDataContourLineInterpolator.h
+++ b/Widgets/vtkPolyDataContourLineInterpolator.h
@@ -34,7 +34,7 @@ class VTK_WIDGETS_EXPORT vtkPolyDataContourLineInterpolator
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPolyDataContourLineInterpolator,
+  vtkTypeMacro(vtkPolyDataContourLineInterpolator,
                               vtkContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkPolyDataPointPlacer.cxx b/Widgets/vtkPolyDataPointPlacer.cxx
index 7296d4444bc7c673c3aacaa470bdd371aad2f9c7..46d3ae9f991c65269e2fa931a2396e00c1bbd7b5 100644
--- a/Widgets/vtkPolyDataPointPlacer.cxx
+++ b/Widgets/vtkPolyDataPointPlacer.cxx
@@ -23,7 +23,6 @@
 #include "vtkAssemblyNode.h"
 #include "vtkInteractorObserver.h"
 
-vtkCxxRevisionMacro(vtkPolyDataPointPlacer, "1.4");
 vtkStandardNewMacro(vtkPolyDataPointPlacer);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkPolyDataPointPlacer.h b/Widgets/vtkPolyDataPointPlacer.h
index f32b971342c28c06bc64f2838165df29e385a7f0..41a832f9d1747991df9ff5d6473aea97c53d314e 100644
--- a/Widgets/vtkPolyDataPointPlacer.h
+++ b/Widgets/vtkPolyDataPointPlacer.h
@@ -47,7 +47,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPolyDataPointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkPolyDataPointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descuription:
diff --git a/Widgets/vtkPolyDataSourceWidget.cxx b/Widgets/vtkPolyDataSourceWidget.cxx
index dddfabdcf8fde0352b2e37b020e36f086da6137b..6ed21c221b5c693ff12a884bfae84f33d007ac1a 100644
--- a/Widgets/vtkPolyDataSourceWidget.cxx
+++ b/Widgets/vtkPolyDataSourceWidget.cxx
@@ -19,7 +19,6 @@
 #include "vtkProp3D.h"
 
 
-vtkCxxRevisionMacro(vtkPolyDataSourceWidget, "1.1");
 
 vtkPolyDataSourceWidget::vtkPolyDataSourceWidget() : vtk3DWidget()
 {
diff --git a/Widgets/vtkPolyDataSourceWidget.h b/Widgets/vtkPolyDataSourceWidget.h
index a61fbc5403592749bfa12b4e3e3a122fa2440adf..417ce1869348b842e3f8db34c8ae823489f096a3 100644
--- a/Widgets/vtkPolyDataSourceWidget.h
+++ b/Widgets/vtkPolyDataSourceWidget.h
@@ -42,7 +42,7 @@ class vtkPolyDataSource;
 class VTK_WIDGETS_EXPORT vtkPolyDataSourceWidget : public vtk3DWidget
 {
  public:
-  vtkTypeRevisionMacro(vtkPolyDataSourceWidget, vtk3DWidget);
+  vtkTypeMacro(vtkPolyDataSourceWidget, vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkPolygonalHandleRepresentation3D.cxx b/Widgets/vtkPolygonalHandleRepresentation3D.cxx
index 4f765bbd7de478a3f50f54e205f0f261295cf921..f52c267ce2d0a8f59f3c5f78841febf64e7071a3 100644
--- a/Widgets/vtkPolygonalHandleRepresentation3D.cxx
+++ b/Widgets/vtkPolygonalHandleRepresentation3D.cxx
@@ -25,7 +25,6 @@
 #include "vtkMatrix4x4.h"
 #include "vtkPointPlacer.h"
 
-vtkCxxRevisionMacro(vtkPolygonalHandleRepresentation3D, "1.11");
 vtkStandardNewMacro(vtkPolygonalHandleRepresentation3D);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkPolygonalHandleRepresentation3D.h b/Widgets/vtkPolygonalHandleRepresentation3D.h
index c138008fa9f483a8e76b7bb1e3dc18edfbe8c85c..5b6fcf55255ce1b652afefd7c7ff31707e791879 100644
--- a/Widgets/vtkPolygonalHandleRepresentation3D.h
+++ b/Widgets/vtkPolygonalHandleRepresentation3D.h
@@ -38,7 +38,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPolygonalHandleRepresentation3D,
+  vtkTypeMacro(vtkPolygonalHandleRepresentation3D,
                        vtkAbstractPolygonalHandleRepresentation3D);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx b/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx
index 998f548b4dd8a8176897ae2f733f8ec66640f8dc..71e16f695f39549b4b4af7fe4bcdbda332b048a8 100644
--- a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx
+++ b/Widgets/vtkPolygonalSurfaceContourLineInterpolator.cxx
@@ -26,8 +26,6 @@
 #include "vtkPolygonalSurfacePointPlacer.h"
 #include "vtkDijkstraGraphGeodesicPath.h"
 
-vtkCxxRevisionMacro(vtkPolygonalSurfaceContourLineInterpolator,
-                                            "1.6");
 vtkStandardNewMacro(vtkPolygonalSurfaceContourLineInterpolator);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h b/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
index 1cf5e5608ee5fffca537bd2518872e09d46861dd..a759641f4fbafc903c90844be73e0c4985de0f53 100644
--- a/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
+++ b/Widgets/vtkPolygonalSurfaceContourLineInterpolator.h
@@ -46,7 +46,7 @@ class VTK_WIDGETS_EXPORT vtkPolygonalSurfaceContourLineInterpolator : public vtk
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPolygonalSurfaceContourLineInterpolator, vtkPolyDataContourLineInterpolator);
+  vtkTypeMacro(vtkPolygonalSurfaceContourLineInterpolator, vtkPolyDataContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   static vtkPolygonalSurfaceContourLineInterpolator *New();
diff --git a/Widgets/vtkPolygonalSurfacePointPlacer.cxx b/Widgets/vtkPolygonalSurfacePointPlacer.cxx
index 839f2cdafb48f453e6d62fc9f6f9cc73ea7a7c11..9b22d83e634c90bfbc13348ea8e492c816456d62 100644
--- a/Widgets/vtkPolygonalSurfacePointPlacer.cxx
+++ b/Widgets/vtkPolygonalSurfacePointPlacer.cxx
@@ -141,7 +141,6 @@ public:
     }
 };
 
-vtkCxxRevisionMacro(vtkPolygonalSurfacePointPlacer, "1.4");
 vtkStandardNewMacro(vtkPolygonalSurfacePointPlacer);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkPolygonalSurfacePointPlacer.h b/Widgets/vtkPolygonalSurfacePointPlacer.h
index 0b939fdfbe0b92c0708036bd8adeb43ad51e23c1..9493eb78576aba229e4588bf85dbc117f850ec4f 100644
--- a/Widgets/vtkPolygonalSurfacePointPlacer.h
+++ b/Widgets/vtkPolygonalSurfacePointPlacer.h
@@ -62,7 +62,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkPolygonalSurfacePointPlacer,vtkPolyDataPointPlacer);
+  vtkTypeMacro(vtkPolygonalSurfacePointPlacer,vtkPolyDataPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descuription:
diff --git a/Widgets/vtkRectilinearWipeRepresentation.cxx b/Widgets/vtkRectilinearWipeRepresentation.cxx
index a610738746d4356915b66a0805f6e8161b15ee87..7c4ef161154f3da574e627e1c878e4ae8bb79d44 100644
--- a/Widgets/vtkRectilinearWipeRepresentation.cxx
+++ b/Widgets/vtkRectilinearWipeRepresentation.cxx
@@ -31,7 +31,6 @@
 #include "vtkObjectFactory.h"
 
 
-vtkCxxRevisionMacro(vtkRectilinearWipeRepresentation, "1.5");
 vtkStandardNewMacro(vtkRectilinearWipeRepresentation);
 
 vtkCxxSetObjectMacro(vtkRectilinearWipeRepresentation,RectilinearWipe,vtkImageRectilinearWipe);
diff --git a/Widgets/vtkRectilinearWipeRepresentation.h b/Widgets/vtkRectilinearWipeRepresentation.h
index b45b8e49e5cba4972b8c09ffe250d1086c428969..bd7141ad22d87e5dd725fe2dca40312ae8b77f2e 100644
--- a/Widgets/vtkRectilinearWipeRepresentation.h
+++ b/Widgets/vtkRectilinearWipeRepresentation.h
@@ -58,7 +58,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkRectilinearWipeRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkRectilinearWipeRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkRectilinearWipeWidget.cxx b/Widgets/vtkRectilinearWipeWidget.cxx
index dc94f4f618965a5ad365fab1511067ffbf41100a..cdcfada322a64fcd499e168e3bd098b135ad6fd1 100644
--- a/Widgets/vtkRectilinearWipeWidget.cxx
+++ b/Widgets/vtkRectilinearWipeWidget.cxx
@@ -27,7 +27,6 @@
 #include "vtkWidgetEvent.h"
 
 
-vtkCxxRevisionMacro(vtkRectilinearWipeWidget, "1.5");
 vtkStandardNewMacro(vtkRectilinearWipeWidget);
 
 
diff --git a/Widgets/vtkRectilinearWipeWidget.h b/Widgets/vtkRectilinearWipeWidget.h
index 558f7e56b437022dd3c68af51123173ef8c436b8..5fa4bd9cc6d3d583291a5278374fb4ef9c4f713e 100644
--- a/Widgets/vtkRectilinearWipeWidget.h
+++ b/Widgets/vtkRectilinearWipeWidget.h
@@ -89,7 +89,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkRectilinearWipeWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkRectilinearWipeWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkScalarBarRepresentation.cxx b/Widgets/vtkScalarBarRepresentation.cxx
index 30594e90ce6e2692884160fb6976e4dcba5ce3b5..59320254a7e7b7d92acb576b561352b41f1d8535 100644
--- a/Widgets/vtkScalarBarRepresentation.cxx
+++ b/Widgets/vtkScalarBarRepresentation.cxx
@@ -31,7 +31,6 @@
 #include "vtkTextProperty.h"
 
 //=============================================================================
-vtkCxxRevisionMacro(vtkScalarBarRepresentation, "1.2");
 vtkStandardNewMacro(vtkScalarBarRepresentation);
 //-----------------------------------------------------------------------------
 vtkScalarBarRepresentation::vtkScalarBarRepresentation()
diff --git a/Widgets/vtkScalarBarRepresentation.h b/Widgets/vtkScalarBarRepresentation.h
index 2d72b0d45cac296f5f6f5129eb79ecfdf41e266d..e21aac6cd34f49053501eae9504335abc3d1ebea 100644
--- a/Widgets/vtkScalarBarRepresentation.h
+++ b/Widgets/vtkScalarBarRepresentation.h
@@ -47,7 +47,7 @@ class vtkScalarBarActor;
 class VTK_WIDGETS_EXPORT vtkScalarBarRepresentation : public vtkBorderRepresentation
 {
 public:
-  vtkTypeRevisionMacro(vtkScalarBarRepresentation, vtkBorderRepresentation);
+  vtkTypeMacro(vtkScalarBarRepresentation, vtkBorderRepresentation);
   virtual void PrintSelf(ostream &os, vtkIndent indent);
   static vtkScalarBarRepresentation *New();
 
diff --git a/Widgets/vtkScalarBarWidget.cxx b/Widgets/vtkScalarBarWidget.cxx
index 865326f733eb8a0978ac985a78b1dc1edaaf2827..f53f1695248429d61cb5bac38e284cabdd637b9c 100644
--- a/Widgets/vtkScalarBarWidget.cxx
+++ b/Widgets/vtkScalarBarWidget.cxx
@@ -25,7 +25,6 @@
 #include "vtkWidgetCallbackMapper.h"
 #include "vtkWidgetEvent.h"
 
-vtkCxxRevisionMacro(vtkScalarBarWidget, "1.8");
 vtkStandardNewMacro(vtkScalarBarWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkScalarBarWidget.h b/Widgets/vtkScalarBarWidget.h
index fb7d2eb7b11a0dcd40774d16fdfa31e98925c85e..0f426f0424c79d966f274933429f95c3b2ce00f2 100644
--- a/Widgets/vtkScalarBarWidget.h
+++ b/Widgets/vtkScalarBarWidget.h
@@ -42,7 +42,7 @@ class VTK_WIDGETS_EXPORT vtkScalarBarWidget : public vtkBorderWidget
 {
 public:
   static vtkScalarBarWidget *New();
-  vtkTypeRevisionMacro(vtkScalarBarWidget, vtkBorderWidget);
+  vtkTypeMacro(vtkScalarBarWidget, vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSeedRepresentation.cxx b/Widgets/vtkSeedRepresentation.cxx
index 2c56f0d7c9310f9e255cc6839e05509999b18498..b537a20a9e12d4f07da7b8d2483a7dda0fb7d911 100644
--- a/Widgets/vtkSeedRepresentation.cxx
+++ b/Widgets/vtkSeedRepresentation.cxx
@@ -27,7 +27,6 @@
 #include <vtkstd/iterator>
 #include <vtkstd/list>
 
-vtkCxxRevisionMacro(vtkSeedRepresentation, "1.15");
 vtkStandardNewMacro(vtkSeedRepresentation);
 
 vtkCxxSetObjectMacro(vtkSeedRepresentation,HandleRepresentation,vtkHandleRepresentation);
diff --git a/Widgets/vtkSeedRepresentation.h b/Widgets/vtkSeedRepresentation.h
index eb2dbd0a01bef7c371984792c3b20d574f497532..a30046ab792b0a077a1fe8afefc4a47da2f9ccbb 100644
--- a/Widgets/vtkSeedRepresentation.h
+++ b/Widgets/vtkSeedRepresentation.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkSeedRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkSeedRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSeedWidget.cxx b/Widgets/vtkSeedWidget.cxx
index 89c360dfa7db637b0a86a01a16b3677b141bc73b..275fc9081f910d9f91a0eb201c4d03fe1ac05710 100644
--- a/Widgets/vtkSeedWidget.cxx
+++ b/Widgets/vtkSeedWidget.cxx
@@ -30,7 +30,6 @@
 #include <vtkstd/iterator>
 #include <vtkstd/list>
 
-vtkCxxRevisionMacro(vtkSeedWidget, "1.22");
 vtkStandardNewMacro(vtkSeedWidget);
 
 // The vtkSeedList is a PIMPLed list<T>.
diff --git a/Widgets/vtkSeedWidget.h b/Widgets/vtkSeedWidget.h
index 52b73c2c1609ec7351d7d6812df8f766a6204aa5..de536abbbfb728c0c8c324b7dbad62cbd908a646 100644
--- a/Widgets/vtkSeedWidget.h
+++ b/Widgets/vtkSeedWidget.h
@@ -81,7 +81,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkSeedWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkSeedWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSliderRepresentation.cxx b/Widgets/vtkSliderRepresentation.cxx
index da41ec949ec86f1950c7e8178b7fd325e6f77656..351e6235b7c964da43ffe6f26bcc50462733ad27 100644
--- a/Widgets/vtkSliderRepresentation.cxx
+++ b/Widgets/vtkSliderRepresentation.cxx
@@ -16,7 +16,6 @@
 #include "vtkCommand.h"
 #include "vtkObjectFactory.h"
 
-vtkCxxRevisionMacro(vtkSliderRepresentation, "1.4");
 
 //----------------------------------------------------------------------
 vtkSliderRepresentation::vtkSliderRepresentation()
diff --git a/Widgets/vtkSliderRepresentation.h b/Widgets/vtkSliderRepresentation.h
index 72947be14f49890daf60733d895a89a7cafb3f94..a5cecd811e3f40041232e10f08871e1fa980cfea 100644
--- a/Widgets/vtkSliderRepresentation.h
+++ b/Widgets/vtkSliderRepresentation.h
@@ -35,7 +35,7 @@ class VTK_WIDGETS_EXPORT vtkSliderRepresentation : public vtkWidgetRepresentatio
 public:
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkSliderRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkSliderRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSliderRepresentation2D.cxx b/Widgets/vtkSliderRepresentation2D.cxx
index 395759f0daa8f213c67858140fe092aa10b5bda4..99efad13594c01dfc027de54ce5a09ab613de50f 100644
--- a/Widgets/vtkSliderRepresentation2D.cxx
+++ b/Widgets/vtkSliderRepresentation2D.cxx
@@ -33,7 +33,6 @@
 #include "vtkTransform.h"
 #include "vtkTransformPolyDataFilter.h"
 
-vtkCxxRevisionMacro(vtkSliderRepresentation2D, "1.10");
 vtkStandardNewMacro(vtkSliderRepresentation2D);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkSliderRepresentation2D.h b/Widgets/vtkSliderRepresentation2D.h
index a907d5d9c97bdee3c7e898e4f11db77c10abc6dc..f4b8afd892613f06a18cb38844e6158375097af8 100644
--- a/Widgets/vtkSliderRepresentation2D.h
+++ b/Widgets/vtkSliderRepresentation2D.h
@@ -56,7 +56,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkSliderRepresentation2D,vtkSliderRepresentation);
+  vtkTypeMacro(vtkSliderRepresentation2D,vtkSliderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSliderRepresentation3D.cxx b/Widgets/vtkSliderRepresentation3D.cxx
index 596f7309acd07b124b39073562dc6aa917382570..09ff014da8db279c0d57ef9543da0df41130c1c5 100644
--- a/Widgets/vtkSliderRepresentation3D.cxx
+++ b/Widgets/vtkSliderRepresentation3D.cxx
@@ -39,7 +39,6 @@
 #include "vtkWindow.h"
 
 
-vtkCxxRevisionMacro(vtkSliderRepresentation3D, "1.10");
 vtkStandardNewMacro(vtkSliderRepresentation3D);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkSliderRepresentation3D.h b/Widgets/vtkSliderRepresentation3D.h
index 932c23eba67bc7568207c600ec4478b668524df2..c75147c8216a39c3a63121fa3baef8b5822a7f85 100644
--- a/Widgets/vtkSliderRepresentation3D.h
+++ b/Widgets/vtkSliderRepresentation3D.h
@@ -52,7 +52,7 @@ public:
 
   // Description:
   // Standard methods for the class.
-  vtkTypeRevisionMacro(vtkSliderRepresentation3D,vtkSliderRepresentation);
+  vtkTypeMacro(vtkSliderRepresentation3D,vtkSliderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSliderWidget.cxx b/Widgets/vtkSliderWidget.cxx
index 0241623d029c6bea300bb07a38e9b11a371ce92b..8d28ef857f468b9b5adb0bcf3e2923685665f7ff 100644
--- a/Widgets/vtkSliderWidget.cxx
+++ b/Widgets/vtkSliderWidget.cxx
@@ -24,7 +24,6 @@
 #include "vtkEvent.h"
 #include "vtkWidgetEvent.h"
 
-vtkCxxRevisionMacro(vtkSliderWidget, "1.7");
 vtkStandardNewMacro(vtkSliderWidget);
 
 //----------------------------------------------------------------------------------
diff --git a/Widgets/vtkSliderWidget.h b/Widgets/vtkSliderWidget.h
index 3f709f5da929361b529835b7fd01b6063aff80fa..15afc1fe6f72ef65fdbc97d20966ed7adeb5f62f 100644
--- a/Widgets/vtkSliderWidget.h
+++ b/Widgets/vtkSliderWidget.h
@@ -75,7 +75,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkSliderWidget,vtkAbstractWidget);
+  vtkTypeMacro(vtkSliderWidget,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSphereHandleRepresentation.cxx b/Widgets/vtkSphereHandleRepresentation.cxx
index 199b24d84465da3a4770a10b5a7fb90129993a06..b00f0e46634280b978a43ca73b17fd52278ad380 100644
--- a/Widgets/vtkSphereHandleRepresentation.cxx
+++ b/Widgets/vtkSphereHandleRepresentation.cxx
@@ -27,7 +27,6 @@
 #include "vtkCoordinate.h"
 #include "vtkRenderWindow.h"
 
-vtkCxxRevisionMacro(vtkSphereHandleRepresentation, "1.5");
 vtkStandardNewMacro(vtkSphereHandleRepresentation);
 vtkCxxSetObjectMacro(vtkSphereHandleRepresentation,SelectedProperty,vtkProperty);
 
diff --git a/Widgets/vtkSphereHandleRepresentation.h b/Widgets/vtkSphereHandleRepresentation.h
index 935a0428cac5992e95d2867bcd45895e68c4db32..589d07502d8175a1316874b5f794f35232c53eb5 100644
--- a/Widgets/vtkSphereHandleRepresentation.h
+++ b/Widgets/vtkSphereHandleRepresentation.h
@@ -44,7 +44,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkSphereHandleRepresentation,vtkHandleRepresentation);
+  vtkTypeMacro(vtkSphereHandleRepresentation,vtkHandleRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSphereRepresentation.cxx b/Widgets/vtkSphereRepresentation.cxx
index 5f367ce09fa021d9c1b5915f1c8d1691437fc8eb..7858bdc2cf95972f5e56c4c2783ce5c1ae9bfa9c 100644
--- a/Widgets/vtkSphereRepresentation.cxx
+++ b/Widgets/vtkSphereRepresentation.cxx
@@ -40,7 +40,6 @@
 #include "vtkObjectFactory.h"
 
 
-vtkCxxRevisionMacro(vtkSphereRepresentation, "1.9");
 vtkStandardNewMacro(vtkSphereRepresentation);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkSphereRepresentation.h b/Widgets/vtkSphereRepresentation.h
index c0c0ce64cffeecae1dbc7630cfb9676ec0bd421a..9d4eadcb4d81c528d71c2683b79657b1d8023b3d 100644
--- a/Widgets/vtkSphereRepresentation.h
+++ b/Widgets/vtkSphereRepresentation.h
@@ -76,7 +76,7 @@ public:
 
   // Description:
   // Standard methods for type information and to print out the contents of the class.
-  vtkTypeRevisionMacro(vtkSphereRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkSphereRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX - used to manage the state of the widget
diff --git a/Widgets/vtkSphereWidget.cxx b/Widgets/vtkSphereWidget.cxx
index 41b5a0bece647881ef70cff9a7d9f256ca289898..479e5e61866323bfc0da52ce1bb804eb130dacf3 100644
--- a/Widgets/vtkSphereWidget.cxx
+++ b/Widgets/vtkSphereWidget.cxx
@@ -31,7 +31,6 @@
 #include "vtkSphere.h"
 #include "vtkSphereSource.h"
 
-vtkCxxRevisionMacro(vtkSphereWidget, "1.1");
 vtkStandardNewMacro(vtkSphereWidget);
 
 vtkSphereWidget::vtkSphereWidget()
diff --git a/Widgets/vtkSphereWidget.h b/Widgets/vtkSphereWidget.h
index 9328f638243a5b74592bdbb81f1f1c4fed897a39..09c9a34da13973596ca42396c251ff2664f4e304 100644
--- a/Widgets/vtkSphereWidget.h
+++ b/Widgets/vtkSphereWidget.h
@@ -78,7 +78,7 @@ public:
   // Instantiate the object.
   static vtkSphereWidget *New();
 
-  vtkTypeRevisionMacro(vtkSphereWidget,vtk3DWidget);
+  vtkTypeMacro(vtkSphereWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSphereWidget2.cxx b/Widgets/vtkSphereWidget2.cxx
index 30dcd211c3bccc59694be861d24310108e8138aa..0b58917ab6fbf4b896aee333f1901902b936898b 100644
--- a/Widgets/vtkSphereWidget2.cxx
+++ b/Widgets/vtkSphereWidget2.cxx
@@ -26,7 +26,6 @@
 #include "vtkRenderer.h"
 
 
-vtkCxxRevisionMacro(vtkSphereWidget2, "1.2");
 vtkStandardNewMacro(vtkSphereWidget2);
 
 //----------------------------------------------------------------------------
diff --git a/Widgets/vtkSphereWidget2.h b/Widgets/vtkSphereWidget2.h
index c6e3575ea6d50386c29091700e44db86dc7e8e4a..031c4fba590cc2ce690cb89cdc9dbe921473e6ef 100644
--- a/Widgets/vtkSphereWidget2.h
+++ b/Widgets/vtkSphereWidget2.h
@@ -99,7 +99,7 @@ public:
 
   // Description:
   // Standard class methods for type information and printing.
-  vtkTypeRevisionMacro(vtkSphereWidget2,vtkAbstractWidget);
+  vtkTypeMacro(vtkSphereWidget2,vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSplineRepresentation.cxx b/Widgets/vtkSplineRepresentation.cxx
index 1ebfe57d7447203585487e2f56b40f4327cce742..e3adee3f6ccefda4713888561b2ac4baf09c5c13 100644
--- a/Widgets/vtkSplineRepresentation.cxx
+++ b/Widgets/vtkSplineRepresentation.cxx
@@ -37,7 +37,6 @@
 #include "vtkDoubleArray.h"
 
 vtkStandardNewMacro(vtkSplineRepresentation);
-vtkCxxRevisionMacro(vtkSplineRepresentation, "1.4");
 //----------------------------------------------------------------------------
 vtkSplineRepresentation::vtkSplineRepresentation()
 {
diff --git a/Widgets/vtkSplineRepresentation.h b/Widgets/vtkSplineRepresentation.h
index d4e4aa196e9bf09f83a052a4a7239a6c4a6a7fc2..3cbb9bc17d506fad28278a47a91857271310a5e4 100644
--- a/Widgets/vtkSplineRepresentation.h
+++ b/Widgets/vtkSplineRepresentation.h
@@ -48,7 +48,7 @@ class VTK_WIDGETS_EXPORT vtkSplineRepresentation : public vtkWidgetRepresentatio
 {
 public:
   static vtkSplineRepresentation* New();
-  vtkTypeRevisionMacro(vtkSplineRepresentation, vtkWidgetRepresentation);
+  vtkTypeMacro(vtkSplineRepresentation, vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 //BTX
   // Used to manage the InteractionState of the widget
diff --git a/Widgets/vtkSplineWidget.cxx b/Widgets/vtkSplineWidget.cxx
index 71f0337b13602778abee71d6748dbf7d00d1a781..3ba7778b5d41d4c42284e44653e31c0f6bb45430 100644
--- a/Widgets/vtkSplineWidget.cxx
+++ b/Widgets/vtkSplineWidget.cxx
@@ -34,7 +34,6 @@
 #include "vtkSphereSource.h"
 #include "vtkTransform.h"
 
-vtkCxxRevisionMacro(vtkSplineWidget, "1.3");
 vtkStandardNewMacro(vtkSplineWidget);
 
 vtkCxxSetObjectMacro(vtkSplineWidget, HandleProperty, vtkProperty);
diff --git a/Widgets/vtkSplineWidget.h b/Widgets/vtkSplineWidget.h
index 14e2343f74e8a5d28236470d772021176e7b2b55..d896c5e7e07b31361704c8469625df17100aed26 100644
--- a/Widgets/vtkSplineWidget.h
+++ b/Widgets/vtkSplineWidget.h
@@ -109,7 +109,7 @@ public:
   // Instantiate the object.
   static vtkSplineWidget *New();
 
-  vtkTypeRevisionMacro(vtkSplineWidget,vtk3DWidget);
+  vtkTypeMacro(vtkSplineWidget,vtk3DWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkSplineWidget2.cxx b/Widgets/vtkSplineWidget2.cxx
index b67c2a32da984745ce512605d588d2eaccf5b8a8..6962f4c243855b12d922d3b4df63ed27c201a249 100644
--- a/Widgets/vtkSplineWidget2.cxx
+++ b/Widgets/vtkSplineWidget2.cxx
@@ -27,7 +27,6 @@
 #include "vtkWidgetEventTranslator.h"
 
 vtkStandardNewMacro(vtkSplineWidget2);
-vtkCxxRevisionMacro(vtkSplineWidget2, "1.1");
 //----------------------------------------------------------------------------
 vtkSplineWidget2::vtkSplineWidget2()
 {
diff --git a/Widgets/vtkSplineWidget2.h b/Widgets/vtkSplineWidget2.h
index 81eb8b9b979adee1a346233366300959089e5a28..dd32c87b5df0b268b40ab4bb7b2273c58506e057 100644
--- a/Widgets/vtkSplineWidget2.h
+++ b/Widgets/vtkSplineWidget2.h
@@ -31,7 +31,7 @@ class VTK_WIDGETS_EXPORT vtkSplineWidget2 : public vtkAbstractWidget
 {
 public:
   static vtkSplineWidget2* New();
-  vtkTypeRevisionMacro(vtkSplineWidget2, vtkAbstractWidget);
+  vtkTypeMacro(vtkSplineWidget2, vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkTensorProbeRepresentation.cxx b/Widgets/vtkTensorProbeRepresentation.cxx
index 7ff01bd81f29506edc341cd02783bc8732240b2b..f075c635ab3a0861cbe65e972bad08ac25c48917 100644
--- a/Widgets/vtkTensorProbeRepresentation.cxx
+++ b/Widgets/vtkTensorProbeRepresentation.cxx
@@ -30,7 +30,6 @@
 #define min(x,y) ((x<y) ? (x) : (y))
 #define max(x,y) ((x>y) ? (x) : (y))
 
-vtkCxxRevisionMacro(vtkTensorProbeRepresentation, "1.4");
 
 //----------------------------------------------------------------------
 vtkTensorProbeRepresentation::vtkTensorProbeRepresentation()
diff --git a/Widgets/vtkTensorProbeRepresentation.h b/Widgets/vtkTensorProbeRepresentation.h
index 592d5a11d2d036e0d5dd96f562cd6fbdd62adc00..acfc9ac9ca3a407b6878d0fa6614ae6b05301174 100644
--- a/Widgets/vtkTensorProbeRepresentation.h
+++ b/Widgets/vtkTensorProbeRepresentation.h
@@ -38,7 +38,7 @@ class VTK_WIDGETS_EXPORT vtkTensorProbeRepresentation :
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkTensorProbeRepresentation,vtkWidgetRepresentation);
+  vtkTypeMacro(vtkTensorProbeRepresentation,vtkWidgetRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkTensorProbeWidget.cxx b/Widgets/vtkTensorProbeWidget.cxx
index 53597fcf6ac3e12a1c0337fb3f35cfc4326af8e9..84f7f7e4055cd6fd9af20195527297ef123a7c3f 100644
--- a/Widgets/vtkTensorProbeWidget.cxx
+++ b/Widgets/vtkTensorProbeWidget.cxx
@@ -30,7 +30,6 @@
 #include "vtkPolyData.h"
 #include "vtkCellArray.h"
 
-vtkCxxRevisionMacro(vtkTensorProbeWidget, "1.1");
 vtkStandardNewMacro(vtkTensorProbeWidget);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkTensorProbeWidget.h b/Widgets/vtkTensorProbeWidget.h
index e4fd77f58f96a89bf45d7c5923d9684cbb4b2d93..2457a00a6e457778e103668827501aa375822308 100644
--- a/Widgets/vtkTensorProbeWidget.h
+++ b/Widgets/vtkTensorProbeWidget.h
@@ -42,7 +42,7 @@ public:
 
   // Description:
   // Standard VTK class macros.
-  vtkTypeRevisionMacro(vtkTensorProbeWidget, vtkAbstractWidget);
+  vtkTypeMacro(vtkTensorProbeWidget, vtkAbstractWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkTerrainContourLineInterpolator.cxx b/Widgets/vtkTerrainContourLineInterpolator.cxx
index 021226225a989c241985baebbc343d8169b26ede..961065a5e1c9c1d154eed8a081dcd61827fbeb3d 100644
--- a/Widgets/vtkTerrainContourLineInterpolator.cxx
+++ b/Widgets/vtkTerrainContourLineInterpolator.cxx
@@ -22,7 +22,6 @@
 #include "vtkCellArray.h"
 #include "vtkMath.h"
 
-vtkCxxRevisionMacro(vtkTerrainContourLineInterpolator, "1.1");
 vtkStandardNewMacro(vtkTerrainContourLineInterpolator);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkTerrainContourLineInterpolator.h b/Widgets/vtkTerrainContourLineInterpolator.h
index 4edbe5381282792ded7a151a3bccef2aabf1f776..f0577f8c58d92f7986509683fefa4201a8bb63cb 100644
--- a/Widgets/vtkTerrainContourLineInterpolator.h
+++ b/Widgets/vtkTerrainContourLineInterpolator.h
@@ -53,7 +53,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkTerrainContourLineInterpolator,
+  vtkTypeMacro(vtkTerrainContourLineInterpolator,
                               vtkContourLineInterpolator);
   void PrintSelf(ostream& os, vtkIndent indent);
 
diff --git a/Widgets/vtkTerrainDataPointPlacer.cxx b/Widgets/vtkTerrainDataPointPlacer.cxx
index 3ef465ff8667d947e807b91b5f7267c0092ed8a3..7d2a411153d99a27e2ccc8070d0d5bb3f222babe 100644
--- a/Widgets/vtkTerrainDataPointPlacer.cxx
+++ b/Widgets/vtkTerrainDataPointPlacer.cxx
@@ -22,7 +22,6 @@
 #include "vtkAssemblyPath.h"
 #include "vtkAssemblyNode.h"
 
-vtkCxxRevisionMacro(vtkTerrainDataPointPlacer, "1.1");
 vtkStandardNewMacro(vtkTerrainDataPointPlacer);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkTerrainDataPointPlacer.h b/Widgets/vtkTerrainDataPointPlacer.h
index e1ce942861addb08f1c88333dfceee0823667848..087f23fd1be80469582da8f573fedcda25be2b17 100644
--- a/Widgets/vtkTerrainDataPointPlacer.h
+++ b/Widgets/vtkTerrainDataPointPlacer.h
@@ -49,7 +49,7 @@ public:
 
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkTerrainDataPointPlacer,vtkPointPlacer);
+  vtkTypeMacro(vtkTerrainDataPointPlacer,vtkPointPlacer);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Descuription:
diff --git a/Widgets/vtkTextRepresentation.cxx b/Widgets/vtkTextRepresentation.cxx
index b0242a164262f255201bb3a7e48f7d99e1220f36..930ce4d6fe7467f0701437432f5a2e5bb06dfcc6 100644
--- a/Widgets/vtkTextRepresentation.cxx
+++ b/Widgets/vtkTextRepresentation.cxx
@@ -50,7 +50,6 @@ protected:
     
 };
 
-vtkCxxRevisionMacro(vtkTextRepresentation, "1.12");
 vtkStandardNewMacro(vtkTextRepresentation);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkTextRepresentation.h b/Widgets/vtkTextRepresentation.h
index 14ae5ec4b6ef32aa23ac029b825f277f13e5719c..ce3e24b7b10a5430f06e3d4984099379a0fc2b94 100644
--- a/Widgets/vtkTextRepresentation.h
+++ b/Widgets/vtkTextRepresentation.h
@@ -41,7 +41,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkTextRepresentation,vtkBorderRepresentation);
+  vtkTypeMacro(vtkTextRepresentation,vtkBorderRepresentation);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkTextWidget.cxx b/Widgets/vtkTextWidget.cxx
index 7d407e7428c6f668d1821929e2604b7edf72bacc..4f5f6407c07b743bd46cf1f923521a5cc06d2c55 100644
--- a/Widgets/vtkTextWidget.cxx
+++ b/Widgets/vtkTextWidget.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkCommand.h"
 
-vtkCxxRevisionMacro(vtkTextWidget, "1.3");
 vtkStandardNewMacro(vtkTextWidget);
 
 //-------------------------------------------------------------------------
diff --git a/Widgets/vtkTextWidget.h b/Widgets/vtkTextWidget.h
index 32098551b9609ac88d0796988b404b336defe272..e28a4ff64b557ccd628d9db4b16ef3d3380e8b68 100644
--- a/Widgets/vtkTextWidget.h
+++ b/Widgets/vtkTextWidget.h
@@ -43,7 +43,7 @@ public:
 
   // Description:
   // Standard VTK methods.
-  vtkTypeRevisionMacro(vtkTextWidget,vtkBorderWidget);
+  vtkTypeMacro(vtkTextWidget,vtkBorderWidget);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkWidgetCallbackMapper.cxx b/Widgets/vtkWidgetCallbackMapper.cxx
index 7d64b54107848a49fd68e5277686a6ad6312b2de..71fe13856a44b1165b2d90eeec2804434478d40e 100644
--- a/Widgets/vtkWidgetCallbackMapper.cxx
+++ b/Widgets/vtkWidgetCallbackMapper.cxx
@@ -19,7 +19,6 @@
 #include "vtkObjectFactory.h"
 #include <vtkstd/map>
 
-vtkCxxRevisionMacro(vtkWidgetCallbackMapper, "1.3");
 vtkStandardNewMacro(vtkWidgetCallbackMapper);
 
 
diff --git a/Widgets/vtkWidgetCallbackMapper.h b/Widgets/vtkWidgetCallbackMapper.h
index 2cc335202164baa287d87a42211525ace42e2d86..1ba0bc908fc22d165c90519ff3311b2b2c8b8213 100644
--- a/Widgets/vtkWidgetCallbackMapper.h
+++ b/Widgets/vtkWidgetCallbackMapper.h
@@ -43,7 +43,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkWidgetCallbackMapper,vtkObject);
+  vtkTypeMacro(vtkWidgetCallbackMapper,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkWidgetEvent.cxx b/Widgets/vtkWidgetEvent.cxx
index 953ec89d97890b9aceacd85a77d49f7edcc45bde..aca4e0fb7360b8d8d618b2732c7e8cef9b0c5019 100644
--- a/Widgets/vtkWidgetEvent.cxx
+++ b/Widgets/vtkWidgetEvent.cxx
@@ -41,7 +41,6 @@ static const char *vtkWidgetEventStrings[] = {
   NULL
 };
 
-vtkCxxRevisionMacro(vtkWidgetEvent, "1.6");
 vtkStandardNewMacro(vtkWidgetEvent);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkWidgetEvent.h b/Widgets/vtkWidgetEvent.h
index 89b85f2146d9a7613b9f9dcb7ecf31a1c887660a..d1bcbe2e1f8397f2d6e76dc25b764863c4e0d4ff 100644
--- a/Widgets/vtkWidgetEvent.h
+++ b/Widgets/vtkWidgetEvent.h
@@ -31,7 +31,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkWidgetEvent,vtkObject);
+  vtkTypeMacro(vtkWidgetEvent,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
 //BTX
diff --git a/Widgets/vtkWidgetEventTranslator.cxx b/Widgets/vtkWidgetEventTranslator.cxx
index 76baff373207d730f294c9aa03f4d87fbb485e80..1b2bf3d9088c8eaf8dfec74c2d0921a56e03a25d 100644
--- a/Widgets/vtkWidgetEventTranslator.cxx
+++ b/Widgets/vtkWidgetEventTranslator.cxx
@@ -24,7 +24,6 @@
 #include <vtkstd/map>
 #include <vtkstd/list>
 
-vtkCxxRevisionMacro(vtkWidgetEventTranslator, "1.5");
 vtkStandardNewMacro(vtkWidgetEventTranslator);
 
 
diff --git a/Widgets/vtkWidgetEventTranslator.h b/Widgets/vtkWidgetEventTranslator.h
index 463241bf51a9c9833461fbde8e2fa83503559979..0aa2e60f44c85a1bdf50fa20c18b471776ccce81 100644
--- a/Widgets/vtkWidgetEventTranslator.h
+++ b/Widgets/vtkWidgetEventTranslator.h
@@ -50,7 +50,7 @@ public:
 
   // Description:
   // Standard macros.
-  vtkTypeRevisionMacro(vtkWidgetEventTranslator,vtkObject);
+  vtkTypeMacro(vtkWidgetEventTranslator,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkWidgetRepresentation.cxx b/Widgets/vtkWidgetRepresentation.cxx
index 4d5fe0788fe09fdca076ce1b36d013032568e566..161526323e63d2edb2cbb970c1be1bdbf025d5b5 100644
--- a/Widgets/vtkWidgetRepresentation.cxx
+++ b/Widgets/vtkWidgetRepresentation.cxx
@@ -18,7 +18,6 @@
 #include "vtkInteractorObserver.h"
 
 
-vtkCxxRevisionMacro(vtkWidgetRepresentation, "1.9");
 
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkWidgetRepresentation.h b/Widgets/vtkWidgetRepresentation.h
index 925dbb394017bb26435e528513de0f71676a7d28..217f4bfaf3f7edfcf200ade9dae6aa89297bedef 100644
--- a/Widgets/vtkWidgetRepresentation.h
+++ b/Widgets/vtkWidgetRepresentation.h
@@ -50,7 +50,7 @@ class VTK_WIDGETS_EXPORT vtkWidgetRepresentation : public vtkProp
 public:
   // Description:
   // Standard methods for instances of this class.
-  vtkTypeRevisionMacro(vtkWidgetRepresentation,vtkProp);
+  vtkTypeMacro(vtkWidgetRepresentation,vtkProp);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkWidgetSet.cxx b/Widgets/vtkWidgetSet.cxx
index 26259393534c191eabdebd6badc87daeeb2f8a54..a73974445dee0f5b8671074712e897326ef3f974 100644
--- a/Widgets/vtkWidgetSet.cxx
+++ b/Widgets/vtkWidgetSet.cxx
@@ -17,7 +17,6 @@
 #include "vtkObjectFactory.h"
 #include "vtkParallelopipedWidget.h" // REMOVE
 
-vtkCxxRevisionMacro(vtkWidgetSet, "1.3");
 vtkStandardNewMacro(vtkWidgetSet);
 
 //----------------------------------------------------------------------
diff --git a/Widgets/vtkWidgetSet.h b/Widgets/vtkWidgetSet.h
index 5f94932d5be2d0d5d7b9ac1af48b7de68ff6ff2b..8f2da0e81ea303d0489cfe8d7a5038d10730e3ac 100644
--- a/Widgets/vtkWidgetSet.h
+++ b/Widgets/vtkWidgetSet.h
@@ -114,7 +114,7 @@ public:
 
   // Description:
   // Standard methods for a VTK class.
-  vtkTypeRevisionMacro(vtkWidgetSet,vtkObject);
+  vtkTypeMacro(vtkWidgetSet,vtkObject);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description:
diff --git a/Widgets/vtkXYPlotWidget.cxx b/Widgets/vtkXYPlotWidget.cxx
index 3e145326142f8b88f70c030555f072771e34be2d..84b2f0977bc53152d170214190f6846e3b87dece 100644
--- a/Widgets/vtkXYPlotWidget.cxx
+++ b/Widgets/vtkXYPlotWidget.cxx
@@ -21,7 +21,6 @@
 #include "vtkRenderWindowInteractor.h"
 #include "vtkCoordinate.h"
 
-vtkCxxRevisionMacro(vtkXYPlotWidget, "1.3");
 vtkStandardNewMacro(vtkXYPlotWidget);
 vtkCxxSetObjectMacro(vtkXYPlotWidget, XYPlotActor, vtkXYPlotActor);
 
diff --git a/Widgets/vtkXYPlotWidget.h b/Widgets/vtkXYPlotWidget.h
index 325deb32da56acb3ebd5ef6e40c4ca122eed1c5a..86fdadad268fd9d2cfdeca327b1674db90c3c4c1 100644
--- a/Widgets/vtkXYPlotWidget.h
+++ b/Widgets/vtkXYPlotWidget.h
@@ -38,7 +38,7 @@ class VTK_WIDGETS_EXPORT vtkXYPlotWidget : public vtkInteractorObserver
 {
 public:
   static vtkXYPlotWidget *New();
-  vtkTypeRevisionMacro(vtkXYPlotWidget,vtkInteractorObserver);
+  vtkTypeMacro(vtkXYPlotWidget,vtkInteractorObserver);
   void PrintSelf(ostream& os, vtkIndent indent);
 
   // Description: