diff --git a/Source/CParse/cscanner.c b/Source/CParse/cscanner.c
index 6c031401c..75cb43e9e 100644
--- a/Source/CParse/cscanner.c
+++ b/Source/CParse/cscanner.c
@@ -365,7 +365,7 @@ void skip_decl(void) {
   int  done = 0;
   while (!done) {
     if ((c = nextchar()) == 0) {
-      Swig_error(cparse_file,cparse_line,"Missing semicolon. Reached end of input.\n");
+      Swig_error(cparse_file,cparse_line - 2,"Missing semicolon. Reached end of input.\n");
       return;
     }
     if (c == '{') {
@@ -379,7 +379,7 @@ void skip_decl(void) {
   if (!done) {
     while (num_brace > last_brace) {
       if ((c = nextchar()) == 0) {
-	Swig_error(cparse_file,cparse_line,"Missing '}'. Reached end of input.\n");
+	Swig_error(cparse_file,cparse_line - 2,"Missing '}'. Reached end of input.\n");
 	return;
       }
       if (c == '{') num_brace++;
@@ -546,6 +546,7 @@ int yylook(void) {
 	    }
 	  }
 	  else if (c == '{') {
+	    cparse_start_line = cparse_line;
 	    last_brace = num_brace;
 	    num_brace++;
 	    return (LBRACE);
diff --git a/Source/Preprocessor/cpp.c b/Source/Preprocessor/cpp.c
index 99930dcb0..4f35124b1 100644
--- a/Source/Preprocessor/cpp.c
+++ b/Source/Preprocessor/cpp.c
@@ -1562,7 +1562,7 @@ Preprocessor_parse(String *s)
 	    }
   	    s2 = Preprocessor_parse(s1);
   	    addline(ns,s2,allow);
-  	    Printf(ns,"\n]");
+  	    StringAppend(ns,"\n]");
 	    if (dirname) {
 	      Swig_pop_directory();
 	    }
diff --git a/Source/Swig/include.c b/Source/Swig/include.c
index c154b9292..cb8abd75e 100644
--- a/Source/Swig/include.c
+++ b/Source/Swig/include.c
@@ -275,7 +275,7 @@ Swig_read_file(FILE *f) {
   while (fgets(buffer,4095,f)) {
     Append(str,buffer);
   }
-  Append(str,"\n");
+  /* Append(str,"\n"); */
   return str;
 }