4 files changed, 3 insertions, 10 deletions
diff --git a/src/server/internals/BlockDelay.cpp b/src/server/internals/BlockDelay.cpp
index b929f2e9..acc68851 100644
--- a/src/server/internals/BlockDelay.cpp
+++ b/src/server/internals/BlockDelay.cpp
@@ -33,11 +33,7 @@
 
 #include <memory>
 
-namespace ingen::server {
-
-class RunContext;
-
-namespace internals {
+namespace ingen::server::internals {
 
 InternalPlugin* BlockDelayNode::internal_plugin(URIs& uris) {
 	return new InternalPlugin(
@@ -90,5 +86,4 @@ BlockDelayNode::run(RunContext& ctx)
 	_buffer->copy(ctx, _in_port->buffer(0).get());
 }
 
-} // namespace internals
-} // namespace ingen::server
+} // namespace ingen::server::internals
diff --git a/src/server/internals/BlockDelay.hpp b/src/server/internals/BlockDelay.hpp
index 78a03c28..a9667fa0 100644
--- a/src/server/internals/BlockDelay.hpp
+++ b/src/server/internals/BlockDelay.hpp
@@ -36,7 +36,6 @@ class GraphImpl;
 class InputPort;
 class InternalPlugin;
 class OutputPort;
-class RunContext;
 
 namespace internals {
 
diff --git a/src/server/internals/Controller.cpp b/src/server/internals/Controller.cpp
index cbc62eea..9103649e 100644
--- a/src/server/internals/Controller.cpp
+++ b/src/server/internals/Controller.cpp
@@ -172,7 +172,7 @@ ControllerNode::control(RunContext& ctx, uint8_t control_num, uint8_t val, Frame
 		}
 		const Sample min = logf(min_port_val + 1 + log_offset);
 		const Sample max = logf(max_port_val + 1 + log_offset);
-		scaled_value = expf(nval * (max - min) + min) - 1 - log_offset;
+		scaled_value = expf((nval * (max - min)) + min) - 1 - log_offset;
 	} else {
 		scaled_value = ((nval) * (max_port_val - min_port_val)) + min_port_val;
 	}
diff --git a/src/server/internals/Time.hpp b/src/server/internals/Time.hpp
index fa3e90e5..228e67a8 100644
--- a/src/server/internals/Time.hpp
+++ b/src/server/internals/Time.hpp
@@ -34,7 +34,6 @@ class BufferFactory;
 class GraphImpl;
 class InternalPlugin;
 class OutputPort;
-class RunContext;
 
 namespace internals {