diff --git a/builds/posix/Makefile.in.client.util b/builds/posix/Makefile.in.client.util
index 9ea42bbcf4..cd3eba128e 100644
--- a/builds/posix/Makefile.in.client.util
+++ b/builds/posix/Makefile.in.client.util
@@ -68,7 +68,7 @@ $(FBCOMMON_ClientObjects) $(FBCLASSES_ClientObjects)
 
 
 GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp common/utils.cpp \
-$(OS_SPECIFIC_Sources) jrd/isc_file.cpp jrd/ThreadData.cpp common/UtilSvc.cpp
+$(OS_SPECIFIC_Sources) jrd/isc_file.cpp jrd/isc.cpp jrd/ThreadData.cpp common/UtilSvc.cpp
 
 GSTAT_Files =  dba.epp ppg.cpp gstatMain.cpp
 GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources)
diff --git a/builds/win32/defs/fbclient.def b/builds/win32/defs/fbclient.def
index c1970ed05c..a3ba07b537 100644
--- a/builds/win32/defs/fbclient.def
+++ b/builds/win32/defs/fbclient.def
@@ -103,9 +103,6 @@ EXPORTS
 	gds__start_request	@74
 	gds__start_transaction	@75
 	gds__temp_file	@231
-	gds__thread_enable	@76
-	gds__thread_enter	@77
-	gds__thread_exit	@78
 	gds__thread_start	@79
 	gds__to_sqlda	@80
 	gds__transaction_cleanup	@235
diff --git a/builds/win32/defs/fbclient_s.def b/builds/win32/defs/fbclient_s.def
index 54e99107b4..229e0e871b 100644
--- a/builds/win32/defs/fbclient_s.def
+++ b/builds/win32/defs/fbclient_s.def
@@ -18,6 +18,9 @@
 EXPORTS
 
 	fb_interpret@12				PRIVATE
+	fb_sqlstate@8			PRIVATE
+	fb_cancel_operation@12		PRIVATE
+	fb_shutdown_callback@16		PRIVATE
 
 	isc_attach_database@24		PRIVATE
 	isc_blob_default_desc@12	PRIVATE
diff --git a/configure.in b/configure.in
index 5775574532..b5a677c8d7 100644
--- a/configure.in
+++ b/configure.in
@@ -1048,8 +1048,7 @@ dnl EKU: handle platform specific installation and packaging
 dnl: Common Files
 case "$PLATFORM" in
   [LINUX|GENTOOFREEBSD|HPUX])
-    AC_CONFIG_FILES([
-    gen/install/misc/firebird.conf:builds/install/misc/firebird.conf
+    AC_CONFIG_FILES([gen/install/misc/firebird.conf:builds/install/misc/firebird.conf
     gen/install/misc/aliases.conf:builds/install/misc/aliases.conf.in
     gen/install/misc/fbintl.conf:builds/install/misc/fbintl.conf
     gen/firebird/bin/fb_config:builds/install/misc/fb_config.in
@@ -1096,14 +1095,13 @@ case "$PLATFORM" in
                      gen/firebird/bin/changeMultiConnectMode.sh:builds/install/misc/changeMultiConnectMode.sh.in
                      gen/firebird/bin/changeGdsLibraryCompatibleLink.sh:builds/install/misc/changeGdsLibraryCompatibleLink.sh.in
                      gen/firebird/bin/createAliasDB.sh:builds/install/misc/createAliasDB.sh.in
-                     gen/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/misc/linuxLibrary.sh.in
-      ],[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
+                     gen/firebird/bin/linuxLibrary.sh:builds/install/arch-specific/linux/misc/linuxLibrary.sh.in]
+      ,[chmod a+x gen/install/scripts/*.sh gen/install/*sh 2>/dev/null])
     ;;
 
   HPUX)
     HP_INSTALL_SRC_DIR=builds/install/arch-specific/hpux/${FIREBIRD_ARCH_TYPE}
-    AC_CONFIG_FILES([
-    gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
+    AC_CONFIG_FILES([gen/install/makeinstallImage.sh:${HP_INSTALL_SRC_DIR}/makeinstallImage.sh.in
     gen/firebirdCS.psf:${HP_INSTALL_SRC_DIR}/firebirdCS.psf.in
     gen/firebird/bin/preInstall.sh:${HP_INSTALL_SRC_DIR}/preInstall.sh.in
     gen/firebird/bin/tarInstall.sh:${HP_INSTALL_SRC_DIR}/tarInstall.sh.in
@@ -1123,14 +1121,14 @@ case "$PLATFORM" in
     ;;
 
   FREEBSD)
-    AC_CONFIG_FILES([gen/install/install.sh:builds/install/arch-specific/freebsd/install.sh.in
-      ],[chmod a+x gen/install/install.sh 2>/dev/null])
+    AC_CONFIG_FILES([gen/install/install.sh:builds/install/arch-specific/freebsd/install.sh.in]
+      ,[chmod a+x gen/install/install.sh 2>/dev/null])
     ;;
 
 
   NETBSD)
-    AC_CONFIG_FILES([gen/install/install.netbsd.sh:builds/install/arch-specific/netbsd/install.sh.in
-      ],[chmod a+x gen/install/install.netbsd.sh 2>/dev/null])
+    AC_CONFIG_FILES([gen/install/install.netbsd.sh:builds/install/arch-specific/netbsd/install.sh.in]
+      ,[chmod a+x gen/install/install.netbsd.sh 2>/dev/null])
     ;;
 
 
@@ -1139,8 +1137,8 @@ case "$PLATFORM" in
                      gen/install/prototype:builds/install/arch-specific/sinixz/prototype.in
                      gen/install/preinstall:builds/install/arch-specific/sinixz/preinstall.in
                      gen/install/postinstall:builds/install/arch-specific/sinixz/postinstall.in
-                     gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in
-      ],[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null])
+                     gen/install/postremove:builds/install/arch-specific/sinixz/postremove.in]
+      ,[chmod a+x gen/install/pre* gen/install/post* 2>/dev/null])
     ;;
 
   solx86|SOLARIS)
@@ -1150,8 +1148,8 @@ case "$PLATFORM" in
                      gen/install/Postinstall:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postinstall.in
                      gen/install/Postremove:builds/install/arch-specific/solaris/${ARCH_TYPE_SUFFIX}/postremove.in
 		     gen/install/prototypelg:builds/install/arch-specific/solaris/libgcc/prototypelg.in
-		     gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in
-      ],[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
+		     gen/install/pkginfolg:builds/install/arch-specific/solaris/libgcc/pkginfolg.in]
+      ,[chmod a+x gen/install/Pre* gen/install/Post* 2>/dev/null])
     ;;
 
   DARWIN)
diff --git a/src/jrd/ThreadData.h b/src/jrd/ThreadData.h
index d211b9756c..ab184fe435 100644
--- a/src/jrd/ThreadData.h
+++ b/src/jrd/ThreadData.h
@@ -31,7 +31,7 @@
 #define JRD_THREADDATA_H
 
 #include "firebird.h"
-#include "../jrd/isc.h"
+//#include "../jrd/isc.h"
 #include "../common/classes/locks.h"
 #include "../common/classes/rwlock.h"
 #include "../common/classes/alloc.h"