gr: added API macros for noaa and pager, also renamed the ones for digital and vocoder to be consistent

42 files changed, 202 insertions, 142 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ad5241c7..ba3ff8e2d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,7 +64,7 @@ IF(MSVC)
         -D_CRT_SECURE_NO_DEPRECATE
         -D_CRT_NONSTDC_NO_DEPRECATE
     )
-    LIST(APPEND GR_COMMON_FLAGS_AND_DEFINES -DHAVE_CONFIG_H)
+    ADD_DEFINITIONS(-DHAVE_CONFIG_H)
     ADD_DEFINITIONS(/MP) #build with multiple processors
 ENDIF(MSVC)
 
diff --git a/gnuradio-core/src/lib/CMakeLists.txt b/gnuradio-core/src/lib/CMakeLists.txt
index 060421a9f..3812167e6 100644
--- a/gnuradio-core/src/lib/CMakeLists.txt
+++ b/gnuradio-core/src/lib/CMakeLists.txt
@@ -63,7 +63,6 @@ LIST(APPEND gnuradio_core_libs
     ${FFTW3F_LIBRARIES}
 )
 
-ADD_DEFINITIONS(${GR_COMMON_FLAGS_AND_DEFINES})
 ADD_LIBRARY(gnuradio-core SHARED ${gnuradio_core_sources})
 TARGET_LINK_LIBRARIES(gnuradio-core ${gnuradio_core_libs})
 SET_TARGET_PROPERTIES(gnuradio-core PROPERTIES DEFINE_SYMBOL "gnuradio_core_EXPORTS")
diff --git a/gnuradio-core/src/tests/CMakeLists.txt b/gnuradio-core/src/tests/CMakeLists.txt
index 46f9e630d..1096ab66e 100644
--- a/gnuradio-core/src/tests/CMakeLists.txt
+++ b/gnuradio-core/src/tests/CMakeLists.txt
@@ -21,8 +21,6 @@
 INCLUDE(GrMiscUtils) #check n def
 GR_CHECK_HDR_N_DEF(sys/resource.h HAVE_SYS_RESOURCE_H)
 
-ADD_DEFINITIONS(${GR_COMMON_FLAGS_AND_DEFINES})
-
 ########################################################################
 # Setup the include and linker paths
 ########################################################################
