diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp
index 0dc35173d1..50a654c4f8 100644
--- a/src/common/toplvcmn.cpp
+++ b/src/common/toplvcmn.cpp
@@ -422,7 +422,11 @@ bool wxTopLevelWindowBase::Layout()
 
 
     // if we're using sizers or constraints - do use them
-    if ( GetSizer() || GetConstraints() )
+    if ( GetSizer()
+#if wxUSE_CONSTRAINTS
+                    || GetConstraints()
+#endif
+                                        )
     {
         return wxNonOwnedWindow::Layout();
     }
diff --git a/src/common/utilscmn.cpp b/src/common/utilscmn.cpp
index 25b00db24c..a3acd27b51 100644
--- a/src/common/utilscmn.cpp
+++ b/src/common/utilscmn.cpp
@@ -86,6 +86,7 @@
 #include <errno.h>
 
 #if wxUSE_GUI
+    #include "wx/filename.h"
     #include "wx/filesys.h"
     #include "wx/notebook.h"
     #include "wx/statusbr.h"