From b3792fec243247ee2ed4808fc41a58939293708f Mon Sep 17 00:00:00 2001
From: Magnus Olsen <magnus@greatlord.com>
Date: Mon, 22 Oct 2007 23:21:23 +0000
Subject: [PATCH] puting back dc.h and driver.h to win32k/include as jimtablor
 requested. we need move PDC only to ntgdihdl.h.

svn path=/branches/reactx/; revision=29803
---
 .../win32k/win32kdc.h => subsystems/win32/win32k/include/dc.h}  | 2 +-
 reactos/subsystems/win32/win32k/include/dib.h                   | 2 +-
 .../win32kdriver.h => subsystems/win32/win32k/include/driver.h} | 0
 reactos/subsystems/win32/win32k/include/gdifloat.h              | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename reactos/{include/reactos/win32k/win32kdc.h => subsystems/win32/win32k/include/dc.h} (99%)
 rename reactos/{include/reactos/win32k/win32kdriver.h => subsystems/win32/win32k/include/driver.h} (100%)

diff --git a/reactos/include/reactos/win32k/win32kdc.h b/reactos/subsystems/win32/win32k/include/dc.h
similarity index 99%
rename from reactos/include/reactos/win32k/win32kdc.h
rename to reactos/subsystems/win32/win32k/include/dc.h
index a4d612d9005..cd4c7442b1e 100644
--- a/reactos/include/reactos/win32k/win32kdc.h
+++ b/reactos/subsystems/win32/win32k/include/dc.h
@@ -2,7 +2,7 @@
 #ifndef __WIN32K_DC_H
 #define __WIN32K_DC_H
 
-#include <reactos/win32k/win32kdriver.h>
+#include "driver.h"
 
 typedef enum tagGdiPathState
 {
diff --git a/reactos/subsystems/win32/win32k/include/dib.h b/reactos/subsystems/win32/win32k/include/dib.h
index d6a8ef48a60..0d1dcdecaf3 100644
--- a/reactos/subsystems/win32/win32k/include/dib.h
+++ b/reactos/subsystems/win32/win32k/include/dib.h
@@ -1,7 +1,7 @@
 #ifndef _WIN32K_DIB_H
 #define _WIN32K_DIB_H
 
-#include <reactos/win32k/win32kdc.h>
+#include "dc.h"
 
 INT FASTCALL
 DIB_BitmapInfoSize (const BITMAPINFO * info, WORD coloruse);
diff --git a/reactos/include/reactos/win32k/win32kdriver.h b/reactos/subsystems/win32/win32k/include/driver.h
similarity index 100%
rename from reactos/include/reactos/win32k/win32kdriver.h
rename to reactos/subsystems/win32/win32k/include/driver.h
diff --git a/reactos/subsystems/win32/win32k/include/gdifloat.h b/reactos/subsystems/win32/win32k/include/gdifloat.h
index ebbfdedf0fe..fd05a1616ca 100644
--- a/reactos/subsystems/win32/win32k/include/gdifloat.h
+++ b/reactos/subsystems/win32/win32k/include/gdifloat.h
@@ -1,7 +1,7 @@
 #ifndef __WIN32K_FLOAT_H
 #define __WIN32K_FLOAT_H
 
-#include <reactos/win32k/win32kdc.h>
+#include "dc.h"
 #include "math.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H