diff --git a/gr-digital/lib/CMakeLists.txt b/gr-digital/lib/CMakeLists.txt
index 4582e23a1..86e082b31 100644
--- a/gr-digital/lib/CMakeLists.txt
+++ b/gr-digital/lib/CMakeLists.txt
@@ -61,7 +61,7 @@ INSTALL(TARGETS gnuradio-digital
 # Install header files
 ########################################################################
 INSTALL(FILES
-    gr_digital_api.h
+    digital_api.h
     digital_constellation.h
     digital_constellation_receiver_cb.h
     digital_constellation_decoder_cb.h
diff --git a/gr-digital/lib/Makefile.am b/gr-digital/lib/Makefile.am
index 8710f946a..1cdb27a38 100644
--- a/gr-digital/lib/Makefile.am
+++ b/gr-digital/lib/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = 				\
-	gr_digital_api.h			\
+	digital_api.h			\
 	digital_constellation.h			\
 	digital_constellation_receiver_cb.h 	\
 	digital_constellation_decoder_cb.h 	\
diff --git a/gr-digital/lib/gr_digital_api.h b/gr-digital/lib/digital_api.h
index 224eba1e3..d45ace13f 100644
--- a/gr-digital/lib/gr_digital_api.h
+++ b/gr-digital/lib/digital_api.h
@@ -19,24 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_DIGITAL_API_H
-#define INCLUDED_GR_DIGITAL_API_H
+#ifndef INCLUDED_DIGITAL_API_H
+#define INCLUDED_DIGITAL_API_H
 
 #include <gruel/attributes.h>
 
-//FIXME
-//I cannot figure out for the life of me
-//why the HAVE_CONFIG_H is not defined for MSVC.
-//But the only things it needs from config.h is M_PI,
-//so just define it here and give up for now...
-#ifdef _MSC_VER
-#define M_PI 3.141592653589793238462643
-#endif
-
 #ifdef gnuradio_digital_EXPORTS
-#  define GR_DIGITAL_API __GR_ATTR_EXPORT
+#  define DIGITAL_API __GR_ATTR_EXPORT
 #else
-#  define GR_DIGITAL_API __GR_ATTR_IMPORT
+#  define DIGITAL_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GR_DIGITAL_API_H */
+#endif /* INCLUDED_DIGITAL_API_H */
diff --git a/gr-digital/lib/digital_cma_equalizer_cc.h b/gr-digital/lib/digital_cma_equalizer_cc.h
index 83736b7f9..69e2f657a 100644
--- a/gr-digital/lib/digital_cma_equalizer_cc.h
+++ b/gr-digital/lib/digital_cma_equalizer_cc.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
 #define	INCLUDED_DIGITAL_CMA_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <gr_math.h>
 #include <iostream>
@@ -31,7 +31,7 @@
 class digital_cma_equalizer_cc;
 typedef boost::shared_ptr<digital_cma_equalizer_cc> digital_cma_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_cma_equalizer_cc_sptr 
+DIGITAL_API digital_cma_equalizer_cc_sptr 
 digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
 
 /*!
@@ -44,13 +44,13 @@ digital_make_cma_equalizer_cc(int num_taps, float modulus, float mu, int sps);
  * Two-Dimensional Data Communication Systems," IEEE Transactions on
  * Communications, Vol. 28, No. 11, pp. 1867 - 1875, 1980,
  */
-class GR_DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_cma_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
   float d_modulus;
   float d_mu;
   
-  friend GR_DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
+  friend DIGITAL_API digital_cma_equalizer_cc_sptr digital_make_cma_equalizer_cc(int num_taps,
 								     float modulus,
 								     float mu,
 								     int sps);
diff --git a/gr-digital/lib/digital_constellation.h b/gr-digital/lib/digital_constellation.h
index 8cf4087ca..df00f3898 100644
--- a/gr-digital/lib/digital_constellation.h
+++ b/gr-digital/lib/digital_constellation.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_H
 #define	INCLUDED_DIGITAL_CONSTELLATION_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <vector>
 #include <math.h>
 #include <gr_complex.h>
@@ -39,7 +39,7 @@
 class digital_constellation;
 typedef boost::shared_ptr<digital_constellation> digital_constellation_sptr;
 
-class GR_DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
+class DIGITAL_API digital_constellation : public boost::enable_shared_from_this<digital_constellation>
 {
 public:
   digital_constellation (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
@@ -119,12 +119,12 @@ class digital_constellation_calcdist;
 typedef boost::shared_ptr<digital_constellation_calcdist> digital_constellation_calcdist_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_calcdist_sptr
+DIGITAL_API digital_constellation_calcdist_sptr
 digital_make_constellation_calcdist (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 				     unsigned int rotational_symmetry, unsigned int dimensionality);
 
 
-class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellation
+class DIGITAL_API digital_constellation_calcdist : public digital_constellation
 {
  public:
   digital_constellation_calcdist (std::vector<gr_complex> constellation,
@@ -137,7 +137,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati
   // void calc_hard_symbol_metric(gr_complex *sample, float *metric);
   
  private:
-  friend GR_DIGITAL_API digital_constellation_calcdist_sptr
+  friend DIGITAL_API digital_constellation_calcdist_sptr
   digital_make_constellation_calcdist (std::vector<gr_complex> constellation);
 };
 
@@ -150,7 +150,7 @@ class GR_DIGITAL_API digital_constellation_calcdist : public digital_constellati
 /* point.                                                   */
 /************************************************************/
 
-class GR_DIGITAL_API digital_constellation_sector : public digital_constellation
+class DIGITAL_API digital_constellation_sector : public digital_constellation
 {
  public:
 
@@ -193,13 +193,13 @@ class digital_constellation_rect;
 typedef boost::shared_ptr<digital_constellation_rect> digital_constellation_rect_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_rect_sptr 
+DIGITAL_API digital_constellation_rect_sptr 
 digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 			    unsigned int rotational_symmetry,
 			    unsigned int real_sectors, unsigned int imag_sectors,
 			    float width_real_sectors, float width_imag_sectors);
 
-class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_sector
+class DIGITAL_API digital_constellation_rect : public digital_constellation_sector
 {
  public:
 
@@ -221,7 +221,7 @@ class GR_DIGITAL_API digital_constellation_rect : public digital_constellation_s
   float d_width_real_sectors;
   float d_width_imag_sectors;
 
-  friend GR_DIGITAL_API digital_constellation_rect_sptr
+  friend DIGITAL_API digital_constellation_rect_sptr
   digital_make_constellation_rect (std::vector<gr_complex> constellation, std::vector<unsigned int> pre_diff_code,
 			      unsigned int rotational_symmetry,
 			      unsigned int real_sectors, unsigned int imag_sectors,
@@ -243,12 +243,12 @@ class digital_constellation_psk;
 typedef boost::shared_ptr<digital_constellation_psk> digital_constellation_psk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_psk_sptr 
+DIGITAL_API digital_constellation_psk_sptr 
 digital_make_constellation_psk (std::vector<gr_complex> constellation,
 				std::vector<unsigned int> pre_diff_code,
 				unsigned int n_sectors);
 
-class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_sector
+class DIGITAL_API digital_constellation_psk : public digital_constellation_sector
 {
  public:
 
@@ -264,7 +264,7 @@ class GR_DIGITAL_API digital_constellation_psk : public digital_constellation_se
 
  private:
 
-  friend GR_DIGITAL_API digital_constellation_psk_sptr
+  friend DIGITAL_API digital_constellation_psk_sptr
   digital_make_constellation_psk (std::vector<gr_complex> constellation,
 				  std::vector<unsigned int> pre_diff_code,
 				  unsigned int n_sectors);
@@ -282,17 +282,17 @@ class digital_constellation_bpsk;
 typedef boost::shared_ptr<digital_constellation_bpsk> digital_constellation_bpsk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_bpsk_sptr 
+DIGITAL_API digital_constellation_bpsk_sptr 
 digital_make_constellation_bpsk ();
 
-class GR_DIGITAL_API digital_constellation_bpsk : public digital_constellation
+class DIGITAL_API digital_constellation_bpsk : public digital_constellation
 {
  public:
 
   digital_constellation_bpsk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_bpsk_sptr
+  friend DIGITAL_API digital_constellation_bpsk_sptr
   digital_make_constellation_bpsk ();
   
 };
@@ -308,17 +308,17 @@ class digital_constellation_qpsk;
 typedef boost::shared_ptr<digital_constellation_qpsk> digital_constellation_qpsk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_qpsk_sptr 
+DIGITAL_API digital_constellation_qpsk_sptr 
 digital_make_constellation_qpsk ();
 
-class GR_DIGITAL_API digital_constellation_qpsk : public digital_constellation
+class DIGITAL_API digital_constellation_qpsk : public digital_constellation
 {
  public:
 
   digital_constellation_qpsk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_qpsk_sptr
+  friend DIGITAL_API digital_constellation_qpsk_sptr
   digital_make_constellation_qpsk ();
   
 };
@@ -335,17 +335,17 @@ class digital_constellation_8psk;
 typedef boost::shared_ptr<digital_constellation_8psk> digital_constellation_8psk_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_8psk_sptr 
+DIGITAL_API digital_constellation_8psk_sptr 
 digital_make_constellation_8psk ();
 
-class GR_DIGITAL_API digital_constellation_8psk : public digital_constellation
+class DIGITAL_API digital_constellation_8psk : public digital_constellation
 {
  public:
 
   digital_constellation_8psk ();
   unsigned int decision_maker (const gr_complex *sample);
 
-  friend GR_DIGITAL_API digital_constellation_8psk_sptr
+  friend DIGITAL_API digital_constellation_8psk_sptr
   digital_make_constellation_8psk ();
   
 };
diff --git a/gr-digital/lib/digital_constellation_decoder_cb.h b/gr-digital/lib/digital_constellation_decoder_cb.h
index 2b3a0e79c..1ce01fe12 100644
--- a/gr-digital/lib/digital_constellation_decoder_cb.h
+++ b/gr-digital/lib/digital_constellation_decoder_cb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 #define INCLUDED_DIGITAL_CONSTELLATION_DECODER_CB_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_block.h>
 #include <digital_constellation.h>
 #include <vector>
@@ -31,7 +31,7 @@
 class digital_constellation_decoder_cb;
 typedef boost::shared_ptr<digital_constellation_decoder_cb>digital_constellation_decoder_cb_sptr;
 
-GR_DIGITAL_API digital_constellation_decoder_cb_sptr 
+DIGITAL_API digital_constellation_decoder_cb_sptr 
 digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
 
 /*!
@@ -39,14 +39,14 @@ digital_make_constellation_decoder_cb (digital_constellation_sptr constellation)
  * \ingroup coding_blk
  *
  */
-class GR_DIGITAL_API digital_constellation_decoder_cb : public gr_block
+class DIGITAL_API digital_constellation_decoder_cb : public gr_block
 {
 
  private:
   digital_constellation_sptr d_constellation;
   unsigned int d_dim;
 
-  friend GR_DIGITAL_API digital_constellation_decoder_cb_sptr 
+  friend DIGITAL_API digital_constellation_decoder_cb_sptr 
   digital_make_constellation_decoder_cb (digital_constellation_sptr constellation);
   
   digital_constellation_decoder_cb (digital_constellation_sptr constellation);
diff --git a/gr-digital/lib/digital_constellation_receiver_cb.h b/gr-digital/lib/digital_constellation_receiver_cb.h
index 74b1ed748..36169d76b 100644
--- a/gr-digital/lib/digital_constellation_receiver_cb.h
+++ b/gr-digital/lib/digital_constellation_receiver_cb.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 #define	INCLUDED_DIGITAL_CONSTELLATION_RECEIVER_CB_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gruel/attributes.h>
 #include <gr_block.h>
 #include <digital_constellation.h>
@@ -35,7 +35,7 @@ class digital_constellation_receiver_cb;
 typedef boost::shared_ptr<digital_constellation_receiver_cb> digital_constellation_receiver_cb_sptr;
 
 // public constructor
-GR_DIGITAL_API digital_constellation_receiver_cb_sptr 
+DIGITAL_API digital_constellation_receiver_cb_sptr 
 digital_make_constellation_receiver_cb (digital_constellation_sptr constellation,
 					float alpha, float beta,
 					float fmin, float fmax);
@@ -66,7 +66,7 @@ digital_make_constellation_receiver_cb (digital_constellation_sptr constellation
  *
  */
 
-class GR_DIGITAL_API digital_constellation_receiver_cb : public gr_block
+class DIGITAL_API digital_constellation_receiver_cb : public gr_block
 {
  public:
   int general_work (int noutput_items,
@@ -142,7 +142,7 @@ protected:
   //! index to delay line
   unsigned int d_dl_idx;
 
-  friend GR_DIGITAL_API digital_constellation_receiver_cb_sptr
+  friend DIGITAL_API digital_constellation_receiver_cb_sptr
   digital_make_constellation_receiver_cb (digital_constellation_sptr constell,
 					  float alpha, float beta,
 					  float fmin, float fmax);
diff --git a/gr-digital/lib/digital_costas_loop_cc.h b/gr-digital/lib/digital_costas_loop_cc.h
index 61f1a3387..099fca3be 100644
--- a/gr-digital/lib/digital_costas_loop_cc.h
+++ b/gr-digital/lib/digital_costas_loop_cc.h
@@ -24,7 +24,7 @@
 #ifndef INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 #define INCLUDED_DIGITAL_COSTAS_LOOP_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_sync_block.h>
 #include <stdexcept>
 #include <fstream>
@@ -58,7 +58,7 @@ class digital_costas_loop_cc;
 typedef boost::shared_ptr<digital_costas_loop_cc> digital_costas_loop_cc_sptr;
 
 
-GR_DIGITAL_API digital_costas_loop_cc_sptr 
+DIGITAL_API digital_costas_loop_cc_sptr 
 digital_make_costas_loop_cc (float damping, float nat_freq,
 			     int order
 			     ) throw (std::invalid_argument);
@@ -74,9 +74,9 @@ digital_make_costas_loop_cc (float damping, float nat_freq,
  *
  * \p order must be 2 or 4.
  */
-class GR_DIGITAL_API digital_costas_loop_cc : public gr_sync_block
+class DIGITAL_API digital_costas_loop_cc : public gr_sync_block
 {
-  friend GR_DIGITAL_API digital_costas_loop_cc_sptr
+  friend DIGITAL_API digital_costas_loop_cc_sptr
   digital_make_costas_loop_cc (float damping, float nat_freq,
 			       int order
 			       ) throw (std::invalid_argument);
diff --git a/gr-digital/lib/digital_kurtotic_equalizer_cc.h b/gr-digital/lib/digital_kurtotic_equalizer_cc.h
index 4363ce282..c07862e11 100644
--- a/gr-digital/lib/digital_kurtotic_equalizer_cc.h
+++ b/gr-digital/lib/digital_kurtotic_equalizer_cc.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
 #define	INCLUDED_DIGITAL_KURTOTIC_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <gr_math.h>
 #include <iostream>
@@ -31,7 +31,7 @@
 class digital_kurtotic_equalizer_cc;
 typedef boost::shared_ptr<digital_kurtotic_equalizer_cc> digital_kurtotic_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_kurtotic_equalizer_cc_sptr 
+DIGITAL_API digital_kurtotic_equalizer_cc_sptr 
 digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
 
 /*!
@@ -42,7 +42,7 @@ digital_make_kurtotic_equalizer_cc(int num_taps, float mu);
  * equalization algorithm," IEEE Conf. on Control, Automation,
  * Robotics and Vision, Vol. 3, Dec. 2004, pp. 2052 - 2057.
  */
-class GR_DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_kurtotic_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
   float d_mu;
@@ -50,7 +50,7 @@ private:
   gr_complex d_q, d_u;
   float d_alpha_p, d_alpha_q, d_alpha_m;
   
-  friend GR_DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
+  friend DIGITAL_API digital_kurtotic_equalizer_cc_sptr digital_make_kurtotic_equalizer_cc(int num_taps,
 									       float mu);
   digital_kurtotic_equalizer_cc(int num_taps, float mu);
 
diff --git a/gr-digital/lib/digital_lms_dd_equalizer_cc.h b/gr-digital/lib/digital_lms_dd_equalizer_cc.h
index d07f5d7d3..edfa18e23 100644
--- a/gr-digital/lib/digital_lms_dd_equalizer_cc.h
+++ b/gr-digital/lib/digital_lms_dd_equalizer_cc.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
 #define INCLUDED_DIGITAL_LMS_DD_EQUALIZER_CC_H
 
-#include <gr_digital_api.h>
+#include <digital_api.h>
 #include <gr_adaptive_fir_ccc.h>
 #include <digital_constellation.h>
 
 class digital_lms_dd_equalizer_cc;
 typedef boost::shared_ptr<digital_lms_dd_equalizer_cc> digital_lms_dd_equalizer_cc_sptr;
 
-GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
 								   float mu, int sps,
 								   digital_constellation_sptr cnst);
 								   
@@ -66,10 +66,10 @@ GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc
  *    Prentice Hall, 1996.
  *
  */
-class GR_DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
+class DIGITAL_API digital_lms_dd_equalizer_cc : public gr_adaptive_fir_ccc
 {
 private:
-  friend GR_DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
+  friend DIGITAL_API digital_lms_dd_equalizer_cc_sptr digital_make_lms_dd_equalizer_cc (int num_taps,
 									    float mu, int sps,
 									    digital_constellation_sptr cnst);
   
diff --git a/gr-noaa/CMakeLists.txt b/gr-noaa/CMakeLists.txt
index a5f3eae30..7a6ad4b5e 100644
--- a/gr-noaa/CMakeLists.txt
+++ b/gr-noaa/CMakeLists.txt
@@ -27,13 +27,10 @@ INCLUDE(GrBoost)
 ########################################################################
 INCLUDE(GrComponent)
 GR_REGISTER_COMPONENT("gr-noaa" ENABLE_GR_NOAA
-    UNIX #FIXME until we get MSVC working
     Boost_FOUND
     ENABLE_GR_CORE_
 )
 
-REMOVE_DEFINITIONS(-fvisibility=hidden) #FIXME until we do symbol visibility
-
 GR_SET_GLOBAL(GR_NOAA_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
diff --git a/gr-noaa/lib/CMakeLists.txt b/gr-noaa/lib/CMakeLists.txt
index 41c973419..2388a450e 100644
--- a/gr-noaa/lib/CMakeLists.txt
+++ b/gr-noaa/lib/CMakeLists.txt
@@ -57,6 +57,7 @@ INSTALL(TARGETS gnuradio-noaa
 # Install header files
 ########################################################################
 INSTALL(FILES
+    noaa_api.h
     noaa_hrpt_decoder.h
     noaa_hrpt_deframer.h
     noaa_hrpt_pll_cf.h
diff --git a/gr-noaa/lib/Makefile.am b/gr-noaa/lib/Makefile.am
index ba660a398..8eedbbb18 100644
--- a/gr-noaa/lib/Makefile.am
+++ b/gr-noaa/lib/Makefile.am
@@ -42,6 +42,7 @@ libgnuradio_noaa_la_LIBADD = \
 libgnuradio_noaa_la_LDFLAGS = $(NO_UNDEFINED) $(LTVERSIONFLAGS)
 
 grinclude_HEADERS = \
+	noaa_api.h \
 	noaa_hrpt_decoder.h \
 	noaa_hrpt_deframer.h \
 	noaa_hrpt_pll_cf.h
diff --git a/gr-noaa/lib/noaa_api.h b/gr-noaa/lib/noaa_api.h
new file mode 100644
index 000000000..d3c3fbf2d
--- /dev/null
+++ b/gr-noaa/lib/noaa_api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_NOAA_API_H
+#define INCLUDED_NOAA_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_noaa_EXPORTS
+#  define NOAA_API __GR_ATTR_EXPORT
+#else
+#  define NOAA_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_NOAA_API_H */
diff --git a/gr-noaa/lib/noaa_hrpt_decoder.h b/gr-noaa/lib/noaa_hrpt_decoder.h
index 9d67d7108..4db09106e 100644
--- a/gr-noaa/lib/noaa_hrpt_decoder.h
+++ b/gr-noaa/lib/noaa_hrpt_decoder.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_DECODER_H
 #define INCLUDED_NOAA_HRPT_DECODER_H
 
+#include <noaa_api.h>
 #include <gr_sync_block.h>
 
 class noaa_hrpt_decoder;
 typedef boost::shared_ptr<noaa_hrpt_decoder> noaa_hrpt_decoder_sptr;
 
-noaa_hrpt_decoder_sptr
+NOAA_API noaa_hrpt_decoder_sptr
 noaa_make_hrpt_decoder(bool verbose, bool output_files);
 
-class noaa_hrpt_decoder : public gr_sync_block
+class NOAA_API noaa_hrpt_decoder : public gr_sync_block
 {
-  friend noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files);
+  friend NOAA_API noaa_hrpt_decoder_sptr noaa_make_hrpt_decoder(bool verbose, bool output_files);
   noaa_hrpt_decoder(bool verbose, bool output_files);
 
   // Configuration
diff --git a/gr-noaa/lib/noaa_hrpt_deframer.h b/gr-noaa/lib/noaa_hrpt_deframer.h
index b11d0fa2b..d254746af 100644
--- a/gr-noaa/lib/noaa_hrpt_deframer.h
+++ b/gr-noaa/lib/noaa_hrpt_deframer.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_DEFRAMER_H
 #define INCLUDED_NOAA_HRPT_DEFRAMER_H
 
+#include <noaa_api.h>
 #include <gr_block.h>
 
 class noaa_hrpt_deframer;
 typedef boost::shared_ptr<noaa_hrpt_deframer> noaa_hrpt_deframer_sptr;
 
-noaa_hrpt_deframer_sptr
+NOAA_API noaa_hrpt_deframer_sptr
 noaa_make_hrpt_deframer();
 
-class noaa_hrpt_deframer : public gr_block
+class NOAA_API noaa_hrpt_deframer : public gr_block
 {
-  friend noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer();
+  friend NOAA_API noaa_hrpt_deframer_sptr noaa_make_hrpt_deframer();
   noaa_hrpt_deframer();
 
   unsigned int       d_state;
diff --git a/gr-noaa/lib/noaa_hrpt_pll_cf.h b/gr-noaa/lib/noaa_hrpt_pll_cf.h
index 507d47fe7..8d3e8f8d5 100644
--- a/gr-noaa/lib/noaa_hrpt_pll_cf.h
+++ b/gr-noaa/lib/noaa_hrpt_pll_cf.h
@@ -23,17 +23,18 @@
 #ifndef INCLUDED_NOAA_HRPT_PLL_CF_H
 #define INCLUDED_NOAA_HRPT_PLL_CF_H
 
+#include <noaa_api.h>
 #include <gr_sync_block.h>
 
 class noaa_hrpt_pll_cf;
 typedef boost::shared_ptr<noaa_hrpt_pll_cf> noaa_hrpt_pll_cf_sptr;
 
-noaa_hrpt_pll_cf_sptr
+NOAA_API noaa_hrpt_pll_cf_sptr
 noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
 
-class noaa_hrpt_pll_cf : public gr_sync_block
+class NOAA_API noaa_hrpt_pll_cf : public gr_sync_block
 {
-  friend noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
+  friend NOAA_API noaa_hrpt_pll_cf_sptr noaa_make_hrpt_pll_cf(float alpha, float beta, float max_offset);
   noaa_hrpt_pll_cf(float alpha, float beta, float max_offset);
 
   float d_alpha;		// 1st order loop constant
diff --git a/gr-pager/CMakeLists.txt b/gr-pager/CMakeLists.txt
index e5c3a3396..b138acc38 100644
--- a/gr-pager/CMakeLists.txt
+++ b/gr-pager/CMakeLists.txt
@@ -27,13 +27,10 @@ INCLUDE(GrBoost)
 ########################################################################
 INCLUDE(GrComponent)
 GR_REGISTER_COMPONENT("gr-pager" ENABLE_GR_PAGER
-    UNIX #FIXME until we get MSVC working
     Boost_FOUND
     ENABLE_GR_CORE_
 )
 
-REMOVE_DEFINITIONS(-fvisibility=hidden) #FIXME until we do symbol visibility
-
 GR_SET_GLOBAL(GR_PAGER_INCLUDE_DIRS
     ${CMAKE_CURRENT_SOURCE_DIR}/lib
 )
diff --git a/gr-pager/lib/CMakeLists.txt b/gr-pager/lib/CMakeLists.txt
index 40aec57c8..c797f733b 100644
--- a/gr-pager/lib/CMakeLists.txt
+++ b/gr-pager/lib/CMakeLists.txt
@@ -62,6 +62,7 @@ INSTALL(TARGETS gnuradio-pager
 # Install header files
 ########################################################################
 INSTALL(FILES
+    pager_api.h
     pager_slicer_fb.h
     pager_flex_sync.h
     pager_flex_deinterleave.h
diff --git a/gr-pager/lib/Makefile.am b/gr-pager/lib/Makefile.am
index 29c82ebe8..b6131171d 100644
--- a/gr-pager/lib/Makefile.am
+++ b/gr-pager/lib/Makefile.am
@@ -25,6 +25,7 @@ AM_CPPFLAGS = $(STD_DEFINES_AND_INCLUDES) $(PYTHON_CPPFLAGS) $(WITH_INCLUDES)
 
 # These headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
+	pager_api.h \
 	pager_slicer_fb.h \
 	pager_flex_sync.h \
 	pager_flex_deinterleave.h \
diff --git a/gr-pager/lib/pager_api.h b/gr-pager/lib/pager_api.h
new file mode 100644
index 000000000..4312c5ae3
--- /dev/null
+++ b/gr-pager/lib/pager_api.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2011 Free Software Foundation, Inc.
+ *
+ * This file is part of GNU Radio
+ *
+ * GNU Radio is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3, or (at your option)
+ * any later version.
+ *
+ * GNU Radio is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with GNU Radio; see the file COPYING.  If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef INCLUDED_PAGER_API_H
+#define INCLUDED_PAGER_API_H
+
+#include <gruel/attributes.h>
+
+#ifdef gnuradio_pager_EXPORTS
+#  define PAGER_API __GR_ATTR_EXPORT
+#else
+#  define PAGER_API __GR_ATTR_IMPORT
+#endif
+
+#endif /* INCLUDED_PAGER_API_H */
diff --git a/gr-pager/lib/pager_flex_deinterleave.h b/gr-pager/lib/pager_flex_deinterleave.h
index 7211a71ad..87094490d 100644
--- a/gr-pager/lib/pager_flex_deinterleave.h
+++ b/gr-pager/lib/pager_flex_deinterleave.h
@@ -22,23 +22,24 @@
 #ifndef INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
 #define INCLUDED_PAGER_FLEX_DEINTERLEAVE_H
 
+#include <pager_api.h>
 #include <gr_sync_decimator.h>
 
 class pager_flex_deinterleave;
 typedef boost::shared_ptr<pager_flex_deinterleave> pager_flex_deinterleave_sptr;
 
-pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+PAGER_API pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
 
 /*!
  * \brief flex deinterleave description
  * \ingroup pager_blk
  */
 
-class pager_flex_deinterleave : public gr_sync_decimator
+class PAGER_API pager_flex_deinterleave : public gr_sync_decimator
 {
 private:
     // Constructors
-    friend pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
+    friend PAGER_API pager_flex_deinterleave_sptr pager_make_flex_deinterleave();
     pager_flex_deinterleave();
 
     // One FLEX block of deinterleaved data
diff --git a/gr-pager/lib/pager_flex_frame.h b/gr-pager/lib/pager_flex_frame.h
index 1f4999e2b..857b49d29 100644
--- a/gr-pager/lib/pager_flex_frame.h
+++ b/gr-pager/lib/pager_flex_frame.h
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_PAGER_FLEX_FRAME_H
 #define INCLUDED_PAGER_FLEX_FRAME_H
 
+#include <pager_api.h>
 #include <boost/shared_ptr.hpp>
 
 class pager_flex_frame;
@@ -29,15 +30,15 @@ typedef boost::shared_ptr<pager_flex_frame> pager_flex_frame_sptr;
 /*!
  * \brief public constructor for pager_flex_frame
  */
-pager_flex_frame_sptr pager_make_flex_frame();
+PAGER_API pager_flex_frame_sptr pager_make_flex_frame();
 
 /*!
  * \brief flex_frame.
  */
-class pager_flex_frame {
+class PAGER_API pager_flex_frame {
     // Constructor is private to force use of shared_ptr
     pager_flex_frame();
-    friend pager_flex_frame_sptr pager_make_flex_frame();
+    friend PAGER_API pager_flex_frame_sptr pager_make_flex_frame();
 
 public:
     ~pager_flex_frame();
diff --git a/gr-pager/lib/pager_flex_parse.h b/gr-pager/lib/pager_flex_parse.h
index 0f7cfb370..dcbd19eae 100644
--- a/gr-pager/lib/pager_flex_parse.h
+++ b/gr-pager/lib/pager_flex_parse.h
@@ -22,6 +22,7 @@
 #ifndef INCLUDED_PAGER_FLEX_PARSE_H
 #define INCLUDED_PAGER_FLEX_PARSE_H
 
+#include <pager_api.h>
 #include <gr_sync_block.h>
 #include <gr_msg_queue.h>
 #include <pageri_flex_modes.h>
@@ -30,7 +31,7 @@
 class pager_flex_parse;
 typedef boost::shared_ptr<pager_flex_parse> pager_flex_parse_sptr;
 
-pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+PAGER_API pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
 
 #define FIELD_DELIM ((unsigned char)128)
 
@@ -38,11 +39,11 @@ pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq)
  * \brief flex parse description
  * \ingroup pager_blk
  */
-class pager_flex_parse : public gr_sync_block
+class PAGER_API pager_flex_parse : public gr_sync_block
 {
 private:
     // Constructors
-    friend pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
+    friend PAGER_API pager_flex_parse_sptr pager_make_flex_parse(gr_msg_queue_sptr queue, float freq);
     pager_flex_parse(gr_msg_queue_sptr queue, float freq);
 
     std::ostringstream d_payload;
diff --git a/gr-pager/lib/pager_flex_sync.h b/gr-pager/lib/pager_flex_sync.h
index b401bf532..53b6f950a 100644
--- a/gr-pager/lib/pager_flex_sync.h
+++ b/gr-pager/lib/pager_flex_sync.h
@@ -22,24 +22,25 @@
 #ifndef INCLUDED_PAGER_FLEX_SYNC_H
 #define INCLUDED_PAGER_FLEX_SYNC_H
 
+#include <pager_api.h>
 #include <gr_block.h>
 
 class pager_flex_sync;
 typedef boost::shared_ptr<pager_flex_sync> pager_flex_sync_sptr;
 typedef std::vector<gr_int64> gr_int64_vector;
 
-pager_flex_sync_sptr pager_make_flex_sync();
+PAGER_API pager_flex_sync_sptr pager_make_flex_sync();
 
 /*!
  * \brief flex sync description
  * \ingroup pager_blk
  */
 
-class pager_flex_sync : public gr_block
+class PAGER_API pager_flex_sync : public gr_block
 {
 private:
     // Constructors
-    friend pager_flex_sync_sptr pager_make_flex_sync();
+    friend PAGER_API pager_flex_sync_sptr pager_make_flex_sync();
     pager_flex_sync();
    
     // State machine transitions
diff --git a/gr-pager/lib/pager_slicer_fb.h b/gr-pager/lib/pager_slicer_fb.h
index 75eea3cd3..b3d92780f 100644
--- a/gr-pager/lib/pager_slicer_fb.h
+++ b/gr-pager/lib/pager_slicer_fb.h
@@ -22,21 +22,22 @@
 #ifndef INCLUDED_PAGER_SLICER_FB_H
 #define INCLUDED_PAGER_SLICER_FB_H
 
+#include <pager_api.h>
 #include <gr_sync_block.h>
 
 class pager_slicer_fb;
 typedef boost::shared_ptr<pager_slicer_fb> pager_slicer_fb_sptr;
 
-pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
+PAGER_API pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
 
 /*!
  * \brief slicer description
  * \ingroup pager_blk
  */
-class pager_slicer_fb : public gr_sync_block
+class PAGER_API pager_slicer_fb : public gr_sync_block
 {
 private:
-    friend pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
+    friend PAGER_API pager_slicer_fb_sptr pager_make_slicer_fb(float alpha);
     pager_slicer_fb(float alpha);
 
     unsigned char slice(float sample);
diff --git a/gr-vocoder/include/CMakeLists.txt b/gr-vocoder/include/CMakeLists.txt
index 5cbe938b0..437074494 100644
--- a/gr-vocoder/include/CMakeLists.txt
+++ b/gr-vocoder/include/CMakeLists.txt
@@ -21,7 +21,7 @@
 # Install header files
 ########################################################################
 INSTALL(FILES
-    gr_vocoder_api.h
+    vocoder_api.h
     vocoder_alaw_decode_bs.h
     vocoder_alaw_encode_sb.h
     vocoder_codec2_decode_ps.h
diff --git a/gr-vocoder/include/Makefile.am b/gr-vocoder/include/Makefile.am
index 83960ef24..e25340b32 100644
--- a/gr-vocoder/include/Makefile.am
+++ b/gr-vocoder/include/Makefile.am
@@ -23,7 +23,7 @@ include $(top_srcdir)/Makefile.common
 
 # C/C++ headers get installed in ${prefix}/include/gnuradio
 grinclude_HEADERS = \
-	gr_vocoder_api.h \
+	vocoder_api.h \
 	vocoder_alaw_decode_bs.h \
 	vocoder_alaw_encode_sb.h \
 	vocoder_codec2_decode_ps.h \
diff --git a/gr-vocoder/include/vocoder_alaw_decode_bs.h b/gr-vocoder/include/vocoder_alaw_decode_bs.h
index 250b4eb4f..f20dfefdb 100644
--- a/gr-vocoder/include/vocoder_alaw_decode_bs.h
+++ b/gr-vocoder/include/vocoder_alaw_decode_bs.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_VOCODER_ALAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ALAW_DECODE_BS_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_alaw_decode_bs;
 
 typedef boost::shared_ptr<vocoder_alaw_decode_bs> vocoder_alaw_decode_bs_sptr;
 
-GR_VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
+VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
 
 /*!
  * \brief This block performs alaw audio decoding. 
@@ -38,10 +38,10 @@ GR_VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
  * \ingroup vocoder_blk
  */
 
-class GR_VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block
+class VOCODER_API vocoder_alaw_decode_bs : public gr_sync_block
 {
 private:
-  friend GR_VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
+  friend VOCODER_API vocoder_alaw_decode_bs_sptr vocoder_make_alaw_decode_bs();
 
   vocoder_alaw_decode_bs();
 
diff --git a/gr-vocoder/include/vocoder_alaw_encode_sb.h b/gr-vocoder/include/vocoder_alaw_encode_sb.h
index 9c20b639c..c00080fb7 100644
--- a/gr-vocoder/include/vocoder_alaw_encode_sb.h
+++ b/gr-vocoder/include/vocoder_alaw_encode_sb.h
@@ -23,24 +23,24 @@
 #ifndef INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ALAW_ENCODER_SB_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_alaw_encode_sb;
 
 typedef boost::shared_ptr<vocoder_alaw_encode_sb> vocoder_alaw_encode_sb_sptr;
 
-GR_VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
+VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
 
 /*!
  * \brief This block performs g.711 alaw audio encoding. 
  *
  * \ingroup vocoder_blk
  */
-class GR_VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block
+class VOCODER_API vocoder_alaw_encode_sb : public gr_sync_block
 {
 private:
-  friend GR_VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
+  friend VOCODER_API vocoder_alaw_encode_sb_sptr vocoder_make_alaw_encode_sb();
 
   vocoder_alaw_encode_sb();
 
diff --git a/gr-vocoder/include/gr_vocoder_api.h b/gr-vocoder/include/vocoder_api.h
index d32db3c6c..331cf5d0b 100644
--- a/gr-vocoder/include/gr_vocoder_api.h
+++ b/gr-vocoder/include/vocoder_api.h
@@ -19,15 +19,15 @@
  * Boston, MA 02110-1301, USA.
  */
 
-#ifndef INCLUDED_GR_VOCODER_API_H
-#define INCLUDED_GR_VOCODER_API_H
+#ifndef INCLUDED_VOCODER_API_H
+#define INCLUDED_VOCODER_API_H
 
 #include <gruel/attributes.h>
 
 #ifdef gnuradio_vocoder_EXPORTS
-#  define GR_VOCODER_API __GR_ATTR_EXPORT
+#  define VOCODER_API __GR_ATTR_EXPORT
 #else
-#  define GR_VOCODER_API __GR_ATTR_IMPORT
+#  define VOCODER_API __GR_ATTR_IMPORT
 #endif
 
-#endif /* INCLUDED_GR_VOCODER_API_H */
+#endif /* INCLUDED_VOCODER_API_H */
diff --git a/gr-vocoder/include/vocoder_codec2_decode_ps.h b/gr-vocoder/include/vocoder_codec2_decode_ps.h
index 26115bd13..7e7ea2d5c 100644
--- a/gr-vocoder/include/vocoder_codec2_decode_ps.h
+++ b/gr-vocoder/include/vocoder_codec2_decode_ps.h
@@ -22,22 +22,22 @@
 #ifndef INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 #define INCLUDED_VOCODER_CODEC2_DECODE_PS_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_interpolator.h>
 
 class vocoder_codec2_decode_ps;
 typedef boost::shared_ptr<vocoder_codec2_decode_ps> vocoder_codec2_decode_ps_sptr;
 
-GR_VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
 
 /*!
  * \brief CODEC2 Vocoder Decoder
  * \ingroup vocoder_blk
  */
-class GR_VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator {
+class VOCODER_API vocoder_codec2_decode_ps : public gr_sync_interpolator {
   void *d_codec2;
 
-  friend GR_VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
+  friend VOCODER_API vocoder_codec2_decode_ps_sptr vocoder_make_codec2_decode_ps ();
   vocoder_codec2_decode_ps ();
 
 public:
diff --git a/gr-vocoder/include/vocoder_codec2_encode_sp.h b/gr-vocoder/include/vocoder_codec2_encode_sp.h
index 486e5b636..8d8588daf 100644
--- a/gr-vocoder/include/vocoder_codec2_encode_sp.h
+++ b/gr-vocoder/include/vocoder_codec2_encode_sp.h
@@ -22,22 +22,22 @@
 #ifndef INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 #define INCLUDED_VOCODER_CODEC2_ENCODE_SP_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_decimator.h>
 
 class vocoder_codec2_encode_sp;
 typedef boost::shared_ptr<vocoder_codec2_encode_sp> vocoder_codec2_encode_sp_sptr;
 
-GR_VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
+VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
 
 /*!
  * \brief CODEC2 Vocoder Encoder
  * \ingroup vocoder_blk
  */
-class GR_VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator {
+class VOCODER_API vocoder_codec2_encode_sp : public gr_sync_decimator {
   void *d_codec2;
 
-  friend GR_VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
+  friend VOCODER_API vocoder_codec2_encode_sp_sptr vocoder_make_codec2_encode_sp ();
   vocoder_codec2_encode_sp ();
 
 public:
diff --git a/gr-vocoder/include/vocoder_cvsd_decode_bs.h b/gr-vocoder/include/vocoder_cvsd_decode_bs.h
index 48b92d8cf..1204e298b 100644
--- a/gr-vocoder/include/vocoder_cvsd_decode_bs.h
+++ b/gr-vocoder/include/vocoder_cvsd_decode_bs.h
@@ -23,7 +23,7 @@
 #ifndef INCLUDED_VOCODER_CVSD_DECODE_BS_H
 #define INCLUDED_VOCODER_CVSD_DECODE_BS_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_interpolator.h>
 
 class vocoder_cvsd_decode_bs;
@@ -45,7 +45,7 @@ typedef boost::shared_ptr<vocoder_cvsd_decode_bs> vocoder_cvsd_decode_bs_sptr;
   * \param neg_accum_max  Minimum integer value allowed for the internal reference.  Default: "-32767" (-2^15 + 1 or MINSHORT+1)
   *
   */
-GR_VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10,
+VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step=10,
 							 short max_step=1280,
 							 double step_decay=0.9990234375,
 							 double accum_decay= 0.96875,
@@ -106,10 +106,10 @@ GR_VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short mi
  *
  */
 
-class GR_VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator
+class VOCODER_API vocoder_cvsd_decode_bs : public gr_sync_interpolator
 {
 private:
-  friend GR_VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step,
+  friend VOCODER_API vocoder_cvsd_decode_bs_sptr vocoder_make_cvsd_decode_bs (short min_step,
 								  short max_step,
 								  double step_decay,
 								  double accum_decay,
diff --git a/gr-vocoder/include/vocoder_cvsd_encode_sb.h b/gr-vocoder/include/vocoder_cvsd_encode_sb.h
index 15ab0823e..4a2d31147 100644
--- a/gr-vocoder/include/vocoder_cvsd_encode_sb.h
+++ b/gr-vocoder/include/vocoder_cvsd_encode_sb.h
@@ -22,7 +22,7 @@
 #ifndef INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 #define INCLUDED_VOCODER_CVSD_ENCODER_SB_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_decimator.h>
 
 class vocoder_cvsd_encode_sb;
@@ -45,7 +45,7 @@ typedef boost::shared_ptr<vocoder_cvsd_encode_sb> vocoder_cvsd_encode_sb_sptr;
   *
   */
 
-GR_VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10,
+VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step=10,
 							short max_step=1280,
 							double step_decay=0.9990234375,
 							double accum_decay= 0.96875,
@@ -108,10 +108,10 @@ GR_VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min
  *
  */
 
-class GR_VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator
+class VOCODER_API vocoder_cvsd_encode_sb : public gr_sync_decimator
 {
 private:
-  friend GR_VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step,
+  friend VOCODER_API vocoder_cvsd_encode_sb_sptr vocoder_make_cvsd_encode_sb(short min_step,
 								 short max_step,
 								 double step_decay,
 								 double accum_decay,
diff --git a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
index 448d046db..748ff5f0f 100644
--- a/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
+++ b/gr-vocoder/include/vocoder_gsm_fr_decode_ps.h
@@ -23,22 +23,22 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 #define INCLUDED_VOCODER_GSM_FR_DECODE_PS_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_interpolator.h>
 
 class vocoder_gsm_fr_decode_ps;
 typedef boost::shared_ptr<vocoder_gsm_fr_decode_ps> vocoder_gsm_fr_decode_ps_sptr;
 
-GR_VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
+VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
 
 /*!
  * \brief GSM 06.10 Full Rate Vocoder Decoder
  * \ingroup vocoder_blk
  */
-class GR_VOCODER_API vocoder_gsm_fr_decode_ps : public gr_sync_interpolator {
+class VOCODER_API vocoder_gsm_fr_decode_ps : public gr_sync_interpolator {
   struct gsm_state	*d_gsm;
 
-  friend GR_VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
+  friend VOCODER_API vocoder_gsm_fr_decode_ps_sptr vocoder_make_gsm_fr_decode_ps ();
   vocoder_gsm_fr_decode_ps ();
 
 public:
diff --git a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
index dd190719e..18f78f525 100644
--- a/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
+++ b/gr-vocoder/include/vocoder_gsm_fr_encode_sp.h
@@ -23,13 +23,13 @@
 #ifndef INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 #define INCLUDED_VOCODER_GSM_FR_ENCODE_SP_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_decimator.h>
 
 class vocoder_gsm_fr_encode_sp;
 typedef boost::shared_ptr<vocoder_gsm_fr_encode_sp> vocoder_gsm_fr_encode_sp_sptr;
 
-GR_VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
+VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
 
 /*!
  * \brief GSM 06.10 Full Rate Vocoder Encoder
@@ -37,10 +37,10 @@ GR_VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
  *
  * shorts in; 33 byte packets out
  */
-class GR_VOCODER_API vocoder_gsm_fr_encode_sp : public gr_sync_decimator {
+class VOCODER_API vocoder_gsm_fr_encode_sp : public gr_sync_decimator {
   struct gsm_state	*d_gsm;
 
-  friend GR_VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
+  friend VOCODER_API vocoder_gsm_fr_encode_sp_sptr vocoder_make_gsm_fr_encode_sp ();
   vocoder_gsm_fr_encode_sp ();
 
 public:
diff --git a/gr-vocoder/include/vocoder_ulaw_decode_bs.h b/gr-vocoder/include/vocoder_ulaw_decode_bs.h
index 14998a64f..f69358168 100644
--- a/gr-vocoder/include/vocoder_ulaw_decode_bs.h
+++ b/gr-vocoder/include/vocoder_ulaw_decode_bs.h
@@ -23,14 +23,14 @@
 #ifndef INCLUDED_VOCODER_ULAW_DECODE_BS_H
 #define INCLUDED_VOCODER_ULAW_DECODE_BS_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_ulaw_decode_bs;
 
 typedef boost::shared_ptr<vocoder_ulaw_decode_bs> vocoder_ulaw_decode_bs_sptr;
 
-GR_VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
+VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
 
 /*!
  * \brief This block performs ulaw audio decoding. 
@@ -38,10 +38,10 @@ GR_VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
  * \ingroup vocoder_blk
  */
 
-class GR_VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block
+class VOCODER_API vocoder_ulaw_decode_bs : public gr_sync_block
 {
 private:
-  friend GR_VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
+  friend VOCODER_API vocoder_ulaw_decode_bs_sptr vocoder_make_ulaw_decode_bs();
 
   vocoder_ulaw_decode_bs();
 
diff --git a/gr-vocoder/include/vocoder_ulaw_encode_sb.h b/gr-vocoder/include/vocoder_ulaw_encode_sb.h
index a0be3430c..a1c2af05b 100644
--- a/gr-vocoder/include/vocoder_ulaw_encode_sb.h
+++ b/gr-vocoder/include/vocoder_ulaw_encode_sb.h
@@ -23,24 +23,24 @@
 #ifndef INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 #define INCLUDED_VOCODER_ULAW_ENCODER_SB_H
 
-#include <gr_vocoder_api.h>
+#include <vocoder_api.h>
 #include <gr_sync_block.h>
 
 class vocoder_ulaw_encode_sb;
 
 typedef boost::shared_ptr<vocoder_ulaw_encode_sb> vocoder_ulaw_encode_sb_sptr;
 
-GR_VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
 
 /*!
  * \brief This block performs g.711 ulaw audio encoding. 
  *
  * \ingroup vocoder_blk
  */
-class GR_VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block
+class VOCODER_API vocoder_ulaw_encode_sb : public gr_sync_block
 {
 private:
-  friend GR_VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
+  friend VOCODER_API vocoder_ulaw_encode_sb_sptr vocoder_make_ulaw_encode_sb();
 
   vocoder_ulaw_encode_sb();