diff --git a/vtkm/CellTraits.h b/vtkm/CellTraits.h
index a85cb9265..73075f8fa 100644
--- a/vtkm/CellTraits.h
+++ b/vtkm/CellTraits.h
@@ -59,7 +59,7 @@ struct CellTraits
   /// This defines the topological dimensions of the cell type. 3 for
   /// polyhedra, 2 for polygons, 1 for lines, 0 for points.
   ///
-  const static vtkm::IdComponent TOPOLOGICAL_DIMENSIONS = 3;
+  static const vtkm::IdComponent TOPOLOGICAL_DIMENSIONS = 3;
 
   /// This tag is typedef'ed to
   /// vtkm::CellTopologicalDimensionsTag<TOPOLOGICAL_DIMENSIONS>. This provides
diff --git a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx
index f8ab2a644..e6987375d 100644
--- a/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx
+++ b/vtkm/benchmarking/BenchmarkDeviceAdapter.cxx
@@ -161,7 +161,7 @@ struct ExtendedTypes : vtkm::ListTagBase<vtkm::UInt8,
 {
 };
 
-const static std::string DIVIDER(40, '-');
+static const std::string DIVIDER(40, '-');
 
 /// This class runs a series of micro-benchmarks to measure
 /// performance of the parallel primitives provided by each
diff --git a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx
index f6176b8b7..7744ccf73 100644
--- a/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx
+++ b/vtkm/benchmarking/BenchmarkFieldAlgorithms.cxx
@@ -46,7 +46,7 @@ namespace benchmarking
 
 #define ARRAY_SIZE (1 << 22)
 #define CUBE_SIZE 256
-const static std::string DIVIDER(40, '-');
+static const std::string DIVIDER(40, '-');
 
 enum BenchmarkName
 {
diff --git a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx
index ad25b9c47..26706af36 100644
--- a/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx
+++ b/vtkm/benchmarking/BenchmarkTopologyAlgorithms.cxx
@@ -42,7 +42,7 @@ namespace benchmarking
 {
 
 #define CUBE_SIZE 256
-const static std::string DIVIDER(40, '-');
+static const std::string DIVIDER(40, '-');
 
 enum BenchmarkName
 {
diff --git a/vtkm/cont/ArrayHandleSwizzle.h b/vtkm/cont/ArrayHandleSwizzle.h
index 785e3dd62..35efce36c 100644
--- a/vtkm/cont/ArrayHandleSwizzle.h
+++ b/vtkm/cont/ArrayHandleSwizzle.h
@@ -43,7 +43,7 @@ struct ComponentIsUnique;
 template <vtkm::IdComponent TestValue, vtkm::IdComponent Head>
 struct ComponentIsUnique<TestValue, Head>
 {
-  const static bool IsUnique = TestValue != Head;
+  static const bool IsUnique = TestValue != Head;
 };
 
 // Recursive case:
@@ -51,7 +51,7 @@ template <vtkm::IdComponent TestValue, vtkm::IdComponent Head, vtkm::IdComponent
 struct ComponentIsUnique<TestValue, Head, Tail...>
 {
   using Next = ComponentIsUnique<TestValue, Tail...>;
-  const static bool IsUnique = TestValue != Head && Next::IsUnique;
+  static const bool IsUnique = TestValue != Head && Next::IsUnique;
 };
 
 // Validate the component map.
diff --git a/vtkm/worklet/internal/ClipTables.h b/vtkm/worklet/internal/ClipTables.h
index b364ad03c..5343b826c 100644
--- a/vtkm/worklet/internal/ClipTables.h
+++ b/vtkm/worklet/internal/ClipTables.h
@@ -36,7 +36,7 @@ namespace internal
 // ncells, {{celltype, nverts, {edge/verts(>=100), ...}}, ...}, \n
 // values < 100 represent edges where the corresponding vertex lies
 // values >= 100 reresent existing vertices of the input cell (vertex = value - 100)
-static vtkm::UInt8 ClipTablesData[] = {
+static const vtkm::UInt8 ClipTablesData[] = {
   // vtkm::CELL_SHAPE_VERTEX
   0, // 0
   1,