diff --git a/drivers/gpu/nvgpu/include/nvgpu/channel.h b/drivers/gpu/nvgpu/include/nvgpu/channel.h
index 604083d46..7434f0e7f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/channel.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/channel.h
@@ -20,6 +20,9 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifndef NVGPU_CHANNEL_H
+#define NVGPU_CHANNEL_H
+
 #include <nvgpu/types.h>
 
 #include "gk20a/gk20a.h"
@@ -50,3 +53,5 @@ static inline void trace_write_pushbuffers(struct channel_gk20a *c, int count)
 {
 }
 #endif
+
+#endif
diff --git a/drivers/gpu/nvgpu/os/linux/channel.h b/drivers/gpu/nvgpu/os/linux/channel.h
index 87231a791..2210678d5 100644
--- a/drivers/gpu/nvgpu/os/linux/channel.h
+++ b/drivers/gpu/nvgpu/os/linux/channel.h
@@ -13,8 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#ifndef __NVGPU_CHANNEL_H__
-#define __NVGPU_CHANNEL_H__
+#ifndef NVGPU_LINUX_CHANNEL_H
+#define NVGPU_LINUX_CHANNEL_H
 
 #include <linux/workqueue.h>
 #include <linux/dma-buf.h>
@@ -84,4 +84,4 @@ struct channel_gk20a *gk20a_open_new_channel_with_cb(struct gk20a *g,
 		int runlist_id,
 		bool is_privileged_channel);
 
-#endif /* __NVGPU_CHANNEL_H__ */
+#endif