diff --git a/builds/install/arch-specific/hpux/classic/postUninstall.sh.in b/builds/install/arch-specific/hpux/classic/postUninstall.sh.in
index 0c86cbc1bc..5ea6f86f53 100644
--- a/builds/install/arch-specific/hpux/classic/postUninstall.sh.in
+++ b/builds/install/arch-specific/hpux/classic/postUninstall.sh.in
@@ -31,8 +31,6 @@
 #   Contributor(s):
 #  
 # 
-#   $Id: postUninstall.sh.in,v 1.4 2008-12-26 14:39:02 alexpeshkoff Exp $
-# 
 
 # The post uninstall routine for Firebird Classic.
 
diff --git a/builds/install/arch-specific/hpux/classic/preUninstall.sh.in b/builds/install/arch-specific/hpux/classic/preUninstall.sh.in
index 7ae23a69ea..b457f9882e 100644
--- a/builds/install/arch-specific/hpux/classic/preUninstall.sh.in
+++ b/builds/install/arch-specific/hpux/classic/preUninstall.sh.in
@@ -31,8 +31,6 @@
 #   Contributor(s):
 #  
 # 
-#   $Id: preUninstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
-# 
 
 # The pre uninstall routines for Firebird Classic
 
diff --git a/builds/install/arch-specific/hpux/classic/tarInstall.sh.in b/builds/install/arch-specific/hpux/classic/tarInstall.sh.in
index 977c86163f..404636ea82 100644
--- a/builds/install/arch-specific/hpux/classic/tarInstall.sh.in
+++ b/builds/install/arch-specific/hpux/classic/tarInstall.sh.in
@@ -31,8 +31,6 @@
 #   Contributor(s):
 #  
 # 
-#   $Id: tarInstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
-# 
 
 # The way this works is that the buildroot file is stored relative to the root
 # directory and a tar -xvf at root directory will restore all the files in 
diff --git a/builds/install/arch-specific/hpux/classic/tarUninstall.sh.in b/builds/install/arch-specific/hpux/classic/tarUninstall.sh.in
index 33a18ce13f..dbe38a61d7 100644
--- a/builds/install/arch-specific/hpux/classic/tarUninstall.sh.in
+++ b/builds/install/arch-specific/hpux/classic/tarUninstall.sh.in
@@ -31,8 +31,6 @@
 #   Contributor(s):
 #  
 # 
-#   $Id: tarUninstall.sh.in,v 1.3 2008-12-26 14:39:02 alexpeshkoff Exp $
-# 
 
 cd $FBRootDir
 cd ..
diff --git a/builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in b/builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
index c1ec2eb44f..f2c9bd88e1 100644
--- a/builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
+++ b/builds/install/arch-specific/hpux/misc/changegdslibrarycompatibleLink.sh.in
@@ -31,8 +31,6 @@
 #   Contributor(s):
 #  
 # 
-#   $Id: changegdslibrarycompatibleLink.sh.in,v 1.3 2008-12-26 14:39:03 alexpeshkoff Exp $
-# 
 
 
 # This script allows the user to change the link on classic for the 
diff --git a/src/gpre/c_cxx.cpp b/src/gpre/c_cxx.cpp
index 8429b9f688..f1d4a385f8 100644
--- a/src/gpre/c_cxx.cpp
+++ b/src/gpre/c_cxx.cpp
@@ -1094,8 +1094,11 @@ static void gen_blr(void* user_arg, SSHORT offset, const char* string)
 		for (const char* p1 = p; p1 < q;)
 		{
 			if ((*q1++ = *p1++) == 'g')
+			{
 				if (p1 < q && (*q1++ = *p1++) == 'd')
+				{
 					if (p1 < q && (*q1++ = *p1++) == 's')
+					{
 						if (p1 < q && (*q1++ = *p1++) == '_')
 						{
 							char d;
@@ -1104,6 +1107,9 @@ static void gen_blr(void* user_arg, SSHORT offset, const char* string)
 							else
 								*q1++ = d;
 						}
+					}
+				}
+			}
 		}
 		*q1 = 0;
 		printa(indent, line);
