diff --git a/src/include/operation/cxz_operation.cc.h b/src/include/operation/op_types.cc.h
similarity index 98%
rename from src/include/operation/cxz_operation.cc.h
rename to src/include/operation/op_types.cc.h
index 15d51e4..62419e7 100644
--- a/src/include/operation/cxz_operation.cc.h
+++ b/src/include/operation/op_types.cc.h
@@ -1,8 +1,12 @@
 
-#include "cxz_operation.h"
+#ifndef __cxz_op_types_cc_h__
+#define __cxz_op_types_cc_h__
+
+#include "op_types.h"
 #include "xpr/pos_type.h"
 #include "ranges/range_helper.h"
 #include "xpr/op_xpr.h"
+#include "statics/static_for.h"
 
 
 namespace CNORXZ
@@ -326,3 +330,5 @@ namespace CNORXZ
     }
 
 }
+
+#endif
diff --git a/src/include/operation/cxz_operation.h b/src/include/operation/op_types.h
similarity index 96%
rename from src/include/operation/cxz_operation.h
rename to src/include/operation/op_types.h
index f67d762..6128170 100644
--- a/src/include/operation/cxz_operation.h
+++ b/src/include/operation/op_types.h
@@ -1,17 +1,10 @@
 // -*- C++ -*-
 
-#ifndef __cxz_operation_h__
-#define __cxz_operation_h__
+#ifndef __cxz_op_types_h__
+#define __cxz_op_types_h__
 
 #include "base/base.h"
 
-#include "arith.h"
-#include "type_operations.h"
-#include "op_expressions.h"
-#include "access.h"
-
-#include "statics/static_for.h"
-
 namespace CNORXZ
 {