diff --git a/include/boost/program_options.hpp b/include/boost/program_options.hpp
index dc35011957..46e1b7d3a5 100644
--- a/include/boost/program_options.hpp
+++ b/include/boost/program_options.hpp
@@ -5,8 +5,8 @@
 
 //  See www.boost.org/libs/program_options for documentation.
 
-#ifndef PROGRAM_OPTIONS_VP_2003_05_19
-#define PROGRAM_OPTIONS_VP_2003_05_19
+#ifndef BOOST_PROGRAM_OPTIONS_VP_2003_05_19
+#define BOOST_PROGRAM_OPTIONS_VP_2003_05_19
 
 #if defined(_MSC_VER)
 #pragma once
@@ -22,4 +22,4 @@
 #include <boost/program_options/value_semantic.hpp>
 #include <boost/program_options/version.hpp>
 
-#endif
+#endif // BOOST_PROGRAM_OPTIONS_VP_2003_05_19
diff --git a/include/boost/program_options/config.hpp b/include/boost/program_options/config.hpp
index 8b70521741..69141726b9 100644
--- a/include/boost/program_options/config.hpp
+++ b/include/boost/program_options/config.hpp
@@ -48,5 +48,5 @@
 #endif
 
 
-#endif // PROGRAM_OPTIONS_CONFIG_HK_2004_01_11
+#endif // BOOST_PROGRAM_OPTIONS_CONFIG_HK_2004_01_11