diff --git a/engine/include/nb_type/draw_driver.h b/engine/include/nb_type/draw_driver.h
index 20108c8..607d225 100644
--- a/engine/include/nb_type/draw_driver.h
+++ b/engine/include/nb_type/draw_driver.h
@@ -15,16 +15,10 @@
 
 /* Standard */
 
-NB_DECLARE_TYPE(draw_driver, {
 #ifdef DRV_OPENGL
-	GLUquadric* quadric;
+NB_DECLARE_TYPE(draw_driver, { GLUquadric* quadric; });
+NB_DECLARE_TYPE(draw_driver_texture, { GLuint id; });
 #endif
-});
-NB_DECLARE_TYPE(draw_driver_texture, {
-#ifdef DRV_OPENGL
-	GLuint id;
-#endif
-});
 #else
 typedef void nb_draw_driver_t;
 typedef void nb_draw_driver_texture_t;
diff --git a/engine/include/nb_type/draw_platform.h b/engine/include/nb_type/draw_platform.h
index 6beb40b..54c6129 100644
--- a/engine/include/nb_type/draw_platform.h
+++ b/engine/include/nb_type/draw_platform.h
@@ -22,21 +22,23 @@
 
 /* Standard */
 
-NB_DECLARE_TYPE(draw_platform, {
 #if defined(USE_GLX)
+NB_DECLARE_TYPE(draw_platform, {
 	Display*   display;
 	Window	   window;
 	GLXContext context;
 	Atom	   wm_delete_window;
+});
 #elif defined(USE_WGL)
+NB_DECLARE_TYPE(draw_platform, {
 	HINSTANCE instance;
 	HWND	  window;
 	HDC	  dc;
 	HGLRC	  glrc;
-#elif defined(USE_GLFW)
-	GLFWwindow* window;
-#endif
 });
+#elif defined(USE_GLFW)
+NB_DECLARE_TYPE(draw_platform, { GLFWwindow* window; });
+#endif
 #else
 typedef void nb_draw_platform_t;
 #endif