diff --git a/src/add-ons/input_server/methods/canna/CannaCommon.h b/src/add-ons/input_server/methods/canna/CannaCommon.h
index 66108ecf65..3caf17f338 100644
--- a/src/add-ons/input_server/methods/canna/CannaCommon.h
+++ b/src/add-ons/input_server/methods/canna/CannaCommon.h
@@ -1,8 +1,10 @@
-//
-// CannaCommon.h
-//		Common data and variable definition for CannaIM
-//		(c) 1999 Masao Kawamura
-//
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+
 
 #ifndef _CANNACOMMON_H
 #define _CANNACOMMON_H
diff --git a/src/add-ons/input_server/methods/canna/CannaInterface.cpp b/src/add-ons/input_server/methods/canna/CannaInterface.cpp
index c08f321215..3cdbbeee54 100644
--- a/src/add-ons/input_server/methods/canna/CannaInterface.cpp
+++ b/src/add-ons/input_server/methods/canna/CannaInterface.cpp
@@ -1,12 +1,10 @@
-//
-//	CannaInterface.cpp
-//	canna library wrapper
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
 
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
 
 #include "CannaInterface.h"
 #include <UTF8.h>
diff --git a/src/add-ons/input_server/methods/canna/CannaInterface.h b/src/add-ons/input_server/methods/canna/CannaInterface.h
index ae125ccdb1..da5e77c419 100644
--- a/src/add-ons/input_server/methods/canna/CannaInterface.h
+++ b/src/add-ons/input_server/methods/canna/CannaInterface.h
@@ -1,12 +1,10 @@
-//
-//	CannaInterface.h
-//	canna library wrapper
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
 
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
 
 #ifndef _CANNA_INTERFACE_H
 #define _CANNA_INTERFACE_H
diff --git a/src/add-ons/input_server/methods/canna/CannaLooper.cpp b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
index d9ec2359a9..8d81a4da14 100644
--- a/src/add-ons/input_server/methods/canna/CannaLooper.cpp
+++ b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2009 Haiku Inc. All rights reserved.
+ * Copyright 2011 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 1999 M.Kawamura
diff --git a/src/add-ons/input_server/methods/canna/CannaLooper.h b/src/add-ons/input_server/methods/canna/CannaLooper.h
index 4d6fcbff9b..60e93a37b2 100644
--- a/src/add-ons/input_server/methods/canna/CannaLooper.h
+++ b/src/add-ons/input_server/methods/canna/CannaLooper.h
@@ -1,9 +1,11 @@
 /*
- * Copyright 2007-2009 Haiku Inc. All rights reserved.
+ * Copyright 2007-2009 Haiku, Inc. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Copyright 1999 M.Kawamura
  */
+
+
 #ifndef CANNA_LOOPER_H
 #define CANNA_LOOPER_H
 
diff --git a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
index 1511d19b8e..2bc2f46ff7 100644
--- a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
+++ b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
@@ -1,11 +1,10 @@
-//
-//	KouhoWindow.cpp
-//
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+
 
 #include <string.h>
 
diff --git a/src/add-ons/input_server/methods/canna/KouhoWindow.h b/src/add-ons/input_server/methods/canna/KouhoWindow.h
index 8103b0b472..c4069da978 100644
--- a/src/add-ons/input_server/methods/canna/KouhoWindow.h
+++ b/src/add-ons/input_server/methods/canna/KouhoWindow.h
@@ -1,11 +1,10 @@
-//
-//	KouhoWindow.h
-//
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+
 
 #ifndef KOUHOWINDOW_H
 #define KOUHOWINDOW_H
diff --git a/src/add-ons/input_server/methods/canna/PaletteWindow.cpp b/src/add-ons/input_server/methods/canna/PaletteWindow.cpp
index 292e3ac527..2b634356ef 100644
--- a/src/add-ons/input_server/methods/canna/PaletteWindow.cpp
+++ b/src/add-ons/input_server/methods/canna/PaletteWindow.cpp
@@ -1,11 +1,10 @@
-//
-//	PaletteWindow.cpp
-//
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+
 
 #include "CannaCommon.h"
 #include "PaletteWindow.h"
diff --git a/src/add-ons/input_server/methods/canna/PaletteWindow.h b/src/add-ons/input_server/methods/canna/PaletteWindow.h
index e3c4d19022..b8f71aa3d5 100644
--- a/src/add-ons/input_server/methods/canna/PaletteWindow.h
+++ b/src/add-ons/input_server/methods/canna/PaletteWindow.h
@@ -1,11 +1,10 @@
-//
-//	PaletteWindow.h
-//
-//	This is a part of...
-//	CannaIM
-//	version 1.0
-//	(c) 1999 M.Kawamura
-//
+/*
+ * Copyright 2011 Haiku, Inc. All rights reserved.
+ * Distributed under the terms of the MIT License.
+ *
+ * Copyright 1999 M.Kawamura
+ */
+
 
 #ifndef PALETTEWINDOW_H
 #define PALETTEWINDOW_H