diff --git a/renderer/HardwareBaseGPU.cpp b/renderer/HardwareBaseGPU.cpp
index 67900a842..f9538727b 100644
--- a/renderer/HardwareBaseGPU.cpp
+++ b/renderer/HardwareBaseGPU.cpp
@@ -1,6 +1,6 @@
 /*
 * Descent 3
-* Copyright (C) 2024 Parallax Software
+* Copyright (C) 2024 Descent Developers
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@ -18,24 +18,14 @@
 
 // TODO: This is missing a good way of overriding base behavior (like, you know, method overrides...)
 
-#include "DDAccess.h"
-#include "pstypes.h"
 #include "pserror.h"
 #include "mono.h"
 #include "3d.h"
 #include "renderer.h"
-#include "ddvid.h"
-#include "ddio.h"
-#include "application.h"
 #include "bitmap.h"
-#include "lightmap.h"
-#include "rend_opengl.h"
 #include "grdefs.h"
-#include "mem.h"
-#include "rtperformance.h"
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
+#include <cstring>
+
 #include "HardwareInternal.h"
 
 // FIXME: Unused
diff --git a/renderer/HardwareBaseGPU.h b/renderer/HardwareBaseGPU.h
deleted file mode 100644
index cd7b1e2c0..000000000
--- a/renderer/HardwareBaseGPU.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-* Descent 3
-* Copyright (C) 2024 Parallax Software
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License as published by
-* the Free Software Foundation, either version 3 of the License, or
-* (at your option) any later version.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef DESCENT3_HARDWAREBASEGPU_H
-#define DESCENT3_HARDWAREBASEGPU_H
-
-
-#endif // DESCENT3_HARDWAREBASEGPU_H