diff --git a/src/c_console.cpp b/src/c_console.cpp
index 5534ce601..d553fe3fd 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -666,7 +666,7 @@ void AddToConsole (int printlevel, const char *text)
 
 	char *work_p;
 	char *linestart;
-	FString cc = 'A' + CR_TAN;
+	FString cc('A' + char(CR_TAN));
 	int size, len;
 	int x;
 	int maxwidth;
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index a295f4f64..3ec53c1dd 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -3703,7 +3703,7 @@ int DLevelScript::RunScript ()
 
 		case PCD_PRINTCOLOR:
 			work += TEXTCOLOR_ESCAPE;
-			work += 'A' + CLAMPCOLOR(STACK(1));
+			work += 'A' + char(CLAMPCOLOR(STACK(1)));
 			sp--;
 			break;
 
diff --git a/src/r_jpeg.h b/src/r_jpeg.h
index 923e265a5..a40b725b0 100644
--- a/src/r_jpeg.h
+++ b/src/r_jpeg.h
@@ -26,4 +26,4 @@ void JPEG_ErrorExit (j_common_ptr cinfo);
 void JPEG_OutputMessage (j_common_ptr cinfo);
 
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/v_font.cpp b/src/v_font.cpp
index 3c15486f9..45f1cee3a 100644
--- a/src/v_font.cpp
+++ b/src/v_font.cpp
@@ -110,6 +110,18 @@ protected:
 	void MakeTexture ();
 };
 
+struct TempParmInfo
+{
+	unsigned int StartParm[2];
+	unsigned int ParmLen[2];
+	int Index;
+};
+struct TempColorInfo
+{
+	FName Name;
+	unsigned int ParmInfo;
+};
+
 // EXTERNAL FUNCTION PROTOTYPES --------------------------------------------
 
 // PUBLIC FUNCTION PROTOTYPES ----------------------------------------------
@@ -1569,18 +1581,6 @@ wrong:
 
 void V_InitFontColors ()
 {
-	struct TempParmInfo
-	{
-		unsigned int StartParm[2];
-		unsigned int ParmLen[2];
-		int Index;
-	};
-	struct TempColorInfo
-	{
-		FName Name;
-		unsigned int ParmInfo;
-	};
-
 	TArray<FName> names;
 	int lump, lastlump = 0;
 	TranslationParm tparm;