diff --git a/Make.inc b/Make.inc
index 6652c44..4306ee5 100644
--- a/Make.inc
+++ b/Make.inc
@@ -1,5 +1,5 @@
 CC=gcc
-CFLAGS=-O2 -fPIC -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration 
+CFLAGS=-std=c99 -O2 -fPIC -I. -I../include -I../ld128 -I../src -D__BSD_VISIBLE -Wno-implicit-function-declaration 
 
 default: all
 
diff --git a/src/Makefile b/src/Makefile
index 26623b3..af6c172 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -7,11 +7,9 @@ SRCS= \
 	e_gammaf_r.o e_hypot.o e_hypotf.o e_j0.o e_j0f.o e_j1.o e_j1f.o \
 	e_jn.o e_jnf.o e_lgamma.o e_lgamma_r.o e_lgammaf.o e_lgammaf_r.o \
 	e_log.o e_log10.o e_log10f.o e_log2.o e_log2f.o e_logf.o \
-	e_rem_pio2.o e_rem_pio2f.o \
 	e_pow.o e_powf.o e_remainder.o e_remainderf.o e_scalb.o e_scalbf.o \
 	e_sinh.o e_sinhf.o e_sqrt.o e_sqrtf.o \
 	k_cos.o k_exp.o k_expf.o k_rem_pio2.o k_sin.o k_tan.o \
-	k_cosf.o k_sinf.o k_tanf.o \
 	s_asinh.o s_asinhf.o s_atan.o s_atanf.o s_carg.o s_cargf.o s_cargl.o \
 	s_cbrt.o s_cbrtf.o s_ceil.o s_ceilf.o \
 	s_copysign.o s_copysignf.o s_cos.o s_cosf.o \
diff --git a/src/s_cos.c b/src/s_cos.c
index 9dafbca..d802cee 100644
--- a/src/s_cos.c
+++ b/src/s_cos.c
@@ -47,9 +47,9 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define INLINE_REM_PIO2
+#define INLINE_REM_PIO2
 #include "math_private.h"
-//#include "e_rem_pio2.c"
+#include "e_rem_pio2.c"
 
 double
 cos(double x)
diff --git a/src/s_cosf.c b/src/s_cosf.c
index 5547dae..7756b34 100644
--- a/src/s_cosf.c
+++ b/src/s_cosf.c
@@ -20,13 +20,13 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define	INLINE_KERNEL_COSDF
-//#define	INLINE_KERNEL_SINDF
-//#define INLINE_REM_PIO2F
+#define	INLINE_KERNEL_COSDF
+#define	INLINE_KERNEL_SINDF
+#define INLINE_REM_PIO2F
 #include "math_private.h"
-//#include "e_rem_pio2f.c"
-//#include "k_cosf.c"
-//#include "k_sinf.c"
+#include "e_rem_pio2f.c"
+#include "k_cosf.c"
+#include "k_sinf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double
diff --git a/src/s_sin.c b/src/s_sin.c
index 8b7109b..664fe14 100644
--- a/src/s_sin.c
+++ b/src/s_sin.c
@@ -47,9 +47,9 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define INLINE_REM_PIO2
+#define INLINE_REM_PIO2
 #include "math_private.h"
-//#include "e_rem_pio2.c"
+#include "e_rem_pio2.c"
 
 double
 sin(double x)
diff --git a/src/s_sinf.c b/src/s_sinf.c
index c03b94c..b5bbf28 100644
--- a/src/s_sinf.c
+++ b/src/s_sinf.c
@@ -20,13 +20,13 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define	INLINE_KERNEL_COSDF
-//#define	INLINE_KERNEL_SINDF
-//#define INLINE_REM_PIO2F
+#define	INLINE_KERNEL_COSDF
+#define	INLINE_KERNEL_SINDF
+#define INLINE_REM_PIO2F
 #include "math_private.h"
-//#include "e_rem_pio2f.c"
-//#include "k_cosf.c"
-//#include "k_sinf.c"
+#include "e_rem_pio2f.c"
+#include "k_cosf.c"
+#include "k_sinf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double
diff --git a/src/s_tan.c b/src/s_tan.c
index 6616702..96ca470 100644
--- a/src/s_tan.c
+++ b/src/s_tan.c
@@ -46,9 +46,9 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define INLINE_REM_PIO2
+#define INLINE_REM_PIO2
 #include "math_private.h"
-//#include "e_rem_pio2.c"
+#include "e_rem_pio2.c"
 
 double
 tan(double x)
diff --git a/src/s_tanf.c b/src/s_tanf.c
index c212c43..06794e7 100644
--- a/src/s_tanf.c
+++ b/src/s_tanf.c
@@ -20,11 +20,11 @@
 #include <float.h>
 
 #include "openlibm.h"
-//#define	INLINE_KERNEL_TANDF
-//#define INLINE_REM_PIO2F
+#define	INLINE_KERNEL_TANDF
+#define INLINE_REM_PIO2F
 #include "math_private.h"
-//#include "e_rem_pio2f.c"
-//#include "k_tanf.c"
+#include "e_rem_pio2f.c"
+#include "k_tanf.c"
 
 /* Small multiples of pi/2 rounded to double precision. */
 static const double