diff --git a/contrib/babelfishpg_common/Makefile b/contrib/babelfishpg_common/Makefile
index 7de842ac71..7eaa1ad825 100644
--- a/contrib/babelfishpg_common/Makefile
+++ b/contrib/babelfishpg_common/Makefile
@@ -102,7 +102,7 @@ FLAG_TO_CHECK := -DENABLE_SPATIAL_TYPES
 ifeq (,$(filter $(FLAG_TO_CHECK),$(PG_CPPFLAGS)))
 # The flag is not present then build the .in file not including the spatial type files
     sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).in
-		cpp $< | sed 's/^# /-- /g' > $@
+		cpp -Werror $< | sed 's/^# /-- /g' > $@
 
     sql/$(EXTENSION)--3.2.0--3.3.0.sql: sql/upgrades/babelfishpg_upgrades.in
 		cpp -D PREV_VERSION=3.2.0 -D CUR_VERSION=3.3.0 $< | sed 's/^# /-- /g' > $@
@@ -122,7 +122,7 @@ ifeq (,$(filter $(FLAG_TO_CHECK),$(PG_CPPFLAGS)))
 else
 # The flag is present build the .in file including the spatial type files
     sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).in
-		cpp -D ENABLE_SPATIAL_TYPES=1 $< | sed 's/^# /-- /g' > $@
+		cpp -Werror -D ENABLE_SPATIAL_TYPES=1 $< | sed 's/^# /-- /g' > $@
 
     sql/$(EXTENSION)--3.2.0--3.3.0.sql: sql/upgrades/babelfishpg_upgrades.in
 		cpp -D ENABLE_SPATIAL_TYPES=1 -D PREV_VERSION=3.2.0 -D CUR_VERSION=3.3.0 $< | sed 's/^# /-- /g' > $@
diff --git a/contrib/babelfishpg_tsql/Makefile b/contrib/babelfishpg_tsql/Makefile
index 84b5ab253f..5ee161c7b9 100644
--- a/contrib/babelfishpg_tsql/Makefile
+++ b/contrib/babelfishpg_tsql/Makefile
@@ -148,7 +148,7 @@ $(EXTENSION).control: $(EXTENSION).control.in
 		> $@
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).in
-	cpp $< | sed 's/^# /-- /g' > $@
+	cpp -Werror $< | sed 's/^# /-- /g' > $@
 
 sql/%.sql: sql/upgrades/%.sql
 	cp $< $@
diff --git a/contrib/babelfishpg_tsql/sql/sys_functions.sql b/contrib/babelfishpg_tsql/sql/sys_functions.sql
index eb34176325..c2e808e03b 100644
--- a/contrib/babelfishpg_tsql/sql/sys_functions.sql
+++ b/contrib/babelfishpg_tsql/sql/sys_functions.sql
@@ -4423,7 +4423,7 @@ CREATE OR REPLACE FUNCTION sys.is_member(IN role sys.SYSNAME)
 RETURNS INT AS
 $$
 DECLARE
-    is_windows_grp boolean := (CHARINDEX('\', role) != 0);
+    is_windows_grp boolean := (CHARINDEX('\', role) != 0); -- '  adding quote in comment to suppress build warning
 BEGIN
     -- Always return 1 for 'public'
     IF (role = 'public')