1 files changed, 8 insertions, 23 deletions
diff --git a/src/types.h b/src/types.h
index bbebbb7..b453f11 100644
--- a/src/types.h
+++ b/src/types.h
@@ -6,7 +6,7 @@
 
 #include "attributes.h"
 
-#include "pugl/pugl.h"
+#include <pugl/pugl.h>
 
 #include <stdbool.h>
 #include <stddef.h>
@@ -21,18 +21,6 @@ typedef struct PuglInternalsImpl PuglInternals;
 /// View hints
 typedef int PuglHints[PUGL_NUM_VIEW_HINTS];
 
-/// View position (both X and Y coordinates) or general point
-typedef struct {
-  PuglCoord x;
-  PuglCoord y;
-} PuglPoint;
-
-/// View size (both X and Y coordinates)
-typedef struct {
-  PuglSpan width;
-  PuglSpan height;
-} PuglArea;
-
 /// Blob of arbitrary data
 typedef struct {
   void*  data; ///< Dynamically allocated data
@@ -57,10 +45,9 @@ struct PuglViewImpl {
   uintptr_t          transientParent;
   PuglConfigureEvent lastConfigure;
   PuglHints          hints;
+  PuglPoint          positionHints[PUGL_NUM_POSITION_HINTS];
   PuglArea           sizeHints[PUGL_NUM_SIZE_HINTS];
   char*              strings[PUGL_NUM_STRING_HINTS];
-  int                defaultX;
-  int                defaultY;
   PuglViewStage      stage;
   bool               resizing;
 };
@@ -82,23 +69,21 @@ typedef void PuglSurface;
 /// Graphics backend interface
 struct PuglBackendImpl {
   /// Get visual information from display and setup view as necessary
-  PUGL_WARN_UNUSED_RESULT
-  PuglStatus (*configure)(PuglView*);
+  PUGL_WARN_UNUSED_RESULT PuglStatus (*configure)(PuglView*);
 
   /// Create surface and drawing context
-  PUGL_WARN_UNUSED_RESULT
-  PuglStatus (*create)(PuglView*);
+  PUGL_WARN_UNUSED_RESULT PuglStatus (*create)(PuglView*);
 
   /// Destroy surface and drawing context
   void (*destroy)(PuglView*);
 
   /// Enter drawing context, for drawing if expose is non-null
-  PUGL_WARN_UNUSED_RESULT
-  PuglStatus (*enter)(PuglView*, const PuglExposeEvent*);
+  PUGL_WARN_UNUSED_RESULT PuglStatus (*enter)(PuglView*,
+                                              const PuglExposeEvent*);
 
   /// Leave drawing context, after drawing if expose is non-null
-  PUGL_WARN_UNUSED_RESULT
-  PuglStatus (*leave)(PuglView*, const PuglExposeEvent*);
+  PUGL_WARN_UNUSED_RESULT PuglStatus (*leave)(PuglView*,
+                                              const PuglExposeEvent*);
 
   /// Return the puglGetContext() handle for the application, if any
   void* (*getContext)(PuglView*);