diff --git a/lib/lame/config_static.h b/lib/lame/config_static.h
index 1b66c87..e4ab4ff 100644
--- a/lib/lame/config_static.h
+++ b/lib/lame/config_static.h
@@ -23,16 +23,16 @@
 /* #undef WORDS_BIGENDIAN */
 
 /* #undef  int8_t */
-#define uint8_t unsigned char
+typedef unsigned char uint8_t;
 /* #undef  int18_t */
-#define uint16_t unsigned short
+typedef unsigned short uint16_t;
 /* #undef  int32_t */
-#define uint32_t unsigned int
+typedef unsigned int uint32_t;
 /* #undef  int64_t */
-#define uint64_t unsigned long long
-#define ieee854_float80_t long double
-#define ieee754_float64_t double
-#define ieee754_float32_t float
+typedef unsigned long long uint64_t;
+typedef long double ieee854_float80_t;
+typedef double ieee754_float64_t;
+typedef float ieee754_float32_t;
 
 /* The number of bytes in a double.  */
 #define SIZEOF_DOUBLE 8
diff --git a/lib/python/Makefile.in b/lib/python/Makefile.in
index 0c8fb15..3a73205 100644
--- a/lib/python/Makefile.in
+++ b/lib/python/Makefile.in
@@ -39,7 +39,7 @@ SWF$(A): $(SWF_OBJS) $(SWF_DEPS) Makefile
 
 GFX_DEPS=../libgfxpdf$(A) ../libgfxswf$(A)  ../librfxswf$(A) ../libgfx$(A) ../libocr$(A) ../libbase$(A) 
 gfx.$(SLEXT): gfx.$(O) $(GFX_DEPS) Makefile
-	$(L) -g $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(GFX_DEPS) $(PYTHON_LIB) $(LIBS) $(CXXLIBS)
+	$(LL) -g $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(GFX_DEPS) $(PYTHON_LIB) $(LIBS) $(CXXLIBS)
 gfx$(A): gfx.$(O) $(GFX_DEPS) Makefile
 	mkdir -p tmp 
 	ar cru gfx$(A) gfx.$(O)
diff --git a/lib/ruby/Makefile.in b/lib/ruby/Makefile.in
index e946201..1208f43 100644
--- a/lib/ruby/Makefile.in
+++ b/lib/ruby/Makefile.in
@@ -10,7 +10,7 @@ gfx.$(O): gfx.c
 
 GFX_DEPS=../libgfxpdf$(A) ../libgfxswf$(A)  ../librfxswf$(A) ../libgfx$(A) ../libocr$(A) ../libbase$(A) 
 gfx.$(SLEXT): gfx.$(O) $(GFX_DEPS) Makefile
-	$(L) $(RUBY_LDFLAGS) $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(GFX_DEPS) $(PYTHON_LIB) $(LIBS) $(RUBY_LIBS) $(CXXLIBS)
+	$(LL) $(SHARED) gfx.$(O) -o gfx.$(SLEXT) $(GFX_DEPS) $(PYTHON_LIB) $(LIBS) $(RUBY_LDFLAGS) $(RUBY_LIBS) $(CXXLIBS)
 
 clean:
 	rm -f *.o *.$(O) *.$(SLEXT) *.so