diff --git a/src/misc/pv/executor.h b/src/misc/pv/executor.h
index 3f64c59..4e7f2ae 100644
--- a/src/misc/pv/executor.h
+++ b/src/misc/pv/executor.h
@@ -11,6 +11,8 @@
 
 #include <memory>
 
+#include <compilerDependencies.h>
+
 #include <pv/pvType.h>
 #include <pv/lock.h>
 #include <pv/event.h>
@@ -30,7 +32,7 @@ typedef std::tr1::shared_ptr<Executor> ExecutorPtr;
  * @brief A command to be called by Executor
  *
  */
-class epicsShareClass Command {
+class epicsShareClass EPICS_DEPRECATED Command {
 public:
     POINTER_DEFINITIONS(Command);
     /**
@@ -52,7 +54,7 @@ private:
  * @brief A class that executes commands.
  *
  */
-class epicsShareClass Executor : public Runnable{
+class epicsShareClass EPICS_DEPRECATED Executor : public Runnable{
 public:
     POINTER_DEFINITIONS(Executor);
     /**
diff --git a/src/misc/pv/messageQueue.h b/src/misc/pv/messageQueue.h
index 1ef988f..fdfbf15 100644
--- a/src/misc/pv/messageQueue.h
+++ b/src/misc/pv/messageQueue.h
@@ -59,7 +59,7 @@ private:
  *
  *
  */
-class epicsShareClass MessageQueue : public Queue<MessageNode> {
+class epicsShareClass EPICS_DEPRECATED MessageQueue : public Queue<MessageNode> {
 public:
     POINTER_DEFINITIONS(MessageQueue);
     /**
diff --git a/src/misc/pv/queue.h b/src/misc/pv/queue.h
index 78c1e4a..edff47f 100644
--- a/src/misc/pv/queue.h
+++ b/src/misc/pv/queue.h
@@ -13,6 +13,7 @@
 #include <cstddef>
 #include <stdexcept>
 
+#include <compilerDependencies.h>
 #include <pv/sharedPtr.h>
 
 namespace epics { namespace pvData { 
@@ -24,7 +25,7 @@ namespace epics { namespace pvData {
  * but must create a std::vector of shared_ptr to queueElements.
  */
 template <typename T>
-class Queue
+class EPICS_DEPRECATED Queue
 {
 public:
     POINTER_DEFINITIONS(Queue);
diff --git a/src/misc/pv/timeFunction.h b/src/misc/pv/timeFunction.h
index bfa8700..3ac6f35 100644
--- a/src/misc/pv/timeFunction.h
+++ b/src/misc/pv/timeFunction.h
@@ -9,6 +9,8 @@
 #ifndef TIMEFUNCTION_H
 #define TIMEFUNCTION_H
 
+#include <compilerDependencies.h>
+
 #include <pv/sharedPtr.h>
 
 #include <shareLib.h>
@@ -24,7 +26,7 @@ typedef std::tr1::shared_ptr<TimeFunction> TimeFunctionPtr;
  * @brief Class that must be implemented by timeFunction requester.
  *
  */
-class epicsShareClass TimeFunctionRequester {
+class epicsShareClass EPICS_DEPRECATED TimeFunctionRequester {
 public:
     POINTER_DEFINITIONS(TimeFunctionRequester);
     /** 
@@ -43,7 +45,7 @@ public:
  * @brief Class for measuring time it takes to execute a function.
  *
  */
-class epicsShareClass TimeFunction {
+class epicsShareClass EPICS_DEPRECATED TimeFunction {
 public:
     POINTER_DEFINITIONS(TimeFunction);
     /**