Merge lp:~raof/mir/hide-internal-symbols into lp:mir

[Chris Halse Rogers]

Hide server-internal symbols using the new MIR_INTERNAL define.

Results in a modest 15% reduction in the set of exported symbols from libmirserver.so

Hide server-internal symbols using the new MIR_INTERNAL define.

Results in a modest 15% reduction in the set of exported symbols from libmirserver.so

[lp:~raof/mir/hide-internal-symbols]

1773. By Chris Halse Rogers on 2014-07-17

Merge trunk, resolving SOVER bump conflict

1774. By Chris Halse Rogers on 2014-07-17

Hide new symbols from trunk merge

1775. By Chris Halse Rogers on 2014-07-17

Ahem. Actually include visibility.h in bzr

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1773
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2176/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/975/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/981/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/970/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/697/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/695/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3261/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2176/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1775
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2179/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/978/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/984
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/973/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/700/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/698/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3267/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2179/rebuild

review: Needs Fixing (continuous-integration)

[lp:~raof/mir/hide-internal-symbols]

1776. By Chris Halse Rogers on 2014-07-18

Explicitly mark some DefaultServerConfiguration as exported.

If someone could pipe up with some idea of *why* this fixes linkage on ARM,
that'd be ace!

1777. By Chris Halse Rogers on 2014-07-18

A little more visibility

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1777
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2188/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/989
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/995/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/984/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/709/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/707/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3329/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2188/rebuild

review: Needs Fixing (continuous-integration)

[Alan Griffiths (alan-griffiths)]

I *think* we can do better than this. I'm not sure how yet but have started thinking about it.

My idea solution wouldn't use macros but would use the location of the include files to control visibility.

Maybe we can use the GCC python plugin. There's an example:
http://blog.cuviper.com/2014/01/23/add-new-warnings-to-gcc-with-python/

The plugin could inspect each function definition as it compiles, and if the source location of the declaration is in <root>/include/ mark it public. (I.e. write it to a symbols file?)

Or something similar based on libclang?

Anyway, not for this week.

review: Abstain

[Daniel van Vugt (vanvugt)]

Sorry, we sat on this too long...

Text conflict in src/server/CMakeLists.txt
Text conflict in src/server/shell/default_placement_strategy.h
Text conflict in tests/integration-tests/CMakeLists.txt
Text conflict in tests/unit-tests/CMakeLists.txt
4 conflicts encountered.

review: Needs Fixing

[Robert Carr (robertcarr)]

>> The plugin could inspect each function definition as it compiles, and if the source location of
>> the declaration is in <root>/include/ mark it public. (I.e. write it to a symbols file?)

Then we would strip the symbol after build? Seems cool I guess...I think it's kind of a pain to write MIR_INTERNAL everywhere

[Chris Halse Rogers (raof)]

The profusion of MIR_INTERNAL is meant to be temporary, until we mark
all the things we actually want to export as MIR_API and flip to
-fvisibility=hidden.

We'd still potentially want MIR_INTERNAL to hide bits of publicly
exported classes, but we'd use it a lot less.

[Alan Griffiths (alan-griffiths)]

> >> The plugin could inspect each function definition as it compiles, and if
> the source location of
> >> the declaration is in <root>/include/ mark it public. (I.e. write it to a
> symbols file?)
>
> Then we would strip the symbol after build?

Well, after compiling: during the link part of the build.

> Seems cool I guess...I think it's
> kind of a pain to write MIR_INTERNAL everywhere