@@ -2854,11 +2860,9 @@ static void gen_request(const gpre_req* request)
 				printa(0, "static %schar\n   isc_%d [] = {", CONST_STR, reference->ref_sdl_ident);
 				if (gpreGlob.sw_raw)
 					gen_raw(reference->ref_sdl, reference->ref_sdl_length);
-				else
-					if (PRETTY_print_sdl(reference->ref_sdl, gen_blr, 0, 0))
-					{
-						CPR_error("internal error during SDL generation");
-					}
+				else if (PRETTY_print_sdl(reference->ref_sdl, gen_blr, 0, 0))
+					CPR_error("internal error during SDL generation");
+
 				printa(INDENT, "};\t/* end of sdl string for request isc_%d */\n",
 					   reference->ref_sdl_ident);
 			}
diff --git a/src/gpre/cmp.cpp b/src/gpre/cmp.cpp
index ed189f5748..c9f8fe7bbc 100644
--- a/src/gpre/cmp.cpp
+++ b/src/gpre/cmp.cpp
@@ -703,8 +703,10 @@ static void cmp_fetch( act* action)
 	{
 		ref* var = (ref*) *ptr;
 		if (var->ref_null_value && !var->ref_null)
+		{
 			if (var->ref_friend)
 				var->ref_null = var->ref_friend->ref_null;
+		}
 	}
 }
 
diff --git a/src/gpre/cob.cpp b/src/gpre/cob.cpp
index 1eaf163b90..88c83490a1 100644
--- a/src/gpre/cob.cpp
+++ b/src/gpre/cob.cpp
@@ -2708,8 +2708,10 @@ static TEXT* gen_name(TEXT* const string, const ref* reference, bool as_blob)
 {
 
 	if (reference->ref_field->fld_array_info && !as_blob)
+	{
 		fb_utils::snprintf(string, MAX_REF_SIZE, "%s%d", names[isc_a_pos],
 				reference->ref_field->fld_array_info->ary_ident);
+	}
 	else
 		fb_utils::snprintf(string, MAX_REF_SIZE, "%s%d", names[isc_b_pos], reference->ref_ident);
 
@@ -4143,11 +4145,12 @@ static void t_start_auto(const gpre_req* request,
 		}
 		fb_assert(strlen(buffer) < sizeof(buffer));
 		if (test)
+		{
 			if (buffer[0])
 				printa(names[COLUMN], false, "IF (%s) AND %s = 0 THEN", buffer, trname);
-
 			else
 				printa(names[COLUMN], false, "IF %s = 0 THEN", trname);
+		}
 		else if (buffer[0])
 			printa(names[COLUMN], false, "IF (%s) THEN", buffer);
 	}
@@ -4161,8 +4164,10 @@ static void t_start_auto(const gpre_req* request,
 		   BY_VALUE, count, END_VALUE);
 
 	for (db = gpreGlob.isc_databases; db; db = db->dbb_next)
+	{
 		printa(names[CONTINUE], true, ", %s%s, %s, %s",
 			   BY_REF, db->dbb_name->sym_string, OMITTED, OMITTED);
+	}
 
 	if (gpreGlob.sw_auto && (test || buffer[0]))
 		printa(names[COLUMN], false, "END-IF");
