diff --git a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp b/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp
index 09ccbd72e..48384cd5b 100755
--- a/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp
+++ b/desmume/src/gtk-glade/dTools/callbacks_1_ioregs.cpp
@@ -1,4 +1,4 @@
-/* callbacks_1_ioregs.c - this file is part of DeSmuME
+/* callbacks_1_ioregs.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Copyright (C) 2007 Pascal Giard (evilynux)
diff --git a/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp b/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp
index fd44e6a22..82a5b6ae6 100755
--- a/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp
+++ b/desmume/src/gtk-glade/dTools/callbacks_2_memview.cpp
@@ -1,4 +1,4 @@
-/* callbacks_2_memview.c - this file is part of DeSmuME
+/* callbacks_2_memview.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net
diff --git a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp b/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp
index 0b7097474..4905094c8 100755
--- a/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp
+++ b/desmume/src/gtk-glade/dTools/callbacks_3_palview.cpp
@@ -1,4 +1,4 @@
-/* callbacks_3_palview.c - this file is part of DeSmuME
+/* callbacks_3_palview.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net
diff --git a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp
index 7fee86b19..0a4b4f719 100755
--- a/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp
+++ b/desmume/src/gtk-glade/dTools/callbacks_4_tileview.cpp
@@ -1,4 +1,4 @@
-/* callbacks_3_palview.c - this file is part of DeSmuME
+/* callbacks_3_palview.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net
diff --git a/desmume/src/gtk-glade/gdk_gl.cpp b/desmume/src/gtk-glade/gdk_gl.cpp
index 2e3633146..34803742e 100755
--- a/desmume/src/gtk-glade/gdk_gl.cpp
+++ b/desmume/src/gtk-glade/gdk_gl.cpp
@@ -1,4 +1,4 @@
-/* gdk_gl.c - this file is part of DeSmuME
+/* gdk_gl.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net
diff --git a/desmume/src/gtk-glade/globals.h b/desmume/src/gtk-glade/globals.h
index 25606d9a1..658c409d0 100755
--- a/desmume/src/gtk-glade/globals.h
+++ b/desmume/src/gtk-glade/globals.h
@@ -103,7 +103,7 @@ glade_xml_signal_autoconnect_StringObject (GladeXML *self);
 
 extern int Frameskip;
 
-/* main.c */
+/* main.cpp */
 extern GtkWidget * pWindow;
 extern GtkWidget * pDrawingArea, * pDrawingArea2;
 extern GladeXML  * xml, * xml_tools;
@@ -114,13 +114,13 @@ void register_Tool(VoidFunPtr fun);
 void unregister_Tool(VoidFunPtr fun);
 gchar * get_ui_file (const char *filename);
 
-/* callbacks.c */
+/* callbacks.cpp */
 void enable_rom_features();
 void resize (float Size1, float Size2);
 void rotate(float angle);
 extern gboolean ScreenInvert;
 
-/* callbacks_IO.c */
+/* callbacks_IO.cpp */
 extern float ScreenCoeff_Size[2];
 extern float ScreenRotate;
 
diff --git a/desmume/src/gtk-glade/keyval_names.cpp b/desmume/src/gtk-glade/keyval_names.cpp
index 180d5268b..65c94f12e 100755
--- a/desmume/src/gtk-glade/keyval_names.cpp
+++ b/desmume/src/gtk-glade/keyval_names.cpp
@@ -1,4 +1,4 @@
-/* keyval_names.c - this file is part of DeSmuME
+/* keyval_names.cpp - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net
diff --git a/desmume/src/gtk-glade/keyval_names.h b/desmume/src/gtk-glade/keyval_names.h
index 87bc919f4..d6bebf976 100755
--- a/desmume/src/gtk-glade/keyval_names.h
+++ b/desmume/src/gtk-glade/keyval_names.h
@@ -1,4 +1,4 @@
-/* keyval_names.c - this file is part of DeSmuME
+/* keyval_names.h - this file is part of DeSmuME
  *
  * Copyright (C) 2007 Damien Nozay (damdoum)
  * Author: damdoum at users.sourceforge.net