Fix spelling, cleanup

svn-id: r49843

32 files changed, 48 insertions, 48 deletions

diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index fe6164cb0c..8a57a3cf1c 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -368,7 +368,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
 		}
 
 		if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
-			debug(6, "An error occured during ExamineDir");
+			debug(6, "An error occurred during ExamineDir");
 			ret = false;
 		} else {
 			ret = true;
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp b/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp
index b4c1e222d0..9566a25311 100644
--- a/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp
+++ b/backends/platform/PalmOS/Src/launcher/forms/formSkins.cpp
@@ -107,7 +107,7 @@ static void SkinsFormExit(Boolean bSave) {
 	listP = (ListType *)GetObjectPtr(SkinsSkinList);
 	selected = LstGetSelection(listP);
 
-	if (bSave && selected == -1)	{	// may never occured...
+	if (bSave && selected == -1)	{	// may never occurred...
 		FrmCustomAlert(FrmWarnAlert, "You didn't select a skin.", 0, 0);
 		return;
 	}
@@ -164,7 +164,7 @@ static void SkinsFormBeam() {
 	listP = (ListType *)GetObjectPtr(SkinsSkinList);
 	selected = LstGetSelection(listP);
 
-	if (selected == -1)	{	// may never occured...
+	if (selected == -1)	{	// may never occurred...
 		FrmCustomAlert(FrmWarnAlert, "You didn't select a skin.", 0, 0);
 		return;
 	}
@@ -187,7 +187,7 @@ static void SkinsFormDelete() {
 	listP = (ListType *)GetObjectPtr(SkinsSkinList);
 	selected = LstGetSelection(listP);
 
-	if (selected == -1)	{	// may never occured...
+	if (selected == -1)	{	// may never occurred...
 		FrmCustomAlert(FrmInfoAlert, "You didn't select a skin.", 0, 0);
 		return;
 	}
diff --git a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
index 58eaa5b5fc..48399efa95 100644
--- a/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
+++ b/backends/platform/PalmOS/Src/launcher/forms/formmusic.cpp
@@ -258,7 +258,7 @@ static void MusicFormInit(UInt16 index) {
 		ogameInfoP = (GameInfoType *)MemHandleLock(recordH);
 
 		if (!ogameInfoP) {
-			FrmCustomAlert(FrmErrorAlert, "An error occured.",0,0);
+			FrmCustomAlert(FrmErrorAlert, "An error occurred.",0,0);
 			return;
 		}
 
diff --git a/backends/platform/PalmOS/Src/launcher/launch.cpp b/backends/platform/PalmOS/Src/launcher/launch.cpp
index cb2d52b20e..d83a34e94c 100644
--- a/backends/platform/PalmOS/Src/launcher/launch.cpp
+++ b/backends/platform/PalmOS/Src/launcher/launch.cpp
@@ -468,7 +468,7 @@ Boolean StartScummVM(Int16 engine) {
 		return false;
 	}
 
-	// reset mode if screen rotation occured (DIA only)
+	// reset mode if screen rotation occurred (DIA only)
 	if (!direct && OPTIONS_TST(kOptCollapsible)) {
 		UInt8 mode = PalmScreenSize(0,0, &(gVars->screenFullWidth), &(gVars->screenFullHeight));
 		OPTIONS_RST(kOptModeLandscape);
diff --git a/backends/platform/ds/arm9/source/fat/io_nmmc.c b/backends/platform/ds/arm9/source/fat/io_nmmc.c
index 261096a27b..6c996f5de1 100644
--- a/backends/platform/ds/arm9/source/fat/io_nmmc.c
+++ b/backends/platform/ds/arm9/source/fat/io_nmmc.c
@@ -170,7 +170,7 @@ bool NMMC_IsInserted(void)	{
 
 	Neo_EnableMMC( true );		// Open SPI port to MMC card
 	Neo_SendMMCCommand(MMC_SEND_CSD, 0);
-	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occured
+	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occurred
 		Neo_EnableMMC( false );
 		return false;
 	}
@@ -227,14 +227,14 @@ bool NMMC_StartUp(void) {
 
 	// Set block length
 	Neo_SendMMCCommand(MMC_SET_BLOCKLEN, BYTE_PER_READ );
-	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occured
+	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occurred
 		Neo_EnableMMC( false );
 		return false;
 	}
 
 	// Check if we can use a higher SPI frequency
 	Neo_SendMMCCommand(MMC_SEND_CSD, 0);
-	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occured
+	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occurred
 		Neo_EnableMMC( false );
 		return false;
 	}
@@ -268,7 +268,7 @@ bool NMMC_WriteSectors (u32 sector, u8 numSecs, void* buffer)
 
 	Neo_EnableMMC( true );												// Open SPI port to MMC card
 	Neo_SendMMCCommand( 25, sector );
-	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occured
+	if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{				// Make sure no errors occurred
 		Neo_EnableMMC( false );
 		return false;
 	}
@@ -318,7 +318,7 @@ bool NMMC_ReadSectors (u32 sector, u8 numSecs, void* buffer)
 
 	while (totalSecs--) {
 		Neo_SendMMCCommand(MMC_READ_BLOCK, sector );
-		if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{			// Make sure no errors occured
+		if( Neo_CheckMMCResponse( 0x00, 0xFF ) == false )	{			// Make sure no errors occurred
 			Neo_EnableMMC( false );
 			return false;
 		}
diff --git a/common/config-file.cpp b/common/config-file.cpp
index cc55ebd6c7..d001a66c9e 100644
--- a/common/config-file.cpp
+++ b/common/config-file.cpp
@@ -125,7 +125,7 @@ bool ConfigFile::loadFromStream(SeekableReadStream &stream) {
 			if (*p == '\0')
 				error("ConfigFile::loadFromStream: missing ] in line %d", lineno);
 			else if (*p != ']')
-				error("ConfigFile::loadFromStream: Invalid character '%c' occured in section name in line %d", *p, lineno);
+				error("ConfigFile::loadFromStream: Invalid character '%c' occurred in section name in line %d", *p, lineno);
 
 			// Previous section is finished now, store it.
 			if (!section.name.empty())
diff --git a/common/error.h b/common/error.h
index 7aff8d40b9..58343114a2 100644
--- a/common/error.h
+++ b/common/error.h
@@ -44,7 +44,7 @@ namespace Common {
  *       kPathInvalid, kPathIsInvalid, kInvalidPathError
  */
 enum Error {
-	kNoError = 0,				///< No error occured
+	kNoError = 0,				///< No error occurred
 	kInvalidPathError,			///< Engine initialization: Invalid game path was passed
 	kNoGameDataFoundError,		///< Engine initialization: No game data was found in the specified location
 	kUnsupportedGameidError,	///< Engine initialization: Gameid not supported by this (Meta)Engine
diff --git a/common/savefile.h b/common/savefile.h
index 39be661b45..16b0fdbfbe 100644
--- a/common/savefile.h
+++ b/common/savefile.h
@@ -109,14 +109,14 @@ public:
 	/**
 	 * Open the savefile with the specified name in the given directory for saving.
 	 * @param name	the name of the savefile
-	 * @return pointer to an OutSaveFile, or NULL if an error occured.
+	 * @return pointer to an OutSaveFile, or NULL if an error occurred.
 	 */
 	virtual OutSaveFile *openForSaving(const String &name) = 0;
 
 	/**
 	 * Open the file with the specified name in the given directory for loading.
 	 * @param name	the name of the savefile
-	 * @return pointer to an InSaveFile, or NULL if an error occured.
+	 * @return pointer to an InSaveFile, or NULL if an error occurred.
 	 */
 	virtual InSaveFile *openForLoading(const String &name) = 0;
 
diff --git a/common/stream.cpp b/common/stream.cpp
index 204efd79b9..84b712a562 100644
--- a/common/stream.cpp
+++ b/common/stream.cpp
@@ -152,7 +152,7 @@ char *SeekableReadStream::readLine(char *buf, size_t bufSize) {
 		len++;
 	}
 
-	// We always terminate the buffer if no error occured
+	// We always terminate the buffer if no error occurred
 	*p = 0;
 	return buf;
 }
diff --git a/common/system.h b/common/system.h
index a09912b3a7..0ff841e441 100644
--- a/common/system.h
+++ b/common/system.h
@@ -879,7 +879,7 @@ public:
 
 	/**
 	 * Create a new mutex.
-	 * @return the newly created mutex, or 0 if an error occured.
+	 * @return the newly created mutex, or 0 if an error occurred.
 	 */
 	virtual MutexRef createMutex() = 0;
 
diff --git a/engines/agi/keyboard.cpp b/engines/agi/keyboard.cpp
index f99d5728be..62bcd5d8d8 100644
--- a/engines/agi/keyboard.cpp
+++ b/engines/agi/keyboard.cpp
@@ -121,7 +121,7 @@ int AgiEngine::handleController(int key) {
 		if (_game.controllers[i].keycode == key) {
 			debugC(3, kDebugLevelInput, "event %d: key press", _game.controllers[i].controller);
 			_game.controllerOccured[_game.controllers[i].controller] = true;
-			report("event AC:%i occured\n", _game.controllers[i].controller);
+			report("event AC:%i occurred\n", _game.controllers[i].controller);
 			return true;
 		}
 	}
diff --git a/engines/agos/icons.cpp b/engines/agos/icons.cpp
index fdc5d1707e..08a3d4e2f0 100644
--- a/engines/agos/icons.cpp
+++ b/engines/agos/icons.cpp
@@ -448,7 +448,7 @@ void AGOSEngine_Feeble::drawIconArray(uint num, Item *itemRef, int line, int cla
 				setupIconHitArea(window, k++, xp, yp, itemRef);
 		} else {
 /*
- *	Just remember the overflow has occured
+ *	Just remember the overflow has occurred
  */
 			window->iconPtr->iconArray[icount].item = NULL;	/* END MARKINGS */
 			_iOverflow = 1;
diff --git a/engines/agos/vga_s2.cpp b/engines/agos/vga_s2.cpp
index 4eb739e974..db3a7c18f3 100644
--- a/engines/agos/vga_s2.cpp
+++ b/engines/agos/vga_s2.cpp
@@ -138,7 +138,7 @@ void AGOSEngine::vc69_playSeq() {
 	// This is a "play track". The original
 	// design stored the track to play if one was
 	// already in progress, so that the next time a
-	// "fill MIDI stream" event occured, the MIDI
+	// "fill MIDI stream" event occurred, the MIDI
 	// player would find the change and switch
 	// tracks. We use a different architecture that
 	// allows for an immediate response here, but
diff --git a/engines/saga/saga.cpp b/engines/saga/saga.cpp
index 446ab86228..d1ab3bc9d7 100644
--- a/engines/saga/saga.cpp
+++ b/engines/saga/saga.cpp
@@ -419,7 +419,7 @@ void SagaEngine::loadStrings(StringsTable &stringsTable, const byte *stringsPoin
 		offset = scriptS.readUint16();
 		// In some rooms in IHNM, string offsets can be greater than the maximum value than a 16-bit integer can hold
 		// We detect this by checking the previous offset, and if it was bigger than the current one, an overflow
-		// occured (since the string offsets are sequential), so we're adding the missing part of the number
+		// occurred (since the string offsets are sequential), so we're adding the missing part of the number
 		// Fixes bug #1895205 - "IHNM: end game text/caption error"
 		if (prevOffset > offset)
 			offset += 65536;
diff --git a/engines/sci/engine/kevent.cpp b/engines/sci/engine/kevent.cpp
index d6cb4ebd8e..da014cd917 100644
--- a/engines/sci/engine/kevent.cpp
+++ b/engines/sci/engine/kevent.cpp
@@ -129,9 +129,9 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
 	if ((s->r_acc.offset) && (g_debugState.stopOnEvent)) {
 		g_debugState.stopOnEvent = false;
 
-		// A SCI event occured, and we have been asked to stop, so open the debug console
+		// A SCI event occurred, and we have been asked to stop, so open the debug console
 		Console *con = g_sci->getSciDebugger();
-		con->DebugPrintf("SCI event occured: ");
+		con->DebugPrintf("SCI event occurred: ");
 		switch (curEvent.type) {
 		case SCI_EVENT_QUIT:
 			con->DebugPrintf("quit event\n");
diff --git a/engines/sci/engine/seg_manager.h b/engines/sci/engine/seg_manager.h
index ec89e42f9c..990836992c 100644
--- a/engines/sci/engine/seg_manager.h
+++ b/engines/sci/engine/seg_manager.h
@@ -407,7 +407,7 @@ public:
 	 * Determines the name of an object
 	 * @param[in] pos	Location (segment, offset) of the object
 	 * @return			A name for that object, or a string describing an error
-	 * 					that occured while looking it up. The string is stored
+	 * 					that occurred while looking it up. The string is stored
 	 * 					in a static buffer and need not be freed (neither may
 	 * 					it be modified).
 	 */
diff --git a/engines/sci/resource.cpp b/engines/sci/resource.cpp
index e23d8fd080..cf253619e6 100644
--- a/engines/sci/resource.cpp
+++ b/engines/sci/resource.cpp
@@ -341,7 +341,7 @@ void MacResourceForkResourceSource::loadResource(Resource *res) {
 
 	int error = res->decompress(stream);
 	if (error) {
-		warning("Error %d occured while reading %s from Mac resource file: %s",
+		warning("Error %d occurred while reading %s from Mac resource file: %s",
 				error, res->_id.toString().c_str(), sci_error_types[error]);
 		res->unalloc();
 	}
@@ -442,7 +442,7 @@ void ResourceSource::loadResource(Resource *res) {
 		delete fileStream;
 
 	if (error) {
-		warning("Error %d occured while reading %s from resource file: %s",
+		warning("Error %d occurred while reading %s from resource file: %s",
 				error, res->_id.toString().c_str(), sci_error_types[error]);
 		res->unalloc();
 	}
@@ -817,7 +817,7 @@ Resource *ResourceManager::findResource(ResourceId id, bool lock) {
 		loadResource(retval);
 	else if (retval->_status == kResStatusEnqueued)
 		removeFromLRU(retval);
-	// Unless an error occured, the resource is now either
+	// Unless an error occurred, the resource is now either
 	// locked or allocated, but never queued or freed.
 
 	freeOldResources();
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index eb2b82fdce..c2f3f17732 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -222,7 +222,7 @@ private:
 	 * This function must be run before script_run() is executed. Graphics data
 	 * is initialized iff s->gfx_state != NULL.
 	 * @param[in] s	The state to operate on
-	 * @return		true on success, false if an error occured.
+	 * @return		true on success, false if an error occurred.
 	 */
 	bool initGame();
 
diff --git a/engines/scumm/verbs.h b/engines/scumm/verbs.h
index 96a49a7ced..83e924edac 100644
--- a/engines/scumm/verbs.h
+++ b/engines/scumm/verbs.h
@@ -31,7 +31,7 @@
 namespace Scumm {
 
 /**
- * The area in which some click (or key press) occured and which is passed
+ * The area in which some click (or key press) occurred and which is passed
  * to the input script.
  */
 enum ClickArea {
diff --git a/graphics/scaler.h b/graphics/scaler.h
index 22bda5273a..577a91ccc1 100644
--- a/graphics/scaler.h
+++ b/graphics/scaler.h
@@ -77,7 +77,7 @@ enum {
  * Creates a thumbnail from the current screen (without overlay).
  *
  * @param surf	a surface (will always have 16 bpp after this for now)
- * @return		false if a error occured
+ * @return		false if a error occurred
  */
 extern bool createThumbnailFromScreen(Graphics::Surface *surf);
 
diff --git a/graphics/video/codecs/qdm2.h b/graphics/video/codecs/qdm2.h
index c9a01a70ee..9eb566d04d 100644
--- a/graphics/video/codecs/qdm2.h
+++ b/graphics/video/codecs/qdm2.h
@@ -44,7 +44,7 @@ namespace Graphics {
  *
  * @param stream       the SeekableReadStream from which to read the FLAC data
  * @param extraData    the QuickTime extra data stream
- * @return   a new AudioStream, or NULL, if an error occured
+ * @return   a new AudioStream, or NULL, if an error occurred
  */
 Audio::AudioStream *makeQDM2Stream(Common::SeekableReadStream *stream, Common::SeekableReadStream *extraData);
 
diff --git a/gui/GuiManager.h b/gui/GuiManager.h
index 2591838416..2a187a92f9 100644
--- a/gui/GuiManager.h
+++ b/gui/GuiManager.h
@@ -122,7 +122,7 @@ protected:
 
 	// position and time of last mouse click (used to detect double clicks)
 	struct {
-		int16 x, y;	// Position of mouse when the click occured
+		int16 x, y;	// Position of mouse when the click occurred
 		uint32 time;	// Time
 		int count;	// How often was it already pressed?
 	} _lastClick;
diff --git a/gui/dialog.cpp b/gui/dialog.cpp
index 5e3a9a1927..e20b181c83 100644
--- a/gui/dialog.cpp
+++ b/gui/dialog.cpp
@@ -171,7 +171,7 @@ void Dialog::handleMouseDown(int x, int y, int button, int clickCount) {
 	if (w && !(w->getFlags() & WIDGET_IGNORE_DRAG))
 		_dragWidget = w;
 
-	// If the click occured inside a widget which is not the currently
+	// If the click occurred inside a widget which is not the currently
 	// focused one, change the focus to that widget.
 	if (w && w != _focusedWidget && w->wantsFocus()) {
 		setFocusWidget(w);
diff --git a/sound/decoders/adpcm.h b/sound/decoders/adpcm.h
index 7452478f35..04dbb1a521 100644
--- a/sound/decoders/adpcm.h
+++ b/sound/decoders/adpcm.h
@@ -71,7 +71,7 @@ enum typesADPCM {
  * @param rate              the sampling rate
  * @param channels          the number of channels
  * @param blockAlign        block alignment ???
- * @return   a new RewindableAudioStream, or NULL, if an error occured
+ * @return   a new RewindableAudioStream, or NULL, if an error occurred
  */
 RewindableAudioStream *makeADPCMStream(
     Common::SeekableReadStream *stream,
diff --git a/sound/decoders/flac.cpp b/sound/decoders/flac.cpp
index 91c48199e3..e588aa872f 100644
--- a/sound/decoders/flac.cpp
+++ b/sound/decoders/flac.cpp
@@ -230,7 +230,7 @@ FLACStream::FLACStream(Common::SeekableReadStream *inStream, bool dispose)
 		if (processUntilEndOfMetadata() && _streaminfo.channels > 0) {
 			_lastSample = _streaminfo.total_samples + 1;
 			_length = Timestamp(0, _lastSample - 1, getRate());
-			return; // no error occured
+			return; // no error occurred
 		}
 	}
 
@@ -355,7 +355,7 @@ int FLACStream::readBuffer(int16 *buffer, const int numSamples) {
 		break;
 	default:
 		decoderOk = false;
-		warning("FLACStream: An error occured while decoding. DecoderState is: %s",
+		warning("FLACStream: An error occurred while decoding. DecoderState is: %s",
 			FLAC__StreamDecoderStateString[getStreamDecoderState()]);
 	}
 
@@ -668,7 +668,7 @@ inline void FLACStream::callbackMetadata(const ::FLAC__StreamMetadata *metadata)
 }
 inline void FLACStream::callbackError(::FLAC__StreamDecoderErrorStatus status) {
 	// some of these are non-critical-Errors
-	debug(1, "FLACStream: An error occured while decoding. DecoderState is: %s",
+	debug(1, "FLACStream: An error occurred while decoding. DecoderState is: %s",
 			FLAC__StreamDecoderErrorStatusString[status]);
 }
 
diff --git a/sound/decoders/flac.h b/sound/decoders/flac.h
index 982450c045..3c00ec3d5d 100644
--- a/sound/decoders/flac.h
+++ b/sound/decoders/flac.h
@@ -41,8 +41,8 @@
 #ifndef SOUND_FLAC_H
 #define SOUND_FLAC_H
 
-#include "common/types.h"
 #include "common/scummsys.h"
+#include "common/types.h"
 
 #ifdef USE_FLAC
 
@@ -61,7 +61,7 @@ class SeekableAudioStream;
  *
  * @param stream            the SeekableReadStream from which to read the FLAC data
  * @param disposeAfterUse   whether to delete the stream after use
- * @return   a new SeekableAudioStream, or NULL, if an error occured
+ * @return   a new SeekableAudioStream, or NULL, if an error occurred
  */
 SeekableAudioStream *makeFLACStream(
 	Common::SeekableReadStream *stream,
diff --git a/sound/decoders/mp3.h b/sound/decoders/mp3.h
index 3175df5e92..ed54c8b013 100644
--- a/sound/decoders/mp3.h
+++ b/sound/decoders/mp3.h
@@ -41,8 +41,8 @@
 #ifndef SOUND_MP3_H
 #define SOUND_MP3_H
 
-#include "common/types.h"
 #include "common/scummsys.h"
+#include "common/types.h"
 
 #ifdef USE_MAD
 
@@ -61,7 +61,7 @@ class SeekableAudioStream;
  *
  * @param stream			the SeekableReadStream from which to read the MP3 data
  * @param disposeAfterUse	whether to delete the stream after use
- * @return	a new SeekableAudioStream, or NULL, if an error occured
+ * @return	a new SeekableAudioStream, or NULL, if an error occurred
  */
 SeekableAudioStream *makeMP3Stream(
 	Common::SeekableReadStream *stream,
diff --git a/sound/decoders/vag.h b/sound/decoders/vag.h
index 7e0ed255be..cdf91a8ea1 100644
--- a/sound/decoders/vag.h
+++ b/sound/decoders/vag.h
@@ -49,7 +49,7 @@ class RewindableAudioStream;
  *
  * @param stream            the SeekableReadStream from which to read the ADPCM data
  * @param rate              the sampling rate
- * @return   a new RewindableAudioStream, or NULL, if an error occured
+ * @return   a new RewindableAudioStream, or NULL, if an error occurred
  */
 RewindableAudioStream *makeVagStream(
 	Common::SeekableReadStream *stream,
diff --git a/sound/decoders/voc.h b/sound/decoders/voc.h
index 79956ee62a..82cc261f2c 100644
--- a/sound/decoders/voc.h
+++ b/sound/decoders/voc.h
@@ -38,8 +38,8 @@
 #ifndef SOUND_VOC_H
 #define SOUND_VOC_H
 
-#include "common/types.h"
 #include "common/scummsys.h"
+#include "common/types.h"
 
 namespace Common { class ReadStream; }
 namespace Common { class SeekableReadStream; }
diff --git a/sound/decoders/vorbis.h b/sound/decoders/vorbis.h
index dd0a89bfdd..0a0cf43bc9 100644
--- a/sound/decoders/vorbis.h
+++ b/sound/decoders/vorbis.h
@@ -41,8 +41,8 @@
 #ifndef SOUND_VORBIS_H
 #define SOUND_VORBIS_H
 
-#include "common/types.h"
 #include "common/scummsys.h"
+#include "common/types.h"
 
 #ifdef USE_VORBIS
 
@@ -61,7 +61,7 @@ class SeekableAudioStream;
  *
  * @param stream			the SeekableReadStream from which to read the Ogg Vorbis data
  * @param disposeAfterUse	whether to delete the stream after use
- * @return	a new SeekableAudioStream, or NULL, if an error occured
+ * @return	a new SeekableAudioStream, or NULL, if an error occurred
  */
 SeekableAudioStream *makeVorbisStream(
 	Common::SeekableReadStream *stream,
diff --git a/sound/decoders/wave.h b/sound/decoders/wave.h
index f0e3bb249b..edd37e7ac9 100644
--- a/sound/decoders/wave.h
+++ b/sound/decoders/wave.h
@@ -38,8 +38,8 @@
 #ifndef SOUND_WAVE_H
 #define SOUND_WAVE_H
 
-#include "common/types.h"
 #include "common/scummsys.h"
+#include "common/types.h"
 
 namespace Common { class SeekableReadStream; }
 
@@ -71,7 +71,7 @@ extern bool loadWAVFromStream(
  *
  * @param stream			the SeekableReadStream from which to read the WAVE data
  * @param disposeAfterUse	whether to delete the stream after use
- * @return	a new RewindableAudioStream, or NULL, if an error occured
+ * @return	a new RewindableAudioStream, or NULL, if an error occurred
  */
 RewindableAudioStream *makeWAVStream(
 	Common::SeekableReadStream *stream,
diff --git a/sound/mods/protracker.h b/sound/mods/protracker.h
index dfcb0e6c51..af722637c7 100644
--- a/sound/mods/protracker.h
+++ b/sound/mods/protracker.h
@@ -48,7 +48,7 @@ class AudioStream;
  * @param stream	the ReadStream from which to read the ProTracker data
  * @param rate		TODO
  * @param stereo	TODO
- * @return	a new AudioStream, or NULL, if an error occured
+ * @return	a new AudioStream, or NULL, if an error occurred
  */
 AudioStream *makeProtrackerStream(Common::SeekableReadStream *stream, int offs = 0, int rate = 44100, bool stereo = true);