Oh I forgot a few things. First, the other .cpp_ files.

windows/drawtext.cpp

@@ -1,7 +1,6 @@
 // 22 december 2015
-#include "uipriv_windows.h"
-// TODO
-#include <vector>
+#include "uipriv_windows.hpp"
+// TODO really migrate
 
 // notes:
 // only available in windows 8 and newer:

windows/dwrite.cpp

@@ -1,8 +1,5 @@
 // 14 april 2016
-// Before we begin, you may be wondering why this file is C++.
-// Simple: <dwrite.h> is C++ only! Thanks Microsoft!
-// And unlike UI Automation which accidentally just forgets the 'struct' and 'enum' tags in places, <dwrite.h> is a full C++ header file, with class definitions and the use of __uuidof. Oh well :/
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 IDWriteFactory *dwfactory = NULL;
 

windows/fontbutton.cpp

@@ -1,6 +1,5 @@
 // 14 april 2016
-#include "uipriv_windows.h"
-#define this self		// TODO
+#include "uipriv_windows.hpp"
 
 struct uiFontButton {
 	uiWindowsControl c;

windows/fontdialog.cpp

@@ -1,5 +1,5 @@
 // 14 april 2016
-#include "uipriv_windows.h"
+#include "uipriv_windows.hpp"
 
 // TODOs
 // - quote the Choose Font sample here for reference