diff --git a/src/qtgui/restable.cpp b/src/qtgui/restable.cpp
index e3ecf696..0f1ed4fe 100644
--- a/src/qtgui/restable.cpp
+++ b/src/qtgui/restable.cpp
@@ -761,8 +761,10 @@ void ResTable::setRclMain(RclMain *m, bool ismain)
 void ResTable::toggleHeader()
 {
     if (tableView->horizontalHeader()->isVisible()) {
+        prefs.noResTableHeader = true;
         tableView->horizontalHeader()->hide();
     } else {
+        prefs.noResTableHeader = false;
         tableView->horizontalHeader()->show();
     }
 }
@@ -770,8 +772,10 @@ void ResTable::toggleHeader()
 void ResTable::toggleVHeader()
 {
     if (tableView->verticalHeader()->isVisible()) {
+        prefs.showResTableVHeader = false;
         tableView->verticalHeader()->hide();
     } else {
+        prefs.showResTableVHeader = true;
         tableView->verticalHeader()->show();
     }
 }
diff --git a/src/utils/smallut.cpp b/src/utils/smallut.cpp
index ffa3071e..c3cd8454 100644
--- a/src/utils/smallut.cpp
+++ b/src/utils/smallut.cpp
@@ -35,13 +35,9 @@
 #include <unordered_set>
 
 #ifdef _WIN32
-// needed for localtime_r under mingw?
-#define _POSIX_THREAD_SAFE_FUNCTIONS
 #define strncasecmp _strnicmp
 #define strcasecmp _stricmp
-#ifdef _MSC_VER
 #define localtime_r(a,b) localtime_s(b,a)
-#endif /* _MSC_VER */
 #endif /* _WIN32 */
 
 
diff --git a/src/utils/smallut.h b/src/utils/smallut.h
index e025e811..5abfe625 100644
--- a/src/utils/smallut.h
+++ b/src/utils/smallut.h
@@ -43,6 +43,13 @@ void smallut_init_mt();
 #ifndef PRETEND_USE
 #define PRETEND_USE(var) ((void)(var))
 #endif
+#ifndef VERSION_AT_LEAST
+#define VERSION_AT_LEAST(LIBMAJ,LIBMIN,LIBREV,TARGMAJ,TARGMIN,TARGREV)  \
+    ((LIBMAJ) > (TARGMAJ) ||                                            \
+     ((LIBMAJ) == (TARGMAJ) &&                                          \
+      ((LIBMIN) > (TARGMIN) ||                                          \
+       ((LIBMIN) == (TARGMIN) && (LIBREV) >= (TARGREV)))))
+#endif
 #endif /* SMALLUT_DISABLE_MACROS */
 
 // Case-insensitive compare. ASCII ONLY !