The sad thing is that the compiler plugin [https://fedorahosted.org/gcc-python-plugin/] isn't part of the Ubuntu archive - and as it is "alpha" code we probably shouldn't make it an integral part of our build process.

Unmerged revisions

1777. By Chris Halse Rogers on 2014-07-18

A little more visibility

1776. By Chris Halse Rogers on 2014-07-18

Explicitly mark some DefaultServerConfiguration as exported.

If someone could pipe up with some idea of *why* this fixes linkage on ARM,
that'd be ace!

1775. By Chris Halse Rogers on 2014-07-17

Ahem. Actually include visibility.h in bzr

1774. By Chris Halse Rogers on 2014-07-17

Hide new symbols from trunk merge

1773. By Chris Halse Rogers on 2014-07-17

Merge trunk, resolving SOVER bump conflict

1772. By Chris Halse Rogers on 2014-07-17

Fix test linkage by building a mirserver-static archive

1771. By Chris Halse Rogers on 2014-07-17

Mark a whole bunch of internal symbols as visibility=hidden

This breaks linking the tests at the moment; followup work will fix them

=== modified file 'include/server/mir/frontend/protobuf_connection_creator.h'
--- include/server/mir/frontend/protobuf_connection_creator.h	2014-06-03 11:04:15 +0000
+++ include/server/mir/frontend/protobuf_connection_creator.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_PROTOBUF_CONNECTION_CREATOR_H_
 #define MIR_FRONTEND_PROTOBUF_CONNECTION_CREATOR_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/connection_creator.h"
 #include "mir/frontend/connections.h"
 

=== added file 'include/shared/mir/visibility.h'
--- include/shared/mir/visibility.h	1970-01-01 00:00:00 +0000
+++ include/shared/mir/visibility.h	2014-07-18 06:57:43 +0000
@@ -0,0 +1,32 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Christopher James Halse Rogers <[e-mail]>
+ */
+
+#ifndef MIR_VISIBILITY_H_
+#define MIR_VISIBILITY_H_
+
+/*
+ * Keep the attribute bit hidden in here; it's plausible that we might want to
+ * support different compilers and such.
+ *
+ * Also, MIR_FOO is more descriptive
+ */
+
+#define MIR_INTERNAL __attribute__ ((visibility ("hidden")))
+#define MIR_API __attribute__ ((visibility ("default")))
+
+#endif

=== modified file 'include/test/mir_test_doubles/stub_ipc_factory.h'
--- include/test/mir_test_doubles/stub_ipc_factory.h	2014-06-03 11:04:15 +0000
+++ include/test/mir_test_doubles/stub_ipc_factory.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_TEST_DOUBLES_STUB_IPC_FACTORY_H_
 #define MIR_TEST_DOUBLES_STUB_IPC_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "mir_test/fake_shared.h"
 #include "src/server/frontend/protobuf_ipc_factory.h"
 #include "src/server/frontend/resource_cache.h"
@@ -35,7 +36,7 @@
 namespace doubles
 {
 
-class StubIpcFactory : public frontend::ProtobufIpcFactory
+class MIR_INTERNAL StubIpcFactory : public frontend::ProtobufIpcFactory
 {
 public:
     StubIpcFactory(frontend::detail::DisplayServer& server) :

=== modified file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	2014-07-08 06:42:38 +0000
+++ src/server/CMakeLists.txt	2014-07-18 06:57:43 +0000
@@ -39,6 +39,10 @@
   ${SRCS}
 )
 
+add_library(mirserver-static STATIC
+  ${SRCS}
+)
+
 list(APPEND MIRSERVER_ARCHIVES
   miroptions
   mircompositor
@@ -54,8 +58,8 @@
   mirshell
   mirscene
   mirtime
+  mirreport
   mirlttng
-  mirreport
   mirlogger
   mirnestedgraphics
   miroffscreengraphics
@@ -98,6 +102,11 @@
   )
 endif()
 
+target_link_libraries(mirserver-static
+  ${MIRSERVER_ARCHIVES}
+  ${MIRSERVER_LINKS}
+)
+
 set(MIRSERVER_ABI 23) # Be sure to increment MIR_VERSION_MINOR at the same time
 
 set_target_properties(

=== modified file 'src/server/compositor/buffer_bundle.h'
--- src/server/compositor/buffer_bundle.h	2014-05-21 08:38:47 +0000
+++ src/server/compositor/buffer_bundle.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_COMPOSITOR_BUFFER_BUNDLE_H_
 #define MIR_COMPOSITOR_BUFFER_BUNDLE_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/buffer_properties.h"
 #include <memory>
 
@@ -30,7 +31,7 @@
 namespace compositor
 {
 
-class BufferBundle
+class MIR_INTERNAL BufferBundle
 {
 public:
     virtual ~BufferBundle() noexcept {}

=== modified file 'src/server/compositor/buffer_queue.h'
--- src/server/compositor/buffer_queue.h	2014-07-14 03:49:17 +0000
+++ src/server/compositor/buffer_queue.h	2014-07-18 06:57:43 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_BUFFER_QUEUE_H_
 #define MIR_BUFFER_QUEUE_H_
 
+#include "mir/visibility.h"
 #include "mir/compositor/frame_dropping_policy_factory.h"
 #include "mir/compositor/frame_dropping_policy.h"
 #include "buffer_bundle.h"
@@ -37,7 +38,7 @@
 namespace compositor
 {
 
-class BufferQueue : public BufferBundle
+class MIR_INTERNAL BufferQueue : public BufferBundle
 {
 public:
     typedef std::function<void(graphics::Buffer* buffer)> Callback;

=== modified file 'src/server/compositor/buffer_stream_factory.h'
--- src/server/compositor/buffer_stream_factory.h	2014-06-09 17:16:32 +0000
+++ src/server/compositor/buffer_stream_factory.h	2014-07-18 06:57:43 +0000
@@ -21,6 +21,7 @@
 #ifndef MIR_COMPOSITOR_BUFFER_STREAM_FACTORY_H_
 #define MIR_COMPOSITOR_BUFFER_STREAM_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/buffer_stream_factory.h"
 #include "mir/compositor/frame_dropping_policy_factory.h"
 
@@ -35,7 +36,7 @@
 namespace compositor
 {
 
-class BufferStreamFactory : public scene::BufferStreamFactory
+class MIR_INTERNAL BufferStreamFactory : public scene::BufferStreamFactory
 {
 public:
     BufferStreamFactory(std::shared_ptr<graphics::GraphicBufferAllocator> const& gralloc,

=== modified file 'src/server/compositor/buffer_stream_surfaces.h'
--- src/server/compositor/buffer_stream_surfaces.h	2014-05-22 10:00:05 +0000
+++ src/server/compositor/buffer_stream_surfaces.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_COMPOSITOR_BUFFER_STREAM_SCENE_H_
 #define MIR_COMPOSITOR_BUFFER_STREAM_SCENE_H_
 
+#include "mir/visibility.h"
 #include "mir/compositor/buffer_stream.h"
 
 #include <mutex>
@@ -33,7 +34,7 @@
 class BufferBundle;
 class BackBufferStrategy;
 
-class BufferStreamSurfaces : public BufferStream
+class MIR_INTERNAL BufferStreamSurfaces : public BufferStream
 {
 public:
     BufferStreamSurfaces(std::shared_ptr<BufferBundle> const& swapper);

=== modified file 'src/server/compositor/compositing_screencast.h'
--- src/server/compositor/compositing_screencast.h	2014-03-05 21:12:05 +0000
+++ src/server/compositor/compositing_screencast.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_COMPOSITOR_COMPOSITING_SCREENCAST_H_
 #define MIR_COMPOSITOR_COMPOSITING_SCREENCAST_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/screencast.h"
 
 #include <unordered_map>
@@ -39,7 +40,7 @@
 
 class DisplayBufferCompositorFactory;
 
-class CompositingScreencast : public frontend::Screencast
+class MIR_INTERNAL CompositingScreencast : public frontend::Screencast
 {
 public:
     CompositingScreencast(

=== modified file 'src/server/compositor/multi_threaded_compositor.h'
--- src/server/compositor/multi_threaded_compositor.h	2014-06-09 17:16:32 +0000
+++ src/server/compositor/multi_threaded_compositor.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_COMPOSITOR_MULTI_THREADED_COMPOSITOR_H_
 #define MIR_COMPOSITOR_MULTI_THREADED_COMPOSITOR_H_
 
+#include "mir/visibility.h"
 #include "mir/compositor/compositor.h"
 
 #include <mutex>
@@ -53,7 +54,7 @@
     stopping
 };
 
-class MultiThreadedCompositor : public Compositor
+class MIR_INTERNAL MultiThreadedCompositor : public Compositor
 {
 public:
     MultiThreadedCompositor(std::shared_ptr<graphics::Display> const& display,

=== modified file 'src/server/compositor/occlusion.h'
--- src/server/compositor/occlusion.h	2014-06-23 17:19:22 +0000
+++ src/server/compositor/occlusion.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_COMPOSITOR_OCCLUSION_H_
 #define MIR_COMPOSITOR_OCCLUSION_H_
 
+#include "mir/visibility.h"
 #include "mir/compositor/scene.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace compositor
 {
 
-SceneElementSequence filter_occlusions_from(SceneElementSequence& list, geometry::Rectangle const& area);
+MIR_INTERNAL SceneElementSequence filter_occlusions_from(SceneElementSequence& list, geometry::Rectangle const& area);
 
 } // namespace compositor
 } // namespace mir

=== modified file 'src/server/compositor/temporary_buffers.h'
--- src/server/compositor/temporary_buffers.h	2014-05-01 08:07:56 +0000
+++ src/server/compositor/temporary_buffers.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_COMPOSITOR_TEMPORARY_BUFFERS_H_
 #define MIR_COMPOSITOR_TEMPORARY_BUFFERS_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/buffer.h"
 #include "mir/graphics/buffer_id.h"
 
@@ -32,7 +33,7 @@
 class BufferBundle;
 class BackBufferStrategy;
 
-class TemporaryBuffer : public mg::Buffer
+class MIR_INTERNAL TemporaryBuffer : public mg::Buffer
 {
 public:
     geometry::Size size() const;
@@ -48,7 +49,7 @@
     std::shared_ptr<mg::Buffer> const buffer;
 };
 
-class TemporaryCompositorBuffer : public TemporaryBuffer
+class MIR_INTERNAL TemporaryCompositorBuffer : public TemporaryBuffer
 {
 public:
     explicit TemporaryCompositorBuffer(
@@ -59,7 +60,7 @@
     std::shared_ptr<BufferBundle> const bundle;
 };
 
-class TemporarySnapshotBuffer : public TemporaryBuffer
+class MIR_INTERNAL TemporarySnapshotBuffer : public TemporaryBuffer
 {
 public:
     explicit TemporarySnapshotBuffer(

=== modified file 'src/server/frontend/client_buffer_tracker.h'
--- src/server/frontend/client_buffer_tracker.h	2013-08-28 03:41:48 +0000
+++ src/server/frontend/client_buffer_tracker.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
  #ifndef MIR_FRONTEND_CLIENT_BUFFER_TRACKER_H_
  #define MIR_FRONTEND_CLIENT_BUFFER_TRACKER_H_
 
+#include "mir/visibility.h"
 #include <stdint.h>
 #include <list>
 
@@ -37,7 +38,7 @@
 
 /// \sa mir::client::ClientBufferDepository for the client-side of this tracking
 /// \note Changes to the tracking algorithm of mir::client::ClientBufferDepository will need to be mirrored here
-class ClientBufferTracker
+class MIR_INTERNAL ClientBufferTracker
 {
 public:
     ClientBufferTracker(unsigned int client_cache_size);

=== modified file 'src/server/frontend/default_ipc_factory.h'
--- src/server/frontend/default_ipc_factory.h	2014-07-09 10:48:47 +0000
+++ src/server/frontend/default_ipc_factory.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_DEFAULT_IPC_FACTORY_H_
 #define MIR_FRONTEND_DEFAULT_IPC_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "protobuf_ipc_factory.h"
 
 namespace mir
@@ -41,7 +42,7 @@
 class Screencast;
 class SessionAuthorizer;
 
-class DefaultIpcFactory : public ProtobufIpcFactory
+class MIR_INTERNAL DefaultIpcFactory : public ProtobufIpcFactory
 {
 public:
     explicit DefaultIpcFactory(

=== modified file 'src/server/frontend/display_server.h'
--- src/server/frontend/display_server.h	2014-06-03 11:04:15 +0000
+++ src/server/frontend/display_server.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_DETAIL_DISPLAY_SERVER_H_
 #define MIR_FRONTEND_DETAIL_DISPLAY_SERVER_H_
 
+#include "mir/visibility.h"
 #include "mir_protobuf.pb.h"
 
 namespace mir
@@ -27,7 +28,7 @@
 {
 namespace detail
 {
-class DisplayServer : public mir::protobuf::DisplayServer
+class MIR_INTERNAL DisplayServer : public mir::protobuf::DisplayServer
 {
 public:
     using mir::protobuf::DisplayServer::DisplayServer;

=== modified file 'src/server/frontend/message_receiver.h'
--- src/server/frontend/message_receiver.h	2014-06-03 11:04:15 +0000
+++ src/server/frontend/message_receiver.h	2014-07-18 06:57:43 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_FRONTEND_MESSAGE_RECEIVER_H_
 #define MIR_FRONTEND_MESSAGE_RECEIVER_H_
 
+#include "mir/visibility.h"
 #include <functional>
 #include <boost/asio.hpp>
 

=== modified file 'src/server/frontend/no_prompt_shell.h'
--- src/server/frontend/no_prompt_shell.h	2014-07-09 17:04:55 +0000
+++ src/server/frontend/no_prompt_shell.h	2014-07-18 06:57:43 +0000
@@ -19,13 +19,14 @@
 #ifndef MIR_FRONTEND_NO_PROMPT_SHELL_H_
 #define MIR_FRONTEND_NO_PROMPT_SHELL_H_
 
+#include "mir/visibility.h"
 #include "shell_wrapper.h"
 
 namespace mir
 {
 namespace frontend
 {
-class NoPromptShell : public ShellWrapper
+class MIR_INTERNAL NoPromptShell : public ShellWrapper
 {
 public:
 

=== modified file 'src/server/frontend/protobuf_ipc_factory.h'
--- src/server/frontend/protobuf_ipc_factory.h	2014-06-03 11:04:15 +0000
+++ src/server/frontend/protobuf_ipc_factory.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_PROTOBUF_IPC_FACTORY_H_
 #define MIR_FRONTEND_PROTOBUF_IPC_FACTORY_H_
 
+#include "mir/visibility.h"
 #include <sys/types.h>
 
 #include <memory>

=== modified file 'src/server/frontend/protobuf_message_processor.h'
--- src/server/frontend/protobuf_message_processor.h	2014-06-03 11:04:15 +0000
+++ src/server/frontend/protobuf_message_processor.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_FRONTEND_PROTOBUF_MESSAGE_PROCESSOR_H_
 #define MIR_FRONTEND_PROTOBUF_MESSAGE_PROCESSOR_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/message_processor.h"
 
 #include "mir_protobuf.pb.h"
@@ -37,7 +38,7 @@
 class DisplayServer;
 class ProtobufMessageSender;
 
-class ProtobufMessageProcessor : public MessageProcessor
+class MIR_INTERNAL ProtobufMessageProcessor : public MessageProcessor
 {
 public:
     ProtobufMessageProcessor(

=== modified file 'src/server/frontend/protobuf_responder.h'
--- src/server/frontend/protobuf_responder.h	2014-05-20 03:37:18 +0000
+++ src/server/frontend/protobuf_responder.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_PROTOBUF_RESPONDER_H_
 #define MIR_FRONTEND_PROTOBUF_RESPONDER_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/protobuf_message_sender.h"
 #include "mir_protobuf_wire.pb.h"
 
@@ -34,7 +35,7 @@
 {
 class MessageSender;
 
-class ProtobufResponder : public ProtobufMessageSender
+class MIR_INTERNAL ProtobufResponder : public ProtobufMessageSender
 {
 public:
     ProtobufResponder(

=== modified file 'src/server/frontend/published_socket_connector.h'
--- src/server/frontend/published_socket_connector.h	2014-06-02 17:07:02 +0000
+++ src/server/frontend/published_socket_connector.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_PROTOBUF_ASIO_COMMUNICATOR_H_
 #define MIR_FRONTEND_PROTOBUF_ASIO_COMMUNICATOR_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/connector.h"
 
 #include <boost/asio.hpp>
@@ -46,7 +47,7 @@
 class ConnectorReport;
 
 /// provides a client-side socket fd for each connection
-class BasicConnector : public Connector
+class MIR_INTERNAL BasicConnector : public Connector
 {
 public:
     explicit BasicConnector(
@@ -74,7 +75,7 @@
 };
 
 /// Accept connections over a published socket
-class PublishedSocketConnector : public BasicConnector
+class MIR_INTERNAL PublishedSocketConnector : public BasicConnector
 {
 public:
     explicit PublishedSocketConnector(

=== modified file 'src/server/frontend/resource_cache.h'
--- src/server/frontend/resource_cache.h	2014-03-06 06:05:17 +0000
+++ src/server/frontend/resource_cache.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_RESOURCE_CACHE_H_
 #define MIR_FRONTEND_RESOURCE_CACHE_H_
 
+#include "mir/visibility.h"
 #include "mir_protobuf.pb.h"
 
 #include <map>
@@ -31,7 +32,7 @@
 {
 
 // Used to save resources that must be retained until a call completes.
-class ResourceCache
+class MIR_INTERNAL ResourceCache
 {
 public:
     void save_resource(google::protobuf::Message* key, std::shared_ptr<void> const& value);

=== modified file 'src/server/frontend/session_mediator.h'
--- src/server/frontend/session_mediator.h	2014-07-09 17:04:55 +0000
+++ src/server/frontend/session_mediator.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_FRONTEND_SESSION_MEDIATOR_H_
 #define MIR_FRONTEND_SESSION_MEDIATOR_H_
 
+#include "mir/visibility.h"
 #include "display_server.h"
 #include "mir/frontend/connection_context.h"
 #include "mir/frontend/surface_id.h"
@@ -61,7 +62,7 @@
 class PromptSession;
 
 // SessionMediator relays requests from the client process into the server.
-class SessionMediator : public detail::DisplayServer
+class MIR_INTERNAL SessionMediator : public detail::DisplayServer
 {
 public:
 

=== modified file 'src/server/frontend/socket_connection.h'
--- src/server/frontend/socket_connection.h	2014-06-02 17:07:02 +0000
+++ src/server/frontend/socket_connection.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_FRONTEND_DETAIL_SOCKET_CONNECTION_H_
 #define MIR_FRONTEND_DETAIL_SOCKET_CONNECTION_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/connections.h"
 
 #include <boost/asio.hpp>

=== modified file 'src/server/frontend/socket_messenger.h'
--- src/server/frontend/socket_messenger.h	2014-06-03 11:04:15 +0000
+++ src/server/frontend/socket_messenger.h	2014-07-18 06:57:43 +0000
@@ -18,6 +18,7 @@
 
 #ifndef MIR_FRONTEND_SOCKET_MESSENGER_H_
 #define MIR_FRONTEND_SOCKET_MESSENGER_H_
+#include "mir/visibility.h"
 #include "message_sender.h"
 #include "message_receiver.h"
 #include "mir/frontend/session_credentials.h"
@@ -29,8 +30,8 @@
 {
 namespace detail
 {
-class SocketMessenger : public MessageSender,
-                        public MessageReceiver
+class MIR_INTERNAL SocketMessenger : public MessageSender,
+                                     public MessageReceiver
 {
 public:
     SocketMessenger(std::shared_ptr<boost::asio::local::stream_protocol::socket> const& socket);

=== modified file 'src/server/graphics/default_display_configuration_policy.h'
--- src/server/graphics/default_display_configuration_policy.h	2014-03-06 06:05:17 +0000
+++ src/server/graphics/default_display_configuration_policy.h	2014-07-18 06:57:43 +0000
@@ -16,6 +16,7 @@
 #ifndef MIR_GRAPHICS_DEFAULT_DISPLAY_CONFIGURATION_POLICY_H_
 #define MIR_GRAPHICS_DEFAULT_DISPLAY_CONFIGURATION_POLICY_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/display_configuration_policy.h"
 
 namespace mir
@@ -23,7 +24,7 @@
 namespace graphics
 {
 
-class DefaultDisplayConfigurationPolicy : public DisplayConfigurationPolicy
+class MIR_INTERNAL DefaultDisplayConfigurationPolicy : public DisplayConfigurationPolicy
 {
 public:
     void apply_to(DisplayConfiguration& conf);

=== modified file 'src/server/graphics/nested/nested_display.h'
--- src/server/graphics/nested/nested_display.h	2014-06-02 17:07:02 +0000
+++ src/server/graphics/nested/nested_display.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_NESTED_NESTED_DISPLAY_H_
 #define MIR_GRAPHICS_NESTED_NESTED_DISPLAY_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
 #include "mir/graphics/display_configuration.h"
@@ -50,7 +51,7 @@
 namespace detail
 {
 
-class EGLSurfaceHandle
+class MIR_INTERNAL EGLSurfaceHandle
 {
 public:
     explicit EGLSurfaceHandle(EGLDisplay display, EGLNativeWindowType native_window, EGLConfig cfg);
@@ -63,7 +64,7 @@
     EGLSurface const egl_surface;
 };
 
-class EGLDisplayHandle
+class MIR_INTERNAL EGLDisplayHandle
 {
 public:
     EGLDisplayHandle(EGLNativeDisplayType native_display,
@@ -91,7 +92,7 @@
 
 class HostConnection;
 
-class NestedDisplay : public Display
+class MIR_INTERNAL NestedDisplay : public Display
 {
 public:
     NestedDisplay(

=== modified file 'src/server/graphics/nested/nested_output.h'
--- src/server/graphics/nested/nested_output.h	2014-06-05 20:35:46 +0000
+++ src/server/graphics/nested/nested_output.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_NESTED_DETAIL_NESTED_OUTPUT_H_
 #define MIR_GRAPHICS_NESTED_DETAIL_NESTED_OUTPUT_H_
 
+#include "mir/visibility.h"
 #include "nested_display.h"
 
 namespace mir
@@ -32,7 +33,7 @@
 namespace detail
 {
 
-class NestedOutput : public DisplayBuffer
+class MIR_INTERNAL NestedOutput : public DisplayBuffer
 {
 public:
     NestedOutput(

=== modified file 'src/server/graphics/nested/nested_platform.h'
--- src/server/graphics/nested/nested_platform.h	2014-06-16 23:37:57 +0000
+++ src/server/graphics/nested/nested_platform.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_NESTED_NESTED_PLATFORM_H_
 #define MIR_GRAPHICS_NESTED_NESTED_PLATFORM_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/platform.h"
 #include "mir/graphics/native_platform.h"
 #include "host_connection.h"
@@ -31,7 +32,7 @@
 namespace nested
 {
 
-class NestedPlatform : public Platform
+class MIR_INTERNAL NestedPlatform : public Platform
 {
 public:
     NestedPlatform(

=== modified file 'src/server/graphics/offscreen/display.h'
--- src/server/graphics/offscreen/display.h	2014-06-02 17:07:02 +0000
+++ src/server/graphics/offscreen/display.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_OFFSCREEN_DISPLAY_H_
 #define MIR_GRAPHICS_OFFSCREEN_DISPLAY_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/display.h"
 #include "display_configuration.h"
 #include "mir/graphics/surfaceless_egl_context.h"
@@ -42,7 +43,7 @@
 namespace detail
 {
 
-class EGLDisplayHandle
+class MIR_INTERNAL EGLDisplayHandle
 {
 public:
     explicit EGLDisplayHandle(EGLNativeDisplayType native_type);
@@ -61,7 +62,7 @@
 
 }
 
-class Display : public graphics::Display
+class MIR_INTERNAL Display : public graphics::Display
 {
 public:
     Display(std::shared_ptr<BasicPlatform> const& basic_platform,

=== modified file 'src/server/graphics/offscreen/display_configuration.h'
--- src/server/graphics/offscreen/display_configuration.h	2014-03-26 05:48:59 +0000
+++ src/server/graphics/offscreen/display_configuration.h	2014-07-18 06:57:43 +0000
@@ -17,6 +17,7 @@
 #ifndef MIR_GRAPHICS_OFFSCREEN_DISPLAY_CONFIGURATION_H_
 #define MIR_GRAPHICS_OFFSCREEN_DISPLAY_CONFIGURATION_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/display_configuration.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace offscreen
 {
 
-class DisplayConfiguration : public graphics::DisplayConfiguration
+class MIR_INTERNAL DisplayConfiguration : public graphics::DisplayConfiguration
 {
 public:
     DisplayConfiguration(geometry::Size const& display_size);

=== modified file 'src/server/graphics/program_factory.h'
--- src/server/graphics/program_factory.h	2014-05-20 20:14:47 +0000
+++ src/server/graphics/program_factory.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_GRAPHICS_GL_RENDERER_FACTORY_H_
 #define MIR_GRAPHICS_GL_RENDERER_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "mir/graphics/gl_program_factory.h"
 #include "mir/graphics/gl_program.h"
 #include "mir/graphics/gl_texture_cache.h"
@@ -28,7 +29,7 @@
 {
 namespace graphics
 {
-class ProgramFactory : public GLProgramFactory
+class MIR_INTERNAL ProgramFactory : public GLProgramFactory
 {
 public:
     std::unique_ptr<GLProgram> create_gl_program(std::string const&, std::string const&) const override;

=== modified file 'src/server/input/android/android_input_manager.h'
--- src/server/input/android/android_input_manager.h	2014-06-02 17:07:02 +0000
+++ src/server/input/android/android_input_manager.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_MANAGER_H_
 #define MIR_INPUT_ANDROID_INPUT_MANAGER_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_manager.h"
 
 #include <memory>
@@ -44,7 +45,7 @@
 /// Encapsulates the instances of the Android input stack that might require startup and
 //  shutdown calls, that is to say an EventHub tied to an InputReader tied to an
 //  InputDispatcher.
-class InputManager : public input::InputManager
+class MIR_INTERNAL InputManager : public input::InputManager
 {
 public:
     explicit InputManager(std::shared_ptr<droidinput::EventHubInterface> const& event_hub,

=== modified file 'src/server/input/android/android_input_reader_policy.h'
--- src/server/input/android/android_input_reader_policy.h	2014-06-09 18:45:21 +0000
+++ src/server/input/android/android_input_reader_policy.h	2014-07-18 06:57:43 +0000
@@ -18,6 +18,7 @@
 #ifndef MIR_ANDROID_INPUT_READER_POLICY_H_
 #define MIR_ANDROID_INPUT_READER_POLICY_H_
 
+#include "mir/visibility.h"
 #include "rudimentary_input_reader_policy.h"
 
 #include <memory>
@@ -31,7 +32,7 @@
 namespace android
 {
 
-class InputReaderPolicy : public RudimentaryInputReaderPolicy
+class MIR_INTERNAL InputReaderPolicy : public RudimentaryInputReaderPolicy
 {
 public:
     explicit InputReaderPolicy(std::shared_ptr<InputRegion> const& input_region,

=== modified file 'src/server/input/android/android_input_registrar.h'
--- src/server/input/android/android_input_registrar.h	2014-06-03 11:04:15 +0000
+++ src/server/input/android/android_input_registrar.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_REGISTRAR_H_
 #define MIR_INPUT_ANDROID_REGISTRAR_H_
 
+#include "mir/visibility.h"
 #include "android_window_handle_repository.h"
 
 #include "mir/scene/null_observer.h"
@@ -54,7 +55,7 @@
 class InputConfiguration;
 class InputTargeter;
 
-class InputRegistrar : public WindowHandleRepository
+class MIR_INTERNAL InputRegistrar : public WindowHandleRepository
 {
 public:
     explicit InputRegistrar(std::shared_ptr<mir::compositor::Scene> const& scene);

=== modified file 'src/server/input/android/android_input_target_enumerator.h'
--- src/server/input/android/android_input_target_enumerator.h	2014-05-20 03:37:18 +0000
+++ src/server/input/android/android_input_target_enumerator.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_TARGET_ENUMERATOR_H_
 #define MIR_INPUT_ANDROID_TARGET_ENUMERATOR_H_
 
+#include "mir/visibility.h"
 #include <InputEnumerator.h>
 
 #include <utils/StrongPointer.h>
@@ -46,7 +47,7 @@
 {
 class WindowHandleRepository;
 
-class InputTargetEnumerator : public droidinput::InputEnumerator
+class MIR_INTERNAL InputTargetEnumerator : public droidinput::InputEnumerator
 {
 public:
     explicit InputTargetEnumerator(std::shared_ptr<input::InputTargets> const& targets,

=== modified file 'src/server/input/android/android_input_targeter.h'
--- src/server/input/android/android_input_targeter.h	2014-05-21 02:24:48 +0000
+++ src/server/input/android/android_input_targeter.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_TARGET_H_
 #define MIR_INPUT_ANDROID_TARGET_H_
 
+#include "mir/visibility.h"
 #include "mir/shell/input_targeter.h"
 
 #include <mutex>
@@ -40,7 +41,7 @@
 class InputConfiguration;
 class WindowHandleRepository;
 
-class InputTargeter : public shell::InputTargeter
+class MIR_INTERNAL InputTargeter : public shell::InputTargeter
 {
 public:
     explicit InputTargeter(std::shared_ptr<droidinput::InputDispatcherInterface> const& input_dispatcher,

=== modified file 'src/server/input/android/android_input_thread.h'
--- src/server/input/android/android_input_thread.h	2013-04-24 05:22:20 +0000
+++ src/server/input/android/android_input_thread.h	2014-07-18 06:57:43 +0000
@@ -19,13 +19,15 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_THREAD_H_
 #define MIR_INPUT_ANDROID_INPUT_THREAD_H_
 
+#include "mir/visibility.h"
+
 namespace mir
 {
 namespace input
 {
 namespace android
 {
-class InputThread
+class MIR_INTERNAL InputThread
 {
 public:
     virtual ~InputThread() {}

=== modified file 'src/server/input/android/android_pointer_controller.h'
--- src/server/input/android/android_pointer_controller.h	2013-08-28 03:41:48 +0000
+++ src/server/input/android/android_pointer_controller.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_POINTER_CONTROLLER_H__
 #define MIR_INPUT_ANDROID_POINTER_CONTROLLER_H__
 
+#include "mir/visibility.h"
 #include "dummy_android_pointer_controller.h"
 
 #include "mir/input/cursor_listener.h"
@@ -33,7 +34,7 @@
 class InputRegion;
 namespace android
 {
-class PointerController : public DummyPointerController
+class MIR_INTERNAL PointerController : public DummyPointerController
 {
   public:
     explicit PointerController(std::shared_ptr<InputRegion> const& input_region);

=== modified file 'src/server/input/android/android_window_handle_repository.h'
--- src/server/input/android/android_window_handle_repository.h	2014-03-06 06:05:17 +0000
+++ src/server/input/android/android_window_handle_repository.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_WINDOW_HANDLE_REPOSITORY_H_
 #define MIR_INPUT_ANDROID_WINDOW_HANDLE_REPOSITORY_H_
 
+#include "mir/visibility.h"
 #include <utils/StrongPointer.h>
 
 #include <memory>
@@ -40,7 +41,7 @@
 
 /// Interface internal to mir::input::android used for tracking the assosciation between droidinput::InputWindowHandle
 /// and mir::input::InputChannel
-class WindowHandleRepository
+class MIR_INTERNAL WindowHandleRepository
 {
 public:
     virtual ~WindowHandleRepository() = default;

=== modified file 'src/server/input/android/common_input_thread.h'
--- src/server/input/android/common_input_thread.h	2014-05-14 14:35:23 +0000
+++ src/server/input/android/common_input_thread.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_COMMON_INPUT_THREAD_H_
 #define MIR_INPUT_ANDROID_COMMON_INPUT_THREAD_H_
 
+#include "mir/visibility.h"
 #include "android_input_thread.h"
 
 #include <utils/StrongPointer.h>
@@ -34,7 +35,7 @@
 {
 namespace android
 {
-class CommonInputThread : public InputThread
+class MIR_INTERNAL CommonInputThread : public InputThread
 {
 public:
     CommonInputThread(std::string const& name, droidinput::sp<droidinput::Thread> const& thread);

=== modified file 'src/server/input/android/input_channel_factory.h'
--- src/server/input/android/input_channel_factory.h	2014-04-10 12:59:14 +0000
+++ src/server/input/android/input_channel_factory.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_CHANNEL_FACTORY_H_
 #define MIR_INPUT_ANDROID_INPUT_CHANNEL_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_channel_factory.h"
 
 namespace mir
@@ -27,7 +28,7 @@
 {
 namespace android
 {
-class InputChannelFactory : public mir::input::InputChannelFactory
+class MIR_INTERNAL InputChannelFactory : public mir::input::InputChannelFactory
 {
 public:
     std::shared_ptr<mir::input::InputChannel> make_input_channel() override;

=== modified file 'src/server/input/android/input_send_entry.h'
--- src/server/input/android/input_send_entry.h	2014-06-23 17:40:57 +0000
+++ src/server/input/android/input_send_entry.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_ANDROID_INPUT_SEND_ENTRY_H_
 #define MIR_INPUT_ANDROID_INPUT_SEND_ENTRY_H_
 
+#include "mir/visibility.h"
 #include "mir_toolkit/event.h"
 #include <memory>
 
@@ -33,7 +34,7 @@
 /*!
  * Stores information about an input event to be sent to a client
  */
-struct InputSendEntry
+struct MIR_INTERNAL InputSendEntry
 {
     uint32_t sequence_id;
     MirEvent event;

=== modified file 'src/server/input/android/rudimentary_input_reader_policy.h'
--- src/server/input/android/rudimentary_input_reader_policy.h	2013-04-24 05:22:20 +0000
+++ src/server/input/android/rudimentary_input_reader_policy.h	2014-07-18 06:57:43 +0000
@@ -18,6 +18,8 @@
 #ifndef MIR_INPUT_ANDROID_RUDIMENTARY_INPUT_READER_POLICY_H_
 #define MIR_INPUT_ANDROID_RUDIMENTARY_INPUT_READER_POLICY_H_
 
+#include "mir/visibility.h"
+
 // from android
 #include <InputReader.h>
 
@@ -29,7 +31,7 @@
 {
 namespace android
 {
-class RudimentaryInputReaderPolicy : public droidinput::InputReaderPolicyInterface
+class MIR_INTERNAL RudimentaryInputReaderPolicy : public droidinput::InputReaderPolicyInterface
 {
   public:
     // From InputReaderPolicyInterface

=== modified file 'src/server/input/cursor_controller.h'
--- src/server/input/cursor_controller.h	2014-06-11 17:42:49 +0000
+++ src/server/input/cursor_controller.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_CURSOR_CONTROLLER_H_
 #define MIR_INPUT_CURSOR_CONTROLLER_H_
 
+#include "mir/visibility.h"
 #include "mir/input/cursor_listener.h"
 #include "mir/geometry/point.h"
 
@@ -41,7 +42,7 @@
 {
 class InputTargets;
 
-class CursorController : public CursorListener
+class MIR_INTERNAL CursorController : public CursorListener
 {
 public:
     CursorController(std::shared_ptr<InputTargets> const& input_targets,

=== modified file 'src/server/input/default_configuration.cpp'
--- src/server/input/default_configuration.cpp	2014-07-09 10:48:47 +0000
+++ src/server/input/default_configuration.cpp	2014-07-18 06:57:43 +0000
@@ -118,7 +118,7 @@
         });
 }
 
-std::shared_ptr<mia::InputRegistrar>
+MIR_API std::shared_ptr<mia::InputRegistrar>
 mir::DefaultServerConfiguration::the_input_registrar()
 {
     return input_registrar(

=== modified file 'src/server/input/event_filter_chain.h'
--- src/server/input/event_filter_chain.h	2014-03-06 06:05:17 +0000
+++ src/server/input/event_filter_chain.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_EVENT_FILTER_CHAIN_H_
 #define MIR_INPUT_EVENT_FILTER_CHAIN_H_
 
+#include "mir/visibility.h"
 #include "mir/input/composite_event_filter.h"
 
 #include <vector>
@@ -28,7 +29,7 @@
 namespace input
 {
 
-class EventFilterChain : public CompositeEventFilter
+class MIR_INTERNAL EventFilterChain : public CompositeEventFilter
 {
 public:
     explicit EventFilterChain(std::initializer_list<std::shared_ptr<EventFilter> const> const& values);

=== modified file 'src/server/input/null_input_channel_factory.h'
--- src/server/input/null_input_channel_factory.h	2014-06-24 15:28:09 +0000
+++ src/server/input/null_input_channel_factory.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_NULL_INPUT_CHANNEL_FACTORY_H_
 #define MIR_INPUT_NULL_INPUT_CHANNEL_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_channel_factory.h"
 
 namespace mir
@@ -27,7 +28,7 @@
 {
 class InputChannel;
 
-class NullInputChannelFactory : public mir::input::InputChannelFactory
+class MIR_INTERNAL NullInputChannelFactory : public mir::input::InputChannelFactory
 {
     std::shared_ptr<mir::input::InputChannel> make_input_channel() override;
 };

=== modified file 'src/server/input/null_input_dispatcher.h'
--- src/server/input/null_input_dispatcher.h	2014-05-08 15:23:20 +0000
+++ src/server/input/null_input_dispatcher.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_NULL_INPUT_DISPATCHER_H_
 #define MIR_INPUT_NULL_INPUT_DISPATCHER_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_dispatcher.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace input
 {
 
-class NullInputDispatcher : public mir::input::InputDispatcher
+class MIR_INTERNAL NullInputDispatcher : public mir::input::InputDispatcher
 {
 public:
     void configuration_changed(nsecs_t when) override;

=== modified file 'src/server/input/null_input_manager.h'
--- src/server/input/null_input_manager.h	2014-05-07 09:11:52 +0000
+++ src/server/input/null_input_manager.h	2014-07-18 06:57:43 +0000
@@ -19,13 +19,14 @@
 #ifndef MIR_INPUT_NULL_INPUT_MANAGER_H_
 #define MIR_INPUT_NULL_INPUT_MANAGER_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_manager.h"
 
 namespace mir
 {
 namespace input
 {
-class NullInputManager : public input::InputManager
+class MIR_INTERNAL NullInputManager : public input::InputManager
 {
     void start() override
     {

=== modified file 'src/server/input/null_input_send_observer.h'
--- src/server/input/null_input_send_observer.h	2014-06-23 17:40:57 +0000
+++ src/server/input/null_input_send_observer.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_INPUT_NULL_INPUT_SEND_OBSERVER_H_
 #define MIR_INPUT_NULL_INPUT_SEND_OBSERVER_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_send_observer.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace input
 {
 
-class NullInputSendObserver : public InputSendObserver
+class MIR_INTERNAL NullInputSendObserver : public InputSendObserver
 {
 public:
     void send_failed(MirEvent const& /*event*/, input::Surface* /*surface*/, FailureReason /*reason*/) override

=== modified file 'src/server/report/lttng/compositor_report.h'
--- src/server/report/lttng/compositor_report.h	2014-02-09 16:18:16 +0000
+++ src/server/report/lttng/compositor_report.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_REPORT_LTTNG_COMPOSITOR_REPORT_H_
 #define MIR_REPORT_LTTNG_COMPOSITOR_REPORT_H_
 
+#include "mir/visibility.h"
 #include "server_tracepoint_provider.h"
 
 #include "mir/compositor/compositor_report.h"
@@ -30,7 +31,7 @@
 namespace lttng
 {
 
-class CompositorReport : public compositor::CompositorReport
+class MIR_INTERNAL CompositorReport : public compositor::CompositorReport
 {
 public:
     CompositorReport() = default;

=== modified file 'src/server/report/lttng/input_report.h'
--- src/server/report/lttng/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/input_report.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_REPORT_LTTNG_INPUT_REPORT_H_
 #define MIR_REPORT_LTTNG_INPUT_REPORT_H_
 
+#include "mir/visibility.h"
 #include "server_tracepoint_provider.h"
 
 #include "mir/input/input_report.h"
@@ -30,7 +31,7 @@
 namespace lttng
 {
 
-class InputReport : public input::InputReport
+class MIR_INTERNAL InputReport : public input::InputReport
 {
 public:
     InputReport() = default;

=== modified file 'src/server/report/lttng/message_processor_report.h'
--- src/server/report/lttng/message_processor_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/lttng/message_processor_report.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_REPORT_LTTNG_MESSAGE_PROCESSOR_REPORT_H_
 #define MIR_REPORT_LTTNG_MESSAGE_PROCESSOR_REPORT_H_
 
+#include "mir/visibility.h"
 #include "server_tracepoint_provider.h"
 
 #include "mir/frontend/message_processor_report.h"
@@ -30,7 +31,7 @@
 namespace lttng
 {
 
-class MessageProcessorReport : public mir::frontend::MessageProcessorReport
+class MIR_INTERNAL MessageProcessorReport : public mir::frontend::MessageProcessorReport
 {
 public:
     void received_invocation(void const* mediator, int id, std::string const& method);

=== modified file 'src/server/report/lttng/scene_report.h'
--- src/server/report/lttng/scene_report.h	2014-02-09 16:18:16 +0000
+++ src/server/report/lttng/scene_report.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_REPORT_LTTNG_SCENE_REPORT_H_
 #define MIR_REPORT_LTTNG_SCENE_REPORT_H_
 
+#include "mir/visibility.h"
 #include "server_tracepoint_provider.h"
 
 #include "mir/scene/scene_report.h"
@@ -31,7 +32,7 @@
 namespace lttng
 {
 
-class SceneReport : public scene::SceneReport
+class MIR_INTERNAL SceneReport : public scene::SceneReport
 {
 public:
     void surface_created(BasicSurfaceId id, std::string const& name) override;

=== modified file 'src/server/report/lttng_report_factory.h'
--- src/server/report/lttng_report_factory.h	2014-02-11 15:18:07 +0000
+++ src/server/report/lttng_report_factory.h	2014-07-18 06:57:43 +0000
@@ -19,13 +19,14 @@
 #ifndef MIR_REPORT_LTTNG_REPORT_FACTORY_H_
 #define MIR_REPORT_LTTNG_REPORT_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "report_factory.h"
 
 namespace mir
 {
 namespace report
 {
-class LttngReportFactory : public report::ReportFactory
+class MIR_INTERNAL LttngReportFactory : public report::ReportFactory
 {
 public:
     std::shared_ptr<compositor::CompositorReport> create_compositor_report() override;

=== modified file 'src/server/report/null/input_report.h'
--- src/server/report/null/input_report.h	2014-03-06 06:05:17 +0000
+++ src/server/report/null/input_report.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_REPORT_NULL_INPUT_REPORT_H_
 #define MIR_REPORT_NULL_INPUT_REPORT_H_
 
+#include "mir/visibility.h"
 #include "mir/input/input_report.h"
 
 namespace mir
@@ -29,7 +30,7 @@
 namespace null
 {
 
-class InputReport : public input::InputReport
+class MIR_INTERNAL InputReport : public input::InputReport
 {
 public:
     InputReport() = default;

=== modified file 'src/server/report/null/scene_report.h'
--- src/server/report/null/scene_report.h	2014-02-09 16:18:16 +0000
+++ src/server/report/null/scene_report.h	2014-07-18 06:57:43 +0000
@@ -21,6 +21,7 @@
 #ifndef MIR_REPORT_NULL_SCENE_REPORT_H_
 #define MIR_REPORT_NULL_SCENE_REPORT_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/scene_report.h"
 
 namespace mir
@@ -30,7 +31,7 @@
 namespace null
 {
 
-class SceneReport : public scene::SceneReport
+class MIR_INTERNAL SceneReport : public scene::SceneReport
 {
 public:
     virtual void surface_created(BasicSurfaceId /*id*/, std::string const& /*name*/) override;

=== modified file 'src/server/report/null_report_factory.h'
--- src/server/report/null_report_factory.h	2014-02-17 22:35:23 +0000
+++ src/server/report/null_report_factory.h	2014-07-18 06:57:43 +0000
@@ -19,13 +19,14 @@
 #ifndef MIR_REPORT_NULL_REPORT_FACTORY_H_
 #define MIR_REPORT_NULL_REPORT_FACTORY_H_
 
+#include "mir/visibility.h"
 #include "report_factory.h"
 
 namespace mir
 {
 namespace report
 {
-class NullReportFactory : public mir::report::ReportFactory
+class MIR_INTERNAL NullReportFactory : public mir::report::ReportFactory
 {
 public:
     std::shared_ptr<compositor::CompositorReport> create_compositor_report() override;
@@ -37,13 +38,13 @@
     std::shared_ptr<input::InputReport> create_input_report() override;
 };
 
-std::shared_ptr<compositor::CompositorReport> null_compositor_report();
-std::shared_ptr<graphics::DisplayReport> null_display_report();
-std::shared_ptr<scene::SceneReport> null_scene_report();
-std::shared_ptr<frontend::ConnectorReport> null_connector_report();
-std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
-std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
-std::shared_ptr<input::InputReport> null_input_report();
+MIR_INTERNAL std::shared_ptr<compositor::CompositorReport> null_compositor_report();
+MIR_INTERNAL std::shared_ptr<graphics::DisplayReport> null_display_report();
+MIR_INTERNAL std::shared_ptr<scene::SceneReport> null_scene_report();
+MIR_INTERNAL std::shared_ptr<frontend::ConnectorReport> null_connector_report();
+MIR_INTERNAL std::shared_ptr<frontend::SessionMediatorReport> null_session_mediator_report();
+MIR_INTERNAL std::shared_ptr<frontend::MessageProcessorReport> null_message_processor_report();
+MIR_INTERNAL std::shared_ptr<input::InputReport> null_input_report();
 
 }
 }

=== modified file 'src/server/scene/broadcasting_session_event_sink.h'
--- src/server/scene/broadcasting_session_event_sink.h	2014-04-15 05:31:19 +0000
+++ src/server/scene/broadcasting_session_event_sink.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_BROADCASTING_SESSION_EVENT_SINK_H_
 #define MIR_SCENE_BROADCASTING_SESSION_EVENT_SINK_H_
 
+#include "mir/visibility.h"
 #include "session_event_sink.h"
 #include "session_event_handler_register.h"
 
@@ -29,8 +30,8 @@
 {
 namespace scene
 {
-class BroadcastingSessionEventSink : public SessionEventSink,
-                                     public SessionEventHandlerRegister
+class MIR_INTERNAL BroadcastingSessionEventSink : public SessionEventSink,
+                                                  public SessionEventHandlerRegister
 {
 public:
     void handle_focus_change(std::shared_ptr<Session> const& session);

=== modified file 'src/server/scene/default_configuration.cpp'
--- src/server/scene/default_configuration.cpp	2014-07-08 06:42:38 +0000
+++ src/server/scene/default_configuration.cpp	2014-07-18 06:57:43 +0000
@@ -100,7 +100,7 @@
     return wrapped;
 }
 
-std::shared_ptr<ms::BroadcastingSessionEventSink>
+MIR_API std::shared_ptr<ms::BroadcastingSessionEventSink>
 mir::DefaultServerConfiguration::the_broadcasting_session_event_sink()
 {
     return broadcasting_session_event_sink(
@@ -116,7 +116,7 @@
     return the_broadcasting_session_event_sink();
 }
 
-std::shared_ptr<ms::SessionEventHandlerRegister>
+MIR_API std::shared_ptr<ms::SessionEventHandlerRegister>
 mir::DefaultServerConfiguration::the_session_event_handler_register()
 {
     return the_broadcasting_session_event_sink();
@@ -129,7 +129,7 @@
         []{ return std::make_shared<ms::DefaultSessionContainer>(); });
 }
 
-std::shared_ptr<ms::MediatingDisplayChanger>
+MIR_API std::shared_ptr<ms::MediatingDisplayChanger>
 mir::DefaultServerConfiguration::the_mediating_display_changer()
 {
     return mediating_display_changer(

=== modified file 'src/server/scene/default_session_container.h'
--- src/server/scene/default_session_container.h	2014-04-24 11:24:51 +0000
+++ src/server/scene/default_session_container.h	2014-07-18 06:57:43 +0000
@@ -23,13 +23,14 @@
 #include <memory>
 #include <mutex>
 
+#include "mir/visibility.h"
 #include "session_container.h"
 
 namespace mir
 {
 namespace scene
 {
-class DefaultSessionContainer : public SessionContainer
+class MIR_INTERNAL DefaultSessionContainer : public SessionContainer
 {
 public:
     void insert_session(std::shared_ptr<Session> const& session) override;

=== modified file 'src/server/scene/gl_pixel_buffer.h'
--- src/server/scene/gl_pixel_buffer.h	2014-03-06 06:05:17 +0000
+++ src/server/scene/gl_pixel_buffer.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_GL_PIXEL_BUFFER_H_
 #define MIR_SCENE_GL_PIXEL_BUFFER_H_
 
+#include "mir/visibility.h"
 #include "pixel_buffer.h"
 
 #include <memory>
@@ -37,7 +38,7 @@
 namespace scene
 {
 /** Extracts the pixels from a graphics::Buffer using GL facilities. */
-class GLPixelBuffer : public PixelBuffer
+class MIR_INTERNAL GLPixelBuffer : public PixelBuffer
 {
 public:
     GLPixelBuffer(std::unique_ptr<graphics::GLContext> gl_context);

=== modified file 'src/server/scene/global_event_sender.h'
--- src/server/scene/global_event_sender.h	2014-03-18 09:24:36 +0000
+++ src/server/scene/global_event_sender.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_GLOBAL_EVENT_SENDER_H_
 #define MIR_SCENE_GLOBAL_EVENT_SENDER_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/event_sink.h"
 #include <memory>
 
@@ -28,7 +29,7 @@
 {
 class SessionContainer;
 
-class GlobalEventSender : public frontend::EventSink
+class MIR_INTERNAL GlobalEventSender : public frontend::EventSink
 {
 public:
     GlobalEventSender(std::shared_ptr<SessionContainer> const&);

=== modified file 'src/server/scene/mediating_display_changer.h'
--- src/server/scene/mediating_display_changer.h	2014-05-21 02:24:48 +0000
+++ src/server/scene/mediating_display_changer.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_MEDIATING_DISPLAY_CHANGER_H_
 #define MIR_SCENE_MEDIATING_DISPLAY_CHANGER_H_
 
+#include "mir/visibility.h"
 #include "mir/frontend/display_changer.h"
 #include "mir/display_changer.h"
 
@@ -41,8 +42,8 @@
 class SessionContainer;
 class Session;
 
-class MediatingDisplayChanger : public frontend::DisplayChanger,
-                                public mir::DisplayChanger
+class MIR_INTERNAL MediatingDisplayChanger : public frontend::DisplayChanger,
+                                             public mir::DisplayChanger
 {
 public:
     MediatingDisplayChanger(

=== modified file 'src/server/scene/prompt_session_manager_impl.h'
--- src/server/scene/prompt_session_manager_impl.h	2014-07-09 17:04:55 +0000
+++ src/server/scene/prompt_session_manager_impl.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_PROMPT_SESSION_MANAGERIMPL_H_
 #define MIR_SCENE_PROMPT_SESSION_MANAGERIMPL_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/prompt_session_manager.h"
 #include "mir_toolkit/common.h"
 
@@ -36,7 +37,7 @@
 class PromptSessionCreationParameters;
 class PromptSessionListener;
 
-class PromptSessionManagerImpl : public scene::PromptSessionManager
+class MIR_INTERNAL PromptSessionManagerImpl : public scene::PromptSessionManager
 {
 public:
     explicit PromptSessionManagerImpl(

=== modified file 'src/server/scene/session_container.h'
--- src/server/scene/session_container.h	2014-04-24 11:24:51 +0000
+++ src/server/scene/session_container.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_SESSION_CONTAINER_H_
 #define MIR_SCENE_SESSION_CONTAINER_H_
 
+#include "mir/visibility.h"
 #include <vector>
 #include <memory>
 #include <mutex>

=== modified file 'src/server/scene/session_event_handler_register.h'
--- src/server/scene/session_event_handler_register.h	2014-04-15 05:31:19 +0000
+++ src/server/scene/session_event_handler_register.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_SESSION_EVENT_HANDLER_REGISTER_H_
 #define MIR_SCENE_SESSION_EVENT_HANDLER_REGISTER_H_
 
+#include "mir/visibility.h"
 #include <functional>
 #include <memory>
 
@@ -28,7 +29,7 @@
 {
 class Session;
 
-class SessionEventHandlerRegister
+class MIR_INTERNAL SessionEventHandlerRegister
 {
 public:
     virtual ~SessionEventHandlerRegister() = default;

=== modified file 'src/server/scene/session_manager.h'
--- src/server/scene/session_manager.h	2014-07-09 17:04:55 +0000
+++ src/server/scene/session_manager.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_APPLICATION_MANAGER_H_
 #define MIR_SCENE_APPLICATION_MANAGER_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/session_coordinator.h"
 
 #include <mutex>
@@ -43,7 +44,7 @@
 class PromptSessionManager;
 
 
-class SessionManager : public SessionCoordinator
+class MIR_INTERNAL SessionManager : public SessionCoordinator
 {
 public:
     explicit SessionManager(std::shared_ptr<SurfaceCoordinator> const& surface_coordinator,

=== modified file 'src/server/scene/snapshot_strategy.h'
--- src/server/scene/snapshot_strategy.h	2014-04-15 05:31:19 +0000
+++ src/server/scene/snapshot_strategy.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SCENE_SNAPSHOT_STRATEGY_H_
 #define MIR_SCENE_SNAPSHOT_STRATEGY_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/snapshot.h"
 
 #include <memory>
@@ -29,7 +30,7 @@
 {
 class SurfaceBufferAccess;
 
-class SnapshotStrategy
+class MIR_INTERNAL SnapshotStrategy
 {
 public:
     virtual ~SnapshotStrategy() = default;

=== modified file 'src/server/scene/surface_controller.h'
--- src/server/scene/surface_controller.h	2014-04-15 10:19:19 +0000
+++ src/server/scene/surface_controller.h	2014-07-18 06:57:43 +0000
@@ -20,6 +20,7 @@
 #ifndef MIR_SCENE_SURFACE_CONTROLLER_H_
 #define MIR_SCENE_SURFACE_CONTROLLER_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/surface_coordinator.h"
 
 namespace mir
@@ -31,7 +32,7 @@
 class SurfaceFactory;
 
 /// Will grow up to provide synchronization of model updates
-class SurfaceController : public SurfaceCoordinator
+class MIR_INTERNAL SurfaceController : public SurfaceCoordinator
 {
 public:
     SurfaceController(

=== modified file 'src/server/scene/surface_stack.h'
--- src/server/scene/surface_stack.h	2014-07-11 03:33:03 +0000
+++ src/server/scene/surface_stack.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,8 @@
 #ifndef MIR_SCENE_SURFACE_STACK_H_
 #define MIR_SCENE_SURFACE_STACK_H_
 
+#include "mir/visibility.h"
+
 #include "surface_stack_model.h"
 
 #include "mir/compositor/scene.h"
@@ -45,7 +47,7 @@
 class SceneReport;
 class RenderingTracker;
 
-class Observers : public Observer, BasicObservers<Observer>
+class MIR_INTERNAL Observers : public Observer, BasicObservers<Observer>
 {
 public:
    // ms::Observer
@@ -59,7 +61,7 @@
    using BasicObservers<Observer>::remove;
 };
 
-class SurfaceStack : public compositor::Scene, public input::InputTargets, public SurfaceStackModel
+class MIR_INTERNAL SurfaceStack : public compositor::Scene, public input::InputTargets, public SurfaceStackModel
 {
 public:
     explicit SurfaceStack(

=== modified file 'src/server/scene/threaded_snapshot_strategy.h'
--- src/server/scene/threaded_snapshot_strategy.h	2014-04-15 05:31:19 +0000
+++ src/server/scene/threaded_snapshot_strategy.h	2014-07-18 06:57:43 +0000
@@ -32,7 +32,7 @@
 class PixelBuffer;
 class SnapshottingFunctor;
 
-class ThreadedSnapshotStrategy : public SnapshotStrategy
+class MIR_INTERNAL ThreadedSnapshotStrategy : public SnapshotStrategy
 {
 public:
     ThreadedSnapshotStrategy(std::shared_ptr<PixelBuffer> const& pixels);

=== modified file 'src/server/shell/consuming_placement_strategy.h'
--- src/server/shell/consuming_placement_strategy.h	2014-04-15 05:31:19 +0000
+++ src/server/shell/consuming_placement_strategy.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SHELL_CONSUMING_PLACEMENT_STRATEGY_H_
 #define MIR_SHELL_CONSUMING_PLACEMENT_STRATEGY_H_
 
+#include "mir/visibility.h"
 #include "mir/scene/placement_strategy.h"
 
 #include <memory>
@@ -29,7 +30,7 @@
 {
 class DisplayLayout;
 
-class ConsumingPlacementStrategy : public scene::PlacementStrategy
+class MIR_INTERNAL ConsumingPlacementStrategy : public scene::PlacementStrategy
 {
 public:
     explicit ConsumingPlacementStrategy(

=== modified file 'src/server/shell/default_focus_mechanism.h'
--- src/server/shell/default_focus_mechanism.h	2014-04-15 05:31:19 +0000
+++ src/server/shell/default_focus_mechanism.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_SHELL_SINGLE_VISIBILITY_FOCUS_MECHANISM_H_
 #define MIR_SHELL_SINGLE_VISIBILITY_FOCUS_MECHANISM_H_
 
+#include "mir/visibility.h"
 #include "mir/shell/focus_setter.h"
 
 #include <memory>
@@ -32,7 +33,7 @@
 {
 class InputTargeter;
 
-class DefaultFocusMechanism : public FocusSetter
+class MIR_INTERNAL DefaultFocusMechanism : public FocusSetter
 {
 public:
     explicit DefaultFocusMechanism(std::shared_ptr<InputTargeter> const& input_targeter,

=== modified file 'src/server/shell/null_host_lifecycle_event_listener.h'
--- src/server/shell/null_host_lifecycle_event_listener.h	2014-07-14 12:06:02 +0000
+++ src/server/shell/null_host_lifecycle_event_listener.h	2014-07-18 06:57:43 +0000
@@ -19,6 +19,7 @@
 #ifndef MIR_NULL_HOST_LIFECYCLE_EVENT_LISTENER_H_
 #define MIR_NULL_HOST_LIFECYCLE_EVENT_LISTENER_H_
 
+#include "mir/visibility.h"
 #include "mir/shell/host_lifecycle_event_listener.h"
 
 namespace mir
@@ -26,7 +27,7 @@
 namespace shell
 {
 
-class NullHostLifecycleEventListener : public HostLifecycleEventListener
+class MIR_INTERNAL NullHostLifecycleEventListener : public HostLifecycleEventListener
 {
 public:
     virtual void lifecycle_event_occurred(MirLifecycleState /*state*/) override {}

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2014-05-16 06:02:30 +0000
+++ tests/CMakeLists.txt	2014-07-18 06:57:43 +0000
@@ -6,6 +6,8 @@
 include_directories(${MIR_3RD_PARTY_INCLUDE_DIRECTORIES})
 include_directories(${MIR_ANDROID_INCLUDE_DIRECTORIES})
 
+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
+
 if ("${CMAKE_CXX_COMPILER}" MATCHES "clang")
   # Avoid clang complaints about poor quality gmock/gtest headers
   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=null-dereference")

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2014-07-11 14:04:15 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2014-07-18 06:57:43 +0000
@@ -61,7 +61,7 @@
 target_link_libraries(
   mir_acceptance_tests
 
-  mirserver
+  mirserver-static
   mirclient
   mirplatform
 

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2014-04-17 01:34:35 +0000
+++ tests/integration-tests/CMakeLists.txt	2014-07-18 06:57:43 +0000
@@ -53,7 +53,7 @@
   mir-test-framework
   mir-test-doubles
 
-  mirserver
+  mirserver-static
   mirplatformgraphics
   mirclient
   mirdraw

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2014-07-11 21:53:44 +0000
+++ tests/unit-tests/CMakeLists.txt	2014-07-18 06:57:43 +0000
@@ -44,7 +44,7 @@
   mir_unit_tests
 
   mirclient
-  mirserver
+  mirserver-static
   mirplatformgraphics
   mirclientplatform
   mirdraw