diff --git a/Core/Config.cpp b/Core/Config.cpp
index 4080f1bd98..2d7c53fafb 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -2015,7 +2015,7 @@ void Config::ResetControlLayout() {
 	g_Config.fRightStickHeadScale = 1.0f;
 }
 
-void Config::GetReportingInfo(UrlEncoder &data) {
+void Config::GetReportingInfo(UrlEncoder &data) const {
 	for (size_t i = 0; i < numSections; ++i) {
 		const std::string prefix = std::string("config.") + sections[i].section;
 		for (size_t j = 0; j < sections[i].settingsCount; j++) {
diff --git a/Core/Config.h b/Core/Config.h
index 7e60fa50f8..844c124d20 100644
--- a/Core/Config.h
+++ b/Core/Config.h
@@ -632,7 +632,7 @@ public:
 
 	void ResetControlLayout();
 
-	void GetReportingInfo(UrlEncoder &data);
+	void GetReportingInfo(UrlEncoder &data) const;
 
 	bool IsPortrait() const;
 	int NextValidBackend();
diff --git a/GPU/Common/GPUDebugInterface.h b/GPU/Common/GPUDebugInterface.h
index a4b7c1c83a..378ac361f4 100644
--- a/GPU/Common/GPUDebugInterface.h
+++ b/GPU/Common/GPUDebugInterface.h
@@ -205,7 +205,7 @@ struct GPUDebugVertex {
 
 class GPUDebugInterface {
 public:
-	virtual ~GPUDebugInterface() {}
+	virtual ~GPUDebugInterface() = default;
 	virtual bool GetCurrentDisplayList(DisplayList &list) = 0;
 	virtual int GetCurrentPrimCount() = 0;
 	virtual std::vector<DisplayList> ActiveDisplayLists() = 0;
diff --git a/GPU/Debugger/Breakpoints.cpp b/GPU/Debugger/Breakpoints.cpp
index 5dc20f3f36..d22c6e11ee 100644
--- a/GPU/Debugger/Breakpoints.cpp
+++ b/GPU/Debugger/Breakpoints.cpp
@@ -42,7 +42,7 @@ const static u8 textureRelatedCmds[] = {
 	GE_CMD_TEXFLUSH, GE_CMD_TEXSYNC,
 };
 
-void GPUBreakpoints::Init() {
+GPUBreakpoints::GPUBreakpoints() {
 	ClearAllBreakpoints();
 
 	nonTextureCmds.clear();
@@ -268,20 +268,20 @@ bool GPUBreakpoints::IsRenderTargetBreakpoint(u32 addr) {
 	return breakRenderTargets.find(addr) != breakRenderTargets.end();
 }
 
-bool GPUBreakpoints::IsOpBreakpoint(u32 op, bool &temp) {
+bool GPUBreakpoints::IsOpBreakpoint(u32 op, bool &temp) const {
 	return IsCmdBreakpoint(op >> 24, temp);
 }
 
-bool GPUBreakpoints::IsOpBreakpoint(u32 op) {
+bool GPUBreakpoints::IsOpBreakpoint(u32 op) const {
 	return IsCmdBreakpoint(op >> 24);
 }
 
-bool GPUBreakpoints::IsCmdBreakpoint(u8 cmd, bool &temp) {
+bool GPUBreakpoints::IsCmdBreakpoint(u8 cmd, bool &temp) const {
 	temp = breakCmdsTemp[cmd];
 	return breakCmds[cmd];
 }
 
-bool GPUBreakpoints::IsCmdBreakpoint(u8 cmd) {
+bool GPUBreakpoints::IsCmdBreakpoint(u8 cmd) const {
 	return breakCmds[cmd];
 }
 
diff --git a/GPU/Debugger/Breakpoints.h b/GPU/Debugger/Breakpoints.h
index 10de2f005d..f2ddb24be8 100644
--- a/GPU/Debugger/Breakpoints.h
+++ b/GPU/Debugger/Breakpoints.h
@@ -29,17 +29,16 @@ struct GECmdInfo;
 
 class GPUBreakpoints {
 public:
-	GPUBreakpoints() {
-		Init();
-	}
-	void Init();
+	GPUBreakpoints();
 
 	bool IsBreakpoint(u32 pc, u32 op);
 
 	bool IsAddressBreakpoint(u32 addr, bool &temp);
 	bool IsAddressBreakpoint(u32 addr);
-	bool IsCmdBreakpoint(u8 cmd, bool &temp);
-	bool IsCmdBreakpoint(u8 cmd);
+	bool IsCmdBreakpoint(u8 cmd, bool &temp) const;
+	bool IsCmdBreakpoint(u8 cmd) const;
+	bool IsOpBreakpoint(u32 op, bool &temp) const;
+	bool IsOpBreakpoint(u32 op) const;
 	bool IsTextureBreakpoint(u32 addr, bool &temp);
 	bool IsTextureBreakpoint(u32 addr);
 	bool IsRenderTargetBreakpoint(u32 addr, bool &temp);
@@ -69,10 +68,6 @@ public:
 	void ClearAllBreakpoints();
 	void ClearTempBreakpoints();
 
-	bool IsOpBreakpoint(u32 op, bool &temp);
-
-	bool IsOpBreakpoint(u32 op);
-
 	bool HasBreakpoints() const {
 		return hasBreakpoints_;
 	}
diff --git a/GPU/GPUCommon.h b/GPU/GPUCommon.h
index 68bfcfe9ef..fa5d5672b2 100644
--- a/GPU/GPUCommon.h
+++ b/GPU/GPUCommon.h
@@ -370,7 +370,7 @@ public:
 		return -1;
 	}
 
-	virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) {
+	virtual void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) const {
 		primaryInfo = reportingPrimaryInfo_;
 		fullInfo = reportingFullInfo_;
 	}
diff --git a/GPU/Software/SoftGpu.h b/GPU/Software/SoftGpu.h
index 058a5b3428..5faaee3568 100644
--- a/GPU/Software/SoftGpu.h
+++ b/GPU/Software/SoftGpu.h
@@ -156,7 +156,7 @@ public:
 	void CheckDisplayResized() override;
 	void CheckConfigChanged() override;
 
-	void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) override {
+	void GetReportingInfo(std::string &primaryInfo, std::string &fullInfo) const override {
 		primaryInfo = "Software";
 		fullInfo = "Software";
 	}