diff --git a/CMakeLists.txt b/CMakeLists.txt
index ea0a0fab..1c2145c0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,7 @@ set(obs-websocket_SOURCES
 	src/Config.cpp
 	src/Utils.cpp
 	src/rpc/RpcRequest.cpp
-	src/rpc/RpcResponse.h
+	src/rpc/RpcResponse.cpp
 	src/protocol/OBSRemoteProtocol.cpp
 	src/forms/settings-dialog.cpp)
 
diff --git a/src/protocol/OBSRemoteProtocol.cpp b/src/protocol/OBSRemoteProtocol.cpp
index 468e0310..a3d4f986 100644
--- a/src/protocol/OBSRemoteProtocol.cpp
+++ b/src/protocol/OBSRemoteProtocol.cpp
@@ -72,9 +72,9 @@ std::string OBSRemoteProtocol::processMessage(std::string message)
 
     OBSData additionalFields = response.additionalFields();
     switch (response.status()) {
-        case Ok:
+		case RpcResponse::Status::Ok:
             return successResponse(messageId, additionalFields);
-        case Error:
+        case RpcResponse::Status::Error:
             return errorResponse(messageId, response.errorMessage(), additionalFields);
     }
 
diff --git a/src/rpc/RpcResponse.cpp b/src/rpc/RpcResponse.cpp
index 7a9bf585..937c8d46 100644
--- a/src/rpc/RpcResponse.cpp
+++ b/src/rpc/RpcResponse.cpp
@@ -20,7 +20,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "RpcRequest.h"
 
 RpcResponse::RpcResponse(
-	ResponseStatus status, const QString& messageId,
+	Status status, const QString& messageId,
 	const QString& methodName, obs_data_t* additionalFields
 ) :
 	_status(status),
@@ -34,15 +34,15 @@ RpcResponse::RpcResponse(
 	}
 }
 
-const RpcResponse::RpcResponse ok(const RpcRequest& request, obs_data_t* additionalFields)
+const RpcResponse RpcResponse::ok(const RpcRequest& request, obs_data_t* additionalFields)
 {
-	RpcResponse response(ResponseStatus::Ok, request.messageId(), request.methodName(), additionalFields);
+	RpcResponse response(Status::Ok, request.messageId(), request.methodName(), additionalFields);
 	return response;
 }
 
-const RpcResponse::RpcResponse fail(const RpcRequest& request, const QString& errorMessage, obs_data_t* additionalFields)
+const RpcResponse RpcResponse::fail(const RpcRequest& request, const QString& errorMessage, obs_data_t* additionalFields)
 {
-	RpcResponse response(ResponseStatus::Error, request.messageId(), request.methodName(), additionalFields);
+	RpcResponse response(Status::Error, request.messageId(), request.methodName(), additionalFields);
 	response._errorMessage = errorMessage;
 	return response;
 }
diff --git a/src/rpc/RpcResponse.h b/src/rpc/RpcResponse.h
index caf9bdd7..a6381bfd 100644
--- a/src/rpc/RpcResponse.h
+++ b/src/rpc/RpcResponse.h
@@ -24,16 +24,11 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 class RpcRequest;
 
-enum ResponseStatus
-{
-	Unknown,
-	Ok,
-	Error
-};
-
 class RpcResponse
 {
 public:
+	enum Status { Unknown, Ok, Error };
+
 	static RpcResponse ofRequest(const RpcRequest& request);
 	static const RpcResponse ok(const RpcRequest& request, obs_data_t* additionalFields = nullptr);
 	static const RpcResponse fail(
@@ -41,7 +36,7 @@ public:
 		obs_data_t* additionalFields = nullptr
 	);
 
-	ResponseStatus status() {
+	Status status() {
 		return _status;
 	}
 
@@ -63,11 +58,11 @@ public:
 
 private:
 	explicit RpcResponse(
-		ResponseStatus status,
+		Status status,
 		const QString& messageId, const QString& methodName,
 		obs_data_t* additionalFields = nullptr
 	);
-	const ResponseStatus _status;
+	const Status _status;
 	const QString _messageId;
 	const QString _methodName;
 	QString _errorMessage;