8 files changed, 28 insertions, 18 deletions
diff --git a/gdb/compile/compile-c.h b/gdb/compile/compile-c.h
index ecb69df..b5a2194 100644
--- a/gdb/compile/compile-c.h
+++ b/gdb/compile/compile-c.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_C_H
-#define GDB_COMPILE_C_H
+#ifndef COMPILE_COMPILE_C_H
+#define COMPILE_COMPILE_C_H
 
 #include "common/enum-flags.h"
 #include "gcc-c-plugin.h"
@@ -92,4 +92,4 @@ extern std::string c_get_range_decl_name (const struct dynamic_prop *prop);
 extern gdb::unique_xmalloc_ptr<char>
   c_symbol_substitution_name (struct symbol *sym);
 
-#endif /* GDB_COMPILE_C_H  */
+#endif /* COMPILE_COMPILE_C_H */
diff --git a/gdb/compile/compile-cplus.h b/gdb/compile/compile-cplus.h
index 8979942..e5ea7d7 100644
--- a/gdb/compile/compile-cplus.h
+++ b/gdb/compile/compile-cplus.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_CPLUS_H
-#define GDB_COMPILE_CPLUS_H
+#ifndef COMPILE_COMPILE_CPLUS_H
+#define COMPILE_COMPILE_CPLUS_H
 
 #include "common/enum-flags.h"
 #include "gcc-cp-plugin.h"
@@ -202,4 +202,4 @@ private:
 enum gcc_cp_symbol_kind get_method_access_flag (const struct type *type,
 						int fni, int num);
 
-#endif /* GDB_COMPILE_CPLUS_H  */
+#endif /* COMPILE_COMPILE_CPLUS_H */
diff --git a/gdb/compile/compile-internal.h b/gdb/compile/compile-internal.h
index 90e8292..406a369 100644
--- a/gdb/compile/compile-internal.h
+++ b/gdb/compile/compile-internal.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_INTERNAL_H
-#define GDB_COMPILE_INTERNAL_H
+#ifndef COMPILE_COMPILE_INTERNAL_H
+#define COMPILE_COMPILE_INTERNAL_H
 
 #include "gcc-c-interface.h"
 
@@ -207,4 +207,4 @@ private:
   std::string m_object_file;
 };
 
-#endif /* GDB_COMPILE_INTERNAL_H */
+#endif /* COMPILE_COMPILE_INTERNAL_H */
diff --git a/gdb/compile/compile-object-load.h b/gdb/compile/compile-object-load.h
index 33cc292..730164f 100644
--- a/gdb/compile/compile-object-load.h
+++ b/gdb/compile/compile-object-load.h
@@ -14,8 +14,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_OBJECT_LOAD_H
-#define GDB_COMPILE_OBJECT_LOAD_H
+#ifndef COMPILE_COMPILE_OBJECT_LOAD_H
+#define COMPILE_COMPILE_OBJECT_LOAD_H
 
 #include "compile-internal.h"
 #include <list>
@@ -82,4 +82,4 @@ extern struct compile_module *compile_object_load
    enum compile_i_scope_types scope, void *scope_data);
 extern void munmap_list_free (struct munmap_list *head);
 
-#endif /* GDB_COMPILE_OBJECT_LOAD_H */
+#endif /* COMPILE_COMPILE_OBJECT_LOAD_H */
diff --git a/gdb/compile/compile-object-run.h b/gdb/compile/compile-object-run.h
index 0124095..f8c1ef4 100644
--- a/gdb/compile/compile-object-run.h
+++ b/gdb/compile/compile-object-run.h
@@ -14,11 +14,11 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_OBJECT_RUN_H
-#define GDB_COMPILE_OBJECT_RUN_H
+#ifndef COMPILE_COMPILE_OBJECT_RUN_H
+#define COMPILE_COMPILE_OBJECT_RUN_H
 
 #include "compile-object-load.h"
 
 extern void compile_object_run (struct compile_module *module);
 
-#endif /* GDB_COMPILE_OBJECT_RUN_H */
+#endif /* COMPILE_COMPILE_OBJECT_RUN_H */
diff --git a/gdb/compile/compile.h b/gdb/compile/compile.h
index 88bd8d8..127d867 100644
--- a/gdb/compile/compile.h
+++ b/gdb/compile/compile.h
@@ -15,8 +15,8 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
-#ifndef GDB_COMPILE_H
-#define GDB_COMPILE_H
+#ifndef COMPILE_COMPILE_H
+#define COMPILE_COMPILE_H
 
 struct ui_file;
 struct gdbarch;
@@ -106,4 +106,4 @@ extern void compile_print_value (struct value *val, void *data_voidp);
 /* Command element for the 'compile' command.  */
 extern cmd_list_element *compile_cmd_element;
 
-#endif /* GDB_COMPILE_H */
+#endif /* COMPILE_COMPILE_H */
diff --git a/gdb/compile/gcc-c-plugin.h b/gdb/compile/gcc-c-plugin.h
index 9ec78e2..12869f3 100644
--- a/gdb/compile/gcc-c-plugin.h
+++ b/gdb/compile/gcc-c-plugin.h
@@ -17,6 +17,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef COMPILE_GCC_C_PLUGIN_H
+#define COMPILE_GCC_C_PLUGIN_H
+
 #include "compile-internal.h"
 
 /* A class representing the C plug-in.  */
@@ -64,3 +67,5 @@ private:
   /* The GCC C context.  */
   struct gcc_c_context *m_context;
 };
+
+#endif /* COMPILE_GCC_C_PLUGIN_H */
diff --git a/gdb/compile/gcc-cp-plugin.h b/gdb/compile/gcc-cp-plugin.h
index f7ba494..0f0d01f 100644
--- a/gdb/compile/gcc-cp-plugin.h
+++ b/gdb/compile/gcc-cp-plugin.h
@@ -17,6 +17,9 @@
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
+#ifndef COMPILE_GCC_CP_PLUGIN_H
+#define COMPILE_GCC_CP_PLUGIN_H
+
 /* A class representing the GCC C++ plug-in.  */
 
 #include "gcc-cp-interface.h"
@@ -83,3 +86,5 @@ private:
   /* The GCC C++ context.  */
   struct gcc_cp_context *m_context;
 };
+
+#endif /* COMPILE_GCC_CP_PLUGIN_H */