Index: kernel/generic/include/ipc/ipc.h
===================================================================
--- kernel/generic/include/ipc/ipc.h	(revision 1167520724b9b526c27b67f2d4bc447ef626240c)
+++ kernel/generic/include/ipc/ipc.h	(revision 6eabb6e6dd5893162a9219e82db2afee1e5b1cb0)
@@ -33,6 +33,6 @@
  */
 
-#ifndef __IPC_H__
-#define __IPC_H__
+#ifndef KERN_IPC_H_
+#define KERN_IPC_H_
 
 /* Length of data being transfered with IPC call */
@@ -190,5 +190,5 @@
 	IPC_PHONE_CONNECTING,   /**< Phone is connecting somewhere */
 	IPC_PHONE_CONNECTED,    /**< Phone is connected */
-	IPC_PHONE_HUNGUP,  /**< Phone is hung up, waiting for answers to come */
+	IPC_PHONE_HUNGUP,  	/**< Phone is hung up, waiting for answers to come */
 	IPC_PHONE_SLAMMED       /**< Phone was hungup from server */
 } ipc_phone_state_t;
@@ -244,5 +244,4 @@
 #endif
 
- /** @}
- */
-
+/** @}
+ */