5 files changed, 15 insertions, 13 deletions
diff --git a/ppapi/c/ppb_file_ref.h b/ppapi/c/ppb_file_ref.h
index e204c28..f3dd432 100644
--- a/ppapi/c/ppb_file_ref.h
+++ b/ppapi/c/ppb_file_ref.h
@@ -6,8 +6,8 @@
 #define PPAPI_C_PPB_FILE_REF_H_
 
 #include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_file_info.h"
-#include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_var.h"
 
@@ -17,14 +17,12 @@
  * file in a file system.
  */
 
-struct PP_CompletionCallback;
-
 #define PPB_FILEREF_INTERFACE_0_9 "PPB_FileRef;0.9"
 #define PPB_FILEREF_INTERFACE_1_0 "PPB_FileRef;1.0"
 #define PPB_FILEREF_INTERFACE PPB_FILEREF_INTERFACE_1_0
 
 /**
- * @addtogroup Structs
+ * @addtogroup Interfaces
  * @{
  */
 /**
diff --git a/ppapi/c/ppb_graphics_2d.h b/ppapi/c/ppb_graphics_2d.h
index 6020b050..c0024f1 100644
--- a/ppapi/c/ppb_graphics_2d.h
+++ b/ppapi/c/ppb_graphics_2d.h
@@ -6,15 +6,14 @@
 #define PPAPI_C_PPB_GRAPHICS_2D_H_
 
 #include "ppapi/c/pp_bool.h"
+#include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
-#include "ppapi/c/pp_module.h"
+#include "ppapi/c/pp_point.h"
+#include "ppapi/c/pp_rect.h"
 #include "ppapi/c/pp_resource.h"
+#include "ppapi/c/pp_size.h"
 #include "ppapi/c/pp_stdint.h"
 
-struct PP_CompletionCallback;
-struct PP_Point;
-struct PP_Rect;
-struct PP_Size;
 
 #define PPB_GRAPHICS_2D_INTERFACE_0_4 "PPB_Graphics2D;0.4"
 #define PPB_GRAPHICS_2D_INTERFACE_1_0 "PPB_Graphics2D;1.0"
@@ -24,7 +23,9 @@ struct PP_Size;
  * @file
  * Defines the <code>PPB_Graphics2D</code> struct representing a 2D graphics
  * context within the browser.
- *
+ */
+
+/**
  * @addtogroup Interfaces
  * @{
  */
diff --git a/ppapi/c/ppb_messaging.h b/ppapi/c/ppb_messaging.h
index b5b729b..92cb09b 100644
--- a/ppapi/c/ppb_messaging.h
+++ b/ppapi/c/ppb_messaging.h
@@ -17,7 +17,9 @@
  * This file defines the <code>PPB_Messaging</code> interface implemented
  * by the browser for sending messages to DOM elements associated with a
  * specific module instance.
- *
+ */
+
+/**
  * @addtogroup Interfaces
  * @{
  */
diff --git a/ppapi/c/ppp_input_event.h b/ppapi/c/ppp_input_event.h
index 4bc5340..0cceff1 100644
--- a/ppapi/c/ppp_input_event.h
+++ b/ppapi/c/ppp_input_event.h
@@ -38,4 +38,4 @@ struct PPP_InputEvent {
   PP_Bool (*HandleInputEvent)(PP_Instance instance, PP_Resource input_event);
 };
 
-#endif  // PPAPI_C_PPP_INPUT_EVENT_H_
+#endif  /* PPAPI_C_PPP_INPUT_EVENT_H_ */
diff --git a/ppapi/c/ppp_messaging.h b/ppapi/c/ppp_messaging.h
index c36ed96..ef30494 100644
--- a/ppapi/c/ppp_messaging.h
+++ b/ppapi/c/ppp_messaging.h
@@ -21,7 +21,8 @@ struct PP_Var;
  *
  */
 
-/** @addtogroup Interfaces
+/**
+ * @addtogroup Interfaces
  * @{
  */