diff --git a/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c b/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c
index b884bd412f..04e1766ed1 100644
--- a/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c
+++ b/modules/juce_audio_formats/codecs/flac/libFLAC/stream_decoder.c
@@ -3369,4 +3369,4 @@ FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *client_d
 	return feof(decoder->private_->file)? true : false;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c b/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c
index f2507ca94a..20e98dacf8 100644
--- a/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c
+++ b/modules/juce_audio_formats/codecs/flac/libFLAC/stream_encoder.c
@@ -4333,4 +4333,4 @@ FILE *get_binary_stdout_(void)
 	return stdout;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.h b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.h
index c637eba048..308ff5ab13 100644
--- a/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.h
+++ b/modules/juce_audio_processors/format_types/juce_VST3PluginFormat.h
@@ -68,5 +68,5 @@ private:
     JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (VST3PluginFormat)
 };
 
-#endif //JUCE_PLUGINHOST_VST3
-#endif //JUCE_VST3PLUGINFORMAT_H_INCLUDED
\ No newline at end of file
+#endif   // JUCE_PLUGINHOST_VST3
+#endif   // JUCE_VST3PLUGINFORMAT_H_INCLUDED
diff --git a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
index 33372726bc..6b32e74136 100644
--- a/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
+++ b/modules/juce_audio_processors/format_types/juce_VSTMidiEventList.h
@@ -22,11 +22,10 @@
   ==============================================================================
 */
 
-#ifdef __aeffect__
-
 #ifndef JUCE_VSTMIDIEVENTLIST_H_INCLUDED
 #define JUCE_VSTMIDIEVENTLIST_H_INCLUDED
 
+#ifdef __aeffect__
 
 //==============================================================================
 /** Holds a set of VSTMidiEvent objects and makes it easy to add
@@ -184,6 +183,5 @@ private:
     }
 };
 
-
-#endif   // JUCE_VSTMIDIEVENTLIST_H_INCLUDED
 #endif
+#endif   // JUCE_VSTMIDIEVENTLIST_H_INCLUDED
diff --git a/modules/juce_core/javascript/juce_Javascript.h b/modules/juce_core/javascript/juce_Javascript.h
index e080b18cb0..42368a4faf 100644
--- a/modules/juce_core/javascript/juce_Javascript.h
+++ b/modules/juce_core/javascript/juce_Javascript.h
@@ -26,7 +26,6 @@
   ==============================================================================
 */
 
-
 /**
     A simple javascript interpreter!
 
diff --git a/modules/juce_core/misc/juce_Uuid.cpp b/modules/juce_core/misc/juce_Uuid.cpp
index bffb38d9d2..eb749643f6 100644
--- a/modules/juce_core/misc/juce_Uuid.cpp
+++ b/modules/juce_core/misc/juce_Uuid.cpp
@@ -26,7 +26,6 @@
   ==============================================================================
 */
 
-
 Uuid::Uuid()
 {
     Random r;
diff --git a/modules/juce_gui_basics/application/juce_Application.cpp b/modules/juce_gui_basics/application/juce_Application.cpp
index 93b54be6a1..e96ff6870e 100644
--- a/modules/juce_gui_basics/application/juce_Application.cpp
+++ b/modules/juce_gui_basics/application/juce_Application.cpp
@@ -22,7 +22,6 @@
   ==============================================================================
 */
 
-
 JUCEApplication::JUCEApplication() {}
 JUCEApplication::~JUCEApplication() {}
 
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h
index 8b977bc959..bc2b6db7bf 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V1.h
@@ -98,4 +98,4 @@ private:
 };
 
 
-#endif   // JUCE_LOOKANDFEEL_H_INCLUDED
+#endif   // JUCE_LOOKANDFEEL_V1_H_INCLUDED
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h
index 5ffb955022..8079e5a133 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V2.h
@@ -344,4 +344,4 @@ private:
 };
 
 
-#endif   // JUCE_LOOKANDFEEL_H_INCLUDED
+#endif   // JUCE_LOOKANDFEEL_V2_H_INCLUDED
diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h
index 04bdd9ee0c..ad97552d2f 100644
--- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h
+++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel_V3.h
@@ -93,4 +93,4 @@ private:
 };
 
 
-#endif   // JUCE_LOOKANDFEEL_H_INCLUDED
+#endif   // JUCE_LOOKANDFEEL_V3_H_INCLUDED
diff --git a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
index a50f167805..6afad60a4e 100644
--- a/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
+++ b/modules/juce_gui_extra/misc/juce_WebBrowserComponent.h
@@ -125,4 +125,4 @@ private:
 
 
 #endif
-#endif   // JUCE_WEBBROWSERCOMPONENT_H_INCLUDED
\ No newline at end of file
+#endif   // JUCE_WEBBROWSERCOMPONENT_H_INCLUDED