diff --git a/session.vim b/session.vim
index bbacc4e0ec..fbb573e27e 100644
--- a/session.vim
+++ b/session.vim
@@ -9,6 +9,7 @@ let g:syntastic_cpp_include_dirs = [
             \'/usr/include/qt4',
             \'src/qtcurve/common', 'src/qtcurve',
             \]
+let g:syntastic_c_include_dirs = g:syntastic_cpp_include_dirs
 
 fun! CalibreLog()
     " Setup buffers to edit the calibre changelog and version info prior to
diff --git a/src/qtcurve/common/config_file.c b/src/qtcurve/common/config_file.c
index 3b4d732acc..17fd333890 100644
--- a/src/qtcurve/common/config_file.c
+++ b/src/qtcurve/common/config_file.c
@@ -2611,7 +2611,12 @@ void qtcDefaultSettings(Options *opts)
     opts->gbFactor=DEF_GB_FACTOR;
     opts->gbLabel=GB_LBL_BOLD|GB_LBL_OUTSIDE;
 #if defined CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
+#if defined _WIN32 || defined __APPLE__
+    // Changed by Kovid to use standard button sizes on Windows/OS X
+    opts->stdBtnSizes=true;
+#else
     opts->stdBtnSizes=false;
+#endif
     opts->titlebarButtons=TITLEBAR_BUTTON_ROUND|TITLEBAR_BUTTON_HOVER_SYMBOL;
     opts->titlebarIcon=TITLEBAR_ICON_NEXT_TO_TITLE;
 #endif
diff --git a/src/qtcurve/test_rendering.py b/src/qtcurve/test_rendering.py
index 7196412b74..61ded9241b 100644
--- a/src/qtcurve/test_rendering.py
+++ b/src/qtcurve/test_rendering.py
@@ -8,7 +8,8 @@ __copyright__ = '2012, Kovid Goyal <kovid at kovidgoyal.net>'
 __docformat__ = 'restructuredtext en'
 
 from calibre.gui2 import Application
-from PyQt4.Qt import (QDialog, QGridLayout, QListWidget, QDialogButtonBox)
+from PyQt4.Qt import (QDialog, QGridLayout, QListWidget, QDialogButtonBox,
+        QPushButton, QTimer)
 
 app = Application([], force_calibre_style=True)
 
@@ -24,5 +25,12 @@ bb.accepted.connect(d.accept)
 bb.rejected.connect(d.reject)
 l.addWidget(bb, 2, 0, 1, 2)
 
+b = QPushButton('Normal')
+l.addWidget(b, 0, 1, 1, 1)
+
+def print_button_sizes():
+    for b in d.findChildren(QPushButton):
+        print (unicode(b.text()), b.height())
+QTimer.singleShot(5, print_button_sizes)
 d.exec_()