diff --git a/stepmania/src/EditMenu.cpp b/stepmania/src/EditMenu.cpp
index 076ff02fb0..a2a2c16e49 100644
--- a/stepmania/src/EditMenu.cpp
+++ b/stepmania/src/EditMenu.cpp
@@ -327,3 +327,4 @@ Steps* EditMenu::GetSelectedSourceNotes()
 {
 	return GetSelectedSong()->GetStepsByDifficulty(GetSelectedSourceNotesType(),GetSelectedSourceDifficulty(), false);
 }
+
diff --git a/stepmania/src/EditMenu.h b/stepmania/src/EditMenu.h
index e12096c6f4..f05b380c9c 100644
--- a/stepmania/src/EditMenu.h
+++ b/stepmania/src/EditMenu.h
@@ -1,5 +1,6 @@
 #ifndef EDITMENU_H
 #define EDITMENU_H
+
 /*
 -----------------------------------------------------------------------------
  Class: EditMenu
diff --git a/stepmania/src/ScreenEditMenu.cpp b/stepmania/src/ScreenEditMenu.cpp
index ecc45cb147..29106c25ab 100644
--- a/stepmania/src/ScreenEditMenu.cpp
+++ b/stepmania/src/ScreenEditMenu.cpp
@@ -230,3 +230,4 @@ void ScreenEditMenu::MenuBack( PlayerNumber pn )
 
 	SOUND->StopMusic();
 }
+
diff --git a/stepmania/src/ScreenEditMenu.h b/stepmania/src/ScreenEditMenu.h
index d59f70460b..c9ab1338fb 100644
--- a/stepmania/src/ScreenEditMenu.h
+++ b/stepmania/src/ScreenEditMenu.h
@@ -1,3 +1,6 @@
+#ifndef SCREEN_EDIT_MENU_H
+#define SCREEN_EDIT_MENU_H
+
 /*
 -----------------------------------------------------------------------------
  Class: ScreenEditMenu
@@ -41,5 +44,4 @@ private:
 	MenuElements	m_Menu;
 };
 
-
-
+#endif