diff --git a/src/gpre/gpre_meta.epp b/src/gpre/gpre_meta.epp
index d9b709a6bb..9557397bbe 100644
--- a/src/gpre/gpre_meta.epp
+++ b/src/gpre/gpre_meta.epp
@@ -1223,8 +1223,10 @@ gpre_rel* MET_get_relation(dbb* database, const TEXT* string, const TEXT* owner_
 intlsym* MET_get_text_subtype(SSHORT ttype)
 {
 	for (intlsym* p = gpreGlob.text_subtypes; p; p = p->intlsym_next)
+	{
 		if (p->intlsym_ttype == ttype)
 			return p;
+	}
 
 	return NULL;
 }
diff --git a/src/gpre/gpre_meta_boot.cpp b/src/gpre/gpre_meta_boot.cpp
index a005ff2e89..fab8ce4a17 100644
--- a/src/gpre/gpre_meta_boot.cpp
+++ b/src/gpre/gpre_meta_boot.cpp
@@ -516,8 +516,10 @@ gpre_rel* MET_get_relation(DBB db, const TEXT* string, const TEXT* owner_name)
 intlsym* MET_get_text_subtype(SSHORT ttype)
 {
 	for (intlsym* p = gpreGlob.text_subtypes; p; p = p->intlsym_next)
+	{
 		if (p->intlsym_ttype == ttype)
 			return p;
+	}
 
 	return NULL;
 }
diff --git a/src/gpre/msc_proto.h b/src/gpre/msc_proto.h
index 2c2a474d44..82fe2a757a 100644
--- a/src/gpre/msc_proto.h
+++ b/src/gpre/msc_proto.h
@@ -42,7 +42,7 @@ gpre_nod*	MSC_node(nod_t, SSHORT);
 gpre_nod*	MSC_pop(gpre_lls**);
 PRV			MSC_privilege_block();
 void		MSC_push(gpre_nod*, gpre_lls**);
-ref*			MSC_reference(ref**);
+ref*		MSC_reference(ref**);
 gpre_req*	MSC_request(req_t);
 SCHAR*		MSC_string(const TEXT*);
 gpre_sym*	MSC_symbol(sym_t, const TEXT*, USHORT, gpre_ctx*);
diff --git a/src/gpre/rmc.cpp b/src/gpre/rmc.cpp
index 745e2cff71..09f0c0dd20 100644
--- a/src/gpre/rmc.cpp
+++ b/src/gpre/rmc.cpp
@@ -1939,8 +1939,8 @@ static void gen_database( const act* action)
 			for (ref* reference = port->por_references; reference;
 				 reference = reference->ref_next)
 			{
-					if (reference->ref_field->fld_array_info)
-						make_array_declaration(reference);
+				if (reference->ref_field->fld_array_info)
+					make_array_declaration(reference);
 			}
 	}
 
diff --git a/src/gpre/sqe.cpp b/src/gpre/sqe.cpp
index 7fac7c205b..a4f4a6e1d0 100644
--- a/src/gpre/sqe.cpp
+++ b/src/gpre/sqe.cpp
@@ -504,8 +504,7 @@ gpre_nod* SQE_field(gpre_req* request,
 				if (context->ctx_request != request)
 					PAR_error("context not part of this request");
 				SQL_resolve_identifier("<Column Name>", NULL, NAME_SIZE);
-				if (!
-					(reference->ref_field =
+				if (!(reference->ref_field =
 						MET_context_field(context, gpreGlob.token_global.tok_string)))
 				{
 					sprintf(s, "column \"%s\" not in context", gpreGlob.token_global.tok_string);
diff --git a/src/gpre/sql.cpp b/src/gpre/sql.cpp
index 6346a043c0..4012d7f35f 100644
--- a/src/gpre/sql.cpp
+++ b/src/gpre/sql.cpp
@@ -2854,7 +2854,7 @@ static act* act_drop()
 		SLONG num = EXP_USHORT_ordinal(true);
 		if (!range_positive_short_integer(num))
 			PAR_error("Shadow number out of range");
-		action->act_object = (ref*)(IPTR)num;
+		action->act_object = (ref*)(IPTR) num;
 		}
 		return action;
 
@@ -5136,7 +5136,6 @@ static gpre_rel* make_relation( gpre_req* request, const TEXT * relation_name)
 
 static void pair( gpre_nod* expr, gpre_nod* field_expr)
 {
-
 	if (field_expr->nod_type != nod_field)
 		return;
 
@@ -6368,4 +6367,3 @@ void SQL_dialect1_bad_type(USHORT field_dtype)
 			s);
 	PAR_error(buffer);
 }
-