12 files changed, 22 insertions, 22 deletions
diff --git a/src/common/symbols.h b/src/common/symbols.h
index b13a8001a..4560f5240 100644
--- a/src/common/symbols.h
+++ b/src/common/symbols.h
@@ -33,5 +33,5 @@ namespace Symbols
     const std::string GetName(u32 _address);
     void Remove(u32 _address);
     void Clear();
-};
+}
 
diff --git a/src/common/thread.h b/src/common/thread.h
index f7ace21b4..5e7bc1f9c 100644
--- a/src/common/thread.h
+++ b/src/common/thread.h
@@ -36,7 +36,7 @@ class Event
 public:
     Event()
         : is_set(false)
-    {};
+    {}
 
     void Set()
     {
diff --git a/src/core/arm/dyncom/arm_dyncom.h b/src/core/arm/dyncom/arm_dyncom.h
index 1f8cd3a3a..f3c70b7d3 100644
--- a/src/core/arm/dyncom/arm_dyncom.h
+++ b/src/core/arm/dyncom/arm_dyncom.h
@@ -19,7 +19,7 @@ public:
 
     /**
      * Set the Program Counter to an address
-     * @param addr Address to set PC to
+     * @param pc Address to set PC to
      */
     void SetPC(u32 pc) override;
 
diff --git a/src/core/arm/interpreter/arm_interpreter.h b/src/core/arm/interpreter/arm_interpreter.h
index ceb1be438..f1e7198c5 100644
--- a/src/core/arm/interpreter/arm_interpreter.h
+++ b/src/core/arm/interpreter/arm_interpreter.h
@@ -18,7 +18,7 @@ public:
 
     /**
      * Set the Program Counter to an address
-     * @param addr Address to set PC to
+     * @param pc Address to set PC to
      */
     void SetPC(u32 pc) override;
 
diff --git a/src/core/core_timing.h b/src/core/core_timing.h
index 09fdf7a90..b197cf40c 100644
--- a/src/core/core_timing.h
+++ b/src/core/core_timing.h
@@ -106,4 +106,4 @@ void SetClockFrequencyMHz(int cpuMhz);
 int GetClockFrequencyMHz();
 extern int slicelength;
 
-}; // namespace
+} // namespace
diff --git a/src/core/file_sys/archive_romfs.cpp b/src/core/file_sys/archive_romfs.cpp
index 3ea60134f..551913a42 100644
--- a/src/core/file_sys/archive_romfs.cpp
+++ b/src/core/file_sys/archive_romfs.cpp
@@ -41,7 +41,7 @@ std::unique_ptr<File> Archive_RomFS::OpenFile(const Path& path, const Mode mode)
 bool Archive_RomFS::CreateDirectory(const Path& path) const {
     ERROR_LOG(FILESYS, "Attempted to create a directory in ROMFS.");
     return false;
-};
+}
 
 /**
  * Open a directory specified by its path
diff --git a/src/core/file_sys/archive_romfs.h b/src/core/file_sys/archive_romfs.h
index 8d5715734..b0dd421b7 100644
--- a/src/core/file_sys/archive_romfs.h
+++ b/src/core/file_sys/archive_romfs.h
@@ -26,7 +26,7 @@ public:
      * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.)
      * @return IdCode of the archive
      */
-    IdCode GetIdCode() const override { return IdCode::RomFS; };
+    IdCode GetIdCode() const override { return IdCode::RomFS; }
 
     /**
      * Open a file specified by its path, using the specified mode
diff --git a/src/core/file_sys/archive_sdmc.h b/src/core/file_sys/archive_sdmc.h
index 1f621b3f7..17b9209b4 100644
--- a/src/core/file_sys/archive_sdmc.h
+++ b/src/core/file_sys/archive_sdmc.h
@@ -30,7 +30,7 @@ public:
      * Get the IdCode of the archive (e.g. RomFS, SaveData, etc.)
      * @return IdCode of the archive
      */
-    IdCode GetIdCode() const override { return IdCode::SDMC; };
+    IdCode GetIdCode() const override { return IdCode::SDMC; }
 
     /**
      * Open a file specified by its path, using the specified mode
diff --git a/src/core/file_sys/directory_sdmc.cpp b/src/core/file_sys/directory_sdmc.cpp
index 923ca6862..60a197ce9 100644
--- a/src/core/file_sys/directory_sdmc.cpp
+++ b/src/core/file_sys/directory_sdmc.cpp
@@ -45,7 +45,7 @@ u32 Directory_SDMC::Read(const u32 count, Entry* entries) {
         WARN_LOG(FILESYS, "File %s: size=%llu dir=%d", filename.c_str(), file.size, file.isDirectory);
 
         // TODO(Link Mauve): use a proper conversion to UTF-16.
-        for (int j = 0; j < FILENAME_LENGTH; ++j) {
+        for (size_t j = 0; j < FILENAME_LENGTH; ++j) {
             entry.filename[j] = filename[j];
             if (!filename[j])
                 break;
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 867d1b89c..dd7c91d4f 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -87,7 +87,7 @@ public:
             delete pool[handle - HANDLE_OFFSET];
         }
         return error;
-    };
+    }
 
     bool IsValid(Handle handle);
 
diff --git a/src/core/mem_map.h b/src/core/mem_map.h
index 87de5cd63..a58c59244 100644
--- a/src/core/mem_map.h
+++ b/src/core/mem_map.h
@@ -157,7 +157,7 @@ u8* GetPointer(VAddr virtual_address);
  * Maps a block of memory on the heap
  * @param size Size of block in bytes
  * @param operation Memory map operation type
- * @param flags Memory allocation flags
+ * @param permissions Memory allocation permissions
  */
 u32 MapBlock_Heap(u32 size, u32 operation, u32 permissions);
 
diff --git a/src/core/system.h b/src/core/system.h
index 8f8ddf87b..0be8711e4 100644
--- a/src/core/system.h
+++ b/src/core/system.h
@@ -11,16 +11,16 @@
 namespace System {
 
 // State of the full emulator
-typedef enum {
-	STATE_NULL = 0,	///< System is in null state, nothing initialized
-	STATE_IDLE,		///< System is in an initialized state, but not running
-	STATE_RUNNING,	///< System is running
-	STATE_LOADING,	///< System is loading a ROM
-	STATE_HALTED,	///< System is halted (error)
-	STATE_STALLED,	///< System is stalled (unused)
-	STATE_DEBUG,	///< System is in a special debug mode (unused)
-	STATE_DIE		///< System is shutting down
-} State;
+enum State {
+	STATE_NULL = 0, ///< System is in null state, nothing initialized
+	STATE_IDLE,     ///< System is in an initialized state, but not running
+	STATE_RUNNING,  ///< System is running
+	STATE_LOADING,  ///< System is loading a ROM
+	STATE_HALTED,   ///< System is halted (error)
+	STATE_STALLED,  ///< System is stalled (unused)
+	STATE_DEBUG,    ///< System is in a special debug mode (unused)
+	STATE_DIE       ///< System is shutting down
+};
 
 extern volatile State g_state;
 
@@ -30,4 +30,4 @@ void RunLoopFor(int cycles);
 void RunLoopUntil(u64 global_cycles);
 void Shutdown();
 
-};
+}