3 files changed, 13 insertions, 8 deletions
diff --git a/qpid/cpp/src/qpid/framing/FrameSet.h b/qpid/cpp/src/qpid/framing/FrameSet.h
index 3b9f60950b..9640abb7ac 100644
--- a/qpid/cpp/src/qpid/framing/FrameSet.h
+++ b/qpid/cpp/src/qpid/framing/FrameSet.h
@@ -1,3 +1,5 @@
+#ifndef QPID_FRAMING_FRAMESET_H
+#define QPID_FRAMING_FRAMESET_H
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -18,6 +20,7 @@
  * under the License.
  *
  */
+
 #include <string>
 #include "qpid/InlineVector.h"
 #include "qpid/framing/amqp_framing.h"
@@ -25,9 +28,6 @@
 #include "qpid/framing/SequenceNumber.h"
 #include "qpid/CommonImportExport.h"
 
-#ifndef _FrameSet_
-#define _FrameSet_
-
 namespace qpid {
 namespace framing {
 
@@ -117,4 +117,4 @@ public:
 }
 
 
-#endif
+#endif /*!QPID_FRAMING_FRAMESET_H*/
diff --git a/qpid/cpp/src/qpid/sys/OutputControl.h b/qpid/cpp/src/qpid/sys/OutputControl.h
index eae99beb0f..ad5caa3168 100644
--- a/qpid/cpp/src/qpid/sys/OutputControl.h
+++ b/qpid/cpp/src/qpid/sys/OutputControl.h
@@ -1,3 +1,6 @@
+#ifndef QPID_SYS_OUTPUT_CONTROL_H
+#define QPID_SYS_OUTPUT_CONTROL_H
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +24,6 @@
 
 #include "qpid/sys/IntegerTypes.h"
 
-#ifndef _OutputControl_
-#define _OutputControl_
-
 namespace qpid {
 namespace sys {
 
@@ -40,4 +40,4 @@ namespace sys {
 }
 
 
-#endif
+#endif /*!QPID_SYS_OUTPUT_CONTROL_H*/
diff --git a/qpid/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h
index c2eabd804d..5024f5b77c 100644
--- a/qpid/cpp/src/tests/MessageUtils.h
+++ b/qpid/cpp/src/tests/MessageUtils.h
@@ -1,3 +1,6 @@
+#ifndef TESTS_MESSAGEUTILS_H
+#define TESTS_MESSAGEUTILS_H
+
 /*
  *
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -98,3 +101,5 @@ struct MessageUtils
 };
 
 }} // namespace qpid::tests
+
+#endif  /*!TESTS_MESSAGEUTILS_H*/