diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
index 90b6b4bda9..ba728193d8 100644
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
@@ -17,6 +17,9 @@
 
 */
 
+#define __STDC_FORMAT_MACROS 1
+#include <stdint.h>
+
 #include <algorithm>
 
 #include <pbd/error.h>
@@ -121,7 +124,7 @@ GenericMidiControlProtocol::_send_feedback ()
 	if (end == buf) {
 		return;
 	} 
-	
+
 	_port->write (buf, (int32_t) (end - buf));
 }
 
@@ -228,9 +231,7 @@ GenericMidiControlProtocol::stop_learning (Controllable* c)
 		}
 	}
 	
-	if (dptr) {
-		delete dptr;
-	}
+	delete dptr;
 }
 
 void