diff --git a/compute_kernel_writer/include/ckw/ITileOperand.h b/compute_kernel_writer/include/ckw/ITileOperand.h
new file mode 100644
index 0000000..db39ea0
--- /dev/null
+++ b/compute_kernel_writer/include/ckw/ITileOperand.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023 Arm Limited.
+ *
+ * SPDX-License-Identifier: MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#ifndef COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEOPERAND
+#define COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEOPERAND
+
+namespace ckw
+{
+
+/** Tile operand which can be either scalar, vector or 2D tile. */
+class ITileOperand
+{
+public:
+    /* Destructor */
+    virtual ~ITileOperand();
+};
+
+} // namespace ckw
+
+#endif /* COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEOPERAND */
diff --git a/compute_kernel_writer/include/ckw/TileInfo.h b/compute_kernel_writer/include/ckw/TileInfo.h
index 06c910c..86a4b44 100644
--- a/compute_kernel_writer/include/ckw/TileInfo.h
+++ b/compute_kernel_writer/include/ckw/TileInfo.h
@@ -22,8 +22,8 @@
  * SOFTWARE.
  */
 
-#ifndef COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO_H
-#define COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO_H
+#ifndef COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO
+#define COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO
 
 #include "ckw/Types.h"
 
@@ -81,4 +81,4 @@
 
 } // namespace ckw
 
-#endif /* COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO_H */
+#endif /* COMPUTE_KERNEL_WRITER_INCLUDE_CKW_TILEINFO */