diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index 19ddb1965c..fec6879ea6 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -112,6 +112,7 @@ wxAppBase::~wxAppBase()
 }
 
 #if wxUSE_GUI
+
 bool wxAppBase::OnInitGui()
 {
 #ifdef __WXUNIVERSAL__
@@ -124,7 +125,6 @@ bool wxAppBase::OnInitGui()
 
     return TRUE;
 }
-#endif // wxUSE_GUI
 
 int wxAppBase::OnRun()
 {
@@ -139,6 +139,8 @@ int wxAppBase::OnRun()
     return MainLoop();
 }
 
+#endif // wxUSE_GUI
+
 int wxAppBase::OnExit()
 {
 #if wxUSE_CONFIG
diff --git a/src/common/wxchar.cpp b/src/common/wxchar.cpp
index e625460013..2f030b8ed9 100644
--- a/src/common/wxchar.cpp
+++ b/src/common/wxchar.cpp
@@ -40,8 +40,6 @@
   #include "wx/hash.h"
 #endif
 
-#include "wx/msgdlg.h"
-
 #if defined(__WIN32__) && defined(wxNEED_WX_CTYPE_H)
   #include <windef.h>
   #include <winbase.h>