diff --git a/Makefile.am b/Makefile.am
index d3685ce019abf92e50b53536ba48768223386c02..42166551f406da2f0239747c6682984fb74b7ea9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 lib_LTLIBRARIES = libopus.la
 
-INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk
+INCLUDES = -I$(top_srcdir)/libcelt -I$(top_srcdir)/silk -I$(top_srcdir)/silk/float -I$(top_srcdir)/silk/fixed
 
 include celt_sources.mk
 include silk_sources.mk
diff --git a/configure.ac b/configure.ac
index a7e1154542305d5b91ccccd84eb07e1ef8e1d0e1..4783fc353311fc18b9a5e1656a02cebdf3fe35e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -214,11 +214,5 @@ AC_MSG_RESULT([
 ------------------------------------------------------------------------
 ])
 
-if test "x$tools" = "x"; then 
-echo "**IMPORTANT**"
-echo "You don't seem to have the development package for libogg (libogg-devel) available. Only the library will be built (no encoder/decoder executable)"
-echo "You can download libogg from http://www.vorbis.com/download.psp"
-fi
-
 echo "Type \"make; make install\" to compile and install";
 echo "Type \"make check\" to run the test suite";
diff --git a/silk_sources.mk b/silk_sources.mk
index 4c50b56d5bc44a4a46c58fcefa2fbfe123d393eb..77820a6bd651db766523a8afc688f243469c1255 100644
--- a/silk_sources.mk
+++ b/silk_sources.mk
@@ -98,7 +98,7 @@ silk/SKP_Silk_stereo_encode_pred.c \
 silk/SKP_Silk_stereo_find_predictor.c
 
 
-ifdef FIXED_POINT
+if FIXED_POINT
 SILK_SOURCES += \
 silk/fixed/SKP_Silk_LTP_analysis_filter_FIX.c \
 silk/fixed/SKP_Silk_LTP_scale_ctrl_FIX.c \