Moved more GDI definitions to gdi_private.h.
Get rid of bitmap.h and palette.h.
diff --git a/objects/bitmap.c b/objects/bitmap.c
index 8858c16..ed6c82d 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -25,7 +25,6 @@
#include "wine/winbase16.h"
#include "wine/winuser16.h"
#include "gdi.h"
-#include "bitmap.h"
#include "gdi_private.h"
#include "wine/debug.h"
diff --git a/objects/brush.c b/objects/brush.c
index d9ec0bc..4fe7c82 100644
--- a/objects/brush.c
+++ b/objects/brush.c
@@ -27,7 +27,7 @@
#include "winbase.h"
#include "wingdi.h"
#include "wine/wingdi16.h"
-#include "bitmap.h"
+#include "gdi.h"
#include "wownt32.h"
#include "gdi_private.h"
#include "wine/debug.h"
diff --git a/objects/dib.c b/objects/dib.c
index eb68bed..74fd3d1 100644
--- a/objects/dib.c
+++ b/objects/dib.c
@@ -24,12 +24,10 @@
#include "windef.h"
#include "winbase.h"
-#include "bitmap.h"
#include "gdi.h"
#include "wownt32.h"
#include "gdi_private.h"
#include "wine/debug.h"
-#include "palette.h"
WINE_DEFAULT_DEBUG_CHANNEL(bitmap);
diff --git a/objects/gdiobj.c b/objects/gdiobj.c
index 88b8d9f..285d912 100644
--- a/objects/gdiobj.c
+++ b/objects/gdiobj.c
@@ -31,9 +31,7 @@
#include "winreg.h"
#include "winerror.h"
-#include "bitmap.h"
#include "local.h"
-#include "palette.h"
#include "gdi.h"
#include "gdi_private.h"
#include "wine/debug.h"
diff --git a/objects/metafile.c b/objects/metafile.c
index a3a9594..1c8e70c 100644
--- a/objects/metafile.c
+++ b/objects/metafile.c
@@ -50,7 +50,7 @@
#include "wine/winbase16.h"
#include "wine/wingdi16.h"
-#include "bitmap.h"
+#include "gdi.h"
#include "wownt32.h"
#include "winreg.h"
#include "winternl.h"
diff --git a/objects/palette.c b/objects/palette.c
index dfca761..a406a67 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -34,7 +34,6 @@
#include "wine/winuser16.h"
#include "gdi.h"
#include "gdi_private.h"
-#include "palette.h"
#include "wine/debug.h"
#include "winerror.h"
