diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h
index 55c7105a0b..15a0c8d25b 100644
--- a/include/wx/gdicmn.h
+++ b/include/wx/gdicmn.h
@@ -216,7 +216,8 @@ public:
     wxSize operator+(const wxSize& sz) { return wxSize(x + sz.x, y + sz.y); }
     wxSize operator-(const wxSize& sz) { return wxSize(x - sz.x, y - sz.y); }
 
-    // accessors    void Set(int xx, int yy) { x = xx; y = yy; }
+    // accessors
+    void Set(int xx, int yy) { x = xx; y = yy; }
     void SetWidth(int w) { x = w; }
     void SetHeight(int h) { y = h; }
 
diff --git a/include/wx/popupwin.h b/include/wx/popupwin.h
index 27779f3484..010481ec0c 100644
--- a/include/wx/popupwin.h
+++ b/include/wx/popupwin.h
@@ -55,7 +55,7 @@ public:
     #include "wx/os2/popupwin.h"
 #elif __WXGTK__
     #include "wx/gtk/popupwin.h"
-#ifdef __WXX11__
+#elif __WXX11__
     #include "wx/x11/popupwin.h"
 #elif __WXMGL__
     #include "wx/mgl/popupwin.h"