diff --git a/sair_base.td b/sair_base.td
index 7b4bc75d..bf349de9 100644
--- a/sair_base.td
+++ b/sair_base.td
@@ -28,6 +28,8 @@ def SairDialect : Dialect {
     loosing the high-level structure of the code (hence the "additive" part of
     the name).
   }];
+
+  let cppNamespace = "::sair";
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/sair_ops.cc b/sair_ops.cc
index 4c275b08..8fd3604a 100644
--- a/sair_ops.cc
+++ b/sair_ops.cc
@@ -1378,7 +1378,7 @@ llvm::SmallBitVector SairFbyOp::MustFuseDimensions(int sair_operand) {
   return mask;
 }
 
+}  // namespace sair
+
 #define GET_OP_CLASSES
 #include "sair_ops.cc.inc"
-
-}  // namespace sair
diff --git a/sair_ops.h b/sair_ops.h
index abcbd6a1..16d48e39 100644
--- a/sair_ops.h
+++ b/sair_ops.h
@@ -36,10 +36,12 @@ namespace sair {
 // `second`.
 OperandRange ChainOperandRanges(OperandRange first, OperandRange second);
 
-using namespace mlir;  // NOLINT - Required by the MLIR infrastructure.
+}  // namespace sair
+
 #define GET_OP_CLASSES
 #include "sair_ops.h.inc"
 
+namespace sair {
 // Parses the declaration of an iteration domain. Appends the dimensions that
 // compose the domain to 'dimensions' and their names to 'dim_names' with the
 // name that the domain binds to each dimension. The syntax for iteration