diff --git a/ortools/constraint_solver/csharp/constraint_solver.i b/ortools/constraint_solver/csharp/constraint_solver.i
index 71c76ad2ed..8eb1b963ba 100644
--- a/ortools/constraint_solver/csharp/constraint_solver.i
+++ b/ortools/constraint_solver/csharp/constraint_solver.i
@@ -28,7 +28,6 @@ using System.Collections.Generic;
 %include "std_string.i"
 
 %include "ortools/base/base.i"
-%include "ortools/util/csharp/tuple_set.i"
 %include "ortools/util/csharp/vector.i"
 %include "ortools/util/csharp/proto.i"
 
@@ -146,6 +145,9 @@ VECTOR_AS_CSHARP_ARRAY(int, int, int, CpIntVector);
 VECTOR_AS_CSHARP_ARRAY(int64, int64, long, CpInt64Vector);
 JAGGED_MATRIX_AS_CSHARP_ARRAY(int64, int64, long, CpInt64VectorVector);
 
+// TupleSet depends on the previous typemaps
+%include "ortools/util/csharp/tuple_set.i"
+
 // Types in Proxy class:
 // Solver.cs:
 // Solver::Foo($cstype $csinput, ...) {Solver_Foo_SWIG($csin, ...);}
diff --git a/ortools/util/csharp/tuple_set.i b/ortools/util/csharp/tuple_set.i
index e182975130..7bd589383a 100644
--- a/ortools/util/csharp/tuple_set.i
+++ b/ortools/util/csharp/tuple_set.i
@@ -14,13 +14,7 @@
 // This is the C# SWIG wrapper for ../tuple_set.h. See that file.
 // TODO(user): Refactor this file to comply with the SWIG style guide.
 
-%include "ortools/base/base.i"
-%include "ortools/util/csharp/vector.i"
-
 %{
-// TODO(user): See if we really need <vector>.
-#include <vector>
-#include "ortools/base/integral_types.h"
 #include "ortools/util/tuple_set.h"
 %}