diff --git a/uppsrc/OleDB/OleDBSchema.h b/uppsrc/OleDB/OleDBSchema.h
index d1e6a6cd4..037193405 100644
--- a/uppsrc/OleDB/OleDBSchema.h
+++ b/uppsrc/OleDB/OleDBSchema.h
@@ -13,6 +13,11 @@
 #define INT_(x)                    COLUMN_("integer", int, x, 0, 0)
 #define INT_ARRAY_(x, items)       COLUMN_ARRAY_("integer", int, x, 0, 0, items)
 
+#define BIGINT(x)                  COLUMN("bigint", int64, x, 0, 0)
+#define BIGINT_ARRAY(x, items)     COLUMN_ARRAY("bigint", int64, x, 0, 0, items)
+#define BIGINT_(x)                 COLUMN_("bigint", int64, x, 0, 0)
+#define BIGINT_ARRAY_(x, items)    COLUMN_ARRAY_("bigint", int64, x, 0, 0, items)
+
 #define DOUBLE(x)                  COLUMN("double precision", double, x, 0, 0)
 #define DOUBLE_ARRAY(x, items)     COLUMN_ARRAY("double precision", double, x, 0, 0, items)
 #define DOUBLE_(x)                 COLUMN_("double precision", double, x, 0, 0)
@@ -66,6 +71,11 @@
 #undef INT_
 #undef INT_ARRAY_
 
+#undef BIGINT
+#undef BIGINT_ARRAY
+#undef BIGINT_
+#undef BIGINT_ARRAY_
+
 #undef DOUBLE
 #undef DOUBLE_ARRAY
 #undef DOUBLE_
@@ -76,10 +86,10 @@
 #undef DATE_
 #undef DATE_ARRAY_
 
-#undef DATETIME
-#undef DATETIME_ARRAY
-#undef DATETIME_
-#undef DATETIME_ARRAY_
+#undef TIME
+#undef TIME_ARRAY
+#undef TIME_
+#undef TIME_ARRAY_
 
 #undef STRING
 #undef STRING_ARRAY
diff --git a/uppsrc/TCore/service/service.h b/uppsrc/TCore/service/service.h
index 960683c69..ff8a5ef8e 100644
--- a/uppsrc/TCore/service/service.h
+++ b/uppsrc/TCore/service/service.h
@@ -5,14 +5,14 @@
 
 #ifdef PLATFORM_WIN32
 
+extern bool InitService(); // implemented by main program
+extern void RunService(); // implemented by main program
+
 NAMESPACE_UPP
 
 extern volatile bool service_stopped;
 extern volatile bool service_paused;
 
-extern bool InitService(); // implemented by main program
-extern void RunService(); // implemented by main program
-
 void InstallConsoleCtrlHandler();
 bool InstallService(String name, String display_name, String& cmdline, String& status);
 bool UninstallService(String name, String& status);