diff --git a/src/jrd/os/thd_priority.h b/src/jrd/os/thd_priority.h
index e253da70c1..41e6576dab 100644
--- a/src/jrd/os/thd_priority.h
+++ b/src/jrd/os/thd_priority.h
@@ -122,18 +122,20 @@ inline void THPS_ENTER(){
 }
 inline void THPS_EXIT(){
 }
+#ifdef WIN_NT
 inline thdd* THPS_GET(DWORD specific_key){
 	return (thdd*) TlsGetValue(specific_key);
 }
 inline void THPS_SET(DWORD specific_key, thdd* new_context){
 	TlsSetValue(specific_key, (LPVOID) new_context);
 }
+inline void THPS_ATTACH(HANDLE handle, DWORD thread_id, int priority){
+}
+#endif
 inline void THPS_INIT(){
 }
 inline void THPS_FINI(){
 }
-inline void THPS_ATTACH(HANDLE handle, DWORD thread_id, int priority){
-}
 inline bool THPS_BOOSTDONE() {
 	return false;
 }
diff --git a/src/remote/remote.h b/src/remote/remote.h
index 748ff72b78..deb655c093 100644
--- a/src/remote/remote.h
+++ b/src/remote/remote.h
@@ -351,7 +351,7 @@ enum state_t
 
 
 #ifndef WIN_NT
-typdef int HANDLE;
+typedef int HANDLE;
 #endif  /* WIN_NT */
 
 
diff --git a/src/remote/remote_def.h b/src/remote/remote_def.h
index 7bf5a968c3..6f86154e62 100644
--- a/src/remote/remote_def.h
+++ b/src/remote/remote_def.h
@@ -44,47 +44,29 @@
 
 #ifdef VMS
 const P_ARCH ARCHITECTURE	= arch_vms;
-#endif
-
-#ifdef sun
-#ifdef sparc
+#elif defined(sun)
+#	ifdef sparc
 const P_ARCH ARCHITECTURE	= arch_sun4;
-#elif defined(i386)
+#	elif defined(i386)
 const P_ARCH ARCHITECTURE	= arch_sun386;
-#else
+#	else
 const P_ARCH ARCHITECTURE	= arch_sun;
-#endif
-#endif
-
-#ifdef hpux
+#	endif
+#elif defined(hpux)
 const P_ARCH ARCHITECTURE	= arch_hpux;
-#endif
-
-#if (defined AIX || defined AIX_PPC)
+#elif (defined AIX || defined AIX_PPC)
 const P_ARCH ARCHITECTURE	= arch_rt;
-#endif
-
-#ifdef SCO_EV
+#elif defined(SCO_EV)
 const P_ARCH ARCHITECTURE	= arch_sco_ev;
-#endif
-
-#ifdef LINUX
+#elif defined(LINUX)
 const P_ARCH ARCHITECTURE	= arch_linux;
-#endif
-
-#ifdef FREEBSD
+#elif defined(FREEBSD)
 const P_ARCH ARCHITECTURE	= arch_freebsd;
-#endif
-
-#ifdef NETBSD
+#elif defined(NETBSD)
 const P_ARCH ARCHITECTURE	= arch_netbsd;
-#endif
-
-#ifdef DARWIN
+#elif defined(DARWIN)
 const P_ARCH ARCHITECTURE	= arch_darwin_ppc;
-#endif
-
-#ifdef I386
+#elif defined(I386)
 const P_ARCH ARCHITECTURE	= arch_intel_32;
 #endif
 
diff --git a/src/utilities/guard/guard.cpp b/src/utilities/guard/guard.cpp
index 0b7dfc6118..e31afc3d6d 100644
--- a/src/utilities/guard/guard.cpp
+++ b/src/utilities/guard/guard.cpp
@@ -15,20 +15,10 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: guard.cpp,v 1.7 2004-05-17 00:21:46 brodsom Exp $
+ * $Id: guard.cpp,v 1.8 2004-05-18 00:45:46 brodsom Exp $
  */
  /* contains the main() and not shared routines for ibguard */
 
-const USHORT FOREVER	= 1;
-const USHORT ONETIME	= 2;
-const USHORT IGNORE		= 3;
-const USHORT NORMAL_EXIT= 0;
-
-const char* SUPER_SERVER_BINARY	= "bin/fbserver";
-
-const char* INTERBASE_USER		= "interbase";
-const char* FIREBIRD_USER		= "firebird";
-const char* INTERBASE_USER_SHORT= "interbas";
 
 #include "firebird.h"
 #include <stdio.h>
@@ -51,6 +41,16 @@ const char* INTERBASE_USER_SHORT= "interbas";
 #include "../jrd/file_params.h"
 #include "../utilities/guard/util_proto.h"
 
+const USHORT FOREVER	= 1;
+const USHORT ONETIME	= 2;
+const USHORT IGNORE		= 3;
+const USHORT NORMAL_EXIT= 0;
+
+const char* SUPER_SERVER_BINARY	= "bin/fbserver";
+
+const char* INTERBASE_USER		= "interbase";
+const char* FIREBIRD_USER		= "firebird";
+const char* INTERBASE_USER_SHORT= "interbas";
 
 int CLIB_ROUTINE main( int argc, char **argv)
 {
diff --git a/src/utilities/ibmgr/ibmgr.h b/src/utilities/ibmgr/ibmgr.h
index b094dd6d46..c2686ec30d 100644
--- a/src/utilities/ibmgr/ibmgr.h
+++ b/src/utilities/ibmgr/ibmgr.h
@@ -19,7 +19,7 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: ibmgr.h,v 1.7 2004-05-17 00:28:58 brodsom Exp $
+ * $Id: ibmgr.h,v 1.8 2004-05-18 00:45:14 brodsom Exp $
  */
 
 #ifndef UTILITIES_IBMGR_H
@@ -27,12 +27,12 @@
 
 #define OUTFILE			stderr
 
-const char* SYSDBA_USER_NAME	= "SYSDBA";
-const char* FIREBIRD_USER_NAME	= "firebird";
-const char* INTERBASE_USER_NAME	= "interbase";
-const char* INTERBASE_USER_SHORT= "interbas";
-const char* SERVER_GUARDIAN		= "bin/fbguard";
-const char* USER_INFO_NAME		= "security.fdb";
+static const char* SYSDBA_USER_NAME	= "SYSDBA";
+static const char* FIREBIRD_USER_NAME	= "firebird";
+static const char* INTERBASE_USER_NAME	= "interbase";
+static const char* INTERBASE_USER_SHORT= "interbas";
+static const char* SERVER_GUARDIAN	= "bin/fbguard";
+static const char* USER_INFO_NAME	= "security.fdb";
 
 const USHORT MSG_FAC	= 18;
 const int MSG_LEN		= 128;