reorganize and move things out of headers

progmgr/desktop.c

@@ -9,11 +9,11 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "resource.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <CommCtrl.h>
+#include "progmgr.h"
+#include "resource.h"
 
 /* Structures */
 typedef struct _mrp

progmgr/desktop2.c

@@ -9,8 +9,8 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
 #include <Windows.h>
+#include "progmgr.h"
 
 /* Structures */
 typedef struct _DPI

progmgr/dialog.c

@@ -9,16 +9,18 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#include <Windows.h>
+#include <Commctrl.h>
+#include <Commdlg.h>
+#include <Shlobj.h>
+#include <shlwapi.h>
+#include <shellapi.h>
+#include <strsafe.h>
 #include "progmgr.h"
 #include "dialog.h"
 #include "group.h"
 #include "resource.h"
-// #define WIN32_LEAN_AND_MEAN
-#include <Windows.h>
-#include <Commctrl.h>
-#include <Shlobj.h>
-#include <shlwapi.h>
-#include <strsafe.h>
 
 /* Variables */
 WCHAR		szDlgTitle[64];

progmgr/group.c

@@ -8,17 +8,18 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "group.h"
-#include "resource.h"
-#include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <windowsx.h>
 #include <CommCtrl.h>
 #include <shlwapi.h>
+#include <shellapi.h>
 #include <strsafe.h>
 #include <uxtheme.h>
+#include "progmgr.h"
+#include "group.h"
+#include "resource.h"
+#include "registry.h"
 
 /* Variables */
 WNDCLASSEX wcGrp;

progmgr/group.h

@@ -10,9 +10,6 @@
 /* Pragmas */
 #pragma once
 
-/* Includes */
-#include <CommCtrl.h>
-
 /* Definitions */
 #define MAX_GROUPS 512
 #define MAX_ITEMS 512

progmgr/progmgr.c

@@ -8,13 +8,13 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#define SECURITY_WIN32
+#include <Windows.h>
 #include "progmgr.h"
 #include "group.h"
 #include "resource.h"
 #include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
-#define SECURITY_WIN32
-#include <Windows.h>
 
 /* Variables */
 // Global

progmgr/progmgr.h

@@ -11,13 +11,11 @@
 #pragma once
 #pragma comment(lib, "ComCtl32.lib")
 #pragma comment(lib, "Shlwapi.lib")
+#pragma comment(lib, "Shell32.lib")
 #pragma comment(lib, "Secur32.lib")
 #pragma comment(lib, "UxTheme.lib")
 #pragma comment(lib, "Version.lib")
 
-/* Includes */
-#include <wtypes.h>
-
 /* Macros and Defines */
 #define GET_WM_COMMAND_ID(wParam, lParam) LOWORD(wParam)
 // RunFileDlg flags

progmgr/registry.c

@@ -8,13 +8,13 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
-#include "group.h"
-#include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 #include <shlwapi.h>
 #include <strsafe.h>
+#include "progmgr.h"
+#include "group.h"
+#include "registry.h"
 
 /* Variables */
 // Global HKEYs

progmgr/registry.h

@@ -10,9 +10,6 @@
 /* Pragmas */
 #pragma once
 
-/* Includes */
-#include <wtypes.h>
-
 /* Defines */
 #define HKEYMAXLEN 261
 // Key Paths

progmgr/sysint.c

@@ -8,9 +8,9 @@
 \* * * * * * * */
 
 /* Headers */
-#include "progmgr.h"
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
+#include "progmgr.h"
 
 /* Functions */
 

progmgr/wndproc.c

@@ -8,17 +8,18 @@
 \* * * * * * * */
 
 /* Headers */
+#define WIN32_LEAN_AND_MEAN
+#define SECURITY_WIN32
+#include <Windows.h>
+#include <strsafe.h>
+#include <shellapi.h>
+#include <Lmcons.h>
+#include <security.h>
 #include "progmgr.h"
 #include "dialog.h"
 #include "group.h"
 #include "resource.h"
 #include "registry.h"
-// #define WIN32_LEAN_AND_MEAN
-#define SECURITY_WIN32
-#include <Windows.h>
-#include <strsafe.h>
-#include <Lmcons.h>
-#include <security.h>
 
 /* Functions */