diff --git a/indra/libopenjpeg/CMakeLists.txt b/indra/libopenjpeg/CMakeLists.txt
index 02b4c65ed..4325c7cc0 100644
--- a/indra/libopenjpeg/CMakeLists.txt
+++ b/indra/libopenjpeg/CMakeLists.txt
@@ -60,19 +60,7 @@ set(openjpeg_HEADER_FILES
 )
 
 IF(WINDOWS)
-   # On Visual Studio 8 MS deprecated C. This removes all 1.276E1265 security warnings
-   add_definitions(
-     -d_crt_far_mappings_no_deprecate
-     -d_crt_is_wctype_no_deprecate
-     -d_crt_managed_fp_no_deprecate
-     -d_crt_nonstdc_no_deprecate
-     -d_crt_secure_no_deprecate
-     -d_crt_secure_no_deprecate_globals
-     -d_crt_seterrormode_beep_sleep_no_deprecate
-     -d_crt_time_functions_no_deprecate
-     -d_crt_vcclrit_no_deprecate
-     -d_scl_secure_no_deprecate
-   )
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
    add_definitions(-DOPJ_STATIC)
 ENDIF(WINDOWS)
 
diff --git a/indra/libopenjpeg/dwt.c b/indra/libopenjpeg/dwt.c
index a8d579fa9..9568f07ed 100644
--- a/indra/libopenjpeg/dwt.c
+++ b/indra/libopenjpeg/dwt.c
@@ -527,7 +527,7 @@ static void dwt_decode_tile(opj_tcd_tilecomp_t* tilec, int numres, DWT1DFN dwt_1
 
 	int w = tilec->x1 - tilec->x0;
 
-	h.mem = opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
+	h.mem = (int *)opj_aligned_malloc(dwt_decode_max_resolution(tr, numres) * sizeof(int));
 	v.mem = h.mem;
 
 	while( --numres) {
diff --git a/indra/libopenjpeg/j2k.c b/indra/libopenjpeg/j2k.c
index 33ff85450..b4e9f5aba 100644
--- a/indra/libopenjpeg/j2k.c
+++ b/indra/libopenjpeg/j2k.c
@@ -236,7 +236,7 @@ static void j2k_read_unk(opj_j2k_t *j2k);
 /* ----------------------------------------------------------------------- */
 typedef struct j2k_prog_order{
 	OPJ_PROG_ORDER enum_prog;
-	char str_prog[4];
+	char str_prog[5];
 }j2k_prog_order_t;
 
 j2k_prog_order_t j2k_prog_order_list[] = {