4 files changed, 22 insertions, 16 deletions
diff --git a/gr-blocks/lib/CMakeLists.txt b/gr-blocks/lib/CMakeLists.txt
index ab989fc78..30eab7b75 100644
--- a/gr-blocks/lib/CMakeLists.txt
+++ b/gr-blocks/lib/CMakeLists.txt
@@ -109,18 +109,16 @@ expand_cc_h_impl(xor_XX             bb ss ii)
 # Setup the include and linker paths
 ########################################################################
 include_directories(
-    ${GNURADIO_CORE_INCLUDE_DIRS}
-    ${VOLK_INCLUDE_DIRS}
-    ${GR_BLOCKS_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}/../include
+    ${GR_BLOCKS_INCLUDE_DIRS}
+    ${GNURADIO_CORE_INCLUDE_DIRS}
+    ${VOLK_INCLUDE_DIRS}
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
 
-include_directories(${BLOCKS_INCLUDE_DIRS})
-link_directories(${BLOCKS_LIBRARY_DIRS})
-
-include_directories(${Boost_INCLUDE_DIRS})
 link_directories(${Boost_LIBRARY_DIRS})
 
 ########################################################################
diff --git a/gr-blocks/lib/file_meta_sink_impl.cc b/gr-blocks/lib/file_meta_sink_impl.cc
index ad16e9fca..b707bfac4 100644
--- a/gr-blocks/lib/file_meta_sink_impl.cc
+++ b/gr-blocks/lib/file_meta_sink_impl.cc
@@ -26,14 +26,12 @@
 
 #include "file_meta_sink_impl.h"
 #include <gr_io_signature.h>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdexcept>
-#include <cstdio>
-
-namespace gr {
-  namespace blocks {
+#include <stdio.h>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
@@ -52,6 +50,11 @@ namespace gr {
 #define	OUR_O_LARGEFILE 0
 #endif
 
+
+namespace gr {
+  namespace blocks {
+
+
     file_meta_sink::sptr
     file_meta_sink::make(size_t itemsize, const std::string &filename,
 			 double samp_rate, double relative_rate,
diff --git a/gr-blocks/lib/file_meta_source_impl.cc b/gr-blocks/lib/file_meta_source_impl.cc
index fb39b205b..42fdabb54 100644
--- a/gr-blocks/lib/file_meta_source_impl.cc
+++ b/gr-blocks/lib/file_meta_source_impl.cc
@@ -26,14 +26,12 @@
 
 #include "file_meta_source_impl.h"
 #include <gr_io_signature.h>
+#include <cstdio>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <stdexcept>
-#include <cstdio>
-
-namespace gr {
-  namespace blocks {
+#include <stdio.h>
 
 // win32 (mingw/msvc) specific
 #ifdef HAVE_IO_H
@@ -52,6 +50,11 @@ namespace gr {
 #define	OUR_O_LARGEFILE 0
 #endif
 
+
+namespace gr {
+  namespace blocks {
+
+
     file_meta_source::sptr
     file_meta_source::make(const std::string &filename,
 			   bool repeat,
diff --git a/gr-blocks/swig/CMakeLists.txt b/gr-blocks/swig/CMakeLists.txt
index fb29789f0..aa5c7bf55 100644
--- a/gr-blocks/swig/CMakeLists.txt
+++ b/gr-blocks/swig/CMakeLists.txt
@@ -24,9 +24,11 @@ include(GrPython)
 include(GrSwig)
 
 set(GR_SWIG_INCLUDE_DIRS
+    ${CMAKE_CURRENT_BINARY_DIR}/../include
     ${GR_BLOCKS_INCLUDE_DIRS}
     ${GNURADIO_CORE_SWIG_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_BINARY_DIR}/../include
+    ${GRUEL_INCLUDE_DIRS}
+    ${Boost_INCLUDE_DIRS}
 )
 
 set(GR_SWIG_DOC_FILE ${CMAKE_CURRENT_BINARY_DIR}/blocks_swig_doc.i)