diff --git a/include/wx/gtk/glcanvas.h b/include/wx/gtk/glcanvas.h
index 6111e3c30b..f4c812ffa8 100644
--- a/include/wx/gtk/glcanvas.h
+++ b/include/wx/gtk/glcanvas.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/scrolwin.h"
 #include "wx/app.h"
 
diff --git a/include/wx/gtk1/glcanvas.h b/include/wx/gtk1/glcanvas.h
index 6111e3c30b..f4c812ffa8 100644
--- a/include/wx/gtk1/glcanvas.h
+++ b/include/wx/gtk1/glcanvas.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/scrolwin.h"
 #include "wx/app.h"
 
diff --git a/include/wx/mac/carbon/glcanvas.h b/include/wx/mac/carbon/glcanvas.h
index c09840f825..465774cba4 100644
--- a/include/wx/mac/carbon/glcanvas.h
+++ b/include/wx/mac/carbon/glcanvas.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #  pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS
diff --git a/include/wx/mac/classic/glcanvas.h b/include/wx/mac/classic/glcanvas.h
index 3aaa62d719..f3f9635aca 100644
--- a/include/wx/mac/classic/glcanvas.h
+++ b/include/wx/mac/classic/glcanvas.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #  pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS
diff --git a/include/wx/msw/glcanvas.h b/include/wx/msw/glcanvas.h
index 3cad5da8ee..1cec4332fe 100644
--- a/include/wx/msw/glcanvas.h
+++ b/include/wx/msw/glcanvas.h
@@ -9,13 +9,13 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/palette.h"
 #include "wx/scrolwin.h"
 
diff --git a/include/wx/x11/glcanvas.h b/include/wx/x11/glcanvas.h
index 454a9d6cc3..575faeaf99 100644
--- a/include/wx/x11/glcanvas.h
+++ b/include/wx/x11/glcanvas.h
@@ -10,13 +10,13 @@
 // Licence:   	wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#ifndef _WX_GLCANVAS_H_
+#define _WX_GLCANVAS_H_
+
 #if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface "glcanvas.h"
 #endif
 
-#ifndef _WX_GLCANVAS_H_
-#define _WX_GLCANVAS_H_
-
 #include "wx/setup.h"
 
 #if wxUSE_GLCANVAS