diff --git a/code/tools/lcc/cpp/lex.c b/code/tools/lcc/cpp/lex.c
index 8030354e..66092e1b 100644
--- a/code/tools/lcc/cpp/lex.c
+++ b/code/tools/lcc/cpp/lex.c
@@ -511,6 +511,25 @@ foldline(Source *s)
 	return 0;
 }
 
+// This doesn't have proper tracking across read() to only remove \r from \r\n sequence.
+// The lexer doesn't correctly handle standalone \r anyway though.
+int
+crlf_to_lf(unsigned char *buf, int n) {
+	int i, count;
+
+	count = 0;
+
+	for (i = 0; i < n; i++) {
+		if (buf[i] == '\r') {
+			continue;
+		}
+
+		buf[count++] = buf[i];
+	}
+
+	return count;
+}
+
 int
 fillbuf(Source *s)
 {
@@ -521,6 +540,7 @@ fillbuf(Source *s)
 		error(FATAL, "Input buffer overflow");
 	if (s->fd<0 || (n=read(s->fd, (char *)s->inl, INS/8)) <= 0)
 		n = 0;
+	n = crlf_to_lf(s->inl, n);
 	if ((*s->inp&0xff) == EOB) /* sentinel character appears in input */
 		*s->inp = EOFC;
 	s->inl += n;
diff --git a/code/tools/lcc/cpp/unix.c b/code/tools/lcc/cpp/unix.c
index bac841d8..56f1fff5 100644
--- a/code/tools/lcc/cpp/unix.c
+++ b/code/tools/lcc/cpp/unix.c
@@ -65,6 +65,9 @@ setup(int argc, char **argv)
 		fp = (char*)newstring((uchar*)argv[optind], strlen(argv[optind]), 0);
 		if ((fd = open(fp, 0)) <= 0)
 			error(FATAL, "Can't open input file %s", fp);
+#ifdef WIN32
+		_setmode(fd, _O_BINARY);
+#endif
 	}
 	if (optind+1<argc) {
 		int fdo;
@@ -75,6 +78,9 @@ setup(int argc, char **argv)
 #endif
 		if (fdo<0)
 			error(FATAL, "Can't open output file %s", argv[optind+1]);
+#ifdef WIN32
+		_setmode(fdo, _O_BINARY);
+#endif
 		dup2(fdo, 1);
 	}
 	if(Mflag)
diff --git a/code/tools/lcc/lburg/gram.c b/code/tools/lcc/lburg/gram.c
index 94fd3b3d..463581e8 100644
--- a/code/tools/lcc/lburg/gram.c
+++ b/code/tools/lcc/lburg/gram.c
@@ -1553,12 +1553,32 @@ static char buf[BUFSIZ], *bp = buf;
 static int ppercent = 0;
 static int code = 0;
 
+static void crlf_to_lf(char *buf, int bufmax) {
+	int i, count;
+
+	count = 0;
+
+	for (i = 0; i < bufmax; i++) {
+		if (buf[i] == '\r' && buf[i+1] == '\n') {
+			// skip '\r'
+			continue;
+		}
+
+		buf[count++] = buf[i];
+
+		if (buf[i] == '\0') {
+			break;
+		}
+	}
+}
+
 static int get(void) {
 	if (*bp == 0) {
 		bp = buf;
 		*bp = 0;
 		if (fgets(buf, sizeof buf, infp) == NULL)
 			return EOF;
+		crlf_to_lf(buf, sizeof buf);
 		yylineno++;
 		while (buf[0] == '%' && buf[1] == '{' && buf[2] == '\n') {
 			for (;;) {
@@ -1566,6 +1586,7 @@ static int get(void) {
 					yywarn("unterminated %{...%}\n");
 					return EOF;
 				}
+				crlf_to_lf(buf, sizeof buf);
 				yylineno++;
 				if (strcmp(buf, "%}\n") == 0)
 					break;
@@ -1573,6 +1594,7 @@ static int get(void) {
 			}
 			if (fgets(buf, sizeof buf, infp) == NULL)
 				return EOF;
+			crlf_to_lf(buf, sizeof buf);
 			yylineno++;
 		}
 	}
diff --git a/code/tools/lcc/lburg/gram.y b/code/tools/lcc/lburg/gram.y
index c0a9c942..2dae09b4 100644
--- a/code/tools/lcc/lburg/gram.y
+++ b/code/tools/lcc/lburg/gram.y
@@ -70,12 +70,32 @@ static char buf[BUFSIZ], *bp = buf;
 static int ppercent = 0;
 static int code = 0;
 
+static void crlf_to_lf(char *buf, int bufmax) {
+	int i, count;
+
+	count = 0;
+
+	for (i = 0; i < bufmax; i++) {
+		if (buf[i] == '\r' && buf[i+1] == '\n') {
+			// skip '\r'
+			continue;
+		}
+
+		buf[count++] = buf[i];
+
+		if (buf[i] == '\0') {
+			break;
+		}
+	}
+}
+
 static int get(void) {
 	if (*bp == 0) {
 		bp = buf;
 		*bp = 0;
 		if (fgets(buf, sizeof buf, infp) == NULL)
 			return EOF;
+		crlf_to_lf(buf, sizeof buf);
 		yylineno++;
 		while (buf[0] == '%' && buf[1] == '{' && buf[2] == '\n') {
 			for (;;) {
@@ -83,6 +103,7 @@ static int get(void) {
 					yywarn("unterminated %{...%}\n");
 					return EOF;
 				}
+				crlf_to_lf(buf, sizeof buf);
 				yylineno++;
 				if (strcmp(buf, "%}\n") == 0)
 					break;
@@ -90,6 +111,7 @@ static int get(void) {
 			}
 			if (fgets(buf, sizeof buf, infp) == NULL)
 				return EOF;
+			crlf_to_lf(buf, sizeof buf);
 			yylineno++;
 		}
 	}
diff --git a/code/tools/lcc/lburg/lburg.c b/code/tools/lcc/lburg/lburg.c
index c43c96ac..7cf859ff 100644
--- a/code/tools/lcc/lburg/lburg.c
+++ b/code/tools/lcc/lburg/lburg.c
@@ -56,14 +56,14 @@ int main(int argc, char *argv[]) {
 		} else if (infp == NULL) {
 			if (strcmp(argv[i], "-") == 0)
 				infp = stdin;
-			else if ((infp = fopen(argv[i], "r")) == NULL) {
+			else if ((infp = fopen(argv[i], "rb")) == NULL) {
 				yyerror("%s: can't read `%s'\n", argv[0], argv[i]);
 				exit(1);
 			}
 		} else if (outfp == NULL) {
 			if (strcmp(argv[i], "-") == 0)
 				outfp = stdout;
-			if ((outfp = fopen(argv[i], "w")) == NULL) {
+			if ((outfp = fopen(argv[i], "wb")) == NULL) {
 				yyerror("%s: can't write `%s'\n", argv[0], argv[i]);
 				exit(1);
 			}