Refactored includes

src/NitroWin/NUtils.cpp

@@ -32,7 +32,9 @@
  */
 
 #include "NUtils.h"
-#include <X11/Xatom.h>
+
+#include <unordered_map>
+#include <utility>
 
 void NUtils::frameWindow (Window w) {
 	frameWindow(w,  false);

src/NitroWin/NUtils.h

@@ -35,12 +35,12 @@
 
 #ifndef NUTILS_H
 #define NUTILS_H
+
 #include "NitroWin.h"
 
 #include "NWMAction.h"
-#include <X11/Xlib.h>
+
 #include <X11/Xatom.h>
-#include <X11/X.h>
 #include <iostream>
 
 class NUtils {

src/NitroWin/NWMAction.cpp

@@ -32,8 +32,11 @@
  */
 
 #include "NWMAction.h"
+
 #include "NUtils.h"
+
 #include <iostream>
+
 //#include <vector>
 
 // MOVING WINDOWS

src/NitroWin/NWMAction.h

@@ -33,13 +33,17 @@
 
 #ifndef NWMACTION_H
 #define NWMACTION_H
+
 #include "NitroWin.h"
-#include <X11/Xlib.h>
-#include <vector>
-#include <unordered_map>
 
 #include <NPosition.h>
-#include "NSize.h"
+#include <NSize.h>
+
+#include <unordered_map>
+#include <vector>
+
+template <class T> class NSize;
+template <typename T> class NPosition;
 
 class NWMAction {
 protected:

src/NitroWin/NWManager.cpp

@@ -25,12 +25,12 @@
  */
 
 #include "NWManager.h"
-#include "NWMAction.h"
-#include "NUtils.h"
 
 #include <iostream>
-#include <iterator>
-#include <unordered_map>
+#include <utility>
+
+#include "NUtils.h"
+#include "NWMAction.h"
 
 bool NWManager::wm_detected = false;
 

src/NitroWin/NWManager.h

@@ -26,10 +26,8 @@
 
 #ifndef NWMANAGER_H
 #define NWMANAGER_H
-#include "NitroWin.h"
 
-#include <X11/X.h>
-#include <X11/Xlib.h>
+#include "NitroWin.h"
 #include <unordered_map>
 
 class NWManager {

src/NitroWin/NitroWin.h

@@ -41,5 +41,8 @@
 #define NITROWIN_VERSION_TWEAK 0
 #define NITROWIN_VERSION "1.0.0.0"
 
+#include <X11/Xlib.h>
+#include <X11/X.h>
+
 #endif /* NITROWIN_H */
 

src/NitroWin/NitroWin.h.in

@@ -41,5 +41,8 @@
 #define NITROWIN_VERSION_TWEAK @Nitrogen_VERSION_TWEAK@
 #define NITROWIN_VERSION "@Nitrogen_VERSION_MAJOR@.@Nitrogen_VERSION_MINOR@.@Nitrogen_VERSION_PATCH@.@Nitrogen_VERSION_TWEAK@"
 
+#include <X11/Xlib.h>
+#include <X11/X.h>
+
 #endif /* NITROWIN_H */
 

src/NitroWin/main.cpp

 #include "NitroWin.h"
-#include <iostream>
-#include "NWManager.h"
+
 #include <Color.h>
-#include <NPosition.h>
+#include <NObject.h>
+#include "NWManager.h"
+
+#include <iostream>
 
 int main ( int argc, char** argv )
 {

src/libnde/NPosition.cpp

@@ -24,9 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <nde.h>
-#include <NPosition.h>
-//#include <string>
+#include "NPosition.h"
 
 /*template <typename T>
 NPosition<T>::NPosition(T x, T y) {

src/libnde/NPosition.h

@@ -28,7 +28,6 @@
 #define NPOSITION_H
 
 #include <nde.h>
-#include <string>
 
 template <typename T>
 class NPosition : public gc {

src/libnde/NSize.cpp

@@ -24,9 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <nde.h>
-#include <NSize.h>
-//#include <string>
+#include "NSize.h"
 
 void testNSizeInt() {
 	NSize<int> rawr = NSize<int>(1,1);

src/libnde/NSize.h

@@ -26,6 +26,7 @@
 
 #ifndef NSIZE_H
 #define NSIZE_H
+
 #include <nde.h>
 
 template <class T>

src/libnde/nde.h

@@ -50,6 +50,7 @@
 #define NDE_VERSION "1.0.0.0"
 
 #include <typeinfo>
+#include <iosfwd>
 #include <string>
 
 namespace nitrogen {

src/libnde/nde.h.in

@@ -50,6 +50,7 @@
 #define NDE_VERSION "@Nitrogen_VERSION_MAJOR@.@Nitrogen_VERSION_MINOR@.@Nitrogen_VERSION_PATCH@.@Nitrogen_VERSION_TWEAK@"
 
 #include <typeinfo>
+#include <iosfwd>
 #include <string>
 
 namespace nitrogen {

src/libnde/ndeMain.cpp

@@ -24,5 +24,3 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <nde.h>
-#include <typeinfo>

src/libntk/Color.cpp

@@ -32,7 +32,7 @@
  */
 
 #include "Color.h"
-#include <string>
+
 namespace nitrogen {
 
 	Color::Color(unsigned int c) {

src/libntk/Color.h

@@ -33,6 +33,7 @@
 
 #ifndef COLOR_H
 #define COLOR_H
+
 #include <ntk.h>
 
 namespace nitrogen {

src/libntk/Component.cpp

@@ -32,6 +32,7 @@
  */
 
 #include "Component.h"
+
 namespace nitrogen {
 
 	Component::Component() {

src/libntk/Component.h

@@ -33,12 +33,14 @@
 
 #ifndef COMPONENT_H
 #define COMPONENT_H
-#include <list>
+
 #include <ntk.h>
 #include <Color.h>
 #include <NSize.h>
 #include <NPosition.h>
 
+#include <list>
+
 namespace nitrogen {
 	class Component : public NObject {
 	public:

src/libntk/Font.cpp

@@ -32,6 +32,10 @@
  */
 
 #include "Font.h"
+
+#include <ntk.h>
+#include <string>
+
 namespace nitrogen {
 	Font::Font(std::string* fn, int st, unsigned int si) {
 		fontName = fn;

src/libntk/Font.h

@@ -35,7 +35,6 @@
 #define FONT_H
 
 #include <ntk.h>
-#include <ostream>
 
 namespace nitrogen {
 	class Font : public NObject {

src/libntk/FontMetrics.cpp

@@ -32,6 +32,14 @@
  */
 
 #include "FontMetrics.h"
+
+#include <ntk.h>
+#include <string>
+
+#include "Font.h"
+#include "X11/Xlib.h"
+#include "ntk.h"
+
 namespace nitrogen {
 
 	FontMetrics::FontMetrics(Font* f) {

src/libntk/FontMetrics.h

@@ -33,13 +33,14 @@
 
 #ifndef FONTMETRICS_H
 #define FONTMETRICS_H
+
 #include <ntk.h>
 #include <Font.h>
-#include <string>
 #include <X11/X.h>
-#include <X11/Xlib.h>
 
 namespace nitrogen {
+class Font;
+
 	class FontMetrics : public NObject {
 	public:
 		FontMetrics(Font* f);

src/libntk/Graphics.h

@@ -33,6 +33,7 @@
 
 #ifndef GRAPHICS_H
 #define GRAPHICS_H
+
 #include <ntk.h>
 #include <Font.h>
 #include <FontMetrics.h>

src/libntk/NComponent.h

@@ -33,8 +33,8 @@
 
 #ifndef NCOMPONENT_H
 #define NCOMPONENT_H
+
 #include <ntk.h>
-#include <string>
 
 namespace nitrogen {
 

src/libntk/NObject.cpp

@@ -31,8 +31,10 @@
  * Created on March 16, 2018, 11:12 AM
  */
 
-#include <NObject.h>
-#include <typeinfo>
+#include "NObject.h"
+
+#include <ostream>
+
 namespace nitrogen {
 
 	NObject::NObject() {

src/libntk/NObject.h

@@ -32,8 +32,8 @@
  */
 #ifndef NOBJECT_H
 #define NOBJECT_H
+
 #include <ntk.h>
-#include <ostream>
 
 namespace nitrogen {
 	class NObject : public gc {

src/libntk/ntk.h

@@ -43,8 +43,9 @@
 #endif
 
 #include <nde.h>
+
 #include <X11/Xlib.h>
-#include <string>
+#include <ostream>
 
 #define NTK_NAME "ntk"
 #define NTK_VERSION_MAJOR 1

src/libntk/ntk.h.in

@@ -43,8 +43,9 @@
 #endif
 
 #include <nde.h>
+
 #include <X11/Xlib.h>
-#include <string>
+#include <ostream>
 
 #define NTK_NAME "@PROJECT_NAME@"
 #define NTK_VERSION_MAJOR @Nitrogen_VERSION_MAJOR@

src/libntk/ntkMain.cpp

@@ -24,6 +24,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <ntk.h>
+#include <X11/Xlib.h>
 
 namespace nitrogen {
 	void init(Display *